src/gpu/gl/GrGLProgramDataManager.cpp - Issue 580863004: Adding 3D lut color filter

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 580863004: Adding 3D lut color filter (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Added generationID for 3D texture key Created 6 years, 3 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 c53abd79abe3a3774129c8aff17b75201e556a19..2792946c3ce8a8916e59aa4085852f7a3727fb11 100644

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

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

@@ -62,7 +62,8 @@ GrGLProgramDataManager::GrGLProgramDataManager(GrGpuGL* gpu,

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

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

- SkASSERT(uni.fType == kSampler2D_GrSLType);

+ SkASSERT((uni.fType == kSampler2D_GrSLType) ||

+ (uni.fType == kSampler3D_GrSLType));

SkASSERT(GrGLShaderVar::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