Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(247)

Unified Diff: src/gpu/vk/GrVkGLSLSampler.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/glsl/GrGLSLUniformHandler.h ('k') | src/gpu/vk/GrVkTexture.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/vk/GrVkGLSLSampler.h
diff --git a/src/gpu/vk/GrVkGLSLSampler.h b/src/gpu/vk/GrVkGLSLSampler.h
index 4bfacaed4800e98453b57b5af9472a6afa5b28d6..f0ba7fa335991d0a68f54c86eea7215c0a9b600b 100644
--- a/src/gpu/vk/GrVkGLSLSampler.h
+++ b/src/gpu/vk/GrVkGLSLSampler.h
@@ -21,7 +21,7 @@ public:
const char* name,
uint32_t binding,
uint32_t set) : INHERITED(visibility, config), fBinding(binding) {
- SkASSERT(GrSLTypeIsSamplerType(type));
+ SkASSERT(GrSLTypeIsCombinedSamplerType(type));
fShaderVar.setType(type);
fShaderVar.setTypeModifier(GrGLSLShaderVar::kUniform_TypeModifier);
fShaderVar.setPrecision(precision);
« no previous file with comments | « src/gpu/glsl/GrGLSLUniformHandler.h ('k') | src/gpu/vk/GrVkTexture.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698