empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename gles -> glselector.

Browse source 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
Andrea Odetti 2021-10-19 09:57:20 +01:00
parent b4f6d64034
commit 3f6116431f
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/frontends/sdl/CMakeLists.txt
View file

@ -83,7 +83,7 @@ target_sources(sa2 PRIVATE
imgui/settingshelper.h
imgui/sdlsettings.h
imgui/imconfig.h
imgui/gles.h
imgui/glselector.h
${IMGUI_PATH}/imgui.h
${IMGUI_PATH}/imgui.cpp

16
source/frontends/sdl/imgui/gles.h → source/frontends/sdl/imgui/glselector.h
View file

@ -7,6 +7,8 @@
// "Supported versions are: 1.00 ES"
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#define SA2_CONTEXT_FLAGS 0
#define SA2_CONTEXT_PROFILE_MASK SDL_GL_CONTEXT_PROFILE_ES
#define SA2_CONTEXT_MAJOR_VERSION 2
@ -16,9 +18,6 @@
#define SA2_IMAGE_FORMAT_INTERNAL GL_BGRA_EXT
#define SA2_IMAGE_FORMAT GL_BGRA_EXT
// this is used in all cases for GL_BGRA_EXT
#include <GLES2/gl2ext.h>
#elif defined(IMGUI_IMPL_OPENGL_ES3)
// Pi4 with Fake KMS
@ -29,7 +28,11 @@
// "OpenGL ES 3.1 Mesa 20.2.6"
// "Supported versions are: 1.00 ES, 3.00 ES, and 3.10 ES"
// "310 es" is accepted on a Pi4, but the imgui shaders do not compile
#include <GLES3/gl3.h>
#include <GLES2/gl2ext.h>
#define SA2_CONTEXT_FLAGS 0
#define SA2_CONTEXT_PROFILE_MASK SDL_GL_CONTEXT_PROFILE_ES
#define SA2_CONTEXT_MAJOR_VERSION 3
@ -39,13 +42,10 @@
#define SA2_IMAGE_FORMAT_INTERNAL GL_BGRA_EXT
#define SA2_IMAGE_FORMAT GL_BGRA_EXT
// "310 es" is accepted on a Pi4, but the imgui shaders do not compile
// this is used in all cases for GL_BGRA_EXT
#include <GLES2/gl2ext.h>
#elif defined(__APPLE__)
#include <SDL_opengl.h>
#define SA2_CONTEXT_FLAGS SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG
#define SA2_CONTEXT_PROFILE_MASK SDL_GL_CONTEXT_PROFILE_CORE
#define SA2_CONTEXT_MAJOR_VERSION 3
@ -57,6 +57,7 @@
#else
#include <SDL_opengl.h>
#define SA2_CONTEXT_FLAGS 0
#define SA2_CONTEXT_PROFILE_MASK SDL_GL_CONTEXT_PROFILE_CORE
#define SA2_CONTEXT_MAJOR_VERSION 3
@ -67,7 +68,6 @@
#endif
#include "imgui.h"
#include "imgui_impl_sdl.h"
#include "imgui_impl_opengl3.h"

2
source/frontends/sdl/imgui/image.h
View file

@ -1,7 +1,7 @@
#pragma once
#include <cstddef>
#include "frontends/sdl/imgui/gles.h"
#include "frontends/sdl/imgui/glselector.h"
namespace sa2
{

2
source/frontends/sdl/imgui/sdlimguiframe.h
View file

@ -2,7 +2,7 @@
#include "frontends/sdl/sdlframe.h"
#include "frontends/sdl/imgui/sdlsettings.h"
#include "frontends/sdl/imgui/gles.h"
#include "frontends/sdl/imgui/glselector.h"
namespace common2
{

2
source/frontends/sdl/imgui/sdlsettings.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "frontends/sdl/imgui/gles.h"
#include "frontends/sdl/imgui/glselector.h"
#include "frontends/sdl/sdirectsound.h"
#include "Debugger/Debug.h"
#include "Debugger/Debugger_Console.h"

2
source/frontends/sdl/imgui/settingshelper.cpp
View file

@ -8,7 +8,7 @@
#include "Tfe/tfe.h"
#include "frontends/sdl/imgui/settingshelper.h"
#include "frontends/sdl/imgui/gles.h"
#include "frontends/sdl/imgui/glselector.h"
#include "imgui_internal.h"