commit 6b0cf0273fdffbbdf69235b57b5b5a311e7f1ca6
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri May 03 13:35:14 2013 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri May 03 13:35:14 2013 +0000
tree 150ff50876434a33bb0d2ccfd299e8bc710d2531
parent dfa1ce027f0b56de40d0ccfefbc30955a50a7350

Add support for GL_*_shader__framebuffer_fetch

R=robertphillips@google.com

Review URL: https://codereview.chromium.org/14875002

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

src/gpu/gl/GrGLProgramDesc.cpp

diff --git a/src/gpu/gl/GrGLProgramDesc.cpp b/src/gpu/gl/GrGLProgramDesc.cpp
index 8677179..1ae6aa6 100644
--- a/src/gpu/gl/GrGLProgramDesc.cpp
+++ b/src/gpu/gl/GrGLProgramDesc.cpp
@@ -96,8 +96,12 @@
     }
 
     if (readsDst) {
-        GrAssert(NULL != dstCopy);
-        desc->fDstRead = GrGLShaderBuilder::KeyForDstRead(dstCopy->texture(), gpu->glCaps());
+        GrAssert(NULL != dstCopy || gpu->caps()->dstReadInShaderSupport());
+        const GrTexture* dstCopyTexture = NULL;
+        if (NULL != dstCopy) {
+            dstCopyTexture = dstCopy->texture();
+        }
+        desc->fDstRead = GrGLShaderBuilder::KeyForDstRead(dstCopyTexture, gpu->glCaps());
         GrAssert(0 != desc->fDstRead);
     } else {
         desc->fDstRead = 0;