commit 2505d77f30ae18358c70f995e23adca920bbab3c
author Bill Yi <byi@google.com> Wed Oct 24 14:46:34 2018 -0700
committer Bill Yi <byi@google.com> Wed Oct 24 14:46:34 2018 -0700
tree 016608bfc6c6c29580a163e005f6bc71bcfae7ed
parent 9c0d97c6494b578005edb22ab8f4679264aa36c3
parent e4fd8b26455d5cbeaff4e99c499ec28d7dec77a2

Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: Ib30caddf5a9c24401b68d6da7aa19a76693aba8b

Android.bp

diff --git a/Android.bp b/Android.bp
index 4001deb..37af066 100644
--- a/Android.bp
+++ b/Android.bp
@@ -976,6 +976,7 @@
         "libskia",
     ],
     cflags: [
+        "-Wno-implicit-fallthrough",
         "-Wno-unused-parameter",
         "-Wno-unused-variable",
     ],

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