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/GrGLShaderVar.h b/src/gpu/gl/GrGLShaderVar.h
index 0231d21..92d7ee0 100644
--- a/src/gpu/gl/GrGLShaderVar.h
+++ b/src/gpu/gl/GrGLShaderVar.h
@@ -55,13 +55,25 @@
fUseUniformFloatArrays = USE_UNIFORM_FLOAT_ARRAYS;
}
+ GrGLShaderVar(const char* name, GrSLType type, int arrayCount = kNonArray) {
+ GrAssert(kVoid_GrSLType != type);
+ fType = type;
+ fTypeModifier = kNone_TypeModifier;
+ fCount = arrayCount;
+ fPrecision = kDefault_Precision;
+ fUseUniformFloatArrays = USE_UNIFORM_FLOAT_ARRAYS;
+ fName = name;
+ }
+
GrGLShaderVar(const GrGLShaderVar& var)
: fType(var.fType)
, fTypeModifier(var.fTypeModifier)
, fName(var.fName)
, fCount(var.fCount)
, fPrecision(var.fPrecision)
- , fUseUniformFloatArrays(var.fUseUniformFloatArrays) {}
+ , fUseUniformFloatArrays(var.fUseUniformFloatArrays) {
+ GrAssert(kVoid_GrSLType != var.fType);
+ }
/**
* Values for array count that have special meaning. We allow 1-sized arrays.
@@ -79,6 +91,7 @@
const SkString& name,
Precision precision = kDefault_Precision,
bool useUniformFloatArrays = USE_UNIFORM_FLOAT_ARRAYS) {
+ GrAssert(kVoid_GrSLType != type);
fType = type;
fTypeModifier = typeModifier;
fName = name;
@@ -95,6 +108,7 @@
const char* name,
Precision precision = kDefault_Precision,
bool useUniformFloatArrays = USE_UNIFORM_FLOAT_ARRAYS) {
+ GrAssert(kVoid_GrSLType != type);
fType = type;
fTypeModifier = typeModifier;
fName = name;
@@ -112,6 +126,7 @@
int count,
Precision precision = kDefault_Precision,
bool useUniformFloatArrays = USE_UNIFORM_FLOAT_ARRAYS) {
+ GrAssert(kVoid_GrSLType != type);
fType = type;
fTypeModifier = typeModifier;
fName = name;
@@ -129,6 +144,7 @@
int count,
Precision precision = kDefault_Precision,
bool useUniformFloatArrays = USE_UNIFORM_FLOAT_ARRAYS) {
+ GrAssert(kVoid_GrSLType != type);
fType = type;
fTypeModifier = typeModifier;
fName = name;
@@ -232,11 +248,12 @@
TypeString(effectiveType),
this->getName().c_str());
}
- out->append(";\n");
}
static const char* TypeString(GrSLType t) {
switch (t) {
+ case kVoid_GrSLType:
+ return "void";
case kFloat_GrSLType:
return "float";
case kVec2f_GrSLType: