Fixed GLSL header line ordering

Under some circumstances, an extension could be written after a global variable.
This should fix the ordering so that can never happen again.

Bug: b/111582212
Change-Id: Id2f7645253fdc521ba85ca0e6863236baef63a4b
Reviewed-on: https://skia-review.googlesource.com/143102
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/src/sksl/SkSLGLSLCodeGenerator.h b/src/sksl/SkSLGLSLCodeGenerator.h
index 362ae7ca18..e19444d74d 100644
--- a/src/sksl/SkSLGLSLCodeGenerator.h
+++ b/src/sksl/SkSLGLSLCodeGenerator.h
@@ -102,7 +102,9 @@ protected:
 
     void writeType(const Type& type);
 
-    void writeExtension(const Extension& ext);
+    void writeExtension(const String& name);
+
+    void writeExtension(const String& name, bool require);
 
     void writeInterfaceBlock(const InterfaceBlock& intf);
 
@@ -194,7 +196,8 @@ protected:
 
     const char* fLineEnding;
     const Context& fContext;
-    StringStream fHeader;
+    StringStream fExtensions;
+    StringStream fGlobals;
     StringStream fExtraFunctions;
     String fFunctionHeader;
     Program::Kind fProgramKind;