diff options
author | 2013-03-01 12:12:55 +0000 | |
---|---|---|
committer | 2013-03-01 12:12:55 +0000 | |
commit | 631cdcb4a6b926b6447f328b81911a4499fb3698 (patch) | |
tree | c0291dc8667b5d3d7c654660ec10b46d52ea8763 /src/gpu/gl | |
parent | af3a3b9fb1f3be46082013a2d1977d12faf1f61c (diff) |
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@7910 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl')
-rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 2 | ||||
-rw-r--r-- | src/gpu/gl/GrGLCaps.h | 2 | ||||
-rw-r--r-- | src/gpu/gl/GrGLContext.cpp | 4 | ||||
-rw-r--r-- | src/gpu/gl/GrGLContext.h | 4 | ||||
-rw-r--r-- | src/gpu/gl/GrGLShaderBuilder.cpp | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 9058b35dea..a2f89f0c82 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -178,7 +178,7 @@ void GrGLCaps::init(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli) { (kARM_GrGLVendor == ctxInfo.vendor() || kImagination_GrGLVendor == ctxInfo.vendor())) { fUseNonVBOVertexAndIndexDynamicData = true; } - + if (kDesktop_GrGLBinding == binding && version >= GR_GL_VER(3, 2)) { GrGLint profileMask; GR_GL_GetIntegerv(gli, GR_GL_CONTEXT_PROFILE_MASK, &profileMask); diff --git a/src/gpu/gl/GrGLCaps.h b/src/gpu/gl/GrGLCaps.h index 35b4dfc1a8..31edd657b3 100644 --- a/src/gpu/gl/GrGLCaps.h +++ b/src/gpu/gl/GrGLCaps.h @@ -228,7 +228,7 @@ public: bool readPixelsSupported(const GrGLInterface* intf, GrGLenum format, GrGLenum type) const; - + bool isCoreProfile() const { return fIsCoreProfile; } private: diff --git a/src/gpu/gl/GrGLContext.cpp b/src/gpu/gl/GrGLContext.cpp index ba4196de8e..0c3f0eb67a 100644 --- a/src/gpu/gl/GrGLContext.cpp +++ b/src/gpu/gl/GrGLContext.cpp @@ -17,7 +17,7 @@ GrGLContextInfo& GrGLContextInfo::operator= (const GrGLContextInfo& ctxInfo) { fGLCaps = ctxInfo.fGLCaps; return *this; } - + bool GrGLContextInfo::initialize(const GrGLInterface* interface) { this->reset(); // We haven't validated the GrGLInterface yet, so check for GetString @@ -44,7 +44,7 @@ bool GrGLContextInfo::initialize(const GrGLInterface* interface) { } bool GrGLContextInfo::isInitialized() const { - return kNone_GrGLBinding != fBindingInUse; + return kNone_GrGLBinding != fBindingInUse; } void GrGLContextInfo::reset() { diff --git a/src/gpu/gl/GrGLContext.h b/src/gpu/gl/GrGLContext.h index 05647cc9fa..1091ab9906 100644 --- a/src/gpu/gl/GrGLContext.h +++ b/src/gpu/gl/GrGLContext.h @@ -18,7 +18,7 @@ #include "SkString.h" /** - * Encapsulates information about an OpenGL context including the OpenGL + * Encapsulates information about an OpenGL context including the OpenGL * version, the GrGLBinding type of the context, and GLSL version. */ class GrGLContextInfo { @@ -32,7 +32,7 @@ public: * Copies a GrGLContextInfo */ GrGLContextInfo& operator= (const GrGLContextInfo& ctxInfo); - + /** * Initializes a GrGLContextInfo from a GrGLInterface and the currently * bound OpenGL context accessible by the GrGLInterface. diff --git a/src/gpu/gl/GrGLShaderBuilder.cpp b/src/gpu/gl/GrGLShaderBuilder.cpp index c4339b81fc..021f56d59b 100644 --- a/src/gpu/gl/GrGLShaderBuilder.cpp +++ b/src/gpu/gl/GrGLShaderBuilder.cpp @@ -81,7 +81,7 @@ void append_swizzle(SkString* outAppend, // varying by stage, if we use 1D textures for gradients! //const int GrGLShaderBuilder::fCoordDims = 2; -GrGLShaderBuilder::GrGLShaderBuilder(const GrGLContextInfo& ctxInfo, +GrGLShaderBuilder::GrGLShaderBuilder(const GrGLContextInfo& ctxInfo, GrGLUniformManager& uniformManager) : fUniforms(kVarsPerBlock) , fVSAttrs(kVarsPerBlock) |