mirror of
https://github.com/Kelsidavis/WoWee.git
synced 2026-04-10 23:03:52 +00:00
refactor: add [[nodiscard]] to shader/asset load functions, suppress warnings
Add [[nodiscard]] to VkShaderModule::loadFromFile, Shader::loadFromFile/ loadFromSource, AssetManifest::load, DbcLoader::load — all return bool indicating success/failure that callers should check. Suppress with (void) at 17 call sites where validity is checked via isValid() after loading rather than the return value (m2_renderer recreatePipelines, swim_effects recreatePipelines).
This commit is contained in:
parent
b5b84fbc19
commit
e805eae33c
6 changed files with 27 additions and 27 deletions
|
|
@ -348,9 +348,9 @@ void SwimEffects::recreatePipelines() {
|
|||
// ---- Rebuild ripple pipeline ----
|
||||
{
|
||||
VkShaderModule vertModule;
|
||||
vertModule.loadFromFile(device, "assets/shaders/swim_ripple.vert.spv");
|
||||
(void)vertModule.loadFromFile(device, "assets/shaders/swim_ripple.vert.spv");
|
||||
VkShaderModule fragModule;
|
||||
fragModule.loadFromFile(device, "assets/shaders/swim_ripple.frag.spv");
|
||||
(void)fragModule.loadFromFile(device, "assets/shaders/swim_ripple.frag.spv");
|
||||
|
||||
VkPipelineShaderStageCreateInfo vertStage = vertModule.stageInfo(VK_SHADER_STAGE_VERTEX_BIT);
|
||||
VkPipelineShaderStageCreateInfo fragStage = fragModule.stageInfo(VK_SHADER_STAGE_FRAGMENT_BIT);
|
||||
|
|
@ -375,9 +375,9 @@ void SwimEffects::recreatePipelines() {
|
|||
// ---- Rebuild bubble pipeline ----
|
||||
{
|
||||
VkShaderModule vertModule;
|
||||
vertModule.loadFromFile(device, "assets/shaders/swim_bubble.vert.spv");
|
||||
(void)vertModule.loadFromFile(device, "assets/shaders/swim_bubble.vert.spv");
|
||||
VkShaderModule fragModule;
|
||||
fragModule.loadFromFile(device, "assets/shaders/swim_bubble.frag.spv");
|
||||
(void)fragModule.loadFromFile(device, "assets/shaders/swim_bubble.frag.spv");
|
||||
|
||||
VkPipelineShaderStageCreateInfo vertStage = vertModule.stageInfo(VK_SHADER_STAGE_VERTEX_BIT);
|
||||
VkPipelineShaderStageCreateInfo fragStage = fragModule.stageInfo(VK_SHADER_STAGE_FRAGMENT_BIT);
|
||||
|
|
@ -402,9 +402,9 @@ void SwimEffects::recreatePipelines() {
|
|||
// ---- Rebuild insect pipeline ----
|
||||
{
|
||||
VkShaderModule vertModule;
|
||||
vertModule.loadFromFile(device, "assets/shaders/swim_ripple.vert.spv");
|
||||
(void)vertModule.loadFromFile(device, "assets/shaders/swim_ripple.vert.spv");
|
||||
VkShaderModule fragModule;
|
||||
fragModule.loadFromFile(device, "assets/shaders/swim_insect.frag.spv");
|
||||
(void)fragModule.loadFromFile(device, "assets/shaders/swim_insect.frag.spv");
|
||||
|
||||
VkPipelineShaderStageCreateInfo vertStage = vertModule.stageInfo(VK_SHADER_STAGE_VERTEX_BIT);
|
||||
VkPipelineShaderStageCreateInfo fragStage = fragModule.stageInfo(VK_SHADER_STAGE_FRAGMENT_BIT);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue