Revert r2611 until windows gm can be debugged
git-svn-id: http://skia.googlecode.com/svn/trunk@2612 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index cedc6a5..3b32154 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -182,28 +182,34 @@
if (fGrContext) {
win->attachGL();
- GrPlatformRenderTargetDesc desc;
+ GrPlatformSurfaceDesc desc;
+ desc.reset();
+ desc.fSurfaceType = kRenderTarget_GrPlatformSurfaceType;
desc.fWidth = SkScalarRound(win->width());
desc.fHeight = SkScalarRound(win->height());
desc.fConfig = kRGBA_8888_GrPixelConfig;
- GR_GL_GetIntegerv(fGL, GR_GL_SAMPLES, &desc.fSampleCnt);
GR_GL_GetIntegerv(fGL, GR_GL_STENCIL_BITS, &desc.fStencilBits);
+ GR_GL_GetIntegerv(fGL, GR_GL_SAMPLES, &desc.fSampleCnt);
GrGLint buffer;
GR_GL_GetIntegerv(fGL, GR_GL_FRAMEBUFFER_BINDING, &buffer);
- desc.fRenderTargetHandle = buffer;
+ desc.fPlatformRenderTarget = buffer;
SkSafeUnref(fGrRenderTarget);
- fGrRenderTarget = fGrContext->createPlatformRenderTarget(desc);
+ fGrRenderTarget = static_cast<GrRenderTarget*>(
+ fGrContext->createPlatformSurface(desc));
}
if (NULL != fNullGrContext) {
- GrPlatformRenderTargetDesc desc;
+ GrPlatformSurfaceDesc desc;
+ desc.reset();
+ desc.fSurfaceType = kRenderTarget_GrPlatformSurfaceType;
desc.fWidth = SkScalarRound(win->width());
desc.fHeight = SkScalarRound(win->height());
desc.fConfig = kRGBA_8888_GrPixelConfig;
desc.fStencilBits = 8;
desc.fSampleCnt = 0;
- desc.fRenderTargetHandle = 0;
- fGrRenderTarget = fNullGrContext->createPlatformRenderTarget(desc);
+ desc.fPlatformRenderTarget = 0;
+ fNullGrRenderTarget = static_cast<GrRenderTarget*>(
+ fNullGrContext->createPlatformSurface(desc));
}
}