put sksl->glsl modifiers in correct order

BUG=skia:6352

Change-Id: I7cdf6fa9c5b48fd2686c5cfc28c594bd291feea5
Reviewed-on: https://skia-review.googlesource.com/9520
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>

diff --git a/src/sksl/SkSLGLSLCodeGenerator.cpp b/src/sksl/SkSLGLSLCodeGenerator.cpp
index 35a2f62..a19de8f 100644 (file)
--- a/src/sksl/SkSLGLSLCodeGenerator.cpp
+++ b/src/sksl/SkSLGLSLCodeGenerator.cpp
@@ -532,6 +532,10 @@ void GLSLCodeGenerator::writeModifiers(const Modifiers& modifiers,
     if (modifiers.fFlags & Modifiers::kNoPerspective_Flag) {
         this->write("noperspective ");
     }
+    SkString layout = modifiers.fLayout.description();
+    if (layout.size()) {
+        this->write(layout + " ");
+    }
     if (modifiers.fFlags & Modifiers::kReadOnly_Flag) {
         this->write("readonly ");
     }
@@ -547,10 +551,6 @@ void GLSLCodeGenerator::writeModifiers(const Modifiers& modifiers,
     if (modifiers.fFlags & Modifiers::kRestrict_Flag) {
         this->write("restrict ");
     }
-    SkString layout = modifiers.fLayout.description();
-    if (layout.size()) {
-        this->write(layout + " ");
-    }
     if ((modifiers.fFlags & Modifiers::kIn_Flag) &&
         (modifiers.fFlags & Modifiers::kOut_Flag)) {
         this->write("inout ");