Merge branch 'master' into libktx

This commit is contained in:
Sascha Willems 2019-09-13 21:52:19 +02:00
commit 79998b4851
6 changed files with 11 additions and 40 deletions

View file

@ -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);