aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/sksl
diff options
context:
space:
mode:
authorGravatar Brian Osman <brianosman@google.com>2018-04-25 13:13:19 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-04-25 17:38:37 +0000
commit6cd92689073c29f0878fb3a83f38c968344e21d8 (patch)
treef5e8d95b4b40f6b5109c9ba2b4cadf577e186c4c /src/sksl
parent910ca0fd014ad9263e54e0cfa4199768b6c7fade (diff)
Don't 'require' external image extensions, 'enable' them
We trigger this when we don't necessarily have support for both extensions, so requiring them can cause compilation failures. Bug: https://github.com/flutter/flutter/issues/16178 Change-Id: I54c190709a677bc9ec2fa46f612e8958e3de38cb Reviewed-on: https://skia-review.googlesource.com/123683 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/sksl')
-rw-r--r--src/sksl/SkSLGLSLCodeGenerator.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sksl/SkSLGLSLCodeGenerator.cpp b/src/sksl/SkSLGLSLCodeGenerator.cpp
index 9b954757e9..47fa721733 100644
--- a/src/sksl/SkSLGLSLCodeGenerator.cpp
+++ b/src/sksl/SkSLGLSLCodeGenerator.cpp
@@ -1087,12 +1087,12 @@ void GLSLCodeGenerator::writeVarDeclarations(const VarDeclarations& decl, bool g
if (fProgram.fSettings.fCaps->externalTextureExtensionString()) {
fHeader.writeText("#extension ");
fHeader.writeText(fProgram.fSettings.fCaps->externalTextureExtensionString());
- fHeader.writeText(" : require\n");
+ fHeader.writeText(" : enable\n");
}
if (fProgram.fSettings.fCaps->secondExternalTextureExtensionString()) {
fHeader.writeText("#extension ");
fHeader.writeText(fProgram.fSettings.fCaps->secondExternalTextureExtensionString());
- fHeader.writeText(" : require\n");
+ fHeader.writeText(" : enable\n");
}
fFoundExternalSamplerDecl = true;
}