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

GL: Add usingGLES to driverInfo struct (#694)

Browse source
This commit is contained in:
wheremyfoodat 2024-12-27 11:45:28 +02:00 • committed by GitHub
parent e8c0b7f9c5
commit 7c2918f3f7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/renderer_gl/gl_driver.hpp
View file

@ -4,6 +4,7 @@
// Stuff like whether specific extensions are supported, and potentially things like OpenGL context information // Stuff like whether specific extensions are supported, and potentially things like OpenGL context information
namespace OpenGL { namespace OpenGL {
struct Driver { struct Driver {
bool usingGLES = false;
bool supportsExtFbFetch = false; bool supportsExtFbFetch = false;
bool supportsArmFbFetch = false; bool supportsArmFbFetch = false;

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

@ -51,17 +51,16 @@ void RendererGL::reset() {
gl.useProgram(oldProgram); // Switch to old GL program gl.useProgram(oldProgram); // Switch to old GL program
} }
#ifdef USING_GLES
fragShaderGen.setTarget(PICA::ShaderGen::API::GLES, PICA::ShaderGen::Language::GLSL);
#endif
} }
void RendererGL::initGraphicsContextInternal() { void RendererGL::initGraphicsContextInternal() {
gl.reset(); gl.reset();
auto gl_resources = cmrc::RendererGL::get_filesystem(); #if defined(USING_GLES) || defined(__ANDROID__)
driverInfo.usingGLES = true;
#endif
auto gl_resources = cmrc::RendererGL::get_filesystem();
auto vertexShaderSource = gl_resources.open("opengl_vertex_shader.vert"); auto vertexShaderSource = gl_resources.open("opengl_vertex_shader.vert");
auto fragmentShaderSource = gl_resources.open("opengl_fragment_shader.frag"); auto fragmentShaderSource = gl_resources.open("opengl_fragment_shader.frag");
@ -191,6 +190,7 @@ void RendererGL::initGraphicsContextInternal() {
} }
reset(); reset();
fragShaderGen.setTarget(driverInfo.usingGLES ? PICA::ShaderGen::API::GLES : PICA::ShaderGen::API::GL, PICA::ShaderGen::Language::GLSL);
// Populate our driver info structure // Populate our driver info structure
driverInfo.supportsExtFbFetch = (GLAD_GL_EXT_shader_framebuffer_fetch != 0); driverInfo.supportsExtFbFetch = (GLAD_GL_EXT_shader_framebuffer_fetch != 0);
@ -850,9 +850,9 @@ OpenGL::Program& RendererGL::getSpecializedShader() {
PICA::FragmentConfig fsConfig(regs); PICA::FragmentConfig fsConfig(regs);
// If we're not on GLES, ignore the logic op configuration and don't generate redundant shaders for it, since we use hw logic ops // If we're not on GLES, ignore the logic op configuration and don't generate redundant shaders for it, since we use hw logic ops
#ifndef USING_GLES if (!driverInfo.usingGLES) {
fsConfig.outConfig.logicOpMode = PICA::LogicOpMode(0); fsConfig.outConfig.logicOpMode = PICA::LogicOpMode(0);
#endif }
OpenGL::Shader& fragShader = shaderCache.fragmentShaderCache[fsConfig]; OpenGL::Shader& fragShader = shaderCache.fragmentShaderCache[fsConfig];
if (!fragShader.exists()) { if (!fragShader.exists()) {
@ -1010,7 +1010,7 @@ bool RendererGL::prepareForDraw(ShaderUnit& shaderUnit, PICA::DrawAcceleration*
std::string picaShaderSource = PICA::ShaderGen::decompileShader( std::string picaShaderSource = PICA::ShaderGen::decompileShader(
shaderUnit.vs, *emulatorConfig, shaderUnit.vs.entrypoint, shaderUnit.vs, *emulatorConfig, shaderUnit.vs.entrypoint,
Helpers::isAndroid() ? PICA::ShaderGen::API::GLES : PICA::ShaderGen::API::GL, PICA::ShaderGen::Language::GLSL driverInfo.usingGLES ? PICA::ShaderGen::API::GLES : PICA::ShaderGen::API::GL, PICA::ShaderGen::Language::GLSL
); );
// Empty source means compilation error, if the source is not empty then we convert the recompiled PICA code into a valid shader and upload // Empty source means compilation error, if the source is not empty then we convert the recompiled PICA code into a valid shader and upload