diff options
author | 2011-01-18 20:57:22 +0000 | |
---|---|---|
committer | 2011-01-18 20:57:22 +0000 | |
commit | 2e7b43d33cc495663cb814a7a9d1ecdc09c31828 (patch) | |
tree | 10d01113bbac30d6e3b121d4a9ab5552a6567fd6 /gpu/src/GrGpuGLShaders2.cpp | |
parent | 44b2c73ca6358ba9c4a413d7b39db7991612a6a2 (diff) |
Remove notion of default rendertarget. This doesn't map well to usage patterns outside sample app. Make binding between SkGpuDevice and a GrRenderTarget more explicit. Create method on GrContext to wrap the current target in the 3D API with a GrRenderTarget.
git-svn-id: http://skia.googlecode.com/svn/trunk@706 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gpu/src/GrGpuGLShaders2.cpp')
-rw-r--r-- | gpu/src/GrGpuGLShaders2.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gpu/src/GrGpuGLShaders2.cpp b/gpu/src/GrGpuGLShaders2.cpp index e47fe5dc5d..1218a3669a 100644 --- a/gpu/src/GrGpuGLShaders2.cpp +++ b/gpu/src/GrGpuGLShaders2.cpp @@ -1233,7 +1233,9 @@ void GrGpuGLShaders2::flushProgram(PrimitiveType type) { bool GrGpuGLShaders2::flushGraphicsState(PrimitiveType type) { - flushGLStateCommon(type); + if (!flushGLStateCommon(type)) { + return false; + } if (fRenderTargetChanged) { // our coords are in pixel space and the GL matrices map to NDC |