commit c49d66b04e0014f6b3be8346e4e4906d6807eb2d
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Aug 03 14:22:30 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Aug 03 14:22:30 2011 +0000
tree 62456e3613da930e828b9ac1e86aa8948a70c4f8
parent d32c5f564e4aa9ada2650e07d3856d5b21cd2138

Add glReadBuffer to GrGLInterface.

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





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

gpu/src/GrGLInterface.cpp

diff --git a/gpu/src/GrGLInterface.cpp b/gpu/src/GrGLInterface.cpp
index 9822dcb..2a8ffaa 100644
--- a/gpu/src/GrGLInterface.cpp
+++ b/gpu/src/GrGLInterface.cpp
@@ -313,7 +313,8 @@
     if (kDesktop_GrGLBinding == fBindingsExported &&
         (NULL == fLineWidth ||
          NULL == fGetTexLevelParameteriv ||
-         NULL == fDrawBuffer)) {
+         NULL == fDrawBuffer ||
+         NULL == fReadBuffer)) {
         return false;
     }
 

gpu/src/android/GrGLDefaultInterface_android.cpp

diff --git a/gpu/src/android/GrGLDefaultInterface_android.cpp b/gpu/src/android/GrGLDefaultInterface_android.cpp
index b402176..033a93c 100644
--- a/gpu/src/android/GrGLDefaultInterface_android.cpp
+++ b/gpu/src/android/GrGLDefaultInterface_android.cpp
@@ -77,6 +77,7 @@
     NULL,  // glMatrixMode
     glPixelStorei,
     NULL,  // glPointSize
+    NULL, // glReadBuffer
     glReadPixels,
     glScissor,
     NULL,  // glShadeModel

gpu/src/ios/GrGLDefaultInterface_iOS.cpp

diff --git a/gpu/src/ios/GrGLDefaultInterface_iOS.cpp b/gpu/src/ios/GrGLDefaultInterface_iOS.cpp
index 8bc9fc5..7bdbcc7 100644
--- a/gpu/src/ios/GrGLDefaultInterface_iOS.cpp
+++ b/gpu/src/ios/GrGLDefaultInterface_iOS.cpp
@@ -76,6 +76,7 @@
         gDefaultInterface.fMatrixMode = glMatrixMode;
         gDefaultInterface.fPointSize = glPointSize;
         gDefaultInterface.fPixelStorei = glPixelStorei;
+        gDefaultInterface.fReadBuffer = NULL; 
         gDefaultInterface.fReadPixels = glReadPixels;
         gDefaultInterface.fScissor = glScissor;
         gDefaultInterface.fShadeModel = glShadeModel;

gpu/src/mac/GrGLDefaultInterface_mac.cpp

diff --git a/gpu/src/mac/GrGLDefaultInterface_mac.cpp b/gpu/src/mac/GrGLDefaultInterface_mac.cpp
index 16d2938..293f14c 100644
--- a/gpu/src/mac/GrGLDefaultInterface_mac.cpp
+++ b/gpu/src/mac/GrGLDefaultInterface_mac.cpp
@@ -77,6 +77,7 @@
         gDefaultInterface.fMatrixMode = glMatrixMode;
         gDefaultInterface.fPointSize = glPointSize;
         gDefaultInterface.fPixelStorei = glPixelStorei;
+        gDefaultInterface.fReadBuffer = glReadBuffer;
         gDefaultInterface.fReadPixels = glReadPixels;
         gDefaultInterface.fScissor = glScissor;
         gDefaultInterface.fShadeModel = glShadeModel;

gpu/src/mesa/GrGLDefaultInterface_mesa.cpp

diff --git a/gpu/src/mesa/GrGLDefaultInterface_mesa.cpp b/gpu/src/mesa/GrGLDefaultInterface_mesa.cpp
index 56f2cf7..c6be2df 100644
--- a/gpu/src/mesa/GrGLDefaultInterface_mesa.cpp
+++ b/gpu/src/mesa/GrGLDefaultInterface_mesa.cpp
@@ -91,6 +91,7 @@
         gDefaultInterface.fMatrixMode = glMatrixMode;
         gDefaultInterface.fPointSize = glPointSize;
         gDefaultInterface.fPixelStorei = glPixelStorei;
+        gDefaultInterface.fReadBuffer = glReadBuffer;
         gDefaultInterface.fReadPixels = glReadPixels;
         gDefaultInterface.fScissor = glScissor;
         gDefaultInterface.fShadeModel = glShadeModel;

gpu/src/unix/GrGLDefaultInterface_unix.cpp

diff --git a/gpu/src/unix/GrGLDefaultInterface_unix.cpp b/gpu/src/unix/GrGLDefaultInterface_unix.cpp
index e38a76b..01725b9 100644
--- a/gpu/src/unix/GrGLDefaultInterface_unix.cpp
+++ b/gpu/src/unix/GrGLDefaultInterface_unix.cpp
@@ -93,6 +93,7 @@
         gDefaultInterface.fMatrixMode = glMatrixMode;
         gDefaultInterface.fPointSize = glPointSize;
         gDefaultInterface.fPixelStorei = glPixelStorei;
+        gDefaultInterface.fReadBuffer = glReadBuffer;
         gDefaultInterface.fReadPixels = glReadPixels;
         gDefaultInterface.fScissor = glScissor;
         gDefaultInterface.fShadeModel = glShadeModel;

gpu/src/win/GrGLDefaultInterface_win.cpp

diff --git a/gpu/src/win/GrGLDefaultInterface_win.cpp b/gpu/src/win/GrGLDefaultInterface_win.cpp
index 05f5414..1bf0457 100644
--- a/gpu/src/win/GrGLDefaultInterface_win.cpp
+++ b/gpu/src/win/GrGLDefaultInterface_win.cpp
@@ -72,6 +72,7 @@
             gDefaultInterface.fMatrixMode = glMatrixMode;
             gDefaultInterface.fPixelStorei = glPixelStorei;
             gDefaultInterface.fPointSize = glPointSize;
+            gDefaultInterface.fReadBuffer = glReadBuffer;
             gDefaultInterface.fReadPixels = glReadPixels;
             gDefaultInterface.fScissor = glScissor;
             gDefaultInterface.fShadeModel = glShadeModel;