diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-12-07 17:06:19 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-07 23:36:31 +0000 |
| commit | 742e31de1599f3902810aecdf2e2e3eed3b40a09 (patch) | |
| tree | bbac738ec7cecce88712ad2df993933c8888305e /src/gpu/vk/GrVkGpuCommandBuffer.cpp | |
| parent | 42521e891081a7a85db4390a457074054649f194 (diff) | |
Rename GrBatchFlushState to GrOpFlushState
Change-Id: I1a8052c61d7624929caf45ba44e2a465cd0dc1c2
Reviewed-on: https://skia-review.googlesource.com/5649
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/gpu/vk/GrVkGpuCommandBuffer.cpp')
| -rw-r--r-- | src/gpu/vk/GrVkGpuCommandBuffer.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gpu/vk/GrVkGpuCommandBuffer.cpp b/src/gpu/vk/GrVkGpuCommandBuffer.cpp index 4dd042b7f6..d2d5ee8324 100644 --- a/src/gpu/vk/GrVkGpuCommandBuffer.cpp +++ b/src/gpu/vk/GrVkGpuCommandBuffer.cpp @@ -7,9 +7,9 @@ #include "GrVkGpuCommandBuffer.h" -#include "GrBatchFlushState.h" #include "GrFixedClip.h" #include "GrMesh.h" +#include "GrOpFlushState.h" #include "GrPipeline.h" #include "GrRenderTargetPriv.h" #include "GrTexturePriv.h" @@ -400,8 +400,7 @@ void GrVkGpuCommandBuffer::addAdditionalCommandBuffer() { cbInfo.fCommandBuffer->begin(fGpu, fRenderTarget->framebuffer(), cbInfo.fRenderPass); } -void GrVkGpuCommandBuffer::inlineUpload(GrBatchFlushState* state, - GrDrawOp::DeferredUploadFn& upload) { +void GrVkGpuCommandBuffer::inlineUpload(GrOpFlushState* state, GrDrawOp::DeferredUploadFn& upload) { if (!fCommandBufferInfos[fCurrentCmdBuffer].fIsEmpty) { this->addAdditionalCommandBuffer(); } |