CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-04 10:36:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

enable standard derivatives extension for GLES, adds support for complex XMB ribbon

Browse Source
This commit is contained in:
Brad Parker 2016-12-06 19:45:49 -05:00
parent 12294c96aa
commit 32a3026654
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/SPIRV-Cross vendored

@ -1 +1 @@
Subproject commit b9600aa8d3d1ff4c412d316fcd56c0951addcc33 Subproject commit cc207e32c8668bfe5a5cc514394e7df8f020ecf6

2
deps/glslang/glslang vendored

@ -1 +1 @@
Subproject commit 2eb0986f10392a4c2365869b17b59ad79226c440 Subproject commit ec2e27adf86a911c5af6c676a539166b5674a09d

3
gfx/drivers/gl_shaders/shaders_common.h
View File

@ -3,7 +3,8 @@
#if defined(HAVE_OPENGLES) #if defined(HAVE_OPENGLES)
#define CG(src) "" #src #define CG(src) "" #src
#define GLSL(src) "#ifdef GL_ES\n" \ #define GLSL(src) "#extension GL_OES_standard_derivatives : enable\n" \
"#ifdef GL_ES\n" \
" #ifdef GL_FRAGMENT_PRECISION_HIGH\n" \ " #ifdef GL_FRAGMENT_PRECISION_HIGH\n" \
" precision highp float;\n" \ " precision highp float;\n" \
" #else\n" \ " #else\n" \

7
gfx/drivers_shader/shader_glsl.c
View File

@ -125,13 +125,11 @@ static const char *glsl_prefixes[] = {
#include "../drivers/gl_shaders/pipeline_xmb_ribbon_simple.glsl.frag.h" #include "../drivers/gl_shaders/pipeline_xmb_ribbon_simple.glsl.frag.h"
#include "../drivers/gl_shaders/pipeline_snow.glsl.frag.h" #include "../drivers/gl_shaders/pipeline_snow.glsl.frag.h"
#include "../drivers/gl_shaders/pipeline_snow_simple.glsl.frag.h" #include "../drivers/gl_shaders/pipeline_snow_simple.glsl.frag.h"
#if !defined(HAVE_OPENGLES)
#include "../drivers/gl_shaders/legacy_pipeline_snow.glsl.vert.h" #include "../drivers/gl_shaders/legacy_pipeline_snow.glsl.vert.h"
#include "../drivers/gl_shaders/legacy_pipeline_xmb_ribbon.glsl.vert.h" #include "../drivers/gl_shaders/legacy_pipeline_xmb_ribbon.glsl.vert.h"
#include "../drivers/gl_shaders/modern_pipeline_xmb_ribbon.glsl.vert.h" #include "../drivers/gl_shaders/modern_pipeline_xmb_ribbon.glsl.vert.h"
#include "../drivers/gl_shaders/pipeline_xmb_ribbon.glsl.frag.h" #include "../drivers/gl_shaders/pipeline_xmb_ribbon.glsl.frag.h"
#endif #endif
#endif
typedef struct glsl_shader_data typedef struct glsl_shader_data
{ {
@ -934,13 +932,8 @@ static void *gl_glsl_init(void *data, const char *path)
} }
#ifdef HAVE_SHADERPIPELINE #ifdef HAVE_SHADERPIPELINE
#if defined(HAVE_OPENGLES)
shader_prog_info.vertex = stock_vertex_xmb_ribbon_simple_legacy;
shader_prog_info.fragment = stock_fragment_xmb_ribbon_simple;
#else
shader_prog_info.vertex = glsl_core ? stock_vertex_xmb_ribbon_modern : stock_vertex_xmb_ribbon_legacy; shader_prog_info.vertex = glsl_core ? stock_vertex_xmb_ribbon_modern : stock_vertex_xmb_ribbon_legacy;
shader_prog_info.fragment = stock_fragment_xmb; shader_prog_info.fragment = stock_fragment_xmb;
#endif
shader_prog_info.is_file = false; shader_prog_info.is_file = false;
gl_glsl_compile_program( gl_glsl_compile_program(