notaz.gp2x.de
/
mupen64plus-pandora.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GLE2RICE: Some fixes from muppen64plus-ae
[mupen64plus-pandora.git]
/
source
/
gles2rice
/
src
/
OGLES2FragmentShaders.h
diff --git
a/source/gles2rice/src/OGLES2FragmentShaders.h
b/source/gles2rice/src/OGLES2FragmentShaders.h
old mode 100644
(file)
new mode 100755
(executable)
index
9e77eaa
..
70b97cf
--- a/
source/gles2rice/src/OGLES2FragmentShaders.h
+++ b/
source/gles2rice/src/OGLES2FragmentShaders.h
@@
-52,8
+52,14
@@
class COGL_FragmentProgramCombiner : public COGLColorCombiner4
{
public:
bool Initialize(void);
{
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;
protected:
friend class OGLDeviceBuilder;
@@
-75,6
+81,11
@@
private:
int FindCompiledMux();
virtual void GenerateCombinerSetting(int index);
virtual void GenerateCombinerSettingConstants(int index);
int FindCompiledMux();
virtual void GenerateCombinerSetting(int index);
virtual void GenerateCombinerSettingConstants(int index);
+ float m_AlphaRef;
+ bool bAlphaTestState;
+ bool bAlphaTestPreviousState;
+ bool bFogState;
+ bool bFogPreviousState;
#ifdef DEBUGGER
void DisplaySimpleMuxString(void);
#ifdef DEBUGGER
void DisplaySimpleMuxString(void);