Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-08 23:25:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

[GPU] Upload configuration for all texture combiners to the shader program

Browse source 
Upload the configuration register values for the remaining texture combiners to the
shader program's uniforms. This is in preparation for emulating those texture combiners next.
This commit is contained in:
fleroviux 2023-06-15 23:27:33 +02:00
parent e66370598a
commit 525890bff7
2 changed files with 52 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/renderer_gl/renderer_gl.hpp
View file

@ -26,11 +26,11 @@ class Renderer {
GLint texUnitConfigLoc = -1; GLint texUnitConfigLoc = -1;
// TEV configuration uniform locations // TEV configuration uniform locations
GLint textureEnv0SourceLoc = -1; GLint textureEnvSourceLoc = -1;
GLint textureEnv0OperandLoc = -1; GLint textureEnvOperandLoc = -1;
GLint textureEnv0CombinerLoc = -1; GLint textureEnvCombinerLoc = -1;
GLint textureEnv0ColorLoc = -1; GLint textureEnvColorLoc = -1;
GLint textureEnv0ScaleLoc = -1; GLint textureEnvScaleLoc = -1;
// Depth configuration uniform locations // Depth configuration uniform locations
GLint depthOffsetLoc = -1; GLint depthOffsetLoc = -1;

77
src/core/renderer_gl/renderer_gl.cpp
View file

@ -39,12 +39,11 @@ const char* fragmentShader = R"(
uniform uint u_textureConfig; uniform uint u_textureConfig;
// TEV uniforms // TEV uniforms
// TODO: use arrays to handle TEVs 1-3. uniform uint u_textureEnvSource[4];
uniform uint u_textureEnv0Source; uniform uint u_textureEnvOperand[4];
uniform uint u_textureEnv0Operand; uniform uint u_textureEnvCombiner[4];
uniform uint u_textureEnv0Combiner; uniform vec4 u_textureEnvColor[4];
uniform vec4 u_textureEnv0Color; // TODO: -> Colour uniform uint u_textureEnvScale[4];
uniform uint u_textureEnv0Scale;
// Depth control uniforms // Depth control uniforms
uniform float u_depthScale; uniform float u_depthScale;
@ -56,27 +55,27 @@ const char* fragmentShader = R"(
vec4 tev_evaluate_source(int src_id) { vec4 tev_evaluate_source(int src_id) {
vec4 source = vec4(1.0); vec4 source = vec4(1.0);
uint rgb_source = (u_textureEnv0Source >> (src_id * 4)) & 15u; uint rgb_source = (u_textureEnvSource[0] >> (src_id * 4)) & 15u;
uint alpha_source = (u_textureEnv0Source >> (16 + src_id * 4)) & 15u; uint alpha_source = (u_textureEnvSource[0] >> (16 + src_id * 4)) & 15u;
// TODO: get rid of redundant texture fetches during TEV evaluation. // TODO: get rid of redundant texture fetches during TEV evaluation.
switch (rgb_source) { switch (rgb_source) {
case 0u: source.rgb = colour.rgb; break; // Primary color, TODO: confirm that this is correct case 0u: source.rgb = colour.rgb; break; // Primary color, TODO: confirm that this is correct
case 3u: source.rgb = texture(u_tex0, tex0_UVs).rgb; break; // Texture 0 case 3u: source.rgb = texture(u_tex0, tex0_UVs).rgb; break; // Texture 0
case 14u: source.rgb = u_textureEnv0Color.rgb; break; // Constant (GPUREG_TEXENVi_COLOR) case 14u: source.rgb = u_textureEnvColor[0].rgb; break; // Constant (GPUREG_TEXENVi_COLOR)
default: break; // TODO: implement remaining sources default: break; // TODO: implement remaining sources
} }
switch (alpha_source) { switch (alpha_source) {
case 0u: source.a = colour.a; break; // Primary color, TODO: confirm that this is correct case 0u: source.a = colour.a; break; // Primary color, TODO: confirm that this is correct
case 3u: source.a = texture(u_tex0, tex0_UVs).a; break; // Texture 0 case 3u: source.a = texture(u_tex0, tex0_UVs).a; break; // Texture 0
case 14u: source.a = u_textureEnv0Color.a; break; // Constant (GPUREG_TEXENVi_COLOR) case 14u: source.a = u_textureEnvColor[0].a; break; // Constant (GPUREG_TEXENVi_COLOR)
default: break; // TODO: implement remaining sources default: break; // TODO: implement remaining sources
} }
uint rgb_operand = (u_textureEnv0Operand >> (src_id * 4)) & 15u; uint rgb_operand = (u_textureEnvOperand[0] >> (src_id * 4)) & 15u;
uint alpha_operand = (u_textureEnv0Operand >> (12 + src_id * 4)) & 7u; uint alpha_operand = (u_textureEnvOperand[0] >> (12 + src_id * 4)) & 7u;
vec4 final; vec4 final;
@ -115,8 +114,8 @@ const char* fragmentShader = R"(
vec4 source1 = tev_evaluate_source(1); vec4 source1 = tev_evaluate_source(1);
vec4 source2 = tev_evaluate_source(2); vec4 source2 = tev_evaluate_source(2);
uint rgb_combine = u_textureEnv0Combiner & 15u; uint rgb_combine = u_textureEnvCombiner[0] & 15u;
uint alpha_combine = (u_textureEnv0Combiner >> 16) & 15u; uint alpha_combine = (u_textureEnvCombiner[0] >> 16) & 15u;
vec4 result = vec4(1.0); vec4 result = vec4(1.0);
@ -137,7 +136,7 @@ const char* fragmentShader = R"(
void main() { void main() {
if ((u_textureConfig & 1u) != 0) { // Render texture 0 if enabled if ((u_textureConfig & 1u) != 0) { // Render texture 0 if enabled
fragColour = texture(u_tex0, tex0_UVs); fragColour = tev_combine();
} else { } else {
fragColour = colour; fragColour = colour;
} }
@ -269,11 +268,11 @@ void Renderer::initGraphicsContext() {
alphaControlLoc = OpenGL::uniformLocation(triangleProgram, "u_alphaControl"); alphaControlLoc = OpenGL::uniformLocation(triangleProgram, "u_alphaControl");
texUnitConfigLoc = OpenGL::uniformLocation(triangleProgram, "u_textureConfig"); texUnitConfigLoc = OpenGL::uniformLocation(triangleProgram, "u_textureConfig");
textureEnv0SourceLoc = OpenGL::uniformLocation(triangleProgram, "u_textureEnv0Source"); textureEnvSourceLoc = OpenGL::uniformLocation(triangleProgram, "u_textureEnvSource");
textureEnv0OperandLoc = OpenGL::uniformLocation(triangleProgram, "u_textureEnv0Operand"); textureEnvOperandLoc = OpenGL::uniformLocation(triangleProgram, "u_textureEnvOperand");
textureEnv0CombinerLoc = OpenGL::uniformLocation(triangleProgram, "u_textureEnv0Combiner"); textureEnvCombinerLoc = OpenGL::uniformLocation(triangleProgram, "u_textureEnvCombiner");
textureEnv0ColorLoc = OpenGL::uniformLocation(triangleProgram, "u_textureEnv0Color"); textureEnvColorLoc = OpenGL::uniformLocation(triangleProgram, "u_textureEnvColor");
textureEnv0ScaleLoc = OpenGL::uniformLocation(triangleProgram, "u_textureEnv0Scale"); textureEnvScaleLoc = OpenGL::uniformLocation(triangleProgram, "u_textureEnvScale");
depthScaleLoc = OpenGL::uniformLocation(triangleProgram, "u_depthScale"); depthScaleLoc = OpenGL::uniformLocation(triangleProgram, "u_depthScale");
depthOffsetLoc = OpenGL::uniformLocation(triangleProgram, "u_depthOffset"); depthOffsetLoc = OpenGL::uniformLocation(triangleProgram, "u_depthOffset");
@ -429,19 +428,37 @@ void Renderer::drawVertices(OpenGL::Primitives primType, Vertex* vertices, u32 c
// TODO: only update TEV uniforms when the configuration changes. // TODO: only update TEV uniforms when the configuration changes.
// TODO: define registers in the PICAInternalRegs enumeration // TODO: define registers in the PICAInternalRegs enumeration
glUniform1ui(textureEnv0SourceLoc, regs[0xc0]);
glUniform1ui(textureEnv0OperandLoc, regs[0xc1]);
glUniform1ui(textureEnv0CombinerLoc, regs[0xc2]);
{ {
const u32 rgba = regs[0xc3]; u32 textureEnvSourceRegs[4];
const float r = (float)(rgba & 0xff) / 255.0f; u32 textureEnvOperandRegs[4];
const float g = (float)((rgba >> 8) & 0xff) / 255.0f; u32 textureEnvCombinerRegs[4];
const float b = (float)((rgba >> 16) & 0xff) / 255.0f; float textureEnvColourRegs[4][4];
const float a = (float)(rgba >> 24) / 255.0f; u32 textureEnvScaleRegs[4];
glUniform4f(textureEnv0ColorLoc, r, g, b, a); u32 base_reg = 0xc0;
for (int i = 0; i < 4; i++) {
textureEnvSourceRegs[i] = regs[base_reg];
textureEnvOperandRegs[i] = regs[base_reg + 1];
textureEnvCombinerRegs[i] = regs[base_reg + 2];
const u32 rgba = regs[base_reg + 3];
textureEnvColourRegs[i][0] = (float)(rgba & 0xff) / 255.0f;
textureEnvColourRegs[i][1] = (float)((rgba >> 8) & 0xff) / 255.0f;
textureEnvColourRegs[i][2] = (float)((rgba >> 16) & 0xff) / 255.0f;
textureEnvColourRegs[i][3] = (float)(rgba >> 24) / 255.0f;
textureEnvScaleRegs[i] = regs[base_reg + 4];
base_reg += 8;
}
glUniform1uiv(textureEnvSourceLoc, 4, textureEnvSourceRegs);
glUniform1uiv(textureEnvOperandLoc, 4, textureEnvOperandRegs);
glUniform1uiv(textureEnvCombinerLoc, 4, textureEnvCombinerRegs);
glUniform4fv(textureEnvColorLoc, 4, (const GLfloat*)textureEnvColourRegs);
glUniform1uiv(textureEnvScaleLoc, 4, textureEnvScaleRegs);
} }
glUniform1ui(textureEnv0ScaleLoc, regs[0xc4]);
// Hack for rendering texture 1 // Hack for rendering texture 1
if (regs[0x80] & 1) { if (regs[0x80] & 1) {