Merge pull request #105 from raven02/patch-4

Add logicOps support in native
This commit is contained in:
Henrik Rydgård committed 2013-08-06 01:06:32 -07:00
commit 9d00b2de2c
2 files changed
+6

No files matched your search

+3
View File
@@ -39,6 +39,9 @@ void OpenGLState::Restore() {
blendFunc.restore(); count++;
blendColor.restore(); count++;
colorLogicOp.restore(); count++;
logicOp.restore(); count++;
scissorTest.restore(); count++;
scissorRect.restore(); count++;
+3
View File
@@ -202,6 +202,9 @@ public:
STATE1(glBlendEquation, GLenum, GL_FUNC_ADD) blendEquation;
STATEFLOAT4(glBlendColor, 1.0f) blendColor;
BoolState<GL_COLOR_LOGIC_OP, false> colorLogicOp;
STATE1(glLogicOp, GLenum, GL_COPY) logicOp;
BoolState<GL_SCISSOR_TEST, false> scissorTest;
BoolState<GL_CULL_FACE, false> cullFace;