Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(249)

Side by Side Diff: src/gpu/gl/GrGLUtil.h

Issue 133703016: Add workaround for Xoom crashing after discard removed from shader. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: add tab Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/gpu/effects/GrConvexPolyEffect.cpp ('k') | src/gpu/gl/GrGLUtil.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 Google Inc. 2 * Copyright 2012 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #ifndef GrGLUtil_DEFINED 8 #ifndef GrGLUtil_DEFINED
9 #define GrGLUtil_DEFINED 9 #define GrGLUtil_DEFINED
10 10
(...skipping 13 matching lines...) Expand all
24 enum GrGLVendor { 24 enum GrGLVendor {
25 kARM_GrGLVendor, 25 kARM_GrGLVendor,
26 kImagination_GrGLVendor, 26 kImagination_GrGLVendor,
27 kIntel_GrGLVendor, 27 kIntel_GrGLVendor,
28 kQualcomm_GrGLVendor, 28 kQualcomm_GrGLVendor,
29 29
30 kOther_GrGLVendor 30 kOther_GrGLVendor
31 }; 31 };
32 32
33 enum GrGLRenderer { 33 enum GrGLRenderer {
34 kTegra2_GrGLRenderer,
34 kTegra3_GrGLRenderer, 35 kTegra3_GrGLRenderer,
35 36
36 kOther_GrGLRenderer 37 kOther_GrGLRenderer
37 }; 38 };
38 39
39 #define GR_GL_VER(major, minor) ((static_cast<int>(major) << 16) | \ 40 #define GR_GL_VER(major, minor) ((static_cast<int>(major) << 16) | \
40 static_cast<int>(minor)) 41 static_cast<int>(minor))
41 #define GR_GLSL_VER(major, minor) ((static_cast<int>(major) << 16) | \ 42 #define GR_GLSL_VER(major, minor) ((static_cast<int>(major) << 16) | \
42 static_cast<int>(minor)) 43 static_cast<int>(minor))
43 44
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 do { \ 171 do { \
171 GR_GL_CALLBACK_IMPL(IFACE); \ 172 GR_GL_CALLBACK_IMPL(IFACE); \
172 (RET) = (IFACE)->fFunctions.f##X; \ 173 (RET) = (IFACE)->fFunctions.f##X; \
173 GR_GL_LOG_CALLS_IMPL(X); \ 174 GR_GL_LOG_CALLS_IMPL(X); \
174 } while (false) 175 } while (false)
175 176
176 // call glGetError without doing a redundant error check or logging. 177 // call glGetError without doing a redundant error check or logging.
177 #define GR_GL_GET_ERROR(IFACE) (IFACE)->fFunctions.fGetError() 178 #define GR_GL_GET_ERROR(IFACE) (IFACE)->fFunctions.fGetError()
178 179
179 #endif 180 #endif
OLDNEW
« no previous file with comments | « src/gpu/effects/GrConvexPolyEffect.cpp ('k') | src/gpu/gl/GrGLUtil.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698