diff options
-rw-r--r-- | src/gpu/GrDrawTarget.h | 6 | ||||
-rw-r--r-- | src/gpu/GrInOrderDrawBuffer.cpp | 4 | ||||
-rw-r--r-- | src/gpu/GrTextContext.cpp | 2 | ||||
-rw-r--r-- | src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp | 2 | ||||
-rw-r--r-- | tools/filtermain.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h index 2a3681f553..5a558ed6db 100644 --- a/src/gpu/GrDrawTarget.h +++ b/src/gpu/GrDrawTarget.h @@ -277,7 +277,7 @@ public: * the vertex data when this is called. * * @param vertexArray cpu array containing vertex data. - * @param vertexCount the number of vertices in the array. Vertex size is + * @param vertexCount the number of vertices in the array. Vertex size is * queried from the current GrDrawState. */ void setVertexSourceToArray(const void* vertexArray, int vertexCount); @@ -296,7 +296,7 @@ public: * in the buffer until drawIndexed, drawNonIndexed, or drawIndexedInstances. * * @param buffer vertex buffer containing vertex data. Must be - * unlocked before draw call. Vertex size is queried + * unlocked before draw call. Vertex size is queried * from current GrDrawState. */ void setVertexSourceToBuffer(const GrVertexBuffer* buffer); @@ -600,7 +600,7 @@ public: class AutoGeometryAndStatePush : ::GrNoncopyable { public: - AutoGeometryAndStatePush(GrDrawTarget* target, ASRInit init) + AutoGeometryAndStatePush(GrDrawTarget* target, ASRInit init) : fState(target, init) { GrAssert(NULL != target); fTarget = target; diff --git a/src/gpu/GrInOrderDrawBuffer.cpp b/src/gpu/GrInOrderDrawBuffer.cpp index ce41ae1d92..991d858174 100644 --- a/src/gpu/GrInOrderDrawBuffer.cpp +++ b/src/gpu/GrInOrderDrawBuffer.cpp @@ -257,7 +257,7 @@ int GrInOrderDrawBuffer::concatInstancedDraw(const DrawInfo& info) { instancesToConcat = GrMin(instancesToConcat, info.instanceCount()); // update the amount of reserved vertex data actually referenced in draws - size_t vertexBytes = instancesToConcat * info.verticesPerInstance() * + size_t vertexBytes = instancesToConcat * info.verticesPerInstance() * drawState.getVertexSize(); poolState.fUsedPoolVertexBytes = GrMax(poolState.fUsedPoolVertexBytes, vertexBytes); @@ -321,7 +321,7 @@ void GrInOrderDrawBuffer::onDraw(const DrawInfo& info) { break; case kReserved_GeometrySrcType: // fallthrough case kArray_GeometrySrcType: { - size_t vertexBytes = (info.vertexCount() + info.startVertex()) * + size_t vertexBytes = (info.vertexCount() + info.startVertex()) * drawState.getVertexSize(); poolState.fUsedPoolVertexBytes = GrMax(poolState.fUsedPoolVertexBytes, vertexBytes); draw->fVertexBuffer = poolState.fPoolVertexBuffer; diff --git a/src/gpu/GrTextContext.cpp b/src/gpu/GrTextContext.cpp index 684b7f749f..b1973a6e89 100644 --- a/src/gpu/GrTextContext.cpp +++ b/src/gpu/GrTextContext.cpp @@ -208,7 +208,7 @@ HAS_ATLAS: if (NULL != fDrawTarget) { fDrawTarget->drawState()->setVertexLayout(fVertexLayout); flush = fDrawTarget->geometryHints(&fMaxVertices, NULL); - } + } if (flush) { this->flushGlyphs(); fContext->flush(); diff --git a/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp b/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp index 3a7bdd5c8f..64f073a75f 100644 --- a/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp +++ b/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp @@ -50,7 +50,7 @@ const GrGLInterface* GrGLCreateNativeInterface() { } GrGLGetStringProc glGetString = (GrGLGetStringProc) GetProcAddress(alu.get(), "glGetString"); - + if (NULL != wglGetCurrentContext()) { const char* versionString = (const char*) glGetString(GR_GL_VERSION); const char* extString = (const char*) glGetString(GR_GL_EXTENSIONS); diff --git a/tools/filtermain.cpp b/tools/filtermain.cpp index 0cf56a8259..cca96e417b 100644 --- a/tools/filtermain.cpp +++ b/tools/filtermain.cpp @@ -185,7 +185,7 @@ static int filter_picture(const SkString& inFile, const SkString& outFile) { const SkTDArray<SkDrawCommand*>& commands = debugCanvas.getDrawCommands(); - // hide the initial save and restore since replaying the commands will + // hide the initial save and restore since replaying the commands will // re-add them if (commands.count() > 0) { commands[0]->setVisible(false); |