src/gpu/gl/GrGLSampler.h - Issue 2143143002: Add Texture2D and Sampler GrSLTypes

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/GrGLSampler.h

Issue 2143143002: Add Texture2D and Sampler GrSLTypes (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: nits Created 4 years, 5 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/GrGLSampler.h

diff --git a/src/gpu/gl/GrGLSampler.h b/src/gpu/gl/GrGLSampler.h

index e270f5deacd007e00e5b414adaaf045e1c595d6b..1f67ac9a5e8c0320e6e95c80d04b3911541b8b9f 100644

--- a/src/gpu/gl/GrGLSampler.h

+++ b/src/gpu/gl/GrGLSampler.h

@@ -20,7 +20,7 @@ public:

GrSLType type,

GrSLPrecision precision,

const char* name) : INHERITED(visibility, config) {

- SkASSERT(GrSLTypeIsSamplerType(type));

+ SkASSERT(GrSLTypeIsCombinedSamplerType(type));

fShaderVar.setType(type);

fShaderVar.setTypeModifier(GrGLSLShaderVar::kUniform_TypeModifier);

fShaderVar.setPrecision(precision);

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