diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-09-06 19:05:24 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-09-06 19:05:24 +0000 |
| commit | dca4aabd89a63dd8c43202dfcbab006f7d75ce2e (patch) | |
| tree | 938c6ab638e18e13e5cc456645ddd74ae5a6ac47 /gpu/src/GrGLInterface.cpp | |
| parent | 40a3772b2740ebdeb591b9e438851e6963c0441d (diff) | |
Make GL calls go through macro (and therefore trigger callback function if present)
Review URL: http://codereview.appspot.com/4986043/
git-svn-id: http://skia.googlecode.com/svn/trunk@2223 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gpu/src/GrGLInterface.cpp')
| -rw-r--r-- | gpu/src/GrGLInterface.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/gpu/src/GrGLInterface.cpp b/gpu/src/GrGLInterface.cpp index 9bee8062e8..38770f124d 100644 --- a/gpu/src/GrGLInterface.cpp +++ b/gpu/src/GrGLInterface.cpp @@ -103,22 +103,21 @@ GR_API const GrGLInterface* GrGLGetDefaultGLInterface() { } bool has_gl_extension(const GrGLInterface* gl, const char* ext) { - const char* glstr = reinterpret_cast<const char*>( - gl->fGetString(GR_GL_EXTENSIONS)); - - return has_gl_extension_from_string(ext, glstr); + const GrGLubyte* glstr; + GR_GL_CALL_RET(gl, glstr, GetString(GR_GL_EXTENSIONS)); + return has_gl_extension_from_string(ext, (const char*) glstr); } void gl_version(const GrGLInterface* gl, int* major, int* minor) { - const char* v = reinterpret_cast<const char*>( - gl->fGetString(GR_GL_VERSION)); - gl_version_from_string(major, minor, v); + const GrGLubyte* v; + GR_GL_CALL_RET(gl, v, GetString(GR_GL_VERSION)); + gl_version_from_string(major, minor, (const char*) v); } float gl_version_as_float(const GrGLInterface* gl) { - const char* v = reinterpret_cast<const char*>( - gl->fGetString(GR_GL_VERSION)); - return gl_version_as_float_from_string(v); + const GrGLubyte* v; + GR_GL_CALL_RET(gl, v, GetString(GR_GL_VERSION)); + return gl_version_as_float_from_string((const char*)v); } GrGLInterface::GrGLInterface() { |