From 0a83632f0a9d85d5a34665e7443e41d21103624e Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Sun, 1 Mar 2015 15:20:37 +0000
Subject: [PATCH] Fixed StateSet::Define names to match
 OpenSceneGraph-Data/shaders.

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14745 16af8721-9629-0410-8352-f15c8da7e697
---
 .../osgshadercomposition/osgshadercomposition.cpp    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/osgshadercomposition/osgshadercomposition.cpp b/examples/osgshadercomposition/osgshadercomposition.cpp
index b14c32eda..aaabdaa9c 100644
--- a/examples/osgshadercomposition/osgshadercomposition.cpp
+++ b/examples/osgshadercomposition/osgshadercomposition.cpp
@@ -82,7 +82,7 @@ osg::Node* createNewShaderCompositionScene(osg::ArgumentParser& arguments)
         // shader calling the lighting function per vertex
         osg::PositionAttitudeTransform* pat = new osg::PositionAttitudeTransform;
         pat->setPosition(position);
-        pat->getOrCreateStateSet()->setDefine("GL_LIGHTING");
+        pat->getOrCreateStateSet()->setDefine("LIGHTING");
 
         pat->addChild(node.get());
 
@@ -99,7 +99,7 @@ osg::Node* createNewShaderCompositionScene(osg::ArgumentParser& arguments)
         // the fragment shader to read the texture of unit 0 (provided by the "texture0" uniform above.
         osg::PositionAttitudeTransform* pat = new osg::PositionAttitudeTransform;
         pat->setPosition(position);
-        pat->getOrCreateStateSet()->setDefine("GL_TEXTURE_2D");
+        pat->getOrCreateStateSet()->setDefine("TEXTURE_2D");
 
         pat->addChild(node.get());
 
@@ -113,8 +113,8 @@ osg::Node* createNewShaderCompositionScene(osg::ArgumentParser& arguments)
         // fourth subgraph, enable texturing and lighting
         osg::PositionAttitudeTransform* pat = new osg::PositionAttitudeTransform;
         pat->setPosition(position);
-        pat->getOrCreateStateSet()->setDefine("GL_LIGHTING");
-        pat->getOrCreateStateSet()->setDefine("GL_TEXTURE_2D");
+        pat->getOrCreateStateSet()->setDefine("LIGHTING");
+        pat->getOrCreateStateSet()->setDefine("TEXTURE_2D");
 
         pat->addChild(node.get());
 
@@ -127,8 +127,8 @@ osg::Node* createNewShaderCompositionScene(osg::ArgumentParser& arguments)
         // fourth subgraph, enable texturing and lighting
         osg::PositionAttitudeTransform* pat = new osg::PositionAttitudeTransform;
         pat->setPosition(position);
-        pat->getOrCreateStateSet()->setDefine("GL_LIGHTING");
-        pat->getOrCreateStateSet()->setDefine("GL_TEXTURE_2D");
+        pat->getOrCreateStateSet()->setDefine("LIGHTING");
+        pat->getOrCreateStateSet()->setDefine("TEXTURE_2D");
         pat->getOrCreateStateSet()->setDefine("VERTEX_FUNC(v)", "vec4(v.x, v.y, v.z * sin(osg_SimulationTime), v.w)");
 
         pat->addChild(node.get());