diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-18 13:00:28 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-18 13:00:28 +0000 |
| commit | 0694ea7f6a16e946972b9c625f434e80eb42bb5f (patch) | |
| tree | 8a93916e28e1954fc631258bfb2715707fef958c /src/gpu/gl/GrGLUtil.h | |
| parent | 688d362b4545e1beadebb7ba5886813d7038883c (diff) | |
Fix to allow ovals GM to finish on N7
R=jvanverth@google.com, robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://chromiumcodereview.appspot.com/23477079
git-svn-id: http://skia.googlecode.com/svn/trunk@11340 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl/GrGLUtil.h')
| -rw-r--r-- | src/gpu/gl/GrGLUtil.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/gpu/gl/GrGLUtil.h b/src/gpu/gl/GrGLUtil.h index 686943bdce..5bcf2f324c 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() |