mirror of
				https://git.zaroz.cloud/nintendo-back-up/yuzu/yuzu.git
				synced 2025-05-12 00:45:25 +00:00 
			
		
		
		
	GPU: Macros are specific to the Maxwell3D engine, so handle them internally.
This commit is contained in:
		
							parent
							
								
									29981fa2eb
								
							
						
					
					
						commit
						7ac8657432
					
				@ -64,35 +64,6 @@ void GPU::WriteReg(u32 method, u32 subchannel, u32 value) {
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void GPU::CallMethod(u32 method, u32 subchannel, const std::vector<u32>& parameters) {
 | 
					 | 
				
			||||||
    LOG_WARNING(HW_GPU, "Processing method %08X on subchannel %u num params %zu", method,
 | 
					 | 
				
			||||||
                subchannel, parameters.size());
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    if (method < static_cast<u32>(BufferMethods::CountBufferMethods)) {
 | 
					 | 
				
			||||||
        // TODO(Subv): Research and implement these methods.
 | 
					 | 
				
			||||||
        LOG_ERROR(HW_GPU, "Special buffer methods other than Bind are not implemented");
 | 
					 | 
				
			||||||
        return;
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    ASSERT(bound_engines.find(subchannel) != bound_engines.end());
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    const EngineID engine = bound_engines[subchannel];
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    switch (engine) {
 | 
					 | 
				
			||||||
    case EngineID::FERMI_TWOD_A:
 | 
					 | 
				
			||||||
        fermi_2d->CallMethod(method, parameters);
 | 
					 | 
				
			||||||
        break;
 | 
					 | 
				
			||||||
    case EngineID::MAXWELL_B:
 | 
					 | 
				
			||||||
        maxwell_3d->CallMethod(method, parameters);
 | 
					 | 
				
			||||||
        break;
 | 
					 | 
				
			||||||
    case EngineID::MAXWELL_COMPUTE_B:
 | 
					 | 
				
			||||||
        maxwell_compute->CallMethod(method, parameters);
 | 
					 | 
				
			||||||
        break;
 | 
					 | 
				
			||||||
    default:
 | 
					 | 
				
			||||||
        UNIMPLEMENTED();
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
void GPU::ProcessCommandList(GPUVAddr address, u32 size) {
 | 
					void GPU::ProcessCommandList(GPUVAddr address, u32 size) {
 | 
				
			||||||
    // TODO(Subv): PhysicalToVirtualAddress is a misnomer, it converts a GPU VAddr into an
 | 
					    // TODO(Subv): PhysicalToVirtualAddress is a misnomer, it converts a GPU VAddr into an
 | 
				
			||||||
    // application VAddr.
 | 
					    // application VAddr.
 | 
				
			||||||
 | 
				
			|||||||
@ -8,7 +8,6 @@ namespace Tegra {
 | 
				
			|||||||
namespace Engines {
 | 
					namespace Engines {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void Fermi2D::WriteReg(u32 method, u32 value) {}
 | 
					void Fermi2D::WriteReg(u32 method, u32 value) {}
 | 
				
			||||||
void Fermi2D::CallMethod(u32 method, const std::vector<u32>& parameters) {}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
} // namespace Engines
 | 
					} // namespace Engines
 | 
				
			||||||
} // namespace Tegra
 | 
					} // namespace Tegra
 | 
				
			||||||
 | 
				
			|||||||
@ -4,7 +4,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#pragma once
 | 
					#pragma once
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <vector>
 | 
					 | 
				
			||||||
#include "common/common_types.h"
 | 
					#include "common/common_types.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace Tegra {
 | 
					namespace Tegra {
 | 
				
			||||||
@ -17,13 +16,6 @@ public:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    /// Write the value to the register identified by method.
 | 
					    /// Write the value to the register identified by method.
 | 
				
			||||||
    void WriteReg(u32 method, u32 value);
 | 
					    void WriteReg(u32 method, u32 value);
 | 
				
			||||||
 | 
					 | 
				
			||||||
    /**
 | 
					 | 
				
			||||||
     * Handles a method call to this engine.
 | 
					 | 
				
			||||||
     * @param method Method to call
 | 
					 | 
				
			||||||
     * @param parameters Arguments to the method call
 | 
					 | 
				
			||||||
     */
 | 
					 | 
				
			||||||
    void CallMethod(u32 method, const std::vector<u32>& parameters);
 | 
					 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
} // namespace Engines
 | 
					} // namespace Engines
 | 
				
			||||||
 | 
				
			|||||||
@ -8,28 +8,59 @@
 | 
				
			|||||||
namespace Tegra {
 | 
					namespace Tegra {
 | 
				
			||||||
namespace Engines {
 | 
					namespace Engines {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/// First register id that is actually a Macro call.
 | 
				
			||||||
 | 
					constexpr u32 MacroRegistersStart = 0xE00;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const std::unordered_map<u32, Maxwell3D::MethodInfo> Maxwell3D::method_handlers = {
 | 
					const std::unordered_map<u32, Maxwell3D::MethodInfo> Maxwell3D::method_handlers = {
 | 
				
			||||||
    {0xE24, {"SetShader", 5, &Maxwell3D::SetShader}},
 | 
					    {0xE24, {"SetShader", 5, &Maxwell3D::SetShader}},
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Maxwell3D::Maxwell3D(MemoryManager& memory_manager) : memory_manager(memory_manager) {}
 | 
					Maxwell3D::Maxwell3D(MemoryManager& memory_manager) : memory_manager(memory_manager) {}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void Maxwell3D::CallMethod(u32 method, const std::vector<u32>& parameters) {
 | 
					void Maxwell3D::AttemptMethodCall(u32 method, const std::vector<u32>& parameters) {
 | 
				
			||||||
    // TODO(Subv): Write an interpreter for the macros uploaded via registers 0x45 and 0x47
 | 
					    // TODO(Subv): Write an interpreter for the macros uploaded via registers 0x45 and 0x47
 | 
				
			||||||
    auto itr = method_handlers.find(method);
 | 
					    auto itr = method_handlers.find(method);
 | 
				
			||||||
    if (itr == method_handlers.end()) {
 | 
					    ASSERT_MSG(itr != method_handlers.end(), "Unhandled method call %08X", method);
 | 
				
			||||||
        LOG_ERROR(HW_GPU, "Unhandled method call %08X", method);
 | 
					
 | 
				
			||||||
        return;
 | 
					    // Only execute the macro handler once we've been fed the expected number of parameters.
 | 
				
			||||||
    }
 | 
					    if (itr->second.arguments != parameters.size())
 | 
				
			||||||
 | 
					        return;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ASSERT(itr->second.arguments == parameters.size());
 | 
					 | 
				
			||||||
    (this->*itr->second.handler)(parameters);
 | 
					    (this->*itr->second.handler)(parameters);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // Reset the current macro and its parameters.
 | 
				
			||||||
 | 
					    executing_macro = 0;
 | 
				
			||||||
 | 
					    macro_params.clear();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void Maxwell3D::WriteReg(u32 method, u32 value) {
 | 
					void Maxwell3D::WriteReg(u32 method, u32 value) {
 | 
				
			||||||
    ASSERT_MSG(method < Regs::NUM_REGS,
 | 
					    ASSERT_MSG(method < Regs::NUM_REGS,
 | 
				
			||||||
               "Invalid Maxwell3D register, increase the size of the Regs structure");
 | 
					               "Invalid Maxwell3D register, increase the size of the Regs structure");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // It is an error to write to a register other than the current macro's ARG register before it
 | 
				
			||||||
 | 
					    // has finished execution.
 | 
				
			||||||
 | 
					    if (executing_macro != 0) {
 | 
				
			||||||
 | 
					        ASSERT(method == executing_macro + 1);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // Methods after 0xE00 are special, they're actually triggers for some microcode that was
 | 
				
			||||||
 | 
					    // uploaded to the GPU during initialization.
 | 
				
			||||||
 | 
					    if (method >= MacroRegistersStart) {
 | 
				
			||||||
 | 
					        // We're trying to execute a macro
 | 
				
			||||||
 | 
					        if (executing_macro == 0) {
 | 
				
			||||||
 | 
					            // A macro call must begin by writing the macro method's register, not its argument.
 | 
				
			||||||
 | 
					            ASSERT_MSG((method % 2) == 0,
 | 
				
			||||||
 | 
					                       "Can't start macro execution by writing to the ARGS register");
 | 
				
			||||||
 | 
					            executing_macro = method;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        macro_params.push_back(value);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        // Try to call the macro with the current number of parameters.
 | 
				
			||||||
 | 
					        AttemptMethodCall(executing_macro, macro_params);
 | 
				
			||||||
 | 
					        return;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    regs.reg_array[method] = value;
 | 
					    regs.reg_array[method] = value;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define MAXWELL3D_REG_INDEX(field_name) (offsetof(Regs, field_name) / sizeof(u32))
 | 
					#define MAXWELL3D_REG_INDEX(field_name) (offsetof(Regs, field_name) / sizeof(u32))
 | 
				
			||||||
 | 
				
			|||||||
@ -23,13 +23,6 @@ public:
 | 
				
			|||||||
    /// Write the value to the register identified by method.
 | 
					    /// Write the value to the register identified by method.
 | 
				
			||||||
    void WriteReg(u32 method, u32 value);
 | 
					    void WriteReg(u32 method, u32 value);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /**
 | 
					 | 
				
			||||||
     * Handles a method call to this engine.
 | 
					 | 
				
			||||||
     * @param method Method to call
 | 
					 | 
				
			||||||
     * @param parameters Arguments to the method call
 | 
					 | 
				
			||||||
     */
 | 
					 | 
				
			||||||
    void CallMethod(u32 method, const std::vector<u32>& parameters);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    /// Register structure of the Maxwell3D engine.
 | 
					    /// Register structure of the Maxwell3D engine.
 | 
				
			||||||
    /// TODO(Subv): This structure will need to be made bigger as more registers are discovered.
 | 
					    /// TODO(Subv): This structure will need to be made bigger as more registers are discovered.
 | 
				
			||||||
    struct Regs {
 | 
					    struct Regs {
 | 
				
			||||||
@ -166,7 +159,11 @@ public:
 | 
				
			|||||||
                    INSERT_PADDING_WORDS(7);
 | 
					                    INSERT_PADDING_WORDS(7);
 | 
				
			||||||
                } cb_bind[MaxShaderStage];
 | 
					                } cb_bind[MaxShaderStage];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                INSERT_PADDING_WORDS(0x50A);
 | 
					                INSERT_PADDING_WORDS(0x56);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                u32 tex_cb_index;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                INSERT_PADDING_WORDS(0x4B3);
 | 
				
			||||||
            };
 | 
					            };
 | 
				
			||||||
            std::array<u32, NUM_REGS> reg_array;
 | 
					            std::array<u32, NUM_REGS> reg_array;
 | 
				
			||||||
        };
 | 
					        };
 | 
				
			||||||
@ -201,6 +198,19 @@ public:
 | 
				
			|||||||
private:
 | 
					private:
 | 
				
			||||||
    MemoryManager& memory_manager;
 | 
					    MemoryManager& memory_manager;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /// Macro method that is currently being executed / being fed parameters.
 | 
				
			||||||
 | 
					    u32 executing_macro = 0;
 | 
				
			||||||
 | 
					    /// Parameters that have been submitted to the macro call so far.
 | 
				
			||||||
 | 
					    std::vector<u32> macro_params;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * Attempts a method call to this engine. Will return without doing anything if the number of
 | 
				
			||||||
 | 
					     * parameters doesn't match what is expected for the method.
 | 
				
			||||||
 | 
					     * @param method Method to call
 | 
				
			||||||
 | 
					     * @param parameters Arguments to the method call
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    void AttemptMethodCall(u32 method, const std::vector<u32>& parameters);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /// Handles a write to the QUERY_GET register.
 | 
					    /// Handles a write to the QUERY_GET register.
 | 
				
			||||||
    void ProcessQueryGet();
 | 
					    void ProcessQueryGet();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -234,6 +244,7 @@ ASSERT_REG_POSITION(vertex_array_limit[0], 0x7C0);
 | 
				
			|||||||
ASSERT_REG_POSITION(shader_config[0], 0x800);
 | 
					ASSERT_REG_POSITION(shader_config[0], 0x800);
 | 
				
			||||||
ASSERT_REG_POSITION(const_buffer, 0x8E0);
 | 
					ASSERT_REG_POSITION(const_buffer, 0x8E0);
 | 
				
			||||||
ASSERT_REG_POSITION(cb_bind[0], 0x904);
 | 
					ASSERT_REG_POSITION(cb_bind[0], 0x904);
 | 
				
			||||||
 | 
					ASSERT_REG_POSITION(tex_cb_index, 0x982);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#undef ASSERT_REG_POSITION
 | 
					#undef ASSERT_REG_POSITION
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -8,7 +8,6 @@ namespace Tegra {
 | 
				
			|||||||
namespace Engines {
 | 
					namespace Engines {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void MaxwellCompute::WriteReg(u32 method, u32 value) {}
 | 
					void MaxwellCompute::WriteReg(u32 method, u32 value) {}
 | 
				
			||||||
void MaxwellCompute::CallMethod(u32 method, const std::vector<u32>& parameters) {}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
} // namespace Engines
 | 
					} // namespace Engines
 | 
				
			||||||
} // namespace Tegra
 | 
					} // namespace Tegra
 | 
				
			||||||
 | 
				
			|||||||
@ -4,7 +4,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#pragma once
 | 
					#pragma once
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <vector>
 | 
					 | 
				
			||||||
#include "common/common_types.h"
 | 
					#include "common/common_types.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace Tegra {
 | 
					namespace Tegra {
 | 
				
			||||||
@ -17,13 +16,6 @@ public:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    /// Write the value to the register identified by method.
 | 
					    /// Write the value to the register identified by method.
 | 
				
			||||||
    void WriteReg(u32 method, u32 value);
 | 
					    void WriteReg(u32 method, u32 value);
 | 
				
			||||||
 | 
					 | 
				
			||||||
    /**
 | 
					 | 
				
			||||||
     * Handles a method call to this engine.
 | 
					 | 
				
			||||||
     * @param method Method to call
 | 
					 | 
				
			||||||
     * @param parameters Arguments to the method call
 | 
					 | 
				
			||||||
     */
 | 
					 | 
				
			||||||
    void CallMethod(u32 method, const std::vector<u32>& parameters);
 | 
					 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
} // namespace Engines
 | 
					} // namespace Engines
 | 
				
			||||||
 | 
				
			|||||||
@ -41,9 +41,6 @@ private:
 | 
				
			|||||||
    /// Writes a single register in the engine bound to the specified subchannel
 | 
					    /// Writes a single register in the engine bound to the specified subchannel
 | 
				
			||||||
    void WriteReg(u32 method, u32 subchannel, u32 value);
 | 
					    void WriteReg(u32 method, u32 subchannel, u32 value);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /// Calls a method in the engine bound to the specified subchannel with the input parameters.
 | 
					 | 
				
			||||||
    void CallMethod(u32 method, u32 subchannel, const std::vector<u32>& parameters);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    /// Mapping of command subchannels to their bound engine ids.
 | 
					    /// Mapping of command subchannels to their bound engine ids.
 | 
				
			||||||
    std::unordered_map<u32, EngineID> bound_engines;
 | 
					    std::unordered_map<u32, EngineID> bound_engines;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user