Merge branch 'master' into libktx
This commit is contained in:
commit
79998b4851
6 changed files with 11 additions and 40 deletions
|
|
@ -201,7 +201,7 @@ public:
|
|||
VkDeviceSize offsets[1] = { 0 };
|
||||
|
||||
// Start capture of pipeline statistics
|
||||
vkCmdBeginQuery(drawCmdBuffers[i], queryPool, 0, VK_QUERY_CONTROL_PRECISE_BIT);
|
||||
vkCmdBeginQuery(drawCmdBuffers[i], queryPool, 0, 0);
|
||||
|
||||
vkCmdBindPipeline(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
|
||||
vkCmdBindDescriptorSets(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipelineLayout, 0, 1, &descriptorSet, 0, NULL);
|
||||
|
|
|
|||
|
|
@ -364,7 +364,7 @@ public:
|
|||
// Terrain
|
||||
if (deviceFeatures.pipelineStatisticsQuery) {
|
||||
// Begin pipeline statistics query
|
||||
vkCmdBeginQuery(drawCmdBuffers[i], queryPool, 0, VK_QUERY_CONTROL_PRECISE_BIT);
|
||||
vkCmdBeginQuery(drawCmdBuffers[i], queryPool, 0, 0);
|
||||
}
|
||||
// Render
|
||||
vkCmdBindPipeline(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, wireframe ? pipelines.wireframe : pipelines.terrain);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue