commit bd20b48796a79146152a13d04a6229200b942095
author android-build-team Robot <android-build-team-robot@google.com> Tue Jul 17 03:05:17 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Jul 17 03:05:17 2018 +0000
tree ed4fc2e9c7f0cd49bbb2cf890e5357a0b872ac20
parent aa0f23c1924e18d0a408d90e02f0c22e2343814f
parent e9a2ecc00ae5ccaf89ce90cbdf8994c736797035

Snap for 4896779 from e9a2ecc00ae5ccaf89ce90cbdf8994c736797035 to pi-dr1-release

Change-Id: Icf060bd649a98f65c4e8d7b064c2a7f31e471927

src/gpu/gl/GrGLCaps.cpp

diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index 123b9b3..8b0235b 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -585,7 +585,7 @@
     }
     if (fProgramBinarySupport) {
         GrGLint count;
-        GR_GL_GetIntegerv(gli, GR_GL_NUM_SHADER_BINARY_FORMATS, &count);
+        GR_GL_GetIntegerv(gli, GR_GL_NUM_PROGRAM_BINARY_FORMATS, &count);
         fProgramBinarySupport = count > 0;
     }
 

src/gpu/gl/GrGLDefines.h

diff --git a/src/gpu/gl/GrGLDefines.h b/src/gpu/gl/GrGLDefines.h
index 6453973..fccb7a7 100644
--- a/src/gpu/gl/GrGLDefines.h
+++ b/src/gpu/gl/GrGLDefines.h
@@ -559,7 +559,6 @@
 #define GR_GL_MAX_VERTEX_UNIFORM_COMPONENTS            0x8B4A
 #define GR_GL_MAX_SHADER_PIXEL_LOCAL_STORAGE_FAST_SIZE 0x8F63
 #define GR_GL_SHADER_BINARY_FORMATS                    0x8DF8
-#define GR_GL_NUM_SHADER_BINARY_FORMATS                0x8DF9
 
 /* StencilFunction */
 #define GR_GL_NEVER                          0x0200
@@ -857,6 +856,9 @@
 #define GR_GL_SHADER_BINARY_FORMATS          0x8DF8
 #define GR_GL_NUM_SHADER_BINARY_FORMATS      0x8DF9
 
+/* Program Binary */
+#define GR_GL_NUM_PROGRAM_BINARY_FORMATS     0x87FE
+
 /* Shader Precision-Specified Types */
 #define GR_GL_LOW_FLOAT                      0x8DF0
 #define GR_GL_MEDIUM_FLOAT                   0x8DF1