Make all pixel ops go thru ctx so we can correctly flush. Unify two texture upload code paths.
Review URL: http://codereview.appspot.com/5373108/
git-svn-id: http://skia.googlecode.com/svn/trunk@2701 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index ffe56b1..cc69578 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -177,10 +177,10 @@
// need to send the raster bits to the (gpu) window
fGrContext->setRenderTarget(fGrRenderTarget);
const SkBitmap& bm = win->getBitmap();
- fGrContext->writePixels(0, 0, bm.width(), bm.height(),
- kSkia8888_PM_GrPixelConfig,
- bm.getPixels(),
- bm.rowBytes());
+ fGrRenderTarget->writePixels(0, 0, bm.width(), bm.height(),
+ kSkia8888_PM_GrPixelConfig,
+ bm.getPixels(),
+ bm.rowBytes());
}
}
win->presentGL();
@@ -211,7 +211,7 @@
desc.fStencilBits = 8;
desc.fSampleCnt = 0;
desc.fRenderTargetHandle = 0;
- fGrRenderTarget = fNullGrContext->createPlatformRenderTarget(desc);
+ fNullGrRenderTarget = fNullGrContext->createPlatformRenderTarget(desc);
}
}