yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

GPU: Corrected the parameter documentation for the SetShader macro call. 

Register 0xE24 is actually a macro that sets some shader parameters in the register structure.

Macros are uploaded to the GPU at startup and have their own ISA, we'll probably write an interpreter for this in the future.
This commit is contained in:
Subv 2018-03-17 13:55:42 -05:00
parent 516ef4f19f
commit 579000e747
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/video_core/engines/maxwell_3d.cpp
View File

@ -15,6 +15,7 @@ const std::unordered_map<u32, Maxwell3D::MethodInfo> Maxwell3D::method_handlers
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::CallMethod(u32 method, const std::vector<u32>& parameters) {
// 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()) { if (itr == method_handlers.end()) {
LOG_ERROR(HW_GPU, "Unhandled method call %08X", method); LOG_ERROR(HW_GPU, "Unhandled method call %08X", method);
@ -86,19 +87,19 @@ void Maxwell3D::SetShader(const std::vector<u32>& parameters) {
* [1] = Unknown. * [1] = Unknown.
* [2] = Offset to the start of the shader, after the 0x30 bytes header. * [2] = Offset to the start of the shader, after the 0x30 bytes header.
* [3] = Shader Type. * [3] = Shader Type.
* [4] = Shader End Address >> 8. * [4] = Const Buffer Address >> 8.
*/ */
auto shader_program = static_cast<Regs::ShaderProgram>(parameters[0]); auto shader_program = static_cast<Regs::ShaderProgram>(parameters[0]);
// TODO(Subv): This address is probably an offset from the CODE_ADDRESS register. // TODO(Subv): This address is probably an offset from the CODE_ADDRESS register.
GPUVAddr begin_address = parameters[2]; GPUVAddr address = parameters[2];
auto shader_type = static_cast<Regs::ShaderType>(parameters[3]); auto shader_type = static_cast<Regs::ShaderType>(parameters[3]);
GPUVAddr end_address = parameters[4] << 8; GPUVAddr cb_address = parameters[4] << 8;
auto& shader = state.shaders[static_cast<size_t>(shader_program)]; auto& shader = state.shaders[static_cast<size_t>(shader_program)];
shader.program = shader_program; shader.program = shader_program;
shader.type = shader_type; shader.type = shader_type;
shader.begin_address = begin_address; shader.address = address;
shader.end_address = end_address; shader.cb_address = cb_address;
} }
} // namespace Engines } // namespace Engines

12
src/video_core/engines/maxwell_3d.h
View File

@ -139,9 +139,9 @@ public:
INSERT_PADDING_WORDS(0x5D0); INSERT_PADDING_WORDS(0x5D0);
struct { struct {
u32 shader_code_call; u32 set_shader_call;
u32 shader_code_args; u32 set_shader_args;
} shader_code; } set_shader;
INSERT_PADDING_WORDS(0x10); INSERT_PADDING_WORDS(0x10);
}; };
std::array<u32, NUM_REGS> reg_array; std::array<u32, NUM_REGS> reg_array;
@ -154,8 +154,8 @@ public:
struct ShaderInfo { struct ShaderInfo {
Regs::ShaderType type; Regs::ShaderType type;
Regs::ShaderProgram program; Regs::ShaderProgram program;
GPUVAddr begin_address; GPUVAddr address;
GPUVAddr end_address; GPUVAddr cb_address;
}; };
std::array<ShaderInfo, Regs::MaxShaderProgram> shaders; std::array<ShaderInfo, Regs::MaxShaderProgram> shaders;
@ -194,7 +194,7 @@ ASSERT_REG_POSITION(query, 0x6C0);
ASSERT_REG_POSITION(vertex_array[0], 0x700); ASSERT_REG_POSITION(vertex_array[0], 0x700);
ASSERT_REG_POSITION(vertex_array_limit[0], 0x7C0); 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(shader_code, 0xE24); ASSERT_REG_POSITION(set_shader, 0xE24);
#undef ASSERT_REG_POSITION #undef ASSERT_REG_POSITION