aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/sksl/SkSLCPPCodeGenerator.cpp
diff options
context:
space:
mode:
authorGravatar Ethan Nicholas <ethannicholas@google.com>2017-12-20 15:16:33 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-12-20 20:41:56 +0000
commit5f9836edb0de062a6e30ba74f94803fae4f311ed (patch)
treee13215a25cbb30c79c7adca8ec8e238ea350b994 /src/sksl/SkSLCPPCodeGenerator.cpp
parentb60c5ebf045df23f9a15f85c37825b15adff9d8d (diff)
removed extraneous unused uniform handles for SkSL samplers
Bug: skia: Change-Id: I11fc3c0d5304b9b308ee5f3a6f8023542ebfd133 Reviewed-on: https://skia-review.googlesource.com/87790 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/sksl/SkSLCPPCodeGenerator.cpp')
-rw-r--r--src/sksl/SkSLCPPCodeGenerator.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/sksl/SkSLCPPCodeGenerator.cpp b/src/sksl/SkSLCPPCodeGenerator.cpp
index c5ddc7a76e..d6a6a25eac 100644
--- a/src/sksl/SkSLCPPCodeGenerator.cpp
+++ b/src/sksl/SkSLCPPCodeGenerator.cpp
@@ -13,7 +13,8 @@
namespace SkSL {
static bool needs_uniform_var(const Variable& var) {
- return (var.fModifiers.fFlags & Modifiers::kUniform_Flag);
+ return (var.fModifiers.fFlags & Modifiers::kUniform_Flag) &&
+ var.fType.kind() != Type::kSampler_Kind;
}
CPPCodeGenerator::CPPCodeGenerator(const Context* context, const Program* program,