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

[GL] More state stuff

Browse source
This commit is contained in:
wheremyfoodat 2023-07-28 01:35:49 +03:00
parent 64fa970468
commit adb78bf838
4 changed files with 67 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/core/renderer_gl/gl_state.cpp
View file

@ -2,7 +2,18 @@
void GLStateManager::resetBlend() {
blendEnabled = false;
logicOpEnabled = false;
OpenGL::disableBlend();
OpenGL::disableLogicOp();
}
void GLStateManager::resetClipping() {
// Disable all (supported) clip planes
enabledClipPlanes = 0;
for (int i = 0; i < clipPlaneCount; i++) {
OpenGL::disableClipPlane(i);
}
}
void GLStateManager::resetColourMask() {
@ -48,6 +59,7 @@ void GLStateManager::resetProgram() {
void GLStateManager::reset() {
resetBlend();
resetClipping();
resetColourMask();
resetDepth();

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

@ -185,10 +185,12 @@ void RendererGL::setupBlending() {
if (!blendingEnabled) { // Logic ops are enabled
const u32 logicOp = getBits<0, 4>(regs[PICA::InternalRegs::LogicOp]);
glLogicOp(logicOps[logicOp]);
glEnable(GL_COLOR_LOGIC_OP);
// If logic ops are enabled we don't need to disable blending because they override it
gl.enableLogicOp();
} else {
gl.enableBlend();
glDisable(GL_COLOR_LOGIC_OP);
gl.disableLogicOp();
// Get blending equations
const u32 blendControl = regs[PICA::InternalRegs::BlendFunc];
@ -359,9 +361,9 @@ void RendererGL::drawVertices(PICA::PrimType primType, std::span<const Vertex> v
gl.bindVAO(vao);
gl.useProgram(triangleProgram);
OpenGL::enableClipPlane(0); // Clipping plane 0 is always enabled
gl.enableClipPlane(0); // Clipping plane 0 is always enabled
if (regs[PICA::InternalRegs::ClipEnable] & 1) {
OpenGL::enableClipPlane(1);
gl.enableClipPlane(1);
}
setupBlending();
@ -563,7 +565,7 @@ void RendererGL::displayTransfer(u32 inputAddr, u32 outputAddr, u32 inputSize, u
screenFramebuffer.bind(OpenGL::DrawFramebuffer);
gl.disableBlend();
glDisable(GL_COLOR_LOGIC_OP);
gl.disableLogicOp();
gl.disableDepth();
gl.disableScissor();
gl.disableStencil();
@ -571,8 +573,8 @@ void RendererGL::displayTransfer(u32 inputAddr, u32 outputAddr, u32 inputSize, u
gl.useProgram(displayProgram);
gl.bindVAO(dummyVAO);
OpenGL::disableClipPlane(0);
OpenGL::disableClipPlane(1);
gl.disableClipPlane(0);
gl.disableClipPlane(1);
// Hack: Detect whether we are writing to the top or bottom screen by checking output gap and drawing to the proper part of the output texture
// We consider output gap == 320 to mean bottom, and anything else to mean top