Split GrGLContextInfo into GrGLContext & GrGLContextInfo
https://codereview.appspot.com/7436045/
git-svn-id: http://skia.googlecode.com/svn/trunk@7905 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/gl/GrGLShaderVar.h b/src/gpu/gl/GrGLShaderVar.h
index 89fa087..ecf0b47 100644
--- a/src/gpu/gl/GrGLShaderVar.h
+++ b/src/gpu/gl/GrGLShaderVar.h
@@ -8,7 +8,7 @@
#ifndef GrGLShaderVar_DEFINED
#define GrGLShaderVar_DEFINED
-#include "GrGLContextInfo.h"
+#include "GrGLContext.h"
#include "GrGLSL.h"
#include "SkString.h"
@@ -252,7 +252,7 @@
/**
* Write a declaration of this variable to out.
*/
- void appendDecl(const GrGLContextInfo& gl, SkString* out) const {
+ void appendDecl(const GrGLContextInfo& ctxInfo, SkString* out) const {
if (kUpperLeft_Origin == fOrigin) {
// this is the only place where we specify a layout modifier. If we use other layout
// modifiers in the future then they should be placed in a list.
@@ -260,10 +260,10 @@
}
if (this->getTypeModifier() != kNone_TypeModifier) {
out->append(TypeModifierString(this->getTypeModifier(),
- gl.glslGeneration()));
+ ctxInfo.glslGeneration()));
out->append(" ");
}
- out->append(PrecisionString(fPrecision, gl.binding()));
+ out->append(PrecisionString(fPrecision, ctxInfo.binding()));
GrSLType effectiveType = this->getType();
if (this->isArray()) {
if (this->isUnsizedArray()) {