Emulator-Archive/melonds-ds
1
0
Fork 0
mirror of https://github.com/JesseTG/melonds-ds.git synced 2024-11-23 14:40:04 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update the render states to reflect upstream API changes

Browse Source
This commit is contained in:
Jesse Talavera 2024-07-09 17:36:16 -04:00
parent 129c4fc0a2
commit f0b516ba58
3 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/libretro/render/opengl.cpp
View File

@ -185,8 +185,7 @@ MelonDsDs::OpenGLRenderState::~OpenGLRenderState() noexcept {
glDeleteVertexArrays(1, &vao);
glDeleteBuffers(1, &vbo);
melonDS::OpenGL::DeleteShaderProgram(shader.data());
glDeleteProgram(_screenProgram);
glsm_ctl(GLSM_CTL_STATE_UNBIND, nullptr);
}
glsm_ctl(GLSM_CTL_STATE_CONTEXT_DESTROY, nullptr);
@ -278,27 +277,32 @@ void MelonDsDs::OpenGLRenderState::SetUpCoreOpenGlState(const CoreConfig& config
// TODO: Check gl_check_capability for GL_CAPS_VAO and GL_CAPS_FBO
if (!melonDS::OpenGL::BuildShaderProgram(embedded_melondsds_vertex_shader, embedded_melondsds_fragment_shader, shader.data(), SHADER_PROGRAM_NAME))
throw shader_compilation_failed_exception("Failed to compile melonDS DS shaders.");
bool shaderCompiled = melonDS::OpenGL::CompileVertexFragmentProgram(
_screenProgram,
embedded_melondsds_vertex_shader,
embedded_melondsds_fragment_shader,
SHADER_PROGRAM_NAME,
{
{"vPosition", 0},
{"vTexcoord", 1},
},
{
{"oColor", 0},
}
);
if (!shaderCompiled)
throw shader_compilation_failed_exception("Failed to compile and link melonDS DS screen shader program.");
if (_openGlDebugAvailable) {
glObjectLabel(GL_SHADER, shader[0], -1, "melonDS DS Vertex Shader");
glObjectLabel(GL_SHADER, shader[1], -1, "melonDS DS Fragment Shader");
glObjectLabel(GL_PROGRAM, shader[2], -1, SHADER_PROGRAM_NAME);
glObjectLabel(GL_PROGRAM, _screenProgram, -1, SHADER_PROGRAM_NAME);
}
glBindAttribLocation(shader[2], 0, "vPosition");
glBindAttribLocation(shader[2], 1, "vTexcoord");
glBindFragDataLocation(shader[2], 0, "oColor");
GLuint uConfigBlockIndex = glGetUniformBlockIndex(_screenProgram, "uConfig");
glUniformBlockBinding(_screenProgram, uConfigBlockIndex, 16); // TODO: Where does 16 come from? It's not a size.
if (!melonDS::OpenGL::LinkShaderProgram(shader.data()))
throw shader_compilation_failed_exception("Failed to link compiled shaders.");
GLuint uConfigBlockIndex = glGetUniformBlockIndex(shader[2], "uConfig");
glUniformBlockBinding(shader[2], uConfigBlockIndex, 16); // TODO: Where does 16 come from? It's not a size.
glUseProgram(shader[2]);
GLuint uni_id = glGetUniformLocation(shader[2], "ScreenTex");
glUseProgram(_screenProgram);
GLuint uni_id = glGetUniformLocation(_screenProgram, "ScreenTex");
glUniform1i(uni_id, 0);
memset(&GL_ShaderConfig, 0, sizeof(GL_ShaderConfig));
@ -387,7 +391,7 @@ void MelonDsDs::OpenGLRenderState::Render(
if (unibuf) memcpy(unibuf, &GL_ShaderConfig, sizeof(GL_ShaderConfig));
glUnmapBuffer(GL_UNIFORM_BUFFER);
melonDS::OpenGL::UseShaderProgram(shader.data());
glUseProgram(_screenProgram);
glDisable(GL_DEPTH_TEST);
glDisable(GL_STENCIL_TEST);
@ -397,7 +401,7 @@ void MelonDsDs::OpenGLRenderState::Render(
glActiveTexture(GL_TEXTURE0);
renderer.GetCompositor().BindOutputTexture(nds.GPU.FrontBuffer);
renderer.BindOutputTexture(nds.GPU.FrontBuffer);
// Set the filtering mode for the active texture
// For simplicity, we'll just use the same filter for both minification and magnification
@ -438,7 +442,7 @@ void MelonDsDs::OpenGLRenderState::ContextDestroyed() {
_openGlDebugAvailable = false;
_needsRefresh = false;
_contextInitialized = false;
shader = {};
_screenProgram = 0;
screen_framebuffer_texture = 0;
screen_vertices = {};
vertexCount = 0;

2
src/libretro/render/opengl.hpp
View File

@ -69,7 +69,7 @@ namespace MelonDsDs {
bool _openGlDebugAvailable = false;
bool _needsRefresh = true;
bool _contextInitialized = false;
std::array<GLuint, 3> shader {};
GLuint _screenProgram = 0;
GLuint screen_framebuffer_texture = 0;
std::array<Vertex, 18> screen_vertices {};
unsigned vertexCount = 0;

9
src/libretro/render/render.cpp
View File

@ -102,7 +102,9 @@ void MelonDsDs::RenderStateWrapper::UpdateRenderer(const CoreConfig& config, mel
softRender->SetThreaded(config.ThreadedSoftRenderer(), nds.GPU);
}
else {
nds.GPU.SetRenderer3D(std::make_unique<melonDS::SoftRenderer>(config.ThreadedSoftRenderer()));
auto renderer = std::make_unique<melonDS::SoftRenderer>();
renderer->SetThreaded(config.ThreadedSoftRenderer(), nds.GPU);
nds.GPU.SetRenderer3D(std::move(renderer));
}
return;
}
@ -118,7 +120,10 @@ void MelonDsDs::RenderStateWrapper::UpdateRenderer(const CoreConfig& config, mel
} else {
retro::set_warn_message("Failed to initialize OpenGL renderer, falling back to software mode.");
_renderState = std::make_unique<SoftwareRenderState>(config);
nds.GPU.SetRenderer3D(std::make_unique<melonDS::SoftRenderer>(config.ThreadedSoftRenderer()));
auto softwareRenderer = std::make_unique<melonDS::SoftRenderer>();
softwareRenderer->SetThreaded(config.ThreadedSoftRenderer(), nds.GPU);
nds.GPU.SetRenderer3D(std::move(softwareRenderer));
}
}
#endif