moonpower/P3DS-test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up ubershader code

Browse Source
This commit is contained in:
wheremyfoodat
2024-07-15 15:11:23 +03:00
parent c535ae43ee
commit 2cd50e7f37
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/renderer_gl/renderer_gl.hpp
View File

@@ -84,7 +84,7 @@ class RendererGL final : public Renderer {
void setupBlending(); void setupBlending();
void setupStencilTest(bool stencilEnable); void setupStencilTest(bool stencilEnable);
void bindDepthBuffer(); void bindDepthBuffer();
void setupTextureEnvState(); void setupUbershaderTexEnv();
void bindTexturesToSlots(); void bindTexturesToSlots();
void updateLightingLUT(); void updateLightingLUT();
void initGraphicsContextInternal(); void initGraphicsContextInternal();

9
src/core/renderer_gl/renderer_gl.cpp
View File

@@ -282,12 +282,8 @@ void RendererGL::setupStencilTest(bool stencilEnable) {
glStencilOp(stencilOps[stencilFailOp], stencilOps[depthFailOp], stencilOps[passOp]); glStencilOp(stencilOps[stencilFailOp], stencilOps[depthFailOp], stencilOps[passOp]);
} }
void RendererGL::setupTextureEnvState() { void RendererGL::setupUbershaderTexEnv() {
// TODO: Only update uniforms when the TEV config changed. Use an UBO potentially. // TODO: Only update uniforms when the TEV config changed. Use an UBO potentially.
if (!usingUbershader) {
return;
}
static constexpr std::array<u32, 6> ioBases = { static constexpr std::array<u32, 6> ioBases = {
PICA::InternalRegs::TexEnv0Source, PICA::InternalRegs::TexEnv1Source, PICA::InternalRegs::TexEnv2Source, PICA::InternalRegs::TexEnv0Source, PICA::InternalRegs::TexEnv1Source, PICA::InternalRegs::TexEnv2Source,
PICA::InternalRegs::TexEnv3Source, PICA::InternalRegs::TexEnv4Source, PICA::InternalRegs::TexEnv5Source, PICA::InternalRegs::TexEnv3Source, PICA::InternalRegs::TexEnv4Source, PICA::InternalRegs::TexEnv5Source,
@@ -439,9 +435,9 @@ void RendererGL::drawVertices(PICA::PrimType primType, std::span<const Vertex> v
// Upload PICA Registers as a single uniform. The shader needs access to the rasterizer registers (for depth, starting from index 0x48) // Upload PICA Registers as a single uniform. The shader needs access to the rasterizer registers (for depth, starting from index 0x48)
// The texturing and the fragment lighting registers. Therefore we upload them all in one go to avoid multiple slow uniform updates // The texturing and the fragment lighting registers. Therefore we upload them all in one go to avoid multiple slow uniform updates
glUniform1uiv(ubershaderData.picaRegLoc, 0x200 - 0x48, &regs[0x48]); glUniform1uiv(ubershaderData.picaRegLoc, 0x200 - 0x48, &regs[0x48]);
setupUbershaderTexEnv();
} }
setupTextureEnvState();
bindTexturesToSlots(); bindTexturesToSlots();
if (gpu.lightingLUTDirty) { if (gpu.lightingLUTDirty) {
@@ -811,7 +807,6 @@ OpenGL::Program& RendererGL::getSpecializedShader() {
if (!program.exists()) { if (!program.exists()) {
std::string vs = fragShaderGen.getVertexShader(regs); std::string vs = fragShaderGen.getVertexShader(regs);
std::string fs = fragShaderGen.generate(regs); std::string fs = fragShaderGen.generate(regs);
std::cout << vs << "\n\n" << fs << "\n";
OpenGL::Shader vertShader({vs.c_str(), vs.size()}, OpenGL::Vertex); OpenGL::Shader vertShader({vs.c_str(), vs.size()}, OpenGL::Vertex);
OpenGL::Shader fragShader({fs.c_str(), fs.size()}, OpenGL::Fragment); OpenGL::Shader fragShader({fs.c_str(), fs.size()}, OpenGL::Fragment);