diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-08-01 16:13:04 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-01 20:46:28 +0000 |
| commit | 369e8b70eedfd151c7f88e50d7f430f4cda5d57e (patch) | |
| tree | 3e77b9ce2c1f4b604bfa42d211f158140e242d2e /src/gpu/vk/GrVkPipelineState.cpp | |
| parent | 0e9605542444a7653359f4fc610f7620df9f6313 (diff) | |
Fix cleanup on program creation failure
Change-Id: Ibc9b96537f774a3b8a43848b8b626f3f036b07b3
Reviewed-on: https://skia-review.googlesource.com/29561
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/vk/GrVkPipelineState.cpp')
| -rw-r--r-- | src/gpu/vk/GrVkPipelineState.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/vk/GrVkPipelineState.cpp b/src/gpu/vk/GrVkPipelineState.cpp index 083d225ff8..ee2413547f 100644 --- a/src/gpu/vk/GrVkPipelineState.cpp +++ b/src/gpu/vk/GrVkPipelineState.cpp @@ -40,8 +40,8 @@ GrVkPipelineState::GrVkPipelineState(GrVkGpu* gpu, uint32_t fragmentUniformSize, uint32_t numSamplers, uint32_t numTexelBuffers, - GrGLSLPrimitiveProcessor* geometryProcessor, - GrGLSLXferProcessor* xferProcessor, + std::unique_ptr<GrGLSLPrimitiveProcessor> geometryProcessor, + std::unique_ptr<GrGLSLXferProcessor> xferProcessor, const GrGLSLFragProcs& fragmentProcessors) : fPipeline(pipeline) , fPipelineLayout(layout) @@ -51,8 +51,8 @@ GrVkPipelineState::GrVkPipelineState(GrVkGpu* gpu, , fSamplerDSHandle(samplerDSHandle) , fTexelBufferDSHandle(texelBufferDSHandle) , fBuiltinUniformHandles(builtinUniformHandles) - , fGeometryProcessor(geometryProcessor) - , fXferProcessor(xferProcessor) + , fGeometryProcessor(std::move(geometryProcessor)) + , fXferProcessor(std::move(xferProcessor)) , fFragmentProcessors(fragmentProcessors) , fDesc(desc) , fDataManager(uniforms, geometryUniformSize, fragmentUniformSize) { |