X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=source%2Fgles2rice%2Fsrc%2FOGLES2FragmentShaders.h;h=2245cb0d5977ebce19631fc7cba9367d6962243e;hb=refs%2Fpull%2F1%2Fhead;hp=9e77eaa28d24efd2a02aba3e5acfdf65b3b28a6b;hpb=292f9317f53c38c181439013be7276f86517fd6b;p=mupen64plus-pandora.git

diff --git a/source/gles2rice/src/OGLES2FragmentShaders.h b/source/gles2rice/src/OGLES2FragmentShaders.h
old mode 100644
new mode 100755
index 9e77eaa..2245cb0
--- a/source/gles2rice/src/OGLES2FragmentShaders.h
+++ b/source/gles2rice/src/OGLES2FragmentShaders.h
@@ -45,6 +45,14 @@ typedef struct {
     GLint FogColorLocation;
     GLint FogMinMaxLocation;
 
+    float PrimColors[4];
+    float EnvColors[4];
+    float PrimLODFrac;
+    float EnvLODFrac;
+    float AlphaRef;
+    float FogColors[4];
+    float FogMin;
+    float FogMax;
 } OGLShaderCombinerSaveType;
 
 
@@ -52,8 +60,14 @@ class COGL_FragmentProgramCombiner : public COGLColorCombiner4
 {
 public:
     bool Initialize(void);
-    float m_AlphaRef;
-    void UpdateFog(bool bEnable);
+    void SetFogState(bool bEnable)
+    {
+        bFogState = bEnable;
+    }
+    void SetAlphaTestState(bool bEnable)
+    {
+        bAlphaTestState = bEnable;
+    }
 
 protected:
     friend class OGLDeviceBuilder;
@@ -75,6 +89,14 @@ private:
     int FindCompiledMux();
     virtual void GenerateCombinerSetting(int index);
     virtual void GenerateCombinerSettingConstants(int index);
+    float m_AlphaRef;
+    bool bAlphaTestState;
+    bool bAlphaTestPreviousState;
+    bool bFogState;
+    bool bFogPreviousState;
+
+    void UseProgram(GLuint program);
+    GLuint currentProgram;
 
 #ifdef DEBUGGER
     void DisplaySimpleMuxString(void);