aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJukka Jylänki <jujjyl@gmail.com>2014-01-18 12:33:18 +0200
committerJukka Jylänki <jujjyl@gmail.com>2014-01-18 12:33:18 +0200
commitac244127bf487f7d74f894412a5e54b8850c0e86 (patch)
tree868e58aa2fc3d4d45b18ecfb6ec2fd09a4f29391
parent6c0e61a08545ce1bb7eb7676d7d7f3d022253f23 (diff)
Fix FFP GL emulation directives. The form !GL_FFP_ONLY is not supported, use GL_FFP_ONLY == 0 instead.
-rw-r--r--src/library_gl.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/library_gl.js b/src/library_gl.js
index dd7aeafb..1b6a47a4 100644
--- a/src/library_gl.js
+++ b/src/library_gl.js
@@ -3547,13 +3547,13 @@ var LibraryGL = {
}
keyView.next((enabledAttributesKey << 2) | fogParam);
-#if !GL_FFP_ONLY
+#if GL_FFP_ONLY == 0
// By cur program:
keyView.next(GL.currProgram);
if (!GL.currProgram) {
#endif
GLImmediate.TexEnvJIT.traverseState(keyView);
-#if !GL_FFP_ONLY
+#if GL_FFP_ONLY == 0
}
#endif
@@ -3940,7 +3940,7 @@ var LibraryGL = {
GLctx.enableVertexAttribArray(this.colorLocation);
#endif
}
-#if !GL_FFP_ONLY
+#if GL_FFP_ONLY == 0
else if (this.hasColor) {
GLctx.disableVertexAttribArray(this.colorLocation);
GLctx.vertexAttrib4fv(this.colorLocation, GLImmediate.clientColor);
@@ -3955,7 +3955,7 @@ var LibraryGL = {
},
cleanup: function cleanup() {
-#if !GL_FFP_ONLY
+#if GL_FFP_ONLY == 0
GLctx.disableVertexAttribArray(this.positionLocation);
if (this.hasTextures) {
for (var i = 0; i < GLImmediate.MAX_TEXTURES; i++) {
@@ -4342,7 +4342,7 @@ var LibraryGL = {
}
#if GL_UNSAFE_OPTS == 0
-#if !GL_FFP_ONLY
+#if GL_FFP_ONLY == 0
renderer.cleanup();
#endif
#endif