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

Fix merge conflict

Browse source
This commit is contained in:
wheremyfoodat 2023-06-17 02:22:19 +03:00
parent 7b859ad602
commit 5b3266be34
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -237,15 +237,6 @@ void Renderer::initGraphicsContext() {
reset(); reset();
} }
// TODO: Maybe merge this with drawVertices
void Renderer::getGraphicsContext() {
OpenGL::disableScissor();
vbo.bind();
vao.bind();
triangleProgram.use();
}
// Set up the OpenGL blending context to match the emulated PICA // Set up the OpenGL blending context to match the emulated PICA
void Renderer::setupBlending() { void Renderer::setupBlending() {
const bool blendingEnabled = (regs[PICAInternalRegs::ColourOperation] & (1 << 8)) != 0; const bool blendingEnabled = (regs[PICAInternalRegs::ColourOperation] & (1 << 8)) != 0;
@ -292,6 +283,15 @@ void Renderer::setupBlending() {
} }
void Renderer::drawVertices(OpenGL::Primitives primType, std::span<const Vertex> vertices) { void Renderer::drawVertices(OpenGL::Primitives primType, std::span<const Vertex> vertices) {
// TODO: We should implement a GL state tracker that tracks settings like scissor, blending, bound program, etc
// This way if we attempt to eg do multiple glEnable(GL_BLEND) calls in a row, it will say "Oh blending is already enabled"
// And not actually perform the very expensive driver call for it
OpenGL::disableScissor();
vbo.bind();
vao.bind();
triangleProgram.use();
// Adjust alpha test if necessary // Adjust alpha test if necessary
const u32 alphaControl = regs[PICAInternalRegs::AlphaTestConfig]; const u32 alphaControl = regs[PICAInternalRegs::AlphaTestConfig];
if (alphaControl != oldAlphaControl) { if (alphaControl != oldAlphaControl) {