yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

Merge pull request #4766 from ReinUsesLisp/tmml-cube 

shader/texture: Implement CUBE texture type for TMML and fix arrays
This commit is contained in:
bunnei 2020-10-12 12:53:57 -07:00 committed by GitHub
parent 419a59a7b1 dffaffaac1
commit 4c348f4069
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/video_core/shader/decode/texture.cpp
View File

@ -292,33 +292,36 @@ u32 ShaderIR::DecodeTexture(NodeBlock& bb, u32 pc) {
break; break;
} }
std::vector<Node> coords; const u64 base_index = is_array ? 1 : 0;
const u64 num_components = [texture_type] {
// TODO: Add coordinates for different samplers once other texture types are implemented.
switch (texture_type) { switch (texture_type) {
case TextureType::Texture1D: case TextureType::Texture1D:
coords.push_back(GetRegister(instr.gpr8)); return 1;
break;
case TextureType::Texture2D: case TextureType::Texture2D:
coords.push_back(GetRegister(instr.gpr8.Value() + 0)); return 2;
coords.push_back(GetRegister(instr.gpr8.Value() + 1)); case TextureType::TextureCube:
break; return 3;
default: default:
UNIMPLEMENTED_MSG("Unhandled texture type {}", static_cast<int>(texture_type)); UNIMPLEMENTED_MSG("Unhandled texture type {}", static_cast<int>(texture_type));
return 2;
// Fallback to interpreting as a 2D texture for now
coords.push_back(GetRegister(instr.gpr8.Value() + 0));
coords.push_back(GetRegister(instr.gpr8.Value() + 1));
} }
}();
// TODO: What's the array component used for?
std::vector<Node> coords;
coords.reserve(num_components);
for (u64 component = 0; component < num_components; ++component) {
coords.push_back(GetRegister(instr.gpr8.Value() + base_index + component));
}
u32 indexer = 0; u32 indexer = 0;
for (u32 element = 0; element < 2; ++element) { for (u32 element = 0; element < 2; ++element) {
if (!instr.tmml.IsComponentEnabled(element)) { if (!instr.tmml.IsComponentEnabled(element)) {
continue; continue;
} }
auto params = coords;
MetaTexture meta{*sampler, {}, {}, {}, {}, {}, {}, {}, {}, element, index_var}; MetaTexture meta{*sampler, {}, {}, {}, {}, {}, {}, {}, {}, element, index_var};
const Node value = Operation(OperationCode::TextureQueryLod, meta, std::move(params)); Node value = Operation(OperationCode::TextureQueryLod, meta, coords);
SetTemporary(bb, indexer++, value); SetTemporary(bb, indexer++, std::move(value));
} }
for (u32 i = 0; i < indexer; ++i) { for (u32 i = 0; i < indexer; ++i) {
SetRegister(bb, instr.gpr0.Value() + i, GetTemporary(i)); SetRegister(bb, instr.gpr0.Value() + i, GetTemporary(i));