Changeset 2354 for OGRE/trunk

Timestamp:

05/08/07 14:36:28 (18 years ago)

Author:

szirmay

Message:

 

Location:

OGRE/trunk/ogre_changes/Ogre1.2/RenderSystems/Direct3D9

Files:

• include/OgreD3D9HLSLProgram.h (modified) (1 diff)
• src/OgreD3D9HLSLProgram.cpp (modified) (1 diff)

OGRE/trunk/ogre_changes/Ogre1.2/RenderSystems/Direct3D9/include/OgreD3D9HLSLProgram.h

@@ -80 +80 @@
                 static CmdOptimalization msCmdOptimalization;
         static CmdFlowControl msCmdFlowControl;
+
+                /** Internal load implementation, loads just the high-level portion, enough to 
+            get parameters.
+        */
+        void loadHighLevelImpl(void);
+                virtual void loadFromFile(void);        
 #endif
         /** Internal load implementation, must be implemented by subclasses.
         */
         void loadFromSource(void);
-        /** Internal method for creating an appropriate low-level program from this
+                /** Internal method for creating an appropriate low-level program from this
         high-level program, must be implemented by subclasses. */
         void createLowLevelImpl(void);

OGRE/trunk/ogre_changes/Ogre1.2/RenderSystems/Direct3D9/src/OgreD3D9HLSLProgram.cpp

@@ -92 +92 @@
 
 
-    }
+    }   
+#ifdef GAMETOOLS_ILLUMINATION_MODULE
+        //-----------------------------------------------------------------------
+        void D3D9HLSLProgram::loadHighLevelImpl(void)
+    {
+        if (mLoadFromFile)
+                loadFromFile();
+        else
+                        loadFromSource();        
+    }
+    void D3D9HLSLProgram::loadFromFile(void)
+        {
+                 LPD3DXBUFFER errors = 0;
+                
+                        mCompilerFlags = NULL;
+                        
+                        if(!mOptimalization)
+                                mCompilerFlags = D3DXSHADER_SKIPOPTIMIZATION;
+                        if(mFlowControl == 1)
+                                mCompilerFlags = mCompilerFlags|D3DXSHADER_PREFER_FLOW_CONTROL;
+                        if(mFlowControl == -1)
+                                mCompilerFlags = mCompilerFlags|D3DXSHADER_AVOID_FLOW_CONTROL;
+
+                        HRESULT hr = D3DXCompileShaderFromFile(
+                                mFilename.c_str(),
+                                NULL, //no preprocessor defines
+                                NULL, //no includes
+                                mEntryPoint.c_str(),
+                                mTarget.c_str(),
+                                mCompilerFlags, 
+                                &mpMicroCode,
+                                &errors,
+                                &mpConstTable);         
+
+        if (FAILED(hr))
+        {
+            String message = "Cannot assemble D3D9 high-level shader " + mName + " Errors:\n" +
+                static_cast<const char*>(errors->GetBufferPointer());
+            errors->Release();
+            OGRE_EXCEPT(hr, message,
+                "D3D9HLSLProgram::loadFromSource");
+        }
+        }
+#endif
     //-----------------------------------------------------------------------
     void D3D9HLSLProgram::createLowLevelImpl(void)