summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2019-02-03 08:58:01 +0100
committerReinUsesLisp <reinuseslisp@airmail.cc>2019-02-03 08:58:40 +0100
commit04e68e973829ddfb262f0539627ec7fe56424fb2 (patch)
treec60e622554a06d2ff0accd60260f498f785b3210
parentmaxwell_3d: Allow texture handles with TIC id zero (diff)
downloadyuzu-04e68e973829ddfb262f0539627ec7fe56424fb2.tar
yuzu-04e68e973829ddfb262f0539627ec7fe56424fb2.tar.gz
yuzu-04e68e973829ddfb262f0539627ec7fe56424fb2.tar.bz2
yuzu-04e68e973829ddfb262f0539627ec7fe56424fb2.tar.lz
yuzu-04e68e973829ddfb262f0539627ec7fe56424fb2.tar.xz
yuzu-04e68e973829ddfb262f0539627ec7fe56424fb2.tar.zst
yuzu-04e68e973829ddfb262f0539627ec7fe56424fb2.zip
-rw-r--r--src/video_core/engines/maxwell_3d.cpp16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp
index cda9b0da5..2cd6d6094 100644
--- a/src/video_core/engines/maxwell_3d.cpp
+++ b/src/video_core/engines/maxwell_3d.cpp
@@ -467,11 +467,9 @@ std::vector<Texture::FullTextureInfo> Maxwell3D::GetStageTextures(Regs::ShaderSt
std::memcpy(&tex_info.tic, &tic_entry, sizeof(tic_entry));
// Load the TSC data
- if (tex_handle.tsc_id != 0) {
- auto tsc_entry = GetTSCEntry(tex_handle.tsc_id);
- // TODO(Subv): Workaround for BitField's move constructor being deleted.
- std::memcpy(&tex_info.tsc, &tsc_entry, sizeof(tsc_entry));
- }
+ auto tsc_entry = GetTSCEntry(tex_handle.tsc_id);
+ // TODO(Subv): Workaround for BitField's move constructor being deleted.
+ std::memcpy(&tex_info.tsc, &tsc_entry, sizeof(tsc_entry));
textures.push_back(tex_info);
}
@@ -501,11 +499,9 @@ Texture::FullTextureInfo Maxwell3D::GetStageTexture(Regs::ShaderStage stage,
std::memcpy(&tex_info.tic, &tic_entry, sizeof(tic_entry));
// Load the TSC data
- if (tex_handle.tsc_id != 0) {
- auto tsc_entry = GetTSCEntry(tex_handle.tsc_id);
- // TODO(Subv): Workaround for BitField's move constructor being deleted.
- std::memcpy(&tex_info.tsc, &tsc_entry, sizeof(tsc_entry));
- }
+ auto tsc_entry = GetTSCEntry(tex_handle.tsc_id);
+ // TODO(Subv): Workaround for BitField's move constructor being deleted.
+ std::memcpy(&tex_info.tsc, &tsc_entry, sizeof(tsc_entry));
return tex_info;
}