Skip to content

Commit 1abb656

Browse files
spencer-lunargspencer-lunarg
committed
layers: More VUID churn 350
1 parent 3e7c750 commit 1abb656

3 files changed

Lines changed: 51 additions & 43 deletions

File tree

‎layers/core_checks/cc_cmd_buffer.cpp‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2476,6 +2476,15 @@ bool CoreChecks::ValidateCmdBeginTransformFeedback(const vvl::CommandBuffer& cb_
24762476
}
24772477
}
24782478

2479+
if (cb_state.per_tile_execution_model_enabled) {
2480+
const char* vuid =
2481+
is_xfb_2 ? "VUID-vkCmdBeginTransformFeedback2EXT-None-10656" : "VUID-vkCmdBeginTransformFeedbackEXT-None-10656";
2482+
skip |= LogError(vuid, cb_state.VkHandle(), error_obj.location,
2483+
"the per-tile execution model has been enabled in this command buffer. "
2484+
"(Don't call vkCmdBeginPerTileExecutionQCOM before %s)",
2485+
String(error_obj.location.function));
2486+
}
2487+
24792488
return skip;
24802489
}
24812490

@@ -2532,12 +2541,6 @@ bool CoreChecks::PreCallValidateCmdBeginTransformFeedbackEXT(VkCommandBuffer com
25322541
}
25332542
}
25342543

2535-
if (cb_state->per_tile_execution_model_enabled) {
2536-
skip |= LogError("VUID-vkCmdBeginTransformFeedbackEXT-None-10656", commandBuffer, error_obj.location,
2537-
"the per-tile execution model has been enabled in this command buffer. "
2538-
"(Don't call vkCmdBeginPerTileExecutionQCOM before vkCmdBeginTransformFeedbackEXT)");
2539-
}
2540-
25412544
return skip;
25422545
}
25432546

@@ -2581,6 +2584,16 @@ bool CoreChecks::ValidateCmdEndTransformFeedback(const vvl::CommandBuffer& cb_st
25812584
skip |= LogError(vuid, cb_state.VkHandle(), error_obj.location, "transform feedback is not active.");
25822585
}
25832586

2587+
if (cb_state.per_tile_execution_model_enabled) {
2588+
const char* vuid =
2589+
is_xfb_2 ? "VUID-vkCmdEndTransformFeedback2EXT-None-10657" : "VUID-vkCmdEndTransformFeedbackEXT-None-10657";
2590+
2591+
skip |= LogError(vuid, cb_state.VkHandle(), error_obj.location,
2592+
"the per-tile execution model has been enabled in this command buffer. "
2593+
"(Don't call vkCmdBeginPerTileExecutionQCOM before %s)",
2594+
String(error_obj.location.function));
2595+
}
2596+
25842597
return skip;
25852598
}
25862599

@@ -2618,12 +2631,6 @@ bool CoreChecks::PreCallValidateCmdEndTransformFeedbackEXT(VkCommandBuffer comma
26182631
}
26192632
}
26202633

2621-
if (cb_state->per_tile_execution_model_enabled) {
2622-
skip |= LogError("VUID-vkCmdEndTransformFeedbackEXT-None-10657", commandBuffer, error_obj.location,
2623-
"the per-tile execution model has been enabled in this command buffer. "
2624-
"(Don't call vkCmdBeginPerTileExecutionQCOM before vkCmdEndTransformFeedbackEXT)");
2625-
}
2626-
26272634
return skip;
26282635
}
26292636

‎layers/core_checks/cc_query.cpp‎

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "core_validation.h"
2626
#include "core_checks/cc_state_tracker.h"
2727
#include "core_checks/cc_buffer_address.h"
28+
#include "error_message/error_location.h"
2829
#include "generated/enum_flag_bits.h"
2930
#include "state_tracker/device_state.h"
3031
#include "state_tracker/buffer_state.h"
@@ -744,6 +745,15 @@ bool CoreChecks::ValidateBeginQuery(const vvl::CommandBuffer& cb_state, const Qu
744745
"there is no bound video session but query type is VK_QUERY_TYPE_VIDEO_ENCODE_FEEDBACK_KHR.");
745746
}
746747

748+
if (cb_state.per_tile_execution_model_enabled) {
749+
const char* vuid = is_indexed ? "VUID-vkCmdBeginQueryIndexedEXT-None-10681" : "VUID-vkCmdBeginQuery-None-10681";
750+
const LogObjectList objlist(cb_state.Handle(), query_obj.pool);
751+
skip |= LogError(vuid, objlist, loc,
752+
"the per-tile execution model has been enabled in this command buffer. "
753+
"(Don't call vkCmdBeginPerTileExecutionQCOM before %s)",
754+
String(loc.function));
755+
}
756+
747757
return skip;
748758
}
749759

@@ -767,13 +777,6 @@ bool CoreChecks::PreCallValidateCmdBeginQuery(VkCommandBuffer commandBuffer, VkQ
767777
skip |= ValidateBeginQuery(*cb_state, query_obj, flags, 0, error_obj.location);
768778
skip |= ValidateCmd(*cb_state, error_obj.location);
769779

770-
if (cb_state->per_tile_execution_model_enabled) {
771-
const LogObjectList objlist(commandBuffer, queryPool);
772-
skip |= LogError("VUID-vkCmdBeginQuery-None-10681", objlist, error_obj.location,
773-
"the per-tile execution model has been enabled in this command buffer. "
774-
"(Don't call vkCmdBeginPerTileExecutionQCOM before vkCmdBeginQuery)");
775-
}
776-
777780
return skip;
778781
}
779782

@@ -948,6 +951,15 @@ bool CoreChecks::ValidateCmdEndQuery(const vvl::CommandBuffer& cb_state, VkQuery
948951
}
949952
}
950953
}
954+
955+
if (cb_state.per_tile_execution_model_enabled) {
956+
const char* vuid = is_indexed ? "VUID-vkCmdEndQueryIndexedEXT-None-10682" : "VUID-vkCmdEndQuery-None-10682";
957+
const LogObjectList objlist(cb_state.Handle(), queryPool);
958+
skip |= LogError(vuid, objlist, loc,
959+
"the per-tile execution model has been enabled in this command buffer. "
960+
"(Don't call vkCmdBeginPerTileExecutionQCOM before %s)",
961+
String(loc.function));
962+
}
951963
return skip;
952964
}
953965

@@ -971,13 +983,6 @@ bool CoreChecks::PreCallValidateCmdEndQuery(VkCommandBuffer commandBuffer, VkQue
971983
skip |= ValidateCmd(*cb_state, error_obj.location);
972984
}
973985

974-
if (cb_state->per_tile_execution_model_enabled) {
975-
const LogObjectList objlist(commandBuffer, queryPool);
976-
skip |= LogError("VUID-vkCmdEndQuery-None-10682", objlist, error_obj.location,
977-
"the per-tile execution model has been enabled in this command buffer. "
978-
"(Don't call vkCmdBeginPerTileExecutionQCOM before vkCmdEndQuery)");
979-
}
980-
981986
return skip;
982987
}
983988

@@ -1297,6 +1302,15 @@ bool CoreChecks::ValidateCmdWriteTimestamp(const vvl::CommandBuffer& cb_state, V
12971302
slot, view_mask_bits, view_mask, query_pool_state->create_info.queryCount, FormatHandle(queryPool).c_str());
12981303
}
12991304

1305+
if (cb_state.per_tile_execution_model_enabled) {
1306+
const char* vuid = is_2 ? "VUID-vkCmdWriteTimestamp2-None-10639" : "VUID-vkCmdWriteTimestamp-None-10640";
1307+
const LogObjectList objlist(cb_state.Handle(), queryPool);
1308+
skip |= LogError(vuid, objlist, loc,
1309+
"the per-tile execution model has been enabled in this command buffer. "
1310+
"(Don't call vkCmdBeginPerTileExecutionQCOM before %s)",
1311+
String(loc.function));
1312+
}
1313+
13001314
return skip;
13011315
}
13021316

@@ -1310,13 +1324,6 @@ bool CoreChecks::PreCallValidateCmdWriteTimestamp(VkCommandBuffer commandBuffer,
13101324
const Location stage_loc = error_obj.location.dot(Field::pipelineStage);
13111325
skip |= ValidatePipelineStage(LogObjectList(commandBuffer), stage_loc, cb_state->GetQueueFlags(), pipelineStage);
13121326

1313-
if (cb_state->per_tile_execution_model_enabled) {
1314-
const LogObjectList objlist(commandBuffer, queryPool);
1315-
skip |= LogError("VUID-vkCmdWriteTimestamp-None-10640", objlist, error_obj.location,
1316-
"the per-tile execution model has been enabled in this command buffer. "
1317-
"(Don't call vkCmdBeginPerTileExecutionQCOM before vkCmdWriteTimestamp)");
1318-
}
1319-
13201327
return skip;
13211328
}
13221329

@@ -1339,13 +1346,6 @@ bool CoreChecks::PreCallValidateCmdWriteTimestamp2(VkCommandBuffer commandBuffer
13391346
}
13401347
skip |= ValidatePipelineStage(LogObjectList(commandBuffer), stage_loc, cb_state->GetQueueFlags(), stage);
13411348

1342-
if (cb_state->per_tile_execution_model_enabled) {
1343-
const LogObjectList objlist(commandBuffer, queryPool);
1344-
skip |= LogError("VUID-vkCmdWriteTimestamp2-None-10639", objlist, error_obj.location,
1345-
"the per-tile execution model has been enabled in this command buffer. "
1346-
"(Don't call vkCmdBeginPerTileExecutionQCOM before vkCmdWriteTimestamp2)");
1347-
}
1348-
13491349
return skip;
13501350
}
13511351

@@ -1410,6 +1410,7 @@ bool CoreChecks::PreCallValidateCmdBeginQueryIndexedEXT(VkCommandBuffer commandB
14101410
"VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT",
14111411
index, FormatHandle(queryPool).c_str());
14121412
}
1413+
14131414
return skip;
14141415
}
14151416

‎scripts/vk_validation_stats.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ def __init__(self, val_json, val_source, val_tests, spirv_val):
317317
"7141" : ["09366", "09367", "09373", "09374"],
318318
"7481" : ["03561"],
319319
"8095" : ["10795", "10796", "10797"],
320-
"8605" : ["09370", "09371", "10198", "10929", "11004", "11029", "11034", "11038", "11044", "11046", "11048", "11049", "11051", "11052", "11055", "11056", "11065", "11066", "11068", "11117", "11118", "11120", "11122", "11140", "11142", "11144", "11149", "11150"],
320+
"8605" : ["02707", "09370", "09371", "10198", "10929", "11004", "11029", "11034", "11038", "11044", "11046", "11048", "11049", "11051", "11052", "11055", "11056", "11065", "11066", "11068", "11117", "11118", "11120", "11122", "11140", "11142", "11144", "11149", "11150"],
321321
"9065" : ["10389", "10390"],
322322
"9081" : ["06344", "06345", "06346", "06347"],
323323
"9102" : ["08727", "09595", "09596", "09597"],
@@ -331,7 +331,7 @@ def __init__(self, val_json, val_source, val_tests, spirv_val):
331331
"11332" : ["12289", "12290", "12291", "12292"],
332332
"11376" : ["00657", "00659", "00660", "00661", "00663", "01125", "01127", "01129", "01130", "01439", "01440", "01441", "01447", "01449", "01451", "01460", "01461", "01467", "01468", "03261", "03262"],
333333
"11377" : ["01307", "02673"],
334-
"11386" : ["03839", "03840", "03841", "03847"],
334+
"11386" : ["01181", "01182", "03839", "03840", "03841", "03847"],
335335
"11388" : ["03821", "03822"],
336336
"11413" : ["01258", "01259"],
337337
"11414" : ["02317", "02319", "02320", "11006"],
@@ -365,7 +365,7 @@ def __init__(self, val_json, val_source, val_tests, spirv_val):
365365
"11863" : ["10834"],
366366
"11864" : ["12208"],
367367
"11892" : ["11064"],
368-
"11995" : ["10607", "03801", "03703", "03706", "03768", "03663", "03664", "12281", "03709", "03717", "03769", "03646", "03647", "03651", "03652", "03653", "03704", "03705", "03724", "03777", "03724", "03773"],
368+
"11995" : ["10607", "03407", "03801", "03703", "03706", "03768", "03663", "03664", "12281", "03709", "03717", "03769", "03646", "03647", "03651", "03652", "03653", "03704", "03705", "03724", "03777", "03724", "03773"],
369369
"12006" : ["03808"],
370370
}
371371

0 commit comments

Comments
 (0)