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

Merge branch 'master' into nyom

Browse source
This commit is contained in:
wheremyfoodat 2024-07-21 17:27:56 +03:00
commit ec754f5820
5 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/config.hpp
View file

@ -14,7 +14,7 @@ struct EmulatorConfig {
#endif
// For now, use specialized shaders by default on MacOS as M1 drivers are buggy when using the ubershader, and on Android since mobile GPUs are
// horrible On other platforms we default to ubershader + shadergen fallback for lights
// horrible. On other platforms we default to ubershader + shadergen fallback for lights
#if defined(__ANDROID__) || defined(__APPLE__)
static constexpr bool ubershaderDefault = false;
#else
@ -51,4 +51,4 @@ struct EmulatorConfig {
EmulatorConfig(const std::filesystem::path& path);
void load();
void save();
};
};

1
include/renderer_gl/renderer_gl.hpp
View file

@ -117,6 +117,7 @@ class RendererGL final : public Renderer {
// Note: The caller is responsible for deleting the currently bound FBO before calling this
void setFBO(uint handle) { screenFramebuffer.m_handle = handle; }
void resetStateManager() { gl.reset(); }
void clearShaderCache();
void initUbershader(OpenGL::Program& program);
#ifdef PANDA3DS_FRONTEND_QT