move DEFAULT_SHADER_TYPE to gl2/gl3.c

This commit is contained in:
U-DESKTOP-SPFP6AQ\twistedtechre committed 2026-05-01 12:03:02 +02:00
1 parent 276e4bce82
commit 42aa9fd60a
3 files changed
+20 -16

No files matched your search

+11 -1
View File
@@ -92,6 +92,16 @@
#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367
#endif
#if defined(HAVE_OPENGLES2)
#define GL2_DEFAULT_SHADER_TYPE RARCH_SHADER_GLSL
#elif defined(HAVE_GLSL)
#define GL2_DEFAULT_SHADER_TYPE RARCH_SHADER_GLSL
#elif defined(HAVE_CG)
#define GL2_DEFAULT_SHADER_TYPE RARCH_SHADER_CG
#else
#define GL2_DEFAULT_SHADER_TYPE RARCH_SHADER_NONE
#endif
#if defined(HAVE_PSGL)
#define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER_OES
#define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE_OES
@@ -2974,7 +2984,7 @@ static enum rarch_shader_type gl2_get_fallback_shader_type(enum rarch_shader_typ
if (type != RARCH_SHADER_CG && type != RARCH_SHADER_GLSL)
{
type = DEFAULT_SHADER_TYPE;
type = GL2_DEFAULT_SHADER_TYPE;
if (type != RARCH_SHADER_CG && type != RARCH_SHADER_GLSL)
type = RARCH_SHADER_GLSL;
+9 -1
View File
@@ -69,6 +69,14 @@
coords[5] = yamt; \
coords[7] = yamt
#if defined(HAVE_SLANG)
#define GL3_DEFAULT_SHADER_TYPE RARCH_SHADER_SLANG
#elif defined(HAVE_GLSL)
#define GL3_DEFAULT_SHADER_TYPE RARCH_SHADER_GLSL
#else
#define GL3_DEFAULT_SHADER_TYPE RARCH_SHADER_NONE
#endif
struct gl3_streamed_texture
{
GLuint tex;
@@ -2142,7 +2150,7 @@ static enum rarch_shader_type gl3_get_fallback_shader_type(enum rarch_shader_typ
* the same as an unknown type and fall back to slang. */
if (type != RARCH_SHADER_GLSL && type != RARCH_SHADER_SLANG)
{
type = DEFAULT_SHADER_TYPE;
type = GL3_DEFAULT_SHADER_TYPE;
if (type != RARCH_SHADER_GLSL && type != RARCH_SHADER_SLANG)
type = RARCH_SHADER_SLANG;
-14
View File
@@ -63,20 +63,6 @@
#define VIDEO_SHADER_STOCK_NOBLEND (GFX_MAX_SHADERS - 10)
#define VIDEO_SHADER_STOCK_BLEND_HDR (GFX_MAX_SHADERS - 11)
#if defined(_XBOX360)
#define DEFAULT_SHADER_TYPE RARCH_SHADER_HLSL
#elif defined(HAVE_OPENGLES2)
#define DEFAULT_SHADER_TYPE RARCH_SHADER_GLSL
#elif defined(HAVE_SLANG)
#define DEFAULT_SHADER_TYPE RARCH_SHADER_SLANG
#elif defined(HAVE_GLSL)
#define DEFAULT_SHADER_TYPE RARCH_SHADER_GLSL
#elif defined(HAVE_CG)
#define DEFAULT_SHADER_TYPE RARCH_SHADER_CG
#else
#define DEFAULT_SHADER_TYPE RARCH_SHADER_NONE
#endif
#ifndef MAX_EGLIMAGE_TEXTURES
#define MAX_EGLIMAGE_TEXTURES 32
#endif