fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unplumbing program_cntl and simplifying shader loading.

Browse Source
This commit is contained in:
Ben Vanik
2015-11-24 20:24:35 -08:00
parent 6a546ebe4d
commit 89172da4b7
8 changed files with 38 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/xenia/gpu/gl4/gl4_shader_translator.cc
View File

@@ -71,17 +71,9 @@ void GL4ShaderTranslator::Reset(GL4Shader* shader) {
}
std::string GL4ShaderTranslator::TranslateVertexShader(
GL4Shader* vertex_shader,
const xenos::xe_gpu_program_cntl_t& program_cntl) {
GL4Shader* vertex_shader) {
Reset(vertex_shader);
// Normal shaders only, for now.
// TODO(benvanik): transform feedback/memexport.
// 0 = normal
// 2 = point size
assert_true(program_cntl.vs_export_mode == 0 ||
program_cntl.vs_export_mode == 2);
// Add vertex shader input.
uint32_t el_index = 0;
const auto& buffer_inputs = vertex_shader->buffer_inputs();
@@ -102,8 +94,7 @@ std::string GL4ShaderTranslator::TranslateVertexShader(
Append("void processVertex(const in StateData state) {\n");
// Add temporaries for any registers we may use.
uint32_t temp_regs = program_cntl.vs_regs + program_cntl.ps_regs;
for (uint32_t n = 0; n <= temp_regs; n++) {
for (uint32_t n = 0; n < 64; n++) {
Append(" vec4 r%d = state.float_consts[%d];\n", n, n);
}
@@ -130,8 +121,7 @@ std::string GL4ShaderTranslator::TranslateVertexShader(
return output_.to_string();
}
std::string GL4ShaderTranslator::TranslatePixelShader(
GL4Shader* pixel_shader, const xenos::xe_gpu_program_cntl_t& program_cntl) {
std::string GL4ShaderTranslator::TranslatePixelShader(GL4Shader* pixel_shader) {
Reset(pixel_shader);
// We need an input VS to make decisions here.
@@ -143,8 +133,7 @@ std::string GL4ShaderTranslator::TranslatePixelShader(
Append("void processFragment(const in StateData state) {\n");
// Add temporary registers.
uint32_t temp_regs = program_cntl.vs_regs + program_cntl.ps_regs;
for (uint32_t n = 0; n <= std::max(15u, temp_regs); n++) {
for (uint32_t n = 0; n < 64; n++) {
Append(" vec4 r%d = state.float_consts[%d];\n", n, n + 256);
}
Append(" vec4 t;\n");