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

[GL] Pipe Pica registers and implement ambient lighting

Browse source
This commit is contained in:
Sky 2023-07-01 16:43:57 -07:00
parent de3c4020d8
commit 6fababb93a
2 changed files with 35 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/renderer_gl/renderer_gl.hpp
View file

@ -32,6 +32,7 @@ class Renderer {
GLint textureEnvScaleLoc = -1; GLint textureEnvScaleLoc = -1;
GLint textureEnvUpdateBufferLoc = -1; GLint textureEnvUpdateBufferLoc = -1;
GLint textureEnvBufferColorLoc = -1; GLint textureEnvBufferColorLoc = -1;
GLint picaRegLoc = -1;
// Depth configuration uniform locations // Depth configuration uniform locations
GLint depthOffsetLoc = -1; GLint depthOffsetLoc = -1;

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

@ -20,9 +20,11 @@ const char* vertexShader = R"(
layout (location = 6) in vec3 a_view; layout (location = 6) in vec3 a_view;
layout (location = 7) in vec2 a_texcoord2; layout (location = 7) in vec2 a_texcoord2;
out vec4 v_quaternion;
out vec4 v_colour; out vec4 v_colour;
out vec3 v_texcoord0; out vec3 v_texcoord0;
out vec2 v_texcoord1; out vec2 v_texcoord1;
out vec3 v_view;
out vec2 v_texcoord2; out vec2 v_texcoord2;
flat out vec4 v_textureEnvColor[6]; flat out vec4 v_textureEnvColor[6];
flat out vec4 v_textureEnvBufferColor; flat out vec4 v_textureEnvBufferColor;
@ -30,6 +32,12 @@ const char* vertexShader = R"(
// TEV uniforms // TEV uniforms
uniform uint u_textureEnvColor[6]; uniform uint u_textureEnvColor[6];
uniform uint u_textureEnvBufferColor; uniform uint u_textureEnvBufferColor;
uniform uint u_picaRegs[0x200-0x47];
//Helper so that the implementation of u_pica_regs can be changed later
uint readPicaReg(uint reg_addr){
return u_picaRegs[reg_addr-0x47];
}
vec4 abgr8888ToVec4(uint abgr) { vec4 abgr8888ToVec4(uint abgr) {
const float scale = 1.0 / 255.0; const float scale = 1.0 / 255.0;
@ -50,6 +58,8 @@ const char* vertexShader = R"(
v_texcoord0 = vec3(a_texcoord0.x, 1.0 - a_texcoord0.y, a_texcoord0_w); v_texcoord0 = vec3(a_texcoord0.x, 1.0 - a_texcoord0.y, a_texcoord0_w);
v_texcoord1 = vec2(a_texcoord1.x, 1.0 - a_texcoord1.y); v_texcoord1 = vec2(a_texcoord1.x, 1.0 - a_texcoord1.y);
v_texcoord2 = vec2(a_texcoord2.x, 1.0 - a_texcoord2.y); v_texcoord2 = vec2(a_texcoord2.x, 1.0 - a_texcoord2.y);
v_quaternion = a_quaternion;
v_view = a_view;
for (int i = 0; i < 6; i++) { for (int i = 0; i < 6; i++) {
v_textureEnvColor[i] = abgr8888ToVec4(u_textureEnvColor[i]); v_textureEnvColor[i] = abgr8888ToVec4(u_textureEnvColor[i]);
@ -62,9 +72,11 @@ const char* vertexShader = R"(
const char* fragmentShader = R"( const char* fragmentShader = R"(
#version 410 core #version 410 core
in vec4 v_quaternion;
in vec4 v_colour; in vec4 v_colour;
in vec3 v_texcoord0; in vec3 v_texcoord0;
in vec2 v_texcoord1; in vec2 v_texcoord1;
in vec3 v_view;
in vec2 v_texcoord2; in vec2 v_texcoord2;
flat in vec4 v_textureEnvColor[6]; flat in vec4 v_textureEnvColor[6];
flat in vec4 v_textureEnvBufferColor; flat in vec4 v_textureEnvBufferColor;
@ -90,6 +102,13 @@ const char* fragmentShader = R"(
uniform sampler2D u_tex1; uniform sampler2D u_tex1;
uniform sampler2D u_tex2; uniform sampler2D u_tex2;
uniform uint u_picaRegs[0x200-0x47];
//Helper so that the implementation of u_pica_regs can be changed later
uint readPicaReg(uint reg_addr){
return u_picaRegs[reg_addr-0x47];
}
vec4 tevSources[16]; vec4 tevSources[16];
vec4 tevNextPreviousBuffer; vec4 tevNextPreviousBuffer;
bool tevUnimplementedSourceFlag = false; bool tevUnimplementedSourceFlag = false;
@ -193,7 +212,18 @@ const char* fragmentShader = R"(
} }
void calcLighting(out vec4 primary_color, out vec4 secondary_color){ void calcLighting(out vec4 primary_color, out vec4 secondary_color){
primary_color = vec4(vec3(0.5) ,1.0); uint GPUREG_LIGHTING_ENABLE = readPicaReg(0x008F);
if(bitfieldExtract(GPUREG_LIGHTING_ENABLE,0,1)==0){
primary_color = secondary_color = vec4(0.0);
return;
}
uint GPUREG_LIGHTING_AMBIENT = readPicaReg(0x01C0);
vec3 ambient = vec3(
float(bitfieldExtract(GPUREG_LIGHTING_AMBIENT,20,8))/255.,
float(bitfieldExtract(GPUREG_LIGHTING_AMBIENT,10,8))/255.,
float(bitfieldExtract(GPUREG_LIGHTING_AMBIENT,00,8))/255.
);
primary_color = vec4(ambient,1.0);
secondary_color = vec4(vec3(0.5) ,1.0); secondary_color = vec4(vec3(0.5) ,1.0);
} }
@ -373,6 +403,7 @@ void Renderer::initGraphicsContext() {
depthScaleLoc = OpenGL::uniformLocation(triangleProgram, "u_depthScale"); depthScaleLoc = OpenGL::uniformLocation(triangleProgram, "u_depthScale");
depthOffsetLoc = OpenGL::uniformLocation(triangleProgram, "u_depthOffset"); depthOffsetLoc = OpenGL::uniformLocation(triangleProgram, "u_depthOffset");
depthmapEnableLoc = OpenGL::uniformLocation(triangleProgram, "u_depthmapEnable"); depthmapEnableLoc = OpenGL::uniformLocation(triangleProgram, "u_depthmapEnable");
picaRegLoc = OpenGL::uniformLocation(triangleProgram, "u_picaRegs");
// Init sampler objects // Init sampler objects
glUniform1i(OpenGL::uniformLocation(triangleProgram, "u_tex0"), 0); glUniform1i(OpenGL::uniformLocation(triangleProgram, "u_tex0"), 0);
@ -621,6 +652,8 @@ void Renderer::drawVertices(PICA::PrimType primType, std::span<const PicaVertex>
setupTextureEnvState(); setupTextureEnvState();
bindTexturesToSlots(); bindTexturesToSlots();
//Upload Pica Registers
glUniform1uiv(picaRegLoc,0x200-0x47,&regs[0x47]);
// TODO: Actually use this // TODO: Actually use this
float viewportWidth = f24::fromRaw(regs[PICA::InternalRegs::ViewportWidth] & 0xffffff).toFloat32() * 2.0; float viewportWidth = f24::fromRaw(regs[PICA::InternalRegs::ViewportWidth] & 0xffffff).toFloat32() * 2.0;