summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Mai M2022-01-05 06:41:16 -0500
committerGravatar GitHub2022-01-05 06:41:16 -0500
commit7116a7d28bb7f0b4ecdf937d20635382e91f4b93 (patch)
treedbf9c3f3c15da610ee8f31d43bf183f16780c72e
parentMerge pull request #7675 from zhaobot/tx-update-20220105075447 (diff)
parentvideo_core: Remove unnecesary maybe_unused flag (diff)
downloadyuzu-7116a7d28bb7f0b4ecdf937d20635382e91f4b93.tar.gz
yuzu-7116a7d28bb7f0b4ecdf937d20635382e91f4b93.tar.xz
yuzu-7116a7d28bb7f0b4ecdf937d20635382e91f4b93.zip
Merge pull request #7673 from german77/no_return
glsl: Remove unreachable return
-rw-r--r--src/shader_recompiler/backend/glsl/var_alloc.cpp1
-rw-r--r--src/video_core/shader_environment.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/shader_recompiler/backend/glsl/var_alloc.cpp b/src/shader_recompiler/backend/glsl/var_alloc.cpp
index 194f926ca..be0a695c0 100644
--- a/src/shader_recompiler/backend/glsl/var_alloc.cpp
+++ b/src/shader_recompiler/backend/glsl/var_alloc.cpp
@@ -131,7 +131,6 @@ std::string VarAlloc::AddDefine(IR::Inst& inst, GlslVarType type) {
131 } else { 131 } else {
132 return ""; 132 return "";
133 } 133 }
134 return Representation(inst.Definition<Id>());
135} 134}
136 135
137std::string VarAlloc::Consume(const IR::Value& value) { 136std::string VarAlloc::Consume(const IR::Value& value) {
diff --git a/src/video_core/shader_environment.cpp b/src/video_core/shader_environment.cpp
index 7d3ae0de4..3e673c437 100644
--- a/src/video_core/shader_environment.cpp
+++ b/src/video_core/shader_environment.cpp
@@ -381,7 +381,7 @@ void FileEnvironment::Deserialize(std::ifstream& file) {
381 } 381 }
382} 382}
383 383
384void FileEnvironment::Dump(u64 [[maybe_unused]] hash) { 384void FileEnvironment::Dump(u64 hash) {
385 DumpImpl(hash, code.get(), read_highest, read_lowest, initial_offset, stage); 385 DumpImpl(hash, code.get(), read_highest, read_lowest, initial_offset, stage);
386} 386}
387 387