Build fixes when compiling wuth CMake options OPENGL_PROFILE set to GLCORE

2016-08-08 15:08:07 +01:00
parent 46c86f53ac
commit 1d75089bf8
4 changed files with 10 additions and 10 deletions
--- a/include/osg/Texture
+++ b/include/osg/Texture
@@ -446,13 +446,13 @@ class OSG_EXPORT Texture : public osg::StateAttribute

        virtual GLenum getTextureTarget() const = 0;

+        #ifdef OSG_GL_FIXED_FUNCTION_AVAILABLE
        virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const
        {
-            #ifdef OSG_GL_FIXED_FUNCTION_AVAILABLE
                usage.usesTextureMode(getTextureTarget());
-            #endif
            return true;
        }
+        #endif

        virtual int getTextureWidth() const { return 0; }
        virtual int getTextureHeight() const { return 0; }