KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

anv/query: Perform CmdResetQueryPool on the GPU 

This fixes a some rendering corruption in The Talos Principle

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: "13.0 17.0" <mesa-stable@lists.freedesktop.org>
This commit is contained in:
Jason Ekstrand 2017-02-18 15:21:04 -08:00
parent dc9abd0e6b
commit 40087bcb51
2 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/intel/vulkan/anv_query.c
View File

@ -169,25 +169,3 @@ VkResult anv_GetQueryPoolResults(
return VK_SUCCESS;
}
void anv_CmdResetQueryPool(
VkCommandBuffer commandBuffer,
VkQueryPool queryPool,
uint32_t firstQuery,
uint32_t queryCount)
{
ANV_FROM_HANDLE(anv_query_pool, pool, queryPool);
for (uint32_t i = 0; i < queryCount; i++) {
switch (pool->type) {
case VK_QUERY_TYPE_OCCLUSION:
case VK_QUERY_TYPE_TIMESTAMP: {
struct anv_query_pool_slot *slot = pool->bo.map;
slot[firstQuery + i].available = 0;
break;
}
default:
assert(!"Invalid query type");
}
}
}

30
src/intel/vulkan/genX_cmd_buffer.c
View File

@ -2510,6 +2510,36 @@ emit_query_availability(struct anv_cmd_buffer *cmd_buffer,
}
}
void genX(CmdResetQueryPool)(
VkCommandBuffer commandBuffer,
VkQueryPool queryPool,
uint32_t firstQuery,
uint32_t queryCount)
{
ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer);
ANV_FROM_HANDLE(anv_query_pool, pool, queryPool);
for (uint32_t i = 0; i < queryCount; i++) {
switch (pool->type) {
case VK_QUERY_TYPE_OCCLUSION:
case VK_QUERY_TYPE_TIMESTAMP: {
anv_batch_emit(&cmd_buffer->batch, GENX(MI_STORE_DATA_IMM), sdm) {
sdm.Address = (struct anv_address) {
.bo = &pool->bo,
.offset = (firstQuery + i) * sizeof(struct anv_query_pool_slot) +
offsetof(struct anv_query_pool_slot, available),
};
sdm.DataDWord0 = 0;
sdm.DataDWord1 = 0;
}
break;
}
default:
assert(!"Invalid query type");
}
}
}
void genX(CmdBeginQuery)(
VkCommandBuffer commandBuffer,
VkQueryPool queryPool,