| Index: src/gpu/gl/GrGLDefines.h
|
| diff --git a/src/gpu/gl/GrGLDefines.h b/src/gpu/gl/GrGLDefines.h
|
| index a759413c5a43d4d7e03f6fd176cb324c31bceb6a..318fcd4d536bd7b9930eed8b54cf04cd2cb1857c 100644
|
| --- a/src/gpu/gl/GrGLDefines.h
|
| +++ b/src/gpu/gl/GrGLDefines.h
|
| @@ -161,7 +161,6 @@
|
| #define GR_GL_VERTEX_PROGRAM_POINT_SIZE 0x8642
|
| #define GR_GL_LINE_STIPPLE 0x0B24
|
| #define GR_GL_FRAMEBUFFER_SRGB 0x8DB9
|
| -#define GR_GL_SHADER_PIXEL_LOCAL_STORAGE 0x8F64
|
|
|
| /* ErrorCode */
|
| #define GR_GL_NO_ERROR 0
|
| @@ -422,30 +421,29 @@
|
| #define GR_GL_UNSIGNED_SHORT_5_6_5 0x8363
|
|
|
| /* Shaders */
|
| -#define GR_GL_FRAGMENT_SHADER 0x8B30
|
| -#define GR_GL_VERTEX_SHADER 0x8B31
|
| -#define GR_GL_GEOMETRY_SHADER 0x8DD9
|
| -#define GR_GL_MAX_VERTEX_ATTRIBS 0x8869
|
| -#define GR_GL_MAX_VERTEX_UNIFORM_VECTORS 0x8DFB
|
| -#define GR_GL_MAX_VARYING_VECTORS 0x8DFC
|
| -#define GR_GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
|
| -#define GR_GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
|
| -#define GR_GL_MAX_TEXTURE_IMAGE_UNITS 0x8872
|
| -#define GR_GL_MAX_FRAGMENT_UNIFORM_VECTORS 0x8DFD
|
| -#define GR_GL_SHADER_TYPE 0x8B4F
|
| -#define GR_GL_DELETE_STATUS 0x8B80
|
| -#define GR_GL_LINK_STATUS 0x8B82
|
| -#define GR_GL_VALIDATE_STATUS 0x8B83
|
| -#define GR_GL_ATTACHED_SHADERS 0x8B85
|
| -#define GR_GL_ACTIVE_UNIFORMS 0x8B86
|
| -#define GR_GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87
|
| -#define GR_GL_ACTIVE_ATTRIBUTES 0x8B89
|
| -#define GR_GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A
|
| -#define GR_GL_SHADING_LANGUAGE_VERSION 0x8B8C
|
| -#define GR_GL_CURRENT_PROGRAM 0x8B8D
|
| -#define GR_GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
|
| -#define GR_GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A
|
| -#define GR_GL_MAX_SHADER_PIXEL_LOCAL_STORAGE_FAST_SIZE 0x8F63
|
| +#define GR_GL_FRAGMENT_SHADER 0x8B30
|
| +#define GR_GL_VERTEX_SHADER 0x8B31
|
| +#define GR_GL_GEOMETRY_SHADER 0x8DD9
|
| +#define GR_GL_MAX_VERTEX_ATTRIBS 0x8869
|
| +#define GR_GL_MAX_VERTEX_UNIFORM_VECTORS 0x8DFB
|
| +#define GR_GL_MAX_VARYING_VECTORS 0x8DFC
|
| +#define GR_GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
|
| +#define GR_GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
|
| +#define GR_GL_MAX_TEXTURE_IMAGE_UNITS 0x8872
|
| +#define GR_GL_MAX_FRAGMENT_UNIFORM_VECTORS 0x8DFD
|
| +#define GR_GL_SHADER_TYPE 0x8B4F
|
| +#define GR_GL_DELETE_STATUS 0x8B80
|
| +#define GR_GL_LINK_STATUS 0x8B82
|
| +#define GR_GL_VALIDATE_STATUS 0x8B83
|
| +#define GR_GL_ATTACHED_SHADERS 0x8B85
|
| +#define GR_GL_ACTIVE_UNIFORMS 0x8B86
|
| +#define GR_GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87
|
| +#define GR_GL_ACTIVE_ATTRIBUTES 0x8B89
|
| +#define GR_GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A
|
| +#define GR_GL_SHADING_LANGUAGE_VERSION 0x8B8C
|
| +#define GR_GL_CURRENT_PROGRAM 0x8B8D
|
| +#define GR_GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
|
| +#define GR_GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A
|
|
|
| /* StencilFunction */
|
| #define GR_GL_NEVER 0x0200
|
|
|