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

Remove unused parameter in vk bindDescriptorSets.

Browse Source 
Change-Id: Ie377fcdca09023b71d1b8cce89db1d9f574df3be
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/338044
Commit-Queue: Greg Daniel <egdaniel@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
Auto-Submit: Greg Daniel <egdaniel@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>
This commit is contained in:
Greg Daniel 2020-11-24 10:41:04 -05:00 committed by Skia Commit-Bot
parent dbc19ea84e
commit 1cf4bc796c
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gpu/vk/GrVkCommandBuffer.cpp
View File

@ -258,7 +258,6 @@ void GrVkCommandBuffer::clearAttachments(const GrVkGpu* gpu,
} }
void GrVkCommandBuffer::bindDescriptorSets(const GrVkGpu* gpu, void GrVkCommandBuffer::bindDescriptorSets(const GrVkGpu* gpu,
GrVkPipelineState* pipelineState,
VkPipelineLayout layout, VkPipelineLayout layout,
uint32_t firstSet, uint32_t firstSet,
uint32_t setCount, uint32_t setCount,

1
src/gpu/vk/GrVkCommandBuffer.h
View File

@ -53,7 +53,6 @@ public:
void bindPipeline(const GrVkGpu* gpu, const GrVkPipeline* pipeline); void bindPipeline(const GrVkGpu* gpu, const GrVkPipeline* pipeline);
void bindDescriptorSets(const GrVkGpu* gpu, void bindDescriptorSets(const GrVkGpu* gpu,
GrVkPipelineState*,
VkPipelineLayout layout, VkPipelineLayout layout,
uint32_t firstSet, uint32_t firstSet,
uint32_t setCount, uint32_t setCount,

21
src/gpu/vk/GrVkPipelineState.cpp
View File

@ -98,8 +98,9 @@ bool GrVkPipelineState::setAndBindUniforms(GrVkGpu* gpu,
if (fUniformBuffer) { if (fUniformBuffer) {
fDataManager.uploadUniformBuffers(gpu, fUniformBuffer.get()); fDataManager.uploadUniformBuffers(gpu, fUniformBuffer.get());
static const int kUniformDSIdx = GrVkUniformHandler::kUniformBufferDescSet; static const int kUniformDSIdx = GrVkUniformHandler::kUniformBufferDescSet;
commandBuffer->bindDescriptorSets(gpu, this, fPipeline->layout(), kUniformDSIdx, 1, commandBuffer->bindDescriptorSets(gpu, fPipeline->layout(), kUniformDSIdx, /*setCount=*/1,
fUniformBuffer->descriptorSet(), 0, nullptr); fUniformBuffer->descriptorSet(), /*dynamicOffsetCount=*/0,
/*dynamicOffsets=*/nullptr);
commandBuffer->addRecycledResource(fUniformBuffer->resource()); commandBuffer->addRecycledResource(fUniformBuffer->resource());
} }
return true; return true;
@ -149,8 +150,10 @@ bool GrVkPipelineState::setAndBindTextures(GrVkGpu* gpu,
commandBuffer->addResource(texture->textureView()); commandBuffer->addResource(texture->textureView());
commandBuffer->addResource(texture->resource()); commandBuffer->addResource(texture->resource());
commandBuffer->addRecycledResource(descriptorSet); commandBuffer->addRecycledResource(descriptorSet);
commandBuffer->bindDescriptorSets(gpu, this, fPipeline->layout(), kSamplerDSIdx, 1, commandBuffer->bindDescriptorSets(gpu, fPipeline->layout(), kSamplerDSIdx,
descriptorSet->descriptorSet(), 0, nullptr); /*setCount=*/1, descriptorSet->descriptorSet(),
/*dynamicOffsetCount=*/0,
/*dynamicOffsets=*/nullptr);
return true; return true;
} }
} }
@ -209,8 +212,9 @@ bool GrVkPipelineState::setAndBindTextures(GrVkGpu* gpu,
texture->addDescriptorSetToCache(descriptorSet, state); texture->addDescriptorSetToCache(descriptorSet, state);
} }
commandBuffer->bindDescriptorSets(gpu, this, fPipeline->layout(), kSamplerDSIdx, 1, commandBuffer->bindDescriptorSets(gpu, fPipeline->layout(), kSamplerDSIdx, /*setCount=*/1,
descriptorSet->descriptorSet(), 0, nullptr); descriptorSet->descriptorSet(),
/*dynamicOffsetCount=*/0, /*dynamicOffsets=*/nullptr);
commandBuffer->addRecycledResource(descriptorSet); commandBuffer->addRecycledResource(descriptorSet);
descriptorSet->recycle(); descriptorSet->recycle();
} }
@ -225,9 +229,8 @@ bool GrVkPipelineState::setAndBindInputAttachment(GrVkGpu* gpu,
if (!descriptorSet) { if (!descriptorSet) {
return false; return false;
} }
commandBuffer->bindDescriptorSets(gpu, this, fPipeline->layout(), commandBuffer->bindDescriptorSets(gpu, fPipeline->layout(), GrVkUniformHandler::kInputDescSet,
GrVkUniformHandler::kInputDescSet, /*setCount=*/1, /*setCount=*/1, descriptorSet->descriptorSet(),
descriptorSet->descriptorSet(),
/*dynamicOffsetCount=*/0, /*dynamicOffsets=*/nullptr); /*dynamicOffsetCount=*/0, /*dynamicOffsets=*/nullptr);
// We don't add the input resource to the command buffer to track since the input will be // We don't add the input resource to the command buffer to track since the input will be
// the same as the color attachment which is already tracked on the command buffer. // the same as the color attachment which is already tracked on the command buffer.