Merge pull request OGRECave#319 from paroj/glcleanup

Glcleanup

OgreMain/src/OgreHighLevelGpuProgram.cpp

@@ -138,6 +138,10 @@ namespace Ogre
                 }
 
             }
+            catch (const RuntimeAssertionException&)
+            {
+                throw;
+            }
             catch (const Exception& e)
             {
                 // will already have been logged

OgreMain/src/OgreResourceGroupManager.cpp

@@ -670,6 +670,7 @@ namespace Ogre {
         const String& resourceName, const String& groupName, 
         bool searchGroupsIfNotFound, Resource* resourceBeingLoaded) const
     {
+        OgreAssert(!resourceName.empty(), "resourceName is empty string");
         OGRE_LOCK_AUTO_MUTEX;
 
         if(mLoadingListener)

RenderSystems/GL/src/OgreGLGpuProgramManager.cpp

@@ -78,7 +78,10 @@ Resource* GLGpuProgramManager::createImpl(const String& name, ResourceHandle han
     {
         // No factory, this is an unsupported syntax code, probably for another rendersystem
         // Create a basic one, it doesn't matter what it is since it won't be used
-        return new GLGpuProgram(this, name, handle, group, isManual, loader);
+        // we have to forward the syntax code though
+        GpuProgram* ret =  new GLGpuProgram(this, name, handle, group, isManual, loader);
+        ret->setSyntaxCode(paramSyntax->second);
+        return  ret;
     }
 
     GpuProgramType gpt;
@@ -108,7 +111,10 @@ Resource* GLGpuProgramManager::createImpl(const String& name, ResourceHandle han
     {
         // No factory, this is an unsupported syntax code, probably for another rendersystem
         // Create a basic one, it doesn't matter what it is since it won't be used
-        return new GLGpuProgram(this, name, handle, group, isManual, loader);
+        // we have to forward the syntax code though
+        GpuProgram* ret =  new GLGpuProgram(this, name, handle, group, isManual, loader);
+        ret->setSyntaxCode(syntaxCode);
+        return  ret;
     }
 
     return (iter->second)(this, name, handle, group, isManual, loader, gptype, syntaxCode);

RenderSystems/GL3Plus/src/GLSL/OgreGLSLShaderManager.cpp

@@ -83,7 +83,10 @@ namespace Ogre {
         {
             // No factory, this is an unsupported syntax code, probably for another rendersystem
             // Create a basic one, it doesn't matter what it is since it won't be used
-            return new GLSLShader(this, name, handle, group, isManual, loader);
+            // we have to forward the syntax code though
+            GpuProgram* ret =  new GLSLShader(this, name, handle, group, isManual, loader);
+            ret->setSyntaxCode(paramSyntax->second);
+            return  ret;
         }
 
         GpuProgramType gpt;
@@ -135,7 +138,10 @@ namespace Ogre {
         {
             // No factory, this is an unsupported syntax code, probably for another rendersystem
             // Create a basic one, it doesn't matter what it is since it won't be used
-            return new GLSLShader(this, name, handle, group, isManual, loader);
+            // we have to forward the syntax code though
+            GpuProgram* ret =  new GLSLShader(this, name, handle, group, isManual, loader);
+            ret->setSyntaxCode(syntaxCode);
+            return  ret;
         }
 
         return (iter->second)(this, name, handle, group, isManual, loader, gptype, syntaxCode);

RenderSystems/GLES2/include/OgreGLES2RenderSystem.h

@@ -33,7 +33,7 @@ THE SOFTWARE.
 
 #include "OgreMaterialManager.h"
 #include "OgreRenderSystem.h"
-#include "OgreGLES2GpuProgram.h"
+#include "OgreGLSLESProgram.h"
 #include "OgreGLRenderSystemCommon.h"
 
 namespace Ogre {
@@ -52,7 +52,6 @@ namespace Ogre {
 #if !OGRE_NO_GLES2_CG_SUPPORT
     class GLSLESCgProgramFactory;
 #endif
-    class GLSLESGpuProgram;
     class HardwareBufferManager;
 #if OGRE_PLATFORM == OGRE_PLATFORM_ANDROID || OGRE_PLATFORM == OGRE_PLATFORM_EMSCRIPTEN
     class GLES2ManagedResourceManager;
@@ -129,8 +128,8 @@ namespace Ogre {
 
             GLint getCombinedMinMipFilter(void) const;
 
-            GLES2GpuProgram* mCurrentVertexProgram;
-            GLES2GpuProgram* mCurrentFragmentProgram;
+            GLSLESProgram* mCurrentVertexProgram;
+            GLSLESProgram* mCurrentFragmentProgram;
 
             GLint getTextureAddressingMode(TextureUnitState::TextureAddressingMode tam) const;
             GLenum getBlendMode(SceneBlendFactor ogreBlend) const;

RenderSystems/GLES2/src/GLSLES/include/OgreGLSLESProgram.h

@@ -97,6 +97,22 @@ namespace Ogre {
         /// compile source into shader object
         bool compile( const bool checkErrors = false);
 
+        /// Since GLSL has no assembly, use this shader for binding.
+        GpuProgram* _getBindingDelegate(void) { return this; }
+
+        /// Execute the binding functions for this program
+        void bindProgram(void);
+        /// Execute the unbinding functions for this program
+        void unbindProgram(void);
+        /// Execute the param binding functions for this program
+        void bindProgramParameters(GpuProgramParametersSharedPtr params, uint16 mask);
+        /// Execute the shared param binding functions for this program
+        void bindProgramSharedParameters(GpuProgramParametersSharedPtr params, uint16 mask);
+        /// Execute the pass iteration param binding functions for this program
+        void bindProgramPassIterationParameters(GpuProgramParametersSharedPtr params);
+
+        size_t calculateSize(void) const;
+
     protected:
 #if !OGRE_NO_GLES2_GLSL_OPTIMISER
         static CmdOptimisation msCmdOptimisation;