From e269f210bdae0288643afaf8a579b22d3f6d5beb Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 7 Nov 2011 13:29:52 +0000 Subject: Recommit r2611 with fix for gm git-svn-id: http://skia.googlecode.com/svn/trunk@2614 2bbb7eff-a529-9590-31e7-b0007b416f81 --- samplecode/SampleApp.cpp | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'samplecode') diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index 3b32154cfa..cedc6a5466 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -182,34 +182,28 @@ public: if (fGrContext) { win->attachGL(); - GrPlatformSurfaceDesc desc; - desc.reset(); - desc.fSurfaceType = kRenderTarget_GrPlatformSurfaceType; + GrPlatformRenderTargetDesc desc; desc.fWidth = SkScalarRound(win->width()); desc.fHeight = SkScalarRound(win->height()); desc.fConfig = kRGBA_8888_GrPixelConfig; - GR_GL_GetIntegerv(fGL, GR_GL_STENCIL_BITS, &desc.fStencilBits); GR_GL_GetIntegerv(fGL, GR_GL_SAMPLES, &desc.fSampleCnt); + GR_GL_GetIntegerv(fGL, GR_GL_STENCIL_BITS, &desc.fStencilBits); GrGLint buffer; GR_GL_GetIntegerv(fGL, GR_GL_FRAMEBUFFER_BINDING, &buffer); - desc.fPlatformRenderTarget = buffer; + desc.fRenderTargetHandle = buffer; SkSafeUnref(fGrRenderTarget); - fGrRenderTarget = static_cast( - fGrContext->createPlatformSurface(desc)); + fGrRenderTarget = fGrContext->createPlatformRenderTarget(desc); } if (NULL != fNullGrContext) { - GrPlatformSurfaceDesc desc; - desc.reset(); - desc.fSurfaceType = kRenderTarget_GrPlatformSurfaceType; + GrPlatformRenderTargetDesc desc; desc.fWidth = SkScalarRound(win->width()); desc.fHeight = SkScalarRound(win->height()); desc.fConfig = kRGBA_8888_GrPixelConfig; desc.fStencilBits = 8; desc.fSampleCnt = 0; - desc.fPlatformRenderTarget = 0; - fNullGrRenderTarget = static_cast( - fNullGrContext->createPlatformSurface(desc)); + desc.fRenderTargetHandle = 0; + fGrRenderTarget = fNullGrContext->createPlatformRenderTarget(desc); } } -- cgit v1.2.3