Recommit r2611 with fix for gm

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

1 files changed, 3 insertions, 5 deletions

diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index f2ab7033fc..f437906068 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -647,15 +647,13 @@ int main(int argc, char * const argv[]) {
             reinterpret_cast<GrPlatform3DContext>(glContext.get()->gl());
         gGrContext = GrContext::Create(kOpenGL_Shaders_GrEngine, ctx);
         if (NULL != gGrContext) {
-            GrPlatformSurfaceDesc desc;
-            desc.reset();
+            GrPlatformRenderTargetDesc desc;
             desc.fConfig = kRGBA_8888_GrPixelConfig;
             desc.fWidth = maxW;
             desc.fHeight = maxH;
             desc.fStencilBits = 8;
-            desc.fPlatformRenderTarget = glContext.get()->getFBOID();
-            desc.fSurfaceType = kRenderTarget_GrPlatformSurfaceType;
-            rt = static_cast<GrRenderTarget*>(gGrContext->createPlatformSurface(desc));
+            desc.fRenderTargetHandle = glContext.get()->getFBOID();
+            rt = gGrContext->createPlatformRenderTarget(desc);
             if (NULL == rt) {
                 gGrContext->unref();
                 gGrContext = NULL;