Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Side by Side Diff: src/gpu/GrInOrderDrawBuffer.cpp

Issue 275493004: Rename from "(un)lock" to "(un)map" for geometry buffers. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Address Rob's comments Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/gpu/GrGpu.cpp ('k') | src/gpu/gl/GrGLBufferImpl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2011 Google Inc. 2 * Copyright 2011 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "GrInOrderDrawBuffer.h" 8 #include "GrInOrderDrawBuffer.h"
9 9
10 #include "GrBufferAllocPool.h" 10 #include "GrBufferAllocPool.h"
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
562 SkASSERT(kReserved_GeometrySrcType != this->getGeomSrc().fIndexSrc); 562 SkASSERT(kReserved_GeometrySrcType != this->getGeomSrc().fIndexSrc);
563 563
564 int numCmds = fCmds.count(); 564 int numCmds = fCmds.count();
565 if (0 == numCmds) { 565 if (0 == numCmds) {
566 return; 566 return;
567 } 567 }
568 568
569 GrAutoTRestore<bool> flushRestore(&fFlushing); 569 GrAutoTRestore<bool> flushRestore(&fFlushing);
570 fFlushing = true; 570 fFlushing = true;
571 571
572 fVertexPool.unlock(); 572 fVertexPool.unmap();
573 fIndexPool.unlock(); 573 fIndexPool.unmap();
574 574
575 GrDrawTarget::AutoClipRestore acr(fDstGpu); 575 GrDrawTarget::AutoClipRestore acr(fDstGpu);
576 AutoGeometryAndStatePush agasp(fDstGpu, kPreserve_ASRInit); 576 AutoGeometryAndStatePush agasp(fDstGpu, kPreserve_ASRInit);
577 577
578 GrDrawState playbackState; 578 GrDrawState playbackState;
579 GrDrawState* prevDrawState = fDstGpu->drawState(); 579 GrDrawState* prevDrawState = fDstGpu->drawState();
580 prevDrawState->ref(); 580 prevDrawState->ref();
581 fDstGpu->setDrawState(&playbackState); 581 fDstGpu->setDrawState(&playbackState);
582 582
583 GrClipData clipData; 583 GrClipData clipData;
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
982 this->addToCmdBuffer(kCopySurface_Cmd); 982 this->addToCmdBuffer(kCopySurface_Cmd);
983 return &fCopySurfaces.push_back(); 983 return &fCopySurfaces.push_back();
984 } 984 }
985 985
986 986
987 void GrInOrderDrawBuffer::clipWillBeSet(const GrClipData* newClipData) { 987 void GrInOrderDrawBuffer::clipWillBeSet(const GrClipData* newClipData) {
988 INHERITED::clipWillBeSet(newClipData); 988 INHERITED::clipWillBeSet(newClipData);
989 fClipSet = true; 989 fClipSet = true;
990 fClipProxyState = kUnknown_ClipProxyState; 990 fClipProxyState = kUnknown_ClipProxyState;
991 } 991 }
OLDNEW
« no previous file with comments | « src/gpu/GrGpu.cpp ('k') | src/gpu/gl/GrGLBufferImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698