src/gpu/gl/GrGLProgramDataManager.cpp - Issue 1870893002: Implement texel buffers

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 1870893002: Implement texel buffers (Closed) Base URL: https://skia.googlesource.com/skia.git@upload_texelfetch

Patch Set: Created 4 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/GrGLProgramDataManager.cpp

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

index d5b48f7061960a18d10d94cf5e02bb02219872c1..6b2e1118cb2ea05f98912142172219322471d62c 100644

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

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

@@ -63,8 +63,7 @@ GrGLProgramDataManager::GrGLProgramDataManager(GrGLGpu* gpu, GrGLuint programID,

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

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

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

- uni.fType == kSampler2DRect_GrSLType);

+ SkASSERT(GrSLTypeIsSamplerType(uni.fType));

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