diff options
author | jvanverth <jvanverth@google.com> | 2016-10-10 09:18:23 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-10-10 09:18:23 -0700 |
commit | 15341a284e78651d2b47b89753044f8d6e7eda0a (patch) | |
tree | 80e2eecf6c4d11f4aa078afcb2181af156934b6f /src/gpu/glsl/GrGLSLShaderBuilder.h | |
parent | e75c19f6380dd07a19faa39edcdbd75c79c7414d (diff) |
Revert of Turned on SkSL->GLSL compiler (patchset #47 id:1200001 of https://codereview.chromium.org/2288033003/ )
Reason for revert:
Looks like it introduces new static initializers, and it's failing the Chrome roll.
Original issue's description:
> Turned on SkSL->GLSL compiler
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003
>
> Committed: https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
> Committed: https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310
> Committed: https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89
> Committed: https://skia.googlesource.com/skia/+/08b2ccf398e2b81bc05d2c105837e5419899469b
TBR=benjaminwagner@google.com,bsalomon@google.com,egdaniel@google.com,ethannicholas@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/2403083002
Diffstat (limited to 'src/gpu/glsl/GrGLSLShaderBuilder.h')
-rw-r--r-- | src/gpu/glsl/GrGLSLShaderBuilder.h | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/src/gpu/glsl/GrGLSLShaderBuilder.h b/src/gpu/glsl/GrGLSLShaderBuilder.h index f59edb4553..a6ff96dd1b 100644 --- a/src/gpu/glsl/GrGLSLShaderBuilder.h +++ b/src/gpu/glsl/GrGLSLShaderBuilder.h @@ -72,27 +72,23 @@ public: void appendTexelFetch(SamplerHandle, const char* coordExpr); /** - * Adds a constant declaration to the top of the shader. + * Adds a #define directive to the top of the shader. */ - void defineConstant(const char* type, const char* name, const char* value) { - this->definitions().appendf("const %s %s = %s;\n", type, name, value); + void define(const char* macro, const char* replacement) { + this->definitions().appendf("#define %s %s\n", macro, replacement); } - void defineConstant(const char* name, int value) { - this->definitions().appendf("const int %s = %i;\n", name, value); + void define(const char* macro, int replacement) { + this->definitions().appendf("#define %s %i\n", macro, replacement); } - void defineConstant(const char* name, float value) { - this->definitions().appendf("const float %s = %f;\n", name, value); - } - - void defineConstantf(const char* type, const char* name, const char* fmt, ...) { - this->definitions().appendf("const %s %s = ", type, name); + void definef(const char* macro, const char* replacement, ...) { + this->definitions().appendf("#define %s ", macro); va_list args; - va_start(args, fmt); - this->definitions().appendVAList(fmt, args); + va_start(args, replacement); + this->definitions().appendVAList(replacement, args); va_end(args); - this->definitions().append(";\n"); + this->definitions().append("\n"); } /** |