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

Unified Diff: src/gpu/gl/builders/GrGLShaderBuilder.cpp

Issue 1425013003: Remove GrGLProcessor and create GrGLSLTextureSampler class. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: remove grglprocessor from gyp Created 5 years, 2 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/gl/builders/GrGLShaderBuilder.h ('k') | src/gpu/glsl/GrGLSLProcessorTypes.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/builders/GrGLShaderBuilder.cpp
diff --git a/src/gpu/gl/builders/GrGLShaderBuilder.cpp b/src/gpu/gl/builders/GrGLShaderBuilder.cpp
index a3cc452e700eb438cf93372bf84159eab9c748d5..991ac9117657a9a7ed042546dd09ce7836994c12 100644
--- a/src/gpu/gl/builders/GrGLShaderBuilder.cpp
+++ b/src/gpu/gl/builders/GrGLShaderBuilder.cpp
@@ -13,6 +13,7 @@
#include "gl/GrGLGpu.h"
#include "glsl/GrGLSLCaps.h"
#include "glsl/GrGLSLShaderVar.h"
+#include "glsl/GrGLSLTextureSampler.h"
namespace {
void append_texture_lookup(SkString* out,
@@ -95,7 +96,7 @@ void GrGLShaderBuilder::emitFunction(GrSLType returnType,
}
void GrGLShaderBuilder::appendTextureLookup(SkString* out,
- const TextureSampler& sampler,
+ const GrGLSLTextureSampler& sampler,
const char* coordName,
GrSLType varyingType) const {
append_texture_lookup(out,
@@ -107,14 +108,14 @@ void GrGLShaderBuilder::appendTextureLookup(SkString* out,
varyingType);
}
-void GrGLShaderBuilder::appendTextureLookup(const TextureSampler& sampler,
+void GrGLShaderBuilder::appendTextureLookup(const GrGLSLTextureSampler& sampler,
const char* coordName,
GrSLType varyingType) {
this->appendTextureLookup(&this->code(), sampler, coordName, varyingType);
}
void GrGLShaderBuilder::appendTextureLookupAndModulate(const char* modulation,
- const TextureSampler& sampler,
+ const GrGLSLTextureSampler& sampler,
const char* coordName,
GrSLType varyingType) {
SkString lookup;
« no previous file with comments | « src/gpu/gl/builders/GrGLShaderBuilder.h ('k') | src/gpu/glsl/GrGLSLProcessorTypes.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698