AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sanitizing source files in Skia_Periodic_House_Keeping

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@7608 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2013-02-06 07:01:54 +00:00
parent 53f3f31e17
commit ae683921ff
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gpu/GrDrawTarget.h
View File

@ -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;

4
src/gpu/GrInOrderDrawBuffer.cpp
View File

@ -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;

2
src/gpu/GrTextContext.cpp
View File

@ -208,7 +208,7 @@ HAS_ATLAS:
if (NULL != fDrawTarget) {
fDrawTarget->drawState()->setVertexLayout(fVertexLayout);
flush = fDrawTarget->geometryHints(&fMaxVertices, NULL);
}
}
if (flush) {
this->flushGlyphs();
fContext->flush();

2
src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp
View File

@ -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);

2
tools/filtermain.cpp
View File

@ -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);