FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed handling of GL function pointer setup for GLES1/GLES2 targets

Browse Source 
Dropped the fixed function pipeline defaults from  StateSet and SceneView.
This commit is contained in:
Robert Osfield
2009-11-03 11:10:41 +00:00
parent 9c5409ad8a
commit 08903d65a1
5 changed files with 70 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/osg/GL2Extensions.cpp
View File

@@ -328,7 +328,7 @@ void GL2Extensions::setupGL2Extensions(unsigned int contextID)
_glVersion = asciiToFloat( version );
_glslLanguageVersion = 0.0f;
_isShaderObjectsSupported = osg::isGLExtensionSupported(contextID,"GL_ARB_shader_objects");
_isVertexShaderSupported = osg::isGLExtensionSupported(contextID,"GL_ARB_vertex_shader");
_isFragmentShaderSupported = osg::isGLExtensionSupported(contextID,"GL_ARB_fragment_shader");
@@ -336,6 +336,15 @@ void GL2Extensions::setupGL2Extensions(unsigned int contextID)
_isGeometryShader4Supported = osg::isGLExtensionSupported(contextID,"GL_EXT_geometry_shader4");
_isGpuShader4Supported = osg::isGLExtensionSupported(contextID,"GL_EXT_gpu_shader4");
#if defined(OSG_GLES2_AVAILABLE)
_glVersion = 2.0;
_isShaderObjectsSupported = true;
_isVertexShaderSupported = true;
_isFragmentShaderSupported = true;
_isLanguage100Supported = true;
#endif
if( isGlslSupported() )
{
// If glGetString raises an error, assume initial release "1.00"