From 1066362ada6b45024999753c081b088b8b36647e Mon Sep 17 00:00:00 2001 From: "Dr. Chat" Date: Fri, 5 Feb 2016 16:00:50 -0600 Subject: [PATCH] ShaderTranslator::GatherAllBindingInformation --- src/xenia/gpu/shader_translator.cc | 37 ++++++++++++++++++++++++++++++ src/xenia/gpu/shader_translator.h | 3 +++ 2 files changed, 40 insertions(+) diff --git a/src/xenia/gpu/shader_translator.cc b/src/xenia/gpu/shader_translator.cc index 11affc7ea..4991833ab 100644 --- a/src/xenia/gpu/shader_translator.cc +++ b/src/xenia/gpu/shader_translator.cc @@ -1,3 +1,4 @@ +#include "shader_translator.h" /** ****************************************************************************** * Xenia : Xbox 360 Emulator Research Project * @@ -57,6 +58,41 @@ void ShaderTranslator::Reset() { } } +bool ShaderTranslator::GatherAllBindingInformation(Shader* shader) { + // FIXME: This is kind of silly. + Reset(); + + shader_type_ = shader->type(); + ucode_dwords_ = shader->ucode_dwords(); + ucode_dword_count_ = shader->ucode_dword_count(); + + uint32_t max_cf_dword_index = static_cast(ucode_dword_count_); + for (uint32_t i = 0; i < max_cf_dword_index; i += 3) { + ControlFlowInstruction cf_a; + ControlFlowInstruction cf_b; + UnpackControlFlowInstructions(ucode_dwords_ + i, &cf_a, &cf_b); + if (IsControlFlowOpcodeExec(cf_a.opcode())) { + max_cf_dword_index = + std::min(max_cf_dword_index, cf_a.exec.address() * 3); + } + if (IsControlFlowOpcodeExec(cf_b.opcode())) { + max_cf_dword_index = + std::min(max_cf_dword_index, cf_b.exec.address() * 3); + } + + GatherBindingInformation(cf_a); + GatherBindingInformation(cf_b); + } + + shader->vertex_bindings_ = std::move(vertex_bindings_); + shader->texture_bindings_ = std::move(texture_bindings_); + for (size_t i = 0; i < xe::countof(writes_color_targets_); ++i) { + shader->writes_color_targets_[i] = writes_color_targets_[i]; + } + + return true; +} + bool ShaderTranslator::Translate(Shader* shader) { Reset(); @@ -79,6 +115,7 @@ bool ShaderTranslator::Translate(Shader* shader) { max_cf_dword_index = std::min(max_cf_dword_index, cf_b.exec.address() * 3); } + GatherBindingInformation(cf_a); GatherBindingInformation(cf_b); } diff --git a/src/xenia/gpu/shader_translator.h b/src/xenia/gpu/shader_translator.h index adf8f449d..d1d731926 100644 --- a/src/xenia/gpu/shader_translator.h +++ b/src/xenia/gpu/shader_translator.h @@ -26,6 +26,9 @@ class ShaderTranslator { public: virtual ~ShaderTranslator(); + // Gathers all vertex/texture bindings. Implicitly called in Translate. + // TODO: Move this functionality to Shader. + bool GatherAllBindingInformation(Shader* shader); bool Translate(Shader* shader); protected: