| Index: src/gpu/gl/GrGLUtil.h
|
| diff --git a/src/gpu/gl/GrGLUtil.h b/src/gpu/gl/GrGLUtil.h
|
| index 686943bdcef2c82626a43f4e8860208b3bb6d710..5bcf2f324c5d9e4cd8a57a3db984ef878bc1a4c2 100644
|
| --- a/src/gpu/gl/GrGLUtil.h
|
| +++ b/src/gpu/gl/GrGLUtil.h
|
| @@ -19,7 +19,7 @@ typedef uint32_t GrGLVersion;
|
| typedef uint32_t GrGLSLVersion;
|
|
|
| /**
|
| - * This list is lazily updated as required.
|
| + * The Vendor and Renderer enum values are lazily updated as required.
|
| */
|
| enum GrGLVendor {
|
| kARM_GrGLVendor,
|
| @@ -30,6 +30,12 @@ enum GrGLVendor {
|
| kOther_GrGLVendor
|
| };
|
|
|
| +enum GrGLRenderer {
|
| + kTegra3_GrGLRenderer,
|
| +
|
| + kOther_GrGLRenderer
|
| +};
|
| +
|
| #define GR_GL_VER(major, minor) ((static_cast<int>(major) << 16) | \
|
| static_cast<int>(minor))
|
| #define GR_GLSL_VER(major, minor) ((static_cast<int>(major) << 16) | \
|
| @@ -76,12 +82,14 @@ GrGLBinding GrGLGetBindingInUseFromString(const char* versionString);
|
| GrGLSLVersion GrGLGetGLSLVersionFromString(const char* versionString);
|
| bool GrGLIsMesaFromVersionString(const char* versionString);
|
| GrGLVendor GrGLGetVendorFromString(const char* vendorString);
|
| +GrGLRenderer GrGLGetRendererFromString(const char* rendererString);
|
|
|
| // these variants call glGetString()
|
| GrGLBinding GrGLGetBindingInUse(const GrGLInterface*);
|
| GrGLVersion GrGLGetVersion(const GrGLInterface*);
|
| GrGLSLVersion GrGLGetGLSLVersion(const GrGLInterface*);
|
| GrGLVendor GrGLGetVendor(const GrGLInterface*);
|
| +GrGLRenderer GrGLGetRenderer(const GrGLInterface*);
|
|
|
| /**
|
| * Helpers for glGetError()
|
|
|