uniquely name FS functions, add lighting effects to unit test
Review URL: http://codereview.appspot.com/6458080/
git-svn-id: http://skia.googlecode.com/svn/trunk@4992 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/gl/GrGLSL.cpp b/src/gpu/gl/GrGLSL.cpp
index 759a17c..ff4d498 100644
--- a/src/gpu/gl/GrGLSL.cpp
+++ b/src/gpu/gl/GrGLSL.cpp
@@ -66,12 +66,12 @@
}
GrSLType GrSLFloatVectorType (int count) {
- GR_STATIC_ASSERT(kFloat_GrSLType == 0);
- GR_STATIC_ASSERT(kVec2f_GrSLType == 1);
- GR_STATIC_ASSERT(kVec3f_GrSLType == 2);
- GR_STATIC_ASSERT(kVec4f_GrSLType == 3);
+ GR_STATIC_ASSERT(kFloat_GrSLType == 1);
+ GR_STATIC_ASSERT(kVec2f_GrSLType == 2);
+ GR_STATIC_ASSERT(kVec3f_GrSLType == 3);
+ GR_STATIC_ASSERT(kVec4f_GrSLType == 4);
GrAssert(count > 0 && count <= 4);
- return (GrSLType)(count - 1);
+ return (GrSLType)(count);
}
const char* GrGLSLVectorHomogCoord(int count) {