diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/vulkan/anv_cmd_buffer.c | 16 | ||||
| -rw-r--r-- | src/vulkan/gen7_cmd_buffer.c | 4 | ||||
| -rw-r--r-- | src/vulkan/gen8_cmd_buffer.c | 12 |
3 files changed, 16 insertions, 16 deletions
diff --git a/src/vulkan/anv_cmd_buffer.c b/src/vulkan/anv_cmd_buffer.c index 401fd5681f6..7c00f9d46ba 100644 --- a/src/vulkan/anv_cmd_buffer.c +++ b/src/vulkan/anv_cmd_buffer.c @@ -468,7 +468,7 @@ void anv_CmdBindDescriptorSets( VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout _layout, uint32_t firstSet, - uint32_t setCount, + uint32_t descriptorSetCount, const VkDescriptorSet* pDescriptorSets, uint32_t dynamicOffsetCount, const uint32_t* pDynamicOffsets) @@ -477,10 +477,10 @@ void anv_CmdBindDescriptorSets( ANV_FROM_HANDLE(anv_pipeline_layout, layout, _layout); struct anv_descriptor_set_layout *set_layout; - assert(firstSet + setCount < MAX_SETS); + assert(firstSet + descriptorSetCount < MAX_SETS); uint32_t dynamic_slot = 0; - for (uint32_t i = 0; i < setCount; i++) { + for (uint32_t i = 0; i < descriptorSetCount; i++) { ANV_FROM_HANDLE(anv_descriptor_set, set, pDescriptorSets[i]); set_layout = layout->set[firstSet + i].layout; @@ -858,9 +858,9 @@ void anv_CmdPushConstants( VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, - uint32_t start, - uint32_t length, - const void* values) + uint32_t offset, + uint32_t size, + const void* pValues) { ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer); VkShaderStage stage; @@ -868,8 +868,8 @@ void anv_CmdPushConstants( for_each_bit(stage, stageFlags) { anv_cmd_buffer_ensure_push_constant_field(cmd_buffer, stage, client_data); - memcpy(cmd_buffer->state.push_constants[stage]->client_data + start, - values, length); + memcpy(cmd_buffer->state.push_constants[stage]->client_data + offset, + pValues, size); } cmd_buffer->state.push_constants_dirty |= stageFlags; diff --git a/src/vulkan/gen7_cmd_buffer.c b/src/vulkan/gen7_cmd_buffer.c index 9a3d4799d62..5f215c6c312 100644 --- a/src/vulkan/gen7_cmd_buffer.c +++ b/src/vulkan/gen7_cmd_buffer.c @@ -581,7 +581,7 @@ void genX(CmdDrawIndirect)( VkCommandBuffer commandBuffer, VkBuffer _buffer, VkDeviceSize offset, - uint32_t count, + uint32_t drawCount, uint32_t stride) { ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer); @@ -608,7 +608,7 @@ void genX(CmdDrawIndexedIndirect)( VkCommandBuffer commandBuffer, VkBuffer _buffer, VkDeviceSize offset, - uint32_t count, + uint32_t drawCount, uint32_t stride) { ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer); diff --git a/src/vulkan/gen8_cmd_buffer.c b/src/vulkan/gen8_cmd_buffer.c index b6523b5ecf5..c4ac28373e5 100644 --- a/src/vulkan/gen8_cmd_buffer.c +++ b/src/vulkan/gen8_cmd_buffer.c @@ -433,7 +433,7 @@ void genX(CmdDrawIndirect)( VkCommandBuffer commandBuffer, VkBuffer _buffer, VkDeviceSize offset, - uint32_t count, + uint32_t drawCount, uint32_t stride) { ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer); @@ -558,7 +558,7 @@ void genX(CmdDrawIndexedIndirect)( VkCommandBuffer commandBuffer, VkBuffer _buffer, VkDeviceSize offset, - uint32_t count, + uint32_t drawCount, uint32_t stride) { ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer); @@ -813,7 +813,7 @@ emit_ps_depth_count(struct anv_batch *batch, void genX(CmdBeginQuery)( VkCommandBuffer commandBuffer, VkQueryPool queryPool, - uint32_t slot, + uint32_t entry, VkQueryControlFlags flags) { ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer); @@ -822,7 +822,7 @@ void genX(CmdBeginQuery)( switch (pool->type) { case VK_QUERY_TYPE_OCCLUSION: emit_ps_depth_count(&cmd_buffer->batch, &pool->bo, - slot * sizeof(struct anv_query_pool_slot)); + entry * sizeof(struct anv_query_pool_slot)); break; case VK_QUERY_TYPE_PIPELINE_STATISTICS: @@ -834,7 +834,7 @@ void genX(CmdBeginQuery)( void genX(CmdEndQuery)( VkCommandBuffer commandBuffer, VkQueryPool queryPool, - uint32_t slot) + uint32_t entry) { ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer); ANV_FROM_HANDLE(anv_query_pool, pool, queryPool); @@ -842,7 +842,7 @@ void genX(CmdEndQuery)( switch (pool->type) { case VK_QUERY_TYPE_OCCLUSION: emit_ps_depth_count(&cmd_buffer->batch, &pool->bo, - slot * sizeof(struct anv_query_pool_slot) + 8); + entry * sizeof(struct anv_query_pool_slot) + 8); break; case VK_QUERY_TYPE_PIPELINE_STATISTICS: |