From 061020eab431e9bf43fe47ace659fedf367c0745 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Tue, 17 Apr 2018 14:22:15 -0400 Subject: With ES3, enable both ES2 and ES3 external image extensions Bug: skia:7713 Change-Id: If06c0368e91c33bbac9e7715227d619c4834684f Reviewed-on: https://skia-review.googlesource.com/121884 Reviewed-by: Brian Salomon Commit-Queue: Brian Osman --- src/sksl/SkSLGLSLCodeGenerator.cpp | 5 +++++ src/sksl/SkSLUtil.h | 4 ++++ 2 files changed, 9 insertions(+) (limited to 'src/sksl') diff --git a/src/sksl/SkSLGLSLCodeGenerator.cpp b/src/sksl/SkSLGLSLCodeGenerator.cpp index bcf45ba7be..84c16d40f8 100644 --- a/src/sksl/SkSLGLSLCodeGenerator.cpp +++ b/src/sksl/SkSLGLSLCodeGenerator.cpp @@ -1089,6 +1089,11 @@ void GLSLCodeGenerator::writeVarDeclarations(const VarDeclarations& decl, bool g fHeader.writeText(fProgram.fSettings.fCaps->externalTextureExtensionString()); fHeader.writeText(" : require\n"); } + if (fProgram.fSettings.fCaps->secondExternalTextureExtensionString()) { + fHeader.writeText("#extension "); + fHeader.writeText(fProgram.fSettings.fCaps->secondExternalTextureExtensionString()); + fHeader.writeText(" : require\n"); + } fFoundExternalSamplerDecl = true; } } diff --git a/src/sksl/SkSLUtil.h b/src/sksl/SkSLUtil.h index dc87246605..40a5a4774f 100644 --- a/src/sksl/SkSLUtil.h +++ b/src/sksl/SkSLUtil.h @@ -155,6 +155,10 @@ public: return nullptr; } + const char* secondExternalTextureExtensionString() const { + return nullptr; + } + const char* versionDeclString() const { return ""; } -- cgit v1.2.3