claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Config: Ignore the GL3 stuff on SDL builds.

Browse Source
This commit is contained in:
OBattler
2025-03-10 16:31:52 +01:00
parent bc5da980f9
commit c832729ee5
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/config.c
View File

@@ -77,9 +77,11 @@
#include <86box/snd_opl.h> #include <86box/snd_opl.h>
#include <86box/version.h> #include <86box/version.h>
#ifndef USE_SDL_UI
/* Deliberate to not make the 86box.h header kitchen-sink. */ /* Deliberate to not make the 86box.h header kitchen-sink. */
#include <86box/qt-glsl.h> #include <86box/qt-glsl.h>
extern char gl3_shader_file[MAX_USER_SHADERS][512]; extern char gl3_shader_file[MAX_USER_SHADERS][512];
#endif
static int cx; static int cx;
static int cy; static int cy;
@@ -1717,6 +1719,7 @@ load_other_peripherals(void)
ini_section_delete_var(cat, temp); ini_section_delete_var(cat, temp);
} }
#ifndef USE_SDL_UI
/* Load OpenGL 3.0 renderer options. */ /* Load OpenGL 3.0 renderer options. */
static void static void
load_gl3_shaders(void) load_gl3_shaders(void)
@@ -1756,6 +1759,7 @@ load_gl3_shaders(void)
} }
} }
} }
#endif
/* Load the specified or a default configuration file. */ /* Load the specified or a default configuration file. */
void void
@@ -1853,7 +1857,9 @@ config_load(void)
load_floppy_and_cdrom_drives(); /* Floppy and CD-ROM drives */ load_floppy_and_cdrom_drives(); /* Floppy and CD-ROM drives */
load_other_removable_devices(); /* Other removable devices */ load_other_removable_devices(); /* Other removable devices */
load_other_peripherals(); /* Other peripherals */ load_other_peripherals(); /* Other peripherals */
#ifndef USE_SDL_UI
load_gl3_shaders(); /* GL3 Shaders */ load_gl3_shaders(); /* GL3 Shaders */
#endif
/* Migrate renamed device configurations. */ /* Migrate renamed device configurations. */
c = ini_find_section(config, "MDA"); c = ini_find_section(config, "MDA");
@@ -2672,6 +2678,7 @@ save_other_peripherals(void)
ini_delete_section_if_empty(config, cat); ini_delete_section_if_empty(config, cat);
} }
#ifndef USE_SDL_UI
/* Save "GL3 Shaders" section. */ /* Save "GL3 Shaders" section. */
static void static void
save_gl3_shaders(void) save_gl3_shaders(void)
@@ -2703,6 +2710,7 @@ save_gl3_shaders(void)
ini_delete_section_if_empty(config, cat); ini_delete_section_if_empty(config, cat);
} }
#endif
/* Save "Hard Disks" section. */ /* Save "Hard Disks" section. */
static void static void
@@ -3059,7 +3067,9 @@ config_save(void)
save_floppy_and_cdrom_drives(); /* Floppy and CD-ROM drives */ save_floppy_and_cdrom_drives(); /* Floppy and CD-ROM drives */
save_other_removable_devices(); /* Other removable devices */ save_other_removable_devices(); /* Other removable devices */
save_other_peripherals(); /* Other peripherals */ save_other_peripherals(); /* Other peripherals */
#ifndef USE_SDL_UI
save_gl3_shaders(); /* GL3 Shaders */ save_gl3_shaders(); /* GL3 Shaders */
#endif
ini_write(config, cfg_path); ini_write(config, cfg_path);
} }