| Index: src/gpu/gl/GrGLShaderVar.h
|
| diff --git a/src/gpu/gl/GrGLShaderVar.h b/src/gpu/gl/GrGLShaderVar.h
|
| index 0a7b1deda31bac4d235cac0f141d979ff03bef49..e32683ab4f8bb95ba93d825a211cc115121fb96a 100644
|
| --- a/src/gpu/gl/GrGLShaderVar.h
|
| +++ b/src/gpu/gl/GrGLShaderVar.h
|
| @@ -88,7 +88,7 @@ public:
|
| bool useUniformFloatArrays = USE_UNIFORM_FLOAT_ARRAYS) {
|
| SkASSERT(kVoid_GrSLType != type);
|
| SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsFloatType(type));
|
| - INHERITED::set(type, typeModifier, name, precision);
|
| + INHERITED::set(type, name, typeModifier, precision);
|
| fOrigin = origin;
|
| fUseUniformFloatArrays = useUniformFloatArrays;
|
| }
|
| @@ -104,7 +104,7 @@ public:
|
| bool useUniformFloatArrays = USE_UNIFORM_FLOAT_ARRAYS) {
|
| SkASSERT(kVoid_GrSLType != type);
|
| SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsFloatType(type));
|
| - INHERITED::set(type, typeModifier, name, precision);
|
| + INHERITED::set(type, name, typeModifier, precision);
|
| fOrigin = origin;
|
| fUseUniformFloatArrays = useUniformFloatArrays;
|
| }
|
| @@ -121,7 +121,7 @@ public:
|
| bool useUniformFloatArrays = USE_UNIFORM_FLOAT_ARRAYS) {
|
| SkASSERT(kVoid_GrSLType != type);
|
| SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsFloatType(type));
|
| - INHERITED::set(type, typeModifier, name, count, precision);
|
| + INHERITED::set(type, name, typeModifier, precision, count);
|
| fOrigin = origin;
|
| fUseUniformFloatArrays = useUniformFloatArrays;
|
| }
|
| @@ -138,7 +138,7 @@ public:
|
| bool useUniformFloatArrays = USE_UNIFORM_FLOAT_ARRAYS) {
|
| SkASSERT(kVoid_GrSLType != type);
|
| SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsFloatType(type));
|
| - INHERITED::set(type, typeModifier, name, count, precision);
|
| + INHERITED::set(type, name, typeModifier, precision, count);
|
| fOrigin = origin;
|
| fUseUniformFloatArrays = useUniformFloatArrays;
|
| }
|
|
|