src/gpu/gl/GrGLProgramDataManager.cpp - Issue 1459323004: Revert of Initial version of external_oes texture support and unit test

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/GrGLProgramDataManager.cpp

Issue 1459323004: Revert of Initial version of external_oes texture support and unit test (Closed) Base URL: https://skia.googlesource.com/skia.git@target

Patch Set: Created 5 years, 1 month ago

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

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: src/gpu/gl/GrGLProgramDataManager.cpp

diff --git a/src/gpu/gl/GrGLProgramDataManager.cpp b/src/gpu/gl/GrGLProgramDataManager.cpp

index f0aba497201b3de3ef881bb6c48e28c4dc86a0e7..a61e6974b64742b81bf8b1472c53503070814dbd 100644

--- a/src/gpu/gl/GrGLProgramDataManager.cpp

+++ b/src/gpu/gl/GrGLProgramDataManager.cpp

@@ -62,7 +62,7 @@

void GrGLProgramDataManager::setSampler(UniformHandle u, int texUnit) const {

const Uniform& uni = fUniforms[u.toIndex()];

- SkASSERT(uni.fType == kSampler2D_GrSLType || uni.fType == kSamplerExternal_GrSLType);

+ SkASSERT(uni.fType == kSampler2D_GrSLType);

SkASSERT(GrGLSLShaderVar::kNonArray == uni.fArrayCount);

// FIXME: We still insert a single sampler uniform for every stage. If the shader does not

// reference the sampler then the compiler may have optimized it out. Uncomment this assert

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