summaryrefslogtreecommitdiffstats
path: root/src/video_core/engines
diff options
context:
space:
mode:
authorDavid Marcec <dmarcecguzman@gmail.com>2018-12-19 02:52:32 +0100
committerDavid Marcec <dmarcecguzman@gmail.com>2018-12-19 02:52:32 +0100
commitfdd649e2ef56ea473e253511d35fe6c10e0fb241 (patch)
tree82bf8e6a7cd1dd344c9bb0b3a728fc17c38de629 /src/video_core/engines
parentMerge pull request #1913 from MerryMage/default-fpcr (diff)
downloadyuzu-fdd649e2ef56ea473e253511d35fe6c10e0fb241.tar
yuzu-fdd649e2ef56ea473e253511d35fe6c10e0fb241.tar.gz
yuzu-fdd649e2ef56ea473e253511d35fe6c10e0fb241.tar.bz2
yuzu-fdd649e2ef56ea473e253511d35fe6c10e0fb241.tar.lz
yuzu-fdd649e2ef56ea473e253511d35fe6c10e0fb241.tar.xz
yuzu-fdd649e2ef56ea473e253511d35fe6c10e0fb241.tar.zst
yuzu-fdd649e2ef56ea473e253511d35fe6c10e0fb241.zip
Diffstat (limited to 'src/video_core/engines')
-rw-r--r--src/video_core/engines/maxwell_3d.h2
-rw-r--r--src/video_core/engines/shader_bytecode.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/video_core/engines/maxwell_3d.h b/src/video_core/engines/maxwell_3d.h
index 25bb7604a..0faff6fdf 100644
--- a/src/video_core/engines/maxwell_3d.h
+++ b/src/video_core/engines/maxwell_3d.h
@@ -164,6 +164,7 @@ public:
return 3;
default:
UNREACHABLE();
+ return 1;
}
}
@@ -871,6 +872,7 @@ public:
return 4;
}
UNREACHABLE();
+ return 1;
}
GPUVAddr StartAddress() const {
diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h
index 2efeb6e1a..eb703bb5a 100644
--- a/src/video_core/engines/shader_bytecode.h
+++ b/src/video_core/engines/shader_bytecode.h
@@ -1065,6 +1065,7 @@ union Instruction {
LOG_CRITICAL(HW_GPU, "Unhandled texture_info: {}",
static_cast<u32>(texture_info.Value()));
UNREACHABLE();
+ return TextureType::Texture1D;
}
TextureProcessMode GetTextureProcessMode() const {
@@ -1145,6 +1146,7 @@ union Instruction {
LOG_CRITICAL(HW_GPU, "Unhandled texture_info: {}",
static_cast<u32>(texture_info.Value()));
UNREACHABLE();
+ return TextureType::Texture1D;
}
TextureProcessMode GetTextureProcessMode() const {