Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CGoGN
CGoGN
Commits
de622e31
Commit
de622e31
authored
Sep 05, 2014
by
Sylvain Thery
Browse files
minor GL modifications
parent
78b25edf
Changes
4
Hide whitespace changes
Inline
Side-by-side
Apps/Examples/viewer.cpp
View file @
de622e31
...
...
@@ -78,7 +78,9 @@ void Viewer::initGUI()
void
Viewer
::
cb_initGL
()
{
Utils
::
GLSLShader
::
setCurrentOGLVersion
(
2
)
;
Utils
::
GLSLShader
::
setCurrentOGLVersion
(
3
)
;
CGoGNout
<<
"GL VERSION = "
<<
glGetString
(
GL_VERSION
)
<<
CGoGNendl
;
Utils
::
GLSLShader
::
areShadersSupported
();
m_render
=
new
Algo
::
Render
::
GL2
::
MapRender
()
;
m_topoRender
=
new
Algo
::
Render
::
GL2
::
TopoRenderMap
<
PFP
>
()
;
...
...
Apps/Examples/volumeExplorer.cpp
View file @
de622e31
...
...
@@ -206,6 +206,8 @@ void MyQT::cb_initGL()
{
// choose to use GL version 2
Utils
::
GLSLShader
::
setCurrentOGLVersion
(
2
);
CGoGNout
<<
"GL VERSION = "
<<
glGetString
(
GL_VERSION
)
<<
CGoGNendl
;
Utils
::
GLSLShader
::
areShadersSupported
();
// create the renders
m_topo_render
=
new
Algo
::
Render
::
GL2
::
Topo3RenderMap
<
PFP
>
();
...
...
src/Utils/GLSLShader.cpp
View file @
de622e31
...
...
@@ -148,10 +148,35 @@ bool GLSLShader::areGeometryShadersSupported()
bool
GLSLShader
::
areShadersSupported
()
{
if
(
!
glewGetExtension
(
"GL_ARB_vertex_shader"
))
return
false
;
if
(
!
glewGetExtension
(
"GL_ARB_fragment_shader"
))
return
false
;
if
(
!
glewGetExtension
(
"GL_ARB_shader_objects"
))
return
false
;
if
(
!
glewGetExtension
(
"GL_ARB_shading_language_100"
))
return
false
;
if
(
!
glewIsSupported
(
"GL_ARB_vertex_shader"
))
{
CGoGNerr
<<
" vertex shaders not supported!"
<<
CGoGNendl
;
return
false
;
}
if
(
!
glewIsSupported
(
"GL_ARB_fragment_shader"
))
{
CGoGNerr
<<
" fragment shaders not supported!"
<<
CGoGNendl
;
return
false
;
}
if
(
!
glewIsSupported
(
"GL_ARB_geometry_shader4"
))
{
CGoGNerr
<<
" geometry shaders not supported!"
<<
CGoGNendl
;
return
false
;
}
if
(
!
glewIsSupported
(
"GL_ARB_shader_objects"
))
{
CGoGNerr
<<
" shaders not supported!"
<<
CGoGNendl
;
return
false
;
}
if
(
!
glewIsSupported
(
"GL_ARB_shading_language_100"
))
{
CGoGNerr
<<
" GLSL no supported!"
<<
CGoGNendl
;
return
false
;
}
return
true
;
}
...
...
@@ -399,7 +424,7 @@ bool GLSLShader::loadGeometryShaderSourceString( const char *geom_shader_source
*
m_geom_shader_object
=
0
;
}
/*** create shader object ***/
*
m_geom_shader_object
=
glCreateShader
(
GL_GEOMETRY_SHADER
_EXT
);
*
m_geom_shader_object
=
glCreateShader
(
GL_GEOMETRY_SHADER
);
if
(
!*
m_geom_shader_object
)
{
...
...
src/Utils/Qt/qtgl.cpp
View file @
de622e31
...
...
@@ -193,7 +193,6 @@ glm::vec3& GLWidget::getObjPos()
void
GLWidget
::
initializeGL
()
{
std
::
cout
<<
"GL VERSION = "
<<
glGetString
(
GL_VERSION
)
<<
std
::
endl
;
glEnable
(
GL_DEPTH_TEST
);
if
(
m_cbs
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment