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

[GL] Actually implement logic ops

Browse source
This commit is contained in:
wheremyfoodat 2023-07-27 21:57:50 +03:00
parent 1ea0b39a3b
commit 64fa970468
2 changed files with 14 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/renderer_gl/renderer_gl.hpp
View file

@ -62,7 +62,6 @@ class RendererGL final : public Renderer {
MAKE_LOG_FUNCTION(log, rendererLogger) MAKE_LOG_FUNCTION(log, rendererLogger)
void setupBlending(); void setupBlending();
void setupStencilTest(bool stencilEnable); void setupStencilTest(bool stencilEnable);
void setupLogicOp();
void bindDepthBuffer(); void bindDepthBuffer();
void setupTextureEnvState(); void setupTextureEnvState();
void bindTexturesToSlots(); void bindTexturesToSlots();

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

@ -149,8 +149,6 @@ void RendererGL::initGraphicsContext(SDL_Window* window) {
// Set up the OpenGL blending context to match the emulated PICA // Set up the OpenGL blending context to match the emulated PICA
void RendererGL::setupBlending() { void RendererGL::setupBlending() {
const bool blendingEnabled = (regs[PICA::InternalRegs::ColourOperation] & (1 << 8)) != 0;
// Map of PICA blending equations to OpenGL blending equations. The unused blending equations are equivalent to equation 0 (add) // Map of PICA blending equations to OpenGL blending equations. The unused blending equations are equivalent to equation 0 (add)
static constexpr std::array<GLenum, 8> blendingEquations = { static constexpr std::array<GLenum, 8> blendingEquations = {
GL_FUNC_ADD, GL_FUNC_SUBTRACT, GL_FUNC_REVERSE_SUBTRACT, GL_MIN, GL_MAX, GL_FUNC_ADD, GL_FUNC_ADD, GL_FUNC_ADD, GL_FUNC_ADD, GL_FUNC_SUBTRACT, GL_FUNC_REVERSE_SUBTRACT, GL_MIN, GL_MAX, GL_FUNC_ADD, GL_FUNC_ADD, GL_FUNC_ADD,
@ -176,10 +174,21 @@ void RendererGL::setupBlending() {
GL_ONE, GL_ONE,
}; };
if (!blendingEnabled) { static constexpr std::array<GLenum, 16> logicOps = {
gl.disableBlend(); GL_CLEAR, GL_AND, GL_AND_REVERSE, GL_COPY, GL_SET, GL_COPY_INVERTED, GL_NOOP, GL_INVERT,
GL_NAND, GL_OR, GL_NOR, GL_XOR, GL_EQUIV, GL_AND_INVERTED, GL_OR_REVERSE, GL_OR_INVERTED,
};
// Shows if blending is enabled. If it is not enabled, then logic ops are enabled instead
const bool blendingEnabled = (regs[PICA::InternalRegs::ColourOperation] & (1 << 8)) != 0;
if (!blendingEnabled) { // Logic ops are enabled
const u32 logicOp = getBits<0, 4>(regs[PICA::InternalRegs::LogicOp]);
glLogicOp(logicOps[logicOp]);
glEnable(GL_COLOR_LOGIC_OP);
} else { } else {
gl.enableBlend(); gl.enableBlend();
glDisable(GL_COLOR_LOGIC_OP);
// Get blending equations // Get blending equations
const u32 blendControl = regs[PICA::InternalRegs::BlendFunc]; const u32 blendControl = regs[PICA::InternalRegs::BlendFunc];
@ -252,30 +261,6 @@ void RendererGL::setupStencilTest(bool stencilEnable) {
glStencilOp(stencilOps[stencilFailOp], stencilOps[depthFailOp], stencilOps[passOp]); glStencilOp(stencilOps[stencilFailOp], stencilOps[depthFailOp], stencilOps[passOp]);
} }
void RendererGL::setupLogicOp() {
const u32 logicOp = getBits<0, 4>(regs[PICA::InternalRegs::LogicOp]);
static constexpr std::array<GLenum, 16> logicOps = {
GL_CLEAR,
GL_AND,
GL_AND_REVERSE,
GL_COPY,
GL_SET,
GL_COPY_INVERTED,
GL_NOOP,
GL_INVERT,
GL_NAND,
GL_OR,
GL_NOR,
GL_XOR,
GL_EQUIV,
GL_AND_INVERTED,
GL_OR_REVERSE,
GL_OR_INVERTED,
};
// TODO: Enable logic op lmao
glLogicOp(logicOps[logicOp]);
}
void RendererGL::setupTextureEnvState() { void RendererGL::setupTextureEnvState() {
// 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.
@ -455,7 +440,6 @@ void RendererGL::drawVertices(PICA::PrimType primType, std::span<const Vertex> v
} }
setupStencilTest(stencilEnable); setupStencilTest(stencilEnable);
setupLogicOp();
vbo.bufferVertsSub(vertices); vbo.bufferVertsSub(vertices);
OpenGL::draw(primitiveTopology, GLsizei(vertices.size())); OpenGL::draw(primitiveTopology, GLsizei(vertices.size()));
@ -579,6 +563,7 @@ void RendererGL::displayTransfer(u32 inputAddr, u32 outputAddr, u32 inputSize, u
screenFramebuffer.bind(OpenGL::DrawFramebuffer); screenFramebuffer.bind(OpenGL::DrawFramebuffer);
gl.disableBlend(); gl.disableBlend();
glDisable(GL_COLOR_LOGIC_OP);
gl.disableDepth(); gl.disableDepth();
gl.disableScissor(); gl.disableScissor();
gl.disableStencil(); gl.disableStencil();