Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright 2016 Google Inc. | 2 * Copyright 2016 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 "GrVkResourceProvider.h" | 8 #include "GrVkResourceProvider.h" |
| 9 | 9 |
| 10 #include "GrVkCommandBuffer.h" | 10 #include "GrVkCommandBuffer.h" |
| 11 #include "GrVkPipeline.h" | 11 #include "GrVkPipeline.h" |
| 12 #include "GrVkRenderPass.h" | 12 #include "GrVkRenderPass.h" |
| 13 #include "GrVkUtil.h" | 13 #include "GrVkUtil.h" |
| 14 | 14 |
| 15 #ifdef SK_TRACE_VK_RESOURCES | 15 #ifdef SK_TRACE_VK_RESOURCES |
| 16 SkTDynamicHash<GrVkResource, uint32_t> GrVkResource::fTrace; | 16 SkTDynamicHash<GrVkResource, uint32_t> GrVkResource::fTrace; |
| 17 SkRandom GrVkResource::fRandom; | 17 SkRandom GrVkResource::fRandom; |
| 18 #endif | 18 #endif |
| 19 | 19 |
| 20 GrVkResourceProvider::GrVkResourceProvider(GrVkGpu* gpu) : fGpu(gpu) { | 20 GrVkResourceProvider::GrVkResourceProvider(GrVkGpu* gpu) : fGpu(gpu) |
| 21 , fPipelineCache(VK_NUL L_HANDLE) { | |
| 21 } | 22 } |
| 22 | 23 |
| 23 GrVkResourceProvider::~GrVkResourceProvider() { | 24 GrVkResourceProvider::~GrVkResourceProvider() { |
| 24 SkASSERT(0 == fSimpleRenderPasses.count()); | 25 SkASSERT(0 == fSimpleRenderPasses.count()); |
| 25 } | 26 } |
| 26 | 27 |
| 28 void GrVkResourceProvider::init() { | |
| 29 VkPipelineCacheCreateInfo createInfo; | |
| 30 memset(&createInfo, 0, sizeof(VkPipelineCacheCreateInfo)); | |
| 31 createInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO; | |
| 32 createInfo.pNext = nullptr; | |
| 33 createInfo.flags = 0; | |
| 34 createInfo.initialDataSize = 0; | |
| 35 createInfo.pInitialData = nullptr; | |
| 36 VkResult result = GR_VK_CALL(fGpu->vkInterface(), | |
| 37 CreatePipelineCache(fGpu->device(), &createInfo , nullptr, | |
| 38 &fPipelineCache)); | |
| 39 SkASSERT(VK_SUCCESS == result); | |
| 40 if (VK_SUCCESS != result) { | |
| 41 fPipelineCache = VK_NULL_HANDLE; | |
| 42 } | |
| 43 } | |
| 44 | |
| 27 GrVkPipeline* GrVkResourceProvider::createPipeline(const GrPipeline& pipeline, | 45 GrVkPipeline* GrVkResourceProvider::createPipeline(const GrPipeline& pipeline, |
| 28 const GrPrimitiveProcessor& p rimProc, | 46 const GrPrimitiveProcessor& p rimProc, |
| 29 VkPipelineShaderStageCreateIn fo* shaderStageInfo, | 47 VkPipelineShaderStageCreateIn fo* shaderStageInfo, |
| 30 int shaderStageCount, | 48 int shaderStageCount, |
| 31 GrPrimitiveType primitiveType , | 49 GrPrimitiveType primitiveType , |
| 32 const GrVkRenderPass& renderP ass, | 50 const GrVkRenderPass& renderP ass, |
| 33 VkPipelineLayout layout) { | 51 VkPipelineLayout layout) { |
| 34 | 52 |
| 35 return GrVkPipeline::Create(fGpu, pipeline, primProc, shaderStageInfo, shade rStageCount, | 53 return GrVkPipeline::Create(fGpu, pipeline, primProc, shaderStageInfo, shade rStageCount, |
| 36 primitiveType, renderPass, layout); | 54 primitiveType, renderPass, layout, fPipelineCach e); |
| 37 } | 55 } |
| 38 | 56 |
| 39 | 57 |
| 40 // To create framebuffers, we first need to create a simple RenderPass that is | 58 // To create framebuffers, we first need to create a simple RenderPass that is |
| 41 // only used for framebuffer creation. When we actually render we will create | 59 // only used for framebuffer creation. When we actually render we will create |
| 42 // RenderPasses as needed that are compatible with the framebuffer. | 60 // RenderPasses as needed that are compatible with the framebuffer. |
| 43 const GrVkRenderPass* | 61 const GrVkRenderPass* |
| 44 GrVkResourceProvider::findOrCreateCompatibleRenderPass(const GrVkRenderTarget& t arget) { | 62 GrVkResourceProvider::findOrCreateCompatibleRenderPass(const GrVkRenderTarget& t arget) { |
| 45 for (int i = 0; i < fSimpleRenderPasses.count(); ++i) { | 63 for (int i = 0; i < fSimpleRenderPasses.count(); ++i) { |
| 46 GrVkRenderPass* renderPass = fSimpleRenderPasses[i]; | 64 GrVkRenderPass* renderPass = fSimpleRenderPasses[i]; |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 108 fActiveCommandBuffers.reset(); | 126 fActiveCommandBuffers.reset(); |
| 109 | 127 |
| 110 for (int i = 0; i < fSimpleRenderPasses.count(); ++i) { | 128 for (int i = 0; i < fSimpleRenderPasses.count(); ++i) { |
| 111 fSimpleRenderPasses[i]->unrefAndAbandon(); | 129 fSimpleRenderPasses[i]->unrefAndAbandon(); |
| 112 } | 130 } |
| 113 fSimpleRenderPasses.reset(); | 131 fSimpleRenderPasses.reset(); |
| 114 | 132 |
| 115 #ifdef SK_TRACE_VK_RESOURCES | 133 #ifdef SK_TRACE_VK_RESOURCES |
| 116 SkASSERT(0 == GrVkResource::fTrace.count()); | 134 SkASSERT(0 == GrVkResource::fTrace.count()); |
| 117 #endif | 135 #endif |
| 118 } | 136 } |
|
egdaniel
2016/03/01 18:47:46
the fact that this line is highlighted worries me.
jvanverth1
2016/03/01 18:51:40
git cl was complaining that the file had a missing
| |
| OLD | NEW |