commit 971d0c8049c6bfc7a58f0b41f8f59f9ec9ca077b
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Aug 19 17:22:05 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Aug 19 17:22:05 2011 +0000
tree 1ad234571b6f62cd6d0a0483807c845e965b7814
parent 3008519e9f977cd60194841d558a4f45c28e9833

Get rid of createRenderTargetFrom3DAPIState and associated glGets necessary to support it.

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



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

bench/benchmain.cpp

diff --git a/bench/benchmain.cpp b/bench/benchmain.cpp
index 0625174..a2d2d75 100644
--- a/bench/benchmain.cpp
+++ b/bench/benchmain.cpp
@@ -5,19 +5,23 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
+
+#include "BenchTimer.h"
+
+#include "GrContext.h"
+#include "GrRenderTarget.h"
+
+#include "SkBenchmark.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
+#include "SkEGLContext.h"
+#include "SkGpuDevice.h"
 #include "SkGraphics.h"
 #include "SkImageEncoder.h"
 #include "SkNWayCanvas.h"
 #include "SkPicture.h"
 #include "SkString.h"
-#include "GrContext.h"
-#include "SkGpuDevice.h"
-#include "SkEGLContext.h"
-
-#include "SkBenchmark.h"
-#include "BenchTimer.h"
 
 #ifdef ANDROID
 static void log_error(const char msg[]) { SkDebugf("%s", msg); }
@@ -169,7 +173,8 @@
 };
 
 static SkDevice* make_device(SkBitmap::Config config, const SkIPoint& size,
-                             Backend backend, GrContext* context) {
+                             Backend backend, GrContext* context,
+                             GrRenderTarget* rt) {
     SkDevice* device = NULL;
     SkBitmap bitmap;
     bitmap.setConfig(config, size.fX, size.fY);
@@ -181,7 +186,7 @@
             device = new SkDevice(bitmap);
             break;
         case kGPU_Backend:
-            device = new SkGpuDevice(context, SkGpuDevice::Current3DApiRenderTarget());
+            device = new SkGpuDevice(context, rt);
 //            device->clear(0xFFFFFFFF);
             break;
         case kPDF_Backend:
@@ -408,11 +413,27 @@
     }
     
     GrContext* context = NULL;
+    GrRenderTarget* rt = NULL;
     //Don't do GL when fixed.
 #if !defined(SK_SCALAR_IS_FIXED)
     SkEGLContext eglContext;
     if (eglContext.init(1024, 1024)) {
         context = GrContext::CreateGLShaderContext();
+        if (NULL != context) {
+            GrPlatformSurfaceDesc desc;
+            desc.reset();
+            desc.fConfig = kRGBA_8888_GrPixelConfig;
+            desc.fWidth = 1024;
+            desc.fHeight = 1024;
+            desc.fStencilBits = 8;
+            desc.fPlatformRenderTarget = eglContext.getFBOID();
+            desc.fSurfaceType = kRenderTarget_GrPlatformSurfaceType;
+            rt = static_cast<GrRenderTarget*>(context->createPlatformSurface(desc));
+            if (NULL == rt) {
+                context->unref();
+                context = NULL;
+            }
+        }
     }
 #endif
     
@@ -457,7 +478,8 @@
                 continue;
             }
             
-            SkDevice* device = make_device(outConfig, dim, backend, context);
+            SkDevice* device = make_device(outConfig, dim,
+                                           backend, context, rt);
             SkCanvas canvas(device);
             device->unref();
             
@@ -516,6 +538,9 @@
         }
         log_progress("\n");
     }
-    
+
+    SkSafeUnref(context);
+    SkSafeUnref(rt);
+
     return 0;
 }