diff options
| author | Bo Liu <boliu@google.com> | 2014-05-01 10:38:38 -0700 |
|---|---|---|
| committer | Bo Liu <boliu@google.com> | 2014-05-01 10:38:38 -0700 |
| commit | 27ab20dffff01006f5d20fdb2b3f4ea503d69114 (patch) | |
| tree | f8a42f1186f835772ed0c20a7f9095392e124b04 /gpu/gl/GrGLUtil.h | |
| parent | 51512eaae8128a677f92e2689d8df720dca13d32 (diff) | |
| parent | 2e8705638185600b128f867809b6cd034225451c (diff) | |
| download | src-27ab20dffff01006f5d20fdb2b3f4ea503d69114.tar.gz | |
Merge from Chromium at DEPS revision 267519idea133-weekly-release
This commit was generated by merge_to_master.py.
Change-Id: Ic063600f0ecbd8d3c74d2d514eaf91c1a33c9f07
Diffstat (limited to 'gpu/gl/GrGLUtil.h')
| -rw-r--r-- | gpu/gl/GrGLUtil.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gpu/gl/GrGLUtil.h b/gpu/gl/GrGLUtil.h index b99487a1..73fcec11 100644 --- a/gpu/gl/GrGLUtil.h +++ b/gpu/gl/GrGLUtil.h @@ -18,6 +18,14 @@ class SkMatrix; typedef uint32_t GrGLVersion; typedef uint32_t GrGLSLVersion; +#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) | \ + static_cast<int>(minor)) + +#define GR_GL_INVALID_VER GR_GL_VER(0, 0) +#define GR_GLSL_INVALID_VER GR_GL_VER(0, 0) + /** * The Vendor and Renderer enum values are lazily updated as required. */ @@ -37,11 +45,6 @@ enum 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) | \ - static_cast<int>(minor)) - //////////////////////////////////////////////////////////////////////////////// /** |