mirror of
https://git.h3cjp.net/H3cJP/yuzu.git
synced 2024-12-15 23:35:38 +00:00
maxwell_3d: Allow sampler handles with TSC id zero
This commit is contained in:
parent
390721a561
commit
04e68e9738
|
@ -467,11 +467,9 @@ std::vector<Texture::FullTextureInfo> Maxwell3D::GetStageTextures(Regs::ShaderSt
|
||||||
std::memcpy(&tex_info.tic, &tic_entry, sizeof(tic_entry));
|
std::memcpy(&tex_info.tic, &tic_entry, sizeof(tic_entry));
|
||||||
|
|
||||||
// Load the TSC data
|
// Load the TSC data
|
||||||
if (tex_handle.tsc_id != 0) {
|
|
||||||
auto tsc_entry = GetTSCEntry(tex_handle.tsc_id);
|
auto tsc_entry = GetTSCEntry(tex_handle.tsc_id);
|
||||||
// TODO(Subv): Workaround for BitField's move constructor being deleted.
|
// TODO(Subv): Workaround for BitField's move constructor being deleted.
|
||||||
std::memcpy(&tex_info.tsc, &tsc_entry, sizeof(tsc_entry));
|
std::memcpy(&tex_info.tsc, &tsc_entry, sizeof(tsc_entry));
|
||||||
}
|
|
||||||
|
|
||||||
textures.push_back(tex_info);
|
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));
|
std::memcpy(&tex_info.tic, &tic_entry, sizeof(tic_entry));
|
||||||
|
|
||||||
// Load the TSC data
|
// Load the TSC data
|
||||||
if (tex_handle.tsc_id != 0) {
|
|
||||||
auto tsc_entry = GetTSCEntry(tex_handle.tsc_id);
|
auto tsc_entry = GetTSCEntry(tex_handle.tsc_id);
|
||||||
// TODO(Subv): Workaround for BitField's move constructor being deleted.
|
// TODO(Subv): Workaround for BitField's move constructor being deleted.
|
||||||
std::memcpy(&tex_info.tsc, &tsc_entry, sizeof(tsc_entry));
|
std::memcpy(&tex_info.tsc, &tsc_entry, sizeof(tsc_entry));
|
||||||
}
|
|
||||||
|
|
||||||
return tex_info;
|
return tex_info;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue