commit 091540d31c6be35332e96178d58d2558db175bf2
author Brandon Jones <bajones@chromium.org> Wed Oct 29 11:32:04 2014 -0700
committer Brandon Jones <bajones@chromium.org> Thu Oct 30 18:30:13 2014 +0000
tree 8a1906f594dcdf34c08b2a015be1aff70ce33038
parent db9b40b0d663a105c05889647931dc25b379d966

Changed feature macros to reduce accidental enabling/disabling

Change-Id: Ieb1a0c55f412f2a1bb858522b2dfaa7a60aa7ddb
Reviewed-on: https://chromium-review.googlesource.com/226304
Reviewed-by: Brandon Jones <bajones@chromium.org>
Tested-by: Brandon Jones <bajones@chromium.org>

src/libGLESv2/ProgramBinary.cpp

diff --git a/src/libGLESv2/ProgramBinary.cpp b/src/libGLESv2/ProgramBinary.cpp
index 900423f..40f1e8c 100644
--- a/src/libGLESv2/ProgramBinary.cpp
+++ b/src/libGLESv2/ProgramBinary.cpp
@@ -27,6 +27,7 @@
 #include "libGLESv2/Context.h"
 #include "libGLESv2/Buffer.h"
 #include "common/blocklayout.h"
+#include "common/features.h"
 
 namespace gl
 {
@@ -362,7 +363,7 @@
 
 LinkResult ProgramBinary::load(InfoLog &infoLog, GLenum binaryFormat, const void *binary, GLsizei length)
 {
-#ifdef ANGLE_DISABLE_PROGRAM_BINARY_LOAD
+#if ANGLE_PROGRAM_BINARY_LOAD == ANGLE_ENABLED
     return LinkResult(false, Error(GL_NO_ERROR));
 #else
     ASSERT(binaryFormat == mProgram->getBinaryFormat());
@@ -419,7 +420,7 @@
     }
 
     return LinkResult(true, Error(GL_NO_ERROR));
-#endif // #ifdef ANGLE_DISABLE_PROGRAM_BINARY_LOAD
+#endif // #if ANGLE_PROGRAM_BINARY_LOAD == ANGLE_ENABLED
 }
 
 Error ProgramBinary::save(GLenum *binaryFormat, void *binary, GLsizei bufSize, GLsizei *length)