aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/gl
diff options
context:
space:
mode:
authorGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-03-08 07:01:25 +0000
committerGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-03-08 07:01:25 +0000
commit754a3eb73b796398062f09cc98eae224262a3bc8 (patch)
tree98c483dad9fc389086de10c00d0e80faa3665136 /src/gpu/gl
parent97876d91d72bc70960db28f74e6862beb52f156f (diff)
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@8033 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl')
-rw-r--r--src/gpu/gl/GrGLVertexArray.cpp2
-rw-r--r--src/gpu/gl/GrGpuGL.h6
-rw-r--r--src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/gl/GrGLVertexArray.cpp b/src/gpu/gl/GrGLVertexArray.cpp
index ded4a9a5d2..a10f9873e8 100644
--- a/src/gpu/gl/GrGLVertexArray.cpp
+++ b/src/gpu/gl/GrGLVertexArray.cpp
@@ -94,7 +94,7 @@ GrGLAttribArrayState* GrGLVertexArray::bind() {
GPUGL->bindVertexArray(fID);
return &fAttribArrays;
}
-
+
GrGLAttribArrayState* GrGLVertexArray::bindWithIndexBuffer(const GrGLIndexBuffer* buffer) {
GrGLAttribArrayState* state = this->bind();
if (NULL != state && NULL != buffer) {
diff --git a/src/gpu/gl/GrGpuGL.h b/src/gpu/gl/GrGpuGL.h
index e4c7197690..f05671e560 100644
--- a/src/gpu/gl/GrGpuGL.h
+++ b/src/gpu/gl/GrGpuGL.h
@@ -56,7 +56,7 @@ public:
const GrGLCaps& glCaps() const { return fGLContext.info().caps(); }
// These functions should be used to bind GL objects. They track the GL state and skip redundant
- // bindings. Making the equivalent glBind calls directly will confuse the state tracking.
+ // bindings. Making the equivalent glBind calls directly will confuse the state tracking.
void bindVertexArray(GrGLuint id) {
fHWGeometryState.setVertexArrayID(this, id);
}
@@ -282,7 +282,7 @@ private:
class HWGeometryState {
public:
HWGeometryState() { fVBOVertexArray = NULL; this->invalidate(); }
-
+
~HWGeometryState() { SkSafeUnref(fVBOVertexArray); }
void invalidate() {
@@ -358,7 +358,7 @@ private:
* Binds the vertex array object that should be used to render from the vertex buffer.
* The vertex array is bound and its attrib array state object is returned. The vertex
* buffer is bound. The index buffer (if non-NULL) is bound to the vertex array. The
- * returned GrGLAttribArrayState should be used to set vertex attribute arrays.
+ * returned GrGLAttribArrayState should be used to set vertex attribute arrays.
*/
GrGLAttribArrayState* bindArrayAndBuffersToDraw(GrGpuGL* gpu,
const GrGLVertexBuffer* vbuffer,
diff --git a/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp b/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp
index a26601fe5d..75cec63d7c 100644
--- a/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp
+++ b/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp
@@ -47,7 +47,7 @@ const GrGLInterface* GrGLCreateNativeInterface() {
static SkAutoTUnref<GrGLInterface> glInterface;
if (!glInterface.get()) {
GrGLInterface* interface = new GrGLInterface;
-
+
GrGLGetStringProc glGetString = (GrGLGetStringProc) GetProcAddress("glGetString");
GrGLGetStringiProc glGetStringi = (GrGLGetStringiProc) GetProcAddress("glGetStringi");
GrGLGetIntegervProc glGetIntegerv = (GrGLGetIntegervProc) GetProcAddress("glGetIntegerv");
@@ -61,7 +61,7 @@ const GrGLInterface* GrGLCreateNativeInterface() {
return NULL;
}
interface->fBindingsExported = kDesktop_GrGLBinding;
-
+
GET_PROC(ActiveTexture);
GET_PROC(AttachShader);
GET_PROC(BeginQuery);