Skip to content

Commit 42aa9fd

Browse files
committed
move DEFAULT_SHADER_TYPE to gl2/gl3.c
1 parent 276e4bc commit 42aa9fd

3 files changed

Lines changed: 20 additions & 16 deletions

File tree

gfx/drivers/gl2.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,16 @@
9292
#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367
9393
#endif
9494

95+
#if defined(HAVE_OPENGLES2)
96+
#define GL2_DEFAULT_SHADER_TYPE RARCH_SHADER_GLSL
97+
#elif defined(HAVE_GLSL)
98+
#define GL2_DEFAULT_SHADER_TYPE RARCH_SHADER_GLSL
99+
#elif defined(HAVE_CG)
100+
#define GL2_DEFAULT_SHADER_TYPE RARCH_SHADER_CG
101+
#else
102+
#define GL2_DEFAULT_SHADER_TYPE RARCH_SHADER_NONE
103+
#endif
104+
95105
#if defined(HAVE_PSGL)
96106
#define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER_OES
97107
#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
29742984

29752985
if (type != RARCH_SHADER_CG && type != RARCH_SHADER_GLSL)
29762986
{
2977-
type = DEFAULT_SHADER_TYPE;
2987+
type = GL2_DEFAULT_SHADER_TYPE;
29782988

29792989
if (type != RARCH_SHADER_CG && type != RARCH_SHADER_GLSL)
29802990
type = RARCH_SHADER_GLSL;

gfx/drivers/gl3.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,14 @@
6969
coords[5] = yamt; \
7070
coords[7] = yamt
7171

72+
#if defined(HAVE_SLANG)
73+
#define GL3_DEFAULT_SHADER_TYPE RARCH_SHADER_SLANG
74+
#elif defined(HAVE_GLSL)
75+
#define GL3_DEFAULT_SHADER_TYPE RARCH_SHADER_GLSL
76+
#else
77+
#define GL3_DEFAULT_SHADER_TYPE RARCH_SHADER_NONE
78+
#endif
79+
7280
struct gl3_streamed_texture
7381
{
7482
GLuint tex;
@@ -2142,7 +2150,7 @@ static enum rarch_shader_type gl3_get_fallback_shader_type(enum rarch_shader_typ
21422150
* the same as an unknown type and fall back to slang. */
21432151
if (type != RARCH_SHADER_GLSL && type != RARCH_SHADER_SLANG)
21442152
{
2145-
type = DEFAULT_SHADER_TYPE;
2153+
type = GL3_DEFAULT_SHADER_TYPE;
21462154

21472155
if (type != RARCH_SHADER_GLSL && type != RARCH_SHADER_SLANG)
21482156
type = RARCH_SHADER_SLANG;

gfx/video_driver.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,6 @@
6363
#define VIDEO_SHADER_STOCK_NOBLEND (GFX_MAX_SHADERS - 10)
6464
#define VIDEO_SHADER_STOCK_BLEND_HDR (GFX_MAX_SHADERS - 11)
6565

66-
#if defined(_XBOX360)
67-
#define DEFAULT_SHADER_TYPE RARCH_SHADER_HLSL
68-
#elif defined(HAVE_OPENGLES2)
69-
#define DEFAULT_SHADER_TYPE RARCH_SHADER_GLSL
70-
#elif defined(HAVE_SLANG)
71-
#define DEFAULT_SHADER_TYPE RARCH_SHADER_SLANG
72-
#elif defined(HAVE_GLSL)
73-
#define DEFAULT_SHADER_TYPE RARCH_SHADER_GLSL
74-
#elif defined(HAVE_CG)
75-
#define DEFAULT_SHADER_TYPE RARCH_SHADER_CG
76-
#else
77-
#define DEFAULT_SHADER_TYPE RARCH_SHADER_NONE
78-
#endif
79-
8066
#ifndef MAX_EGLIMAGE_TEXTURES
8167
#define MAX_EGLIMAGE_TEXTURES 32
8268
#endif

0 commit comments

Comments
 (0)