minor

oxygine/src/STDRenderer.cpp

@@ -563,7 +563,7 @@ namespace oxygine
 
     void STDRenderer::preDrawBatch()
     {
-        ShaderProgram* prog = _uberShader->getShaderProgram(_shaderFlags)->program;
+        ShaderProgram* prog = _uberShader->getShaderProgram(_shaderFlags);
         setShader(prog);
 
 
@@ -637,7 +637,7 @@ namespace oxygine
 
         _shaderFlags = shaderFlags;
 
-        ShaderProgram* prog = _uberShader->getShaderProgram(_shaderFlags)->program;
+        ShaderProgram* prog = _uberShader->getShaderProgram(_shaderFlags);
         setShader(prog);
 
         Vector4 c;
@@ -653,7 +653,7 @@ namespace oxygine
         drawBatch();
         _shaderFlags &= ~(UberShaderProgram::SDF | UberShaderProgram::SDF_OUTLINE);
 
-        ShaderProgram* prog = _uberShader->getShaderProgram(_shaderFlags)->program;
+        ShaderProgram* prog = _uberShader->getShaderProgram(_shaderFlags);
         setShader(prog);
     }
 

oxygine/src/core/UberShaderProgram.cpp

@@ -38,7 +38,7 @@ namespace oxygine
         unreg();
     }
 
-    UberShaderProgramBase::shader* UberShaderProgram::getShaderProgram(int flags)
+    ShaderProgram* UberShaderProgram::getShaderProgram(int flags)
     {
         shader& s = _shaders[flags];
 
@@ -107,7 +107,7 @@ namespace oxygine
             CHECKGL();
         }
 
-        return &s;
+        return s.program;
     }
 
     UberShaderProgram::UberShaderProgram()

oxygine/src/core/UberShaderProgram.h

@@ -34,7 +34,7 @@ namespace oxygine
         void setShaderUniformsCallback(ShaderUniformsCallback cb) {_cb = cb;}
 
 
-        virtual shader*         getShaderProgram(int flags) = 0;
+        virtual ShaderProgram*         getShaderProgram(int flags) = 0;
 
 
     protected:
@@ -72,7 +72,7 @@ namespace oxygine
             SAMPLER_NUM,
         };
 
-        shader*                 getShaderProgram(int flags);
+        ShaderProgram*  getShaderProgram(int flags) OVERRIDE;
 
         void apply(IVideoDriver* driver, spNativeTexture base, spNativeTexture alpha);