src/gpu/gl/GrGLProgramDesc.cpp - Issue 14875002: Add support for GL_*_shader_framebuffer_fetch

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/gpu/gl/GrGLProgramDesc.cpp

Issue 14875002: Add support for GL_*_shader_framebuffer_fetch (Closed) Base URL: http://skia.googlecode.com/svn/trunk/

Patch Set: Created 7 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: src/gpu/gl/GrGLProgramDesc.cpp

===================================================================

--- src/gpu/gl/GrGLProgramDesc.cpp (revision 8966)

+++ src/gpu/gl/GrGLProgramDesc.cpp (working copy)

@@ -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;

« no previous file with comments | « src/gpu/gl/GrGLCaps.cpp ('k') | src/gpu/gl/GrGLShaderBuilder.h » ('j') | no next file with comments »