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

Merge branch 'master' into bottom-screen

Browse source
This commit is contained in:
wheremyfoodat 2023-06-17 02:19:30 +03:00
commit 7b859ad602
11 changed files with 107 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -237,6 +237,15 @@ void Renderer::initGraphicsContext() {
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
void Renderer::setupBlending() {
const bool blendingEnabled = (regs[PICAInternalRegs::ColourOperation] & (1 << 8)) != 0;
@ -282,13 +291,7 @@ void Renderer::setupBlending() {
}
}
void Renderer::drawVertices(OpenGL::Primitives primType, Vertex* vertices, u32 count) {
OpenGL::disableScissor();
vbo.bind();
vao.bind();
triangleProgram.use();
void Renderer::drawVertices(OpenGL::Primitives primType, std::span<const Vertex> vertices) {
// Adjust alpha test if necessary
const u32 alphaControl = regs[PICAInternalRegs::AlphaTestConfig];
if (alphaControl != oldAlphaControl) {
@ -375,8 +378,8 @@ void Renderer::drawVertices(OpenGL::Primitives primType, Vertex* vertices, u32 c
}
}
vbo.bufferVertsSub(vertices, count);
OpenGL::draw(primType, count);
vbo.bufferVertsSub(vertices);
OpenGL::draw(primType, vertices.size());
}
constexpr u32 topScreenBuffer = 0x1f000000;