RTSS: slightly refactor ProgramProcessor

OGRECave · Oct 19, 2023 · aa2c53d · aa2c53d
1 parent 029de78
commit aa2c53d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 107 deletions.
diff --git a/Components/RTShaderSystem/src/OgreShaderGLSLProgramProcessor.cpp b/Components/RTShaderSystem/src/OgreShaderGLSLProgramProcessor.cpp
@@ -30,33 +30,6 @@ THE SOFTWARE.
 namespace Ogre {
 namespace RTShader {
 
-//-----------------------------------------------------------------------------
-GLSLProgramProcessor::GLSLProgramProcessor()
-{
-}
-
-//-----------------------------------------------------------------------------
-GLSLProgramProcessor::~GLSLProgramProcessor()
-{
-}
-
-//-----------------------------------------------------------------------------
-bool GLSLProgramProcessor::preCreateGpuPrograms(ProgramSet* programSet)
-{
-    Program* vsProgram = programSet->getCpuProgram(GPT_VERTEX_PROGRAM);
-    Program* fsProgram = programSet->getCpuProgram(GPT_FRAGMENT_PROGRAM);
-    Function* vsMain   = vsProgram->getEntryPointFunction();
-    Function* fsMain   = fsProgram->getEntryPointFunction();    
-    bool success;
-
-    // Compact vertex shader outputs.
-    success = ProgramProcessor::compactVsOutputs(vsMain, fsMain);
-    if (success == false)   
-        return false;   
-
-    return true;
-}
-
 //-----------------------------------------------------------------------------
 bool GLSLProgramProcessor::postCreateGpuPrograms(ProgramSet* programSet)
 {

diff --git a/Components/RTShaderSystem/src/OgreShaderGLSLProgramProcessor.h b/Components/RTShaderSystem/src/OgreShaderGLSLProgramProcessor.h
@@ -45,30 +45,7 @@ namespace RTShader {
 */
 class GLSLProgramProcessor : public ProgramProcessor
 {
-
-// Interface.
-public: 
-
-    /** Class constructor.
-    */
-    GLSLProgramProcessor();
-
-    /** Class destructor */
-    virtual ~GLSLProgramProcessor();
-
-    /** 
-    @see ProgramProcessor::preCreateGpuPrograms
-    */
-    bool preCreateGpuPrograms(ProgramSet* programSet) override;
-
-    /** 
-    @see ProgramProcessor::postCreateGpuPrograms
-    */
     bool postCreateGpuPrograms(ProgramSet* programSet) override;
-
-
-private:
-
     /** Bind texture samplers. */
     void bindTextureSamplers(Program* pCpuProgram, GpuProgramPtr pGpuProgram);
 };

diff --git a/Components/RTShaderSystem/src/OgreShaderHLSLProgramProcessor.cpp b/Components/RTShaderSystem/src/OgreShaderHLSLProgramProcessor.cpp
@@ -29,38 +29,6 @@ THE SOFTWARE.
 
 namespace Ogre {
 namespace RTShader {
-
-String HLSLProgramProcessor::TargetLanguage = "hlsl";
-
-//-----------------------------------------------------------------------------
-HLSLProgramProcessor::HLSLProgramProcessor()
-{
-
-}
-
-//-----------------------------------------------------------------------------
-HLSLProgramProcessor::~HLSLProgramProcessor()
-{
-
-}
-
-//-----------------------------------------------------------------------------
-bool HLSLProgramProcessor::preCreateGpuPrograms( ProgramSet* programSet )
-{
-    Program* vsProgram = programSet->getCpuProgram(GPT_VERTEX_PROGRAM);
-    Program* psProgram = programSet->getCpuProgram(GPT_FRAGMENT_PROGRAM);
-    Function* vsMain   = vsProgram->getEntryPointFunction();
-    Function* fsMain   = psProgram->getEntryPointFunction();    
-    bool success;
-
-    // Compact vertex shader outputs.
-    success = ProgramProcessor::compactVsOutputs(vsMain, fsMain);
-    if (success == false)   
-        return false;   
-
-    return true;
-}
-
 //-----------------------------------------------------------------------------
 bool HLSLProgramProcessor::postCreateGpuPrograms( ProgramSet* programSet )
 {

diff --git a/Components/RTShaderSystem/src/OgreShaderHLSLProgramProcessor.h b/Components/RTShaderSystem/src/OgreShaderHLSLProgramProcessor.h
@@ -45,31 +45,7 @@ namespace RTShader {
 */
 class HLSLProgramProcessor : public ProgramProcessor
 {
-
-    // Interface.
-public: 
-
-    /** Class constructor.
-    */
-    HLSLProgramProcessor();
-
-    /** Class destructor */
-    virtual ~HLSLProgramProcessor();
-
-    /** Return the target language of this processor. */
-    virtual const String& getTargetLanguage() const { return TargetLanguage; }
-
-    /** 
-    @see ProgramProcessor::preCreateGpuPrograms
-    */
-    bool preCreateGpuPrograms(ProgramSet* programSet) override;
-    /** 
-    @see ProgramProcessor::postCreateGpuPrograms
-    */
     bool postCreateGpuPrograms(ProgramSet* programSet) override;
-
-    static String TargetLanguage;
-
 };
 
 

diff --git a/Components/RTShaderSystem/src/OgreShaderProgramProcessor.cpp b/Components/RTShaderSystem/src/OgreShaderProgramProcessor.cpp
@@ -44,6 +44,19 @@ ProgramProcessor::~ProgramProcessor()
 
 }
 
+//-----------------------------------------------------------------------------
+bool ProgramProcessor::preCreateGpuPrograms(ProgramSet* programSet)
+{
+    Program* vsProgram = programSet->getCpuProgram(GPT_VERTEX_PROGRAM);
+    Program* fsProgram = programSet->getCpuProgram(GPT_FRAGMENT_PROGRAM);
+    Function* vsMain   = vsProgram->getEntryPointFunction();
+    Function* fsMain   = fsProgram->getEntryPointFunction();    
+
+    // Compact vertex shader outputs.
+    return compactVsOutputs(vsMain, fsMain);
+}
+
+
 //-----------------------------------------------------------------------------
 void ProgramProcessor::bindAutoParameters(Program* pCpuProgram, GpuProgramPtr pGpuProgram)
 {

diff --git a/Components/RTShaderSystem/src/OgreShaderProgramProcessor.h b/Components/RTShaderSystem/src/OgreShaderProgramProcessor.h
@@ -63,7 +63,7 @@ class ProgramProcessor : public RTShaderSystemAlloc
     @param programSet The program set container.
     Return true on success.
     */
-    virtual bool preCreateGpuPrograms(ProgramSet* programSet) = 0;
+    virtual bool preCreateGpuPrograms(ProgramSet* programSet);
 
     /** Called after creation of the GPU programs.
     @param programSet The program set container.