diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2018-07-09 16:29:09 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-09 21:05:38 +0000 |
| commit | 8fe31406e98062af447ff1e0511ab9bbdeed7638 (patch) | |
| tree | 43b49d726b553aebce67d0b9b3cfd183602bff0a | |
| parent | b456e2fc84b1bbb7209904c0835f671a59663ac9 (diff) | |
switched from NUM_SHADER_BINARY_FORMATS to NUM_PROGRAM_BINARY_FORMATS
Bug: b/110175245
Change-Id: I6b843bc1e3c36bc32531705fc661788d4eef6d35
Reviewed-on: https://skia-review.googlesource.com/140003
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
| -rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLDefines.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 5cb23427c5..d35dadda03 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -600,7 +600,7 @@ void GrGLCaps::init(const GrContextOptions& contextOptions, } 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; } diff --git a/src/gpu/gl/GrGLDefines.h b/src/gpu/gl/GrGLDefines.h index 30d0a4c2f9..8e7809f642 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 @@ -852,6 +851,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 |