summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2019-03-27 00:02:24 +0100
committerFernandoS27 <fsahmkow27@gmail.com>2019-04-08 17:28:44 +0200
commitac3ba9a33e0d1e14061fc0f341b69cb85ea2e6a6 (patch)
tree05563ef525c4f8b177f1d797de9fdb06e467e622
parentFixes to Const Buffer Accessor and Formatting (diff)
downloadyuzu-ac3ba9a33e0d1e14061fc0f341b69cb85ea2e6a6.tar
yuzu-ac3ba9a33e0d1e14061fc0f341b69cb85ea2e6a6.tar.gz
yuzu-ac3ba9a33e0d1e14061fc0f341b69cb85ea2e6a6.tar.bz2
yuzu-ac3ba9a33e0d1e14061fc0f341b69cb85ea2e6a6.tar.lz
yuzu-ac3ba9a33e0d1e14061fc0f341b69cb85ea2e6a6.tar.xz
yuzu-ac3ba9a33e0d1e14061fc0f341b69cb85ea2e6a6.tar.zst
yuzu-ac3ba9a33e0d1e14061fc0f341b69cb85ea2e6a6.zip
-rw-r--r--src/video_core/engines/shader_bytecode.h32
-rw-r--r--src/video_core/shader/decode/texture.cpp9
2 files changed, 37 insertions, 4 deletions
diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h
index 2edd3245e..71c22aff0 100644
--- a/src/video_core/engines/shader_bytecode.h
+++ b/src/video_core/engines/shader_bytecode.h
@@ -967,6 +967,38 @@ union Instruction {
} tex;
union {
+ BitField<28, 1, u64> array;
+ BitField<29, 2, TextureType> texture_type;
+ BitField<31, 4, u64> component_mask;
+ BitField<49, 1, u64> nodep_flag;
+ BitField<50, 1, u64> dc_flag;
+ BitField<36, 1, u64> aoffi_flag;
+ BitField<37, 3, TextureProcessMode> process_mode;
+
+ bool IsComponentEnabled(std::size_t component) const {
+ return ((1ull << component) & component_mask) != 0;
+ }
+
+ TextureProcessMode GetTextureProcessMode() const {
+ return process_mode;
+ }
+
+ bool UsesMiscMode(TextureMiscMode mode) const {
+ switch (mode) {
+ case TextureMiscMode::DC:
+ return dc_flag != 0;
+ case TextureMiscMode::NODEP:
+ return nodep_flag != 0;
+ case TextureMiscMode::AOFFI:
+ return aoffi_flag != 0;
+ default:
+ break;
+ }
+ return false;
+ }
+ } tex_b;
+
+ union {
BitField<22, 6, TextureQueryType> query_type;
BitField<31, 4, u64> component_mask;
BitField<49, 1, u64> nodep_flag;
diff --git a/src/video_core/shader/decode/texture.cpp b/src/video_core/shader/decode/texture.cpp
index 3ac04f6b7..300f1abad 100644
--- a/src/video_core/shader/decode/texture.cpp
+++ b/src/video_core/shader/decode/texture.cpp
@@ -65,10 +65,10 @@ u32 ShaderIR::DecodeTexture(NodeBlock& bb, u32 pc) {
LOG_WARNING(HW_GPU, "TEX.NODEP implementation is incomplete");
}
- const TextureType texture_type{instr.tex.texture_type};
- const bool is_array = instr.tex.array != 0;
- const bool depth_compare = instr.tex.UsesMiscMode(TextureMiscMode::DC);
- const auto process_mode = instr.tex.GetTextureProcessMode();
+ const TextureType texture_type{instr.tex_b.texture_type};
+ const bool is_array = instr.tex_b.array != 0;
+ const bool depth_compare = instr.tex_b.UsesMiscMode(TextureMiscMode::DC);
+ const auto process_mode = instr.tex_b.GetTextureProcessMode();
WriteTexInstructionFloat(bb, instr,
GetTexCode(instr, texture_type, process_mode, depth_compare,
is_array, true, instr.gpr20));
@@ -462,6 +462,7 @@ Node4 ShaderIR::GetTexCode(Instruction instr, TextureType texture_type,
if (is_aoffi) {
aoffi = GetAoffiCoordinates(GetRegister(parameter_register++), coord_count, false);
}
+ const u32 bindless_offset = (is_bindless ? 1 : 0);
Node dc{};
if (depth_compare) {