replace GR_GL(GetIntegerv with GR_GL_GetIntegerv to ensure that we zero-init

the var-arg (needed for chrome)

git-svn-id: http://skia.googlecode.com/svn/trunk@716 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/gpu/src/GrGpuGL.cpp b/gpu/src/GrGpuGL.cpp
index 0198481..63cf237 100644 (file)
--- a/gpu/src/GrGpuGL.cpp
+++ b/gpu/src/GrGpuGL.cpp
@@ -58,8 +58,8 @@ bool fbo_test(GrGLExts exts, int w, int h) {
 
     GLint savedFBO;
     GLint savedTexUnit;
-    GR_GL(GetIntegerv(GL_ACTIVE_TEXTURE, &savedTexUnit));
-    GR_GL(GetIntegerv(GR_FRAMEBUFFER_BINDING, &savedFBO));
+    GR_GL_GetIntegerv(GL_ACTIVE_TEXTURE, &savedTexUnit);
+    GR_GL_GetIntegerv(GR_FRAMEBUFFER_BINDING, &savedFBO);
 
     GR_GL(ActiveTexture(GL_TEXTURE0 + SPARE_TEX_UNIT));
 
@@ -111,11 +111,11 @@ GrGpuGL::GrGpuGL() {
     // we only use textures in the fragment stage currently.
     // checks are > to make sure we have a spare unit.
 #if GR_SUPPORT_GLDESKTOP || GR_SUPPORT_GLES2
-    GR_GL(GetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &maxTextureUnits));
+    GR_GL_GetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &maxTextureUnits);
     GrAssert(maxTextureUnits > kNumStages);
 #endif
 #if GR_SUPPORT_GLDESKTOP || GR_SUPPORT_GLES1
-    GR_GL(GetIntegerv(GL_MAX_TEXTURE_UNITS, &maxTextureUnits));
+    GR_GL_GetIntegerv(GL_MAX_TEXTURE_UNITS, &maxTextureUnits);
     GrAssert(maxTextureUnits > kNumStages);
 #endif