commit f987d1b2348258970cae675135b6dedda079de48
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Apr 04 17:13:52 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Apr 04 17:13:52 2011 +0000
tree fa09c4a941878660d3a3f57877e0513c106afc0f
parent 65c82f52bea0db35b4422467abeee1e36b25ee05

Remove dependence on platform GL headers. Remove code that attempts to infer GL function pointers on various platforms. Instead add platform-specific implementations for Windows and Mac. (GLX coming)

Review URL: http://codereview.appspot.com/4354048/

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

gpu/src/GrGpuGL.cpp

diff --git a/gpu/src/GrGpuGL.cpp b/gpu/src/GrGpuGL.cpp
index 41cb32a..50e7386 100644
--- a/gpu/src/GrGpuGL.cpp
+++ b/gpu/src/GrGpuGL.cpp
@@ -737,7 +737,7 @@
         GR_GL(CompressedTexImage2D(GR_GL_TEXTURE_2D, 0, glDesc.fUploadFormat,
                                    glDesc.fAllocWidth, glDesc.fAllocHeight,
                                    0, imageSize, srcData));
-        GrGL_RestoreResetRowLength();
+        GrGLRestoreResetRowLength();
     } else {
         if (NULL != srcData && (glDesc.fAllocWidth != desc.fWidth ||
                                 glDesc.fAllocHeight != desc.fHeight)) {
@@ -747,7 +747,7 @@
             GR_GL(TexSubImage2D(GR_GL_TEXTURE_2D, 0, 0, 0, desc.fWidth,
                                 desc.fHeight, glDesc.fUploadFormat,
                                 glDesc.fUploadType, srcData));
-            GrGL_RestoreResetRowLength();
+            GrGLRestoreResetRowLength();
 
             uint32_t extraW = glDesc.fAllocWidth  - desc.fWidth;
             uint32_t extraH = glDesc.fAllocHeight - desc.fHeight;
@@ -802,7 +802,7 @@
             GR_GL(TexImage2D(GR_GL_TEXTURE_2D, 0, internalFormat, glDesc.fAllocWidth,
                              glDesc.fAllocHeight, 0, glDesc.fUploadFormat,
                              glDesc.fUploadType, srcData));
-            GrGL_RestoreResetRowLength();
+            GrGLRestoreResetRowLength();
         }
     }