commit 6177e6999d23a4268ffd98dedfb1da00e272a89b
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Feb 28 20:16:25 2013 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Feb 28 20:16:25 2013 +0000
tree aeadfad9da388e124819af0f3e51bec543cfaa9a
parent 26fb61ae464d9dfeabb4824663cdde379ae87829

Split GrGLContextInfo into GrGLContext & GrGLContextInfo

https://codereview.appspot.com/7436045/



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

bench/BenchGpuTimer_gl.cpp

diff --git a/bench/BenchGpuTimer_gl.cpp b/bench/BenchGpuTimer_gl.cpp
index 1b317c6..349fc15 100644
--- a/bench/BenchGpuTimer_gl.cpp
+++ b/bench/BenchGpuTimer_gl.cpp
@@ -6,10 +6,10 @@
  * found in the LICENSE file.
  */
 #include "BenchGpuTimer_gl.h"
-#include "gl/SkGLContext.h"
+#include "gl/SkGLContextHelper.h"
 #include "gl/GrGLUtil.h"
 
-BenchGpuTimer::BenchGpuTimer(const SkGLContext* glctx) {
+BenchGpuTimer::BenchGpuTimer(const SkGLContextHelper* glctx) {
     fContext = glctx;
     glctx->ref();
     glctx->makeCurrent();

bench/BenchGpuTimer_gl.h

diff --git a/bench/BenchGpuTimer_gl.h b/bench/BenchGpuTimer_gl.h
index 7c7b5c2..e472a4c 100644
--- a/bench/BenchGpuTimer_gl.h
+++ b/bench/BenchGpuTimer_gl.h
@@ -8,18 +8,18 @@
 #ifndef SkBenchGpuTimer_DEFINED
 #define SkBenchGpuTimer_DEFINED
 
-class SkGLContext;
+class SkGLContextHelper;
 
 class BenchGpuTimer {
 public:
-    BenchGpuTimer(const SkGLContext* glctx);
+    BenchGpuTimer(const SkGLContextHelper* glctx);
     ~BenchGpuTimer();
     void startGpu();
     double endGpu();
 private:
     unsigned fQuery;
     int fStarted;
-    const SkGLContext* fContext;
+    const SkGLContextHelper* fContext;
     bool fSupported;
 };
 

bench/BenchTimer.cpp

diff --git a/bench/BenchTimer.cpp b/bench/BenchTimer.cpp
index 4e04844..ab9dfda 100644
--- a/bench/BenchTimer.cpp
+++ b/bench/BenchTimer.cpp
@@ -20,7 +20,7 @@
 #include "BenchGpuTimer_gl.h"
 #endif
 
-BenchTimer::BenchTimer(SkGLContext* gl)
+BenchTimer::BenchTimer(SkGLContextHelper* gl)
         : fCpu(-1.0)
         , fWall(-1.0)
         , fTruncatedCpu(-1.0)

bench/BenchTimer.h

diff --git a/bench/BenchTimer.h b/bench/BenchTimer.h
index 58773d4..79e1036 100644
--- a/bench/BenchTimer.h
+++ b/bench/BenchTimer.h
@@ -14,7 +14,7 @@
 class BenchSysTimer;
 class BenchGpuTimer;
 
-class SkGLContext;
+class SkGLContextHelper;
 
 /**
  * SysTimers and GpuTimers are implemented orthogonally.
@@ -27,7 +27,7 @@
  */
 class BenchTimer {
 public:
-    BenchTimer(SkGLContext* gl = NULL);
+    BenchTimer(SkGLContextHelper* gl = NULL);
     ~BenchTimer();
     void start();
     void end();

bench/benchmain.cpp

diff --git a/bench/benchmain.cpp b/bench/benchmain.cpp
index 5fc74bc..96db07d 100644
--- a/bench/benchmain.cpp
+++ b/bench/benchmain.cpp
@@ -625,7 +625,7 @@
     SkTArray<BenchTimer*> timers(SK_ARRAY_COUNT(gConfigs));
     for (size_t i = 0; i < SK_ARRAY_COUNT(gConfigs); ++i) {
 #if SK_SUPPORT_GPU
-        SkGLContext* ctx = NULL;
+        SkGLContextHelper* ctx = NULL;
         if (kGPU_Backend == gConfigs[i].fBackend) {
             ctx = gContextFactory.getGLContext(gConfigs[i].fContextType);
         }
@@ -680,7 +680,7 @@
             configName = gConfigs[configIndex].fName;
             backend = gConfigs[configIndex].fBackend;
             GrContext* context = NULL;
-            SkGLContext* glContext = NULL;
+            SkGLContextHelper* glContext = NULL;
             BenchTimer* timer = timers[configIndex];
 
 #if SK_SUPPORT_GPU