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

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

Issue 133413003: Rename GrGLBinding->GrGLStandard, no longer a bitfield (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: actually fix enum names? Created 6 years, 11 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
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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 } while (0) 71 } while (0)
72 72
73 //////////////////////////////////////////////////////////////////////////////// 73 ////////////////////////////////////////////////////////////////////////////////
74 74
75 /** 75 /**
76 * Helpers for glGetString() 76 * Helpers for glGetString()
77 */ 77 */
78 78
79 // these variants assume caller already has a string from glGetString() 79 // these variants assume caller already has a string from glGetString()
80 GrGLVersion GrGLGetVersionFromString(const char* versionString); 80 GrGLVersion GrGLGetVersionFromString(const char* versionString);
81 GrGLBinding GrGLGetBindingInUseFromString(const char* versionString); 81 GrGLStandard GrGLGetStandardInUseFromString(const char* versionString);
82 GrGLSLVersion GrGLGetGLSLVersionFromString(const char* versionString); 82 GrGLSLVersion GrGLGetGLSLVersionFromString(const char* versionString);
83 bool GrGLIsMesaFromVersionString(const char* versionString); 83 bool GrGLIsMesaFromVersionString(const char* versionString);
84 GrGLVendor GrGLGetVendorFromString(const char* vendorString); 84 GrGLVendor GrGLGetVendorFromString(const char* vendorString);
85 GrGLRenderer GrGLGetRendererFromString(const char* rendererString); 85 GrGLRenderer GrGLGetRendererFromString(const char* rendererString);
86 bool GrGLIsChromiumFromRendererString(const char* rendererString); 86 bool GrGLIsChromiumFromRendererString(const char* rendererString);
87 87
88 // these variants call glGetString() 88 // these variants call glGetString()
89 GrGLBinding GrGLGetBindingInUse(const GrGLInterface*);
90 GrGLVersion GrGLGetVersion(const GrGLInterface*); 89 GrGLVersion GrGLGetVersion(const GrGLInterface*);
91 GrGLSLVersion GrGLGetGLSLVersion(const GrGLInterface*); 90 GrGLSLVersion GrGLGetGLSLVersion(const GrGLInterface*);
92 GrGLVendor GrGLGetVendor(const GrGLInterface*); 91 GrGLVendor GrGLGetVendor(const GrGLInterface*);
93 GrGLRenderer GrGLGetRenderer(const GrGLInterface*); 92 GrGLRenderer GrGLGetRenderer(const GrGLInterface*);
94 93
95 94
96 /** 95 /**
97 * Helpers for glGetError() 96 * Helpers for glGetError()
98 */ 97 */
99 98
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 do { \ 170 do { \
172 GR_GL_CALLBACK_IMPL(IFACE); \ 171 GR_GL_CALLBACK_IMPL(IFACE); \
173 (RET) = (IFACE)->f##X; \ 172 (RET) = (IFACE)->f##X; \
174 GR_GL_LOG_CALLS_IMPL(X); \ 173 GR_GL_LOG_CALLS_IMPL(X); \
175 } while (false) 174 } while (false)
176 175
177 // call glGetError without doing a redundant error check or logging. 176 // call glGetError without doing a redundant error check or logging.
178 #define GR_GL_GET_ERROR(IFACE) (IFACE)->fGetError() 177 #define GR_GL_GET_ERROR(IFACE) (IFACE)->fGetError()
179 178
180 #endif 179 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698