diff -r 3486e648dc5f Source/System/State/Shader/SHL/OSGSimpleSHLChunk.cpp
--- a/Source/System/State/Shader/SHL/OSGSimpleSHLChunk.cpp Tue Jun 07
11:29:35 2011 -0700
+++ b/Source/System/State/Shader/SHL/OSGSimpleSHLChunk.cpp Wed Jun 08
09:25:34 2011 -0700
@@ -1257,7 +1257,7 @@
#ifdef OSG_1_COMPAT
if(_fParameterCallback)
{
- OSGGETGLFUNCBYID_GL3_ES(OSGglGetUniformLocationProc,
+ OSGGETGLFUNCBYID_GL3_ES(glGetUniformLocation,
osgGlGetUniformLocation,
ShaderProgram::getFuncIdGetUniformLocation(),
pWin);
diff -r 3486e648dc5f
Source/System/State/Shader/SHL/testSHLProcLights_compat.cpp
--- a/Source/System/State/Shader/SHL/testSHLProcLights_compat.cpp Tue
Jun 07 11:29:35 2011 -0700
+++ b/Source/System/State/Shader/SHL/testSHLProcLights_compat.cpp Wed
Jun 08 09:25:34 2011 -0700
@@ -169,9 +169,9 @@
if(iLoc != -1)
{
- OSGGETGLFUNC(OSG::OSGglUniform1iProc,
- osgGlUniform1i,
- OSG::ShaderProgram::getFuncIdUniform1i());
+ OSGGETGLFUNC_EXT(glUniform1i,
+ osgGlUniform1i,
+ OSG::ShaderProgram::getFuncIdUniform1i());
osgGlUniform1i(iLoc,
GLint(pEnv->getLightState() & 0x0001));
@@ -186,9 +186,9 @@
if(iLoc != -1)
{
- OSGGETGLFUNC(OSG::OSGglUniform1iProc,
- osgGlUniform1i,
- OSG::ShaderProgram::getFuncIdUniform1i());
+ OSGGETGLFUNC_EXT(glUniform1i,
+ osgGlUniform1i,
+ OSG::ShaderProgram::getFuncIdUniform1i());
osgGlUniform1i(iLoc,
GLint(pEnv->getLightState() & 0x0002));
@@ -203,9 +203,9 @@
if(iLoc != -1)
{
- OSGGETGLFUNC(OSG::OSGglUniform1iProc,
- osgGlUniform1i,
- OSG::ShaderProgram::getFuncIdUniform1i());
+ OSGGETGLFUNC_EXT(glUniform1i,
+ osgGlUniform1i,
+ OSG::ShaderProgram::getFuncIdUniform1i());
osgGlUniform1i(iLoc,
GLint(pEnv->getLightState() & 0x0004));
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
Opensg-users mailing list
Opensg-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensg-users
