minor skslc bugfixes

This fixes the attributes on sk_VertexID, and a backwards test on
SkSL::String::startsWith and ::endsWith.

Change-Id: Icfddfc8ca95454d8646a1771761685c2525b296e
Reviewed-on: https://skia-review.googlesource.com/17398
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

diff --git a/src/sksl/SkSLString.cpp b/src/sksl/SkSLString.cpp
index 8e531ae..9b2c178 100644 (file)
--- a/src/sksl/SkSLString.cpp
+++ b/src/sksl/SkSLString.cpp
@@ -53,7 +53,7 @@ void String::vappendf(const char* fmt, va_list args) {
 
 
 bool String::startsWith(const char* s) const {
-    return strncmp(c_str(), s, strlen(s));
+    return !strncmp(c_str(), s, strlen(s));
 }
 
 bool String::endsWith(const char* s) const {
@@ -61,7 +61,7 @@ bool String::endsWith(const char* s) const {
     if (size() < len) {
         return false;
     }
-    return strncmp(c_str() + size() - len, s, len);
+    return !strncmp(c_str() + size() - len, s, len);
 }
 
 String String::operator+(const char* s) const {

diff --git a/src/sksl/sksl_vert.include b/src/sksl/sksl_vert.include
index e7e9d59..2c38a8b 100644 (file)
--- a/src/sksl/sksl_vert.include
+++ b/src/sksl/sksl_vert.include
@@ -8,7 +8,7 @@ out sk_PerVertex {
     layout(builtin=3) float sk_ClipDistance[1];
 };
 
-layout(builtin=5) int sk_VertexID;
+layout(builtin=5) in int sk_VertexID;
 
 )