Merge pull request #123 from raven02/patch-8

Prepare to use GL_QCOM_alpha_test
This commit is contained in:
Henrik Rydgård committed 2013-09-05 00:17:09 -07:00
commit 0cfbc081f3
2 files changed
+13

No files matched your search

+7
View File
@@ -47,6 +47,13 @@ void OpenGLState::Restore() {
logicOp.restore(); count++;
#endif
#ifdef ANDROID
if (gl_extensions.QCOM_alpha_test) {
alphaTestQCOM.restore(); count++;
alphaFuncQCOM.restore(); count++;
}
#endif
scissorTest.restore(); count++;
scissorRect.restore(); count++;
+6
View File
@@ -267,6 +267,12 @@ public:
STATE3(glStencilOp, GLenum, GLenum, GLenum, GL_KEEP, GL_KEEP, GL_KEEP) stencilOp;
STATE3(glStencilFunc, GLenum, GLint, GLuint, GL_ALWAYS, 0, 0xFF) stencilFunc;
#ifdef ANDROID
// QCOM Alpha Test
BoolState<GL_ALPHA_TEST_QCOM, false> alphaTestQCOM;
STATE2(glAlphaFuncQCOM, GLenum, GLclampf, GL_ALWAYS, 0.0f) alphaFuncQCOM;
#endif
// Only works on Win32, all other platforms are "force-vsync"
void SetVSyncInterval(int interval); // one of the above VSYNC, or a higher number for multi-frame waits (could be useful for 30hz games)
};