Add push descriptor validation #460
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Android build broken |
jzulauf-lunarg
force-pushed
the
zulauf_pd_implement_calltime_validation_428
branch
3 times, most recently
from
c1dae02 to
5fdc1c1
Compare
jzulauf-lunarg
force-pushed
the
zulauf_pd_implement_calltime_validation_428
branch
from
5fdc1c1 to
dbe9f97
Compare
jzulauf-lunarg
requested review from
tobine,
mikes-lunarg,
daveh-lunarg,
mark-lunarg,
shannon-lunarg and
chrisforbes
tobine
reviewed
Nov 28, 2018
| << "VkWriteDescriptorSetInlineUniformBlockEXT missing"; | ||
| } else { | ||
| error_str << "Attempting write update to descriptor set " << set_ << " binding #" << update->dstBinding << " with " | ||
| error_str << "Attempting write update to " << StringifySetAndLayout() << " binding #" << update->dstBinding | ||
| << " with " |
There was a problem hiding this comment.
The formatting on these lines looks a little goofy with two really short strings (1 here, 1 on 1904 below). Perhaps possible to combine a line or two from below in order to save lines?
| @@ -31,6 +31,7 @@ | |||
| * Author: Mike Schuchardt <mikes@lunarg.com> | |||
| * Author: Mike Weiblen <mikew@lunarg.com> | |||
| * Author: Tony Barbour <tony@LunarG.com> | |||
| * Author: John Zulauf <jzulauf@lunarg.com> | |||
There was a problem hiding this comment.
YES! Finally getting all that fame you deserve! 👍
layers/core_validation.cpp
Outdated
| @@ -772,6 +773,15 @@ shader_module const *GetShaderModuleState(layer_data const *dev_data, VkShaderMo | |||
| return it->second.get(); | |||
| } | |||
|
|
|||
| const TEMPLATE_STATE *GetDescriptorTemplateState(const layer_data *dev_data, | |||
| VkDescriptorUpdateTemplateKHR descriptor_update_template) { | |||
| auto it = dev_data->desc_template_map.find(descriptor_update_template); | |||
| @@ -1230,14 +1240,6 @@ static bool ValidateCmdBufDrawState(layer_data *dev_data, GLOBAL_CB_NODE *cb_nod | |||
|
|
|||
| for (const auto &set_binding_pair : pPipe->active_slots) { | |||
| uint32_t setIndex = set_binding_pair.first; | |||
|
|
|||
| // TODO -- remove this continue path when CmdPushDescriptorSet is implemented, for now it prevents a false positive | |||
tobine
suggested changes
Nov 28, 2018
jzulauf-lunarg
force-pushed
the
zulauf_pd_implement_calltime_validation_428
branch
from
dbe9f97 to
d88f226
Compare
|
@tobine -- I think I picked up everything from your review. |
tobine
approved these changes
Nov 29, 2018
layers/core_validation.cpp
Outdated
| func_name, set, layout_u64); | ||
| const auto dsl = set_layouts[set]; | ||
| if (dsl) { | ||
| if (0 == (dsl->IsPushDescriptor())) { |
There was a problem hiding this comment.
if (!dsl->IsPushDescriptor())
Tested buffer was not setting the correct usage flag. Enabling push descriptor validation (next commits) causes test case to fail Change-Id: Ibd8fd98259825ae376289b4d9ed867aa1e202818
Update the write descriptor validation to be able to validate and report a push descriptor update. Change-Id: I8b2c0de85ae3eded211fd5ac397c9e30de3a5d34
Add validation of CmdPushDescriptorSet(WithTemplate) descriptor state updates, removing the code disabling later use of the recorded data. Change-Id: If9c4345e67c974f36e7a5356a517f411e470c2c5
Add push descriptor validation to buffer validation path test. Change-Id: I80135f69a0ac4351b6415559403573574917b281
jzulauf-lunarg
force-pushed
the
zulauf_pd_implement_calltime_validation_428
branch
from
d88f226 to
878dad5
Compare
jzulauf-lunarg
deleted the
zulauf_pd_implement_calltime_validation_428
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add validation of CmdPushDescriptorSet(WithTemplate) descriptor state updates, removing the code disabling later use of the recorded data.
Addresses #413 and #428