Rename some files

This commit is contained in:
twinaphex 2018-11-24 00:30:46 +01:00
parent c1de2e5697
commit 03a8bc9875
41 changed files with 52 additions and 34 deletions

View File

@ -0,0 +1,6 @@
#ifndef _SHADERS_COMMON
#define _SHADERS_COMMON
#define CG(src) "" #src
#endif

View File

@ -0,0 +1,6 @@
#ifndef _SHADERS_COMMON
#define _SHADERS_COMMON
#include "../glsl_common.h"
#endif

View File

@ -14,11 +14,9 @@
"#endif\n"
#if defined(HAVE_OPENGLES)
#define CG(src) "" #src
#define GLSL(src) GLSL_DERIV_PREAMBLE() GLSL_PREAMBLE() #src
#define GLSL_330(src) "#version 330 es\n" GLSL_PREAMBLE() #src
#else
#define CG(src) "" #src
#define GLSL(src) "" GLSL_PREAMBLE() #src
#define GLSL_300(src) "#version 300 es\n" GLSL_PREAMBLE() #src
#define GLSL_330(src) "#version 330 core\n" GLSL_PREAMBLE() #src

View File

@ -0,0 +1,6 @@
#ifndef _SHADERS_COMMON
#define _SHADERS_COMMON
#include "../glsl_common.h"
#endif

View File

@ -39,8 +39,8 @@
#endif
#ifdef HAVE_SHADERPIPELINE
#include "../drivers/gl_shaders/pipeline_xmb_ribbon_simple.cg.h"
#include "../drivers/gl_shaders/pipeline_snow.cg.h"
#include "../drivers/gl_shaders/cg/pipeline_xmb_ribbon_simple.cg.h"
#include "../drivers/gl_shaders/cg/pipeline_snow.cg.h"
#endif
#include "../include/Cg/cg.h"
@ -132,7 +132,7 @@ struct uniform_cg
}
#include "../drivers/gl_shaders/opaque.cg.h"
#include "../drivers/gl_shaders/cg/opaque.cg.h"
static void gl_cg_set_uniform_parameter(
void *data,

View File

@ -105,37 +105,39 @@ static const char *glsl_prefixes[] = {
"ruby",
};
#include "../drivers/gl_shaders/modern_opaque.glsl.vert.h"
#include "../drivers/gl_shaders/modern_opaque.glsl.frag.h"
#include "../drivers/gl_shaders/core_opaque.glsl.vert.h"
#include "../drivers/gl_shaders/core_opaque.glsl.frag.h"
#include "../drivers/gl_shaders/legacy_opaque.glsl.vert.h"
#include "../drivers/gl_shaders/legacy_opaque.glsl.frag.h"
#include "../drivers/gl_shaders/modern_alpha_blend.glsl.vert.h"
#include "../drivers/gl_shaders/modern_alpha_blend.glsl.frag.h"
#include "../drivers/gl_shaders/core_alpha_blend.glsl.vert.h"
#include "../drivers/gl_shaders/core_alpha_blend.glsl.frag.h"
#include "../drivers/gl_shaders/glsl/vert/modern_opaque.glsl.vert.h"
#include "../drivers/gl_shaders/glsl/vert/core_opaque.glsl.vert.h"
#include "../drivers/gl_shaders/glsl/vert/legacy_opaque.glsl.vert.h"
#include "../drivers/gl_shaders/glsl/vert/modern_alpha_blend.glsl.vert.h"
#include "../drivers/gl_shaders/glsl/vert/core_alpha_blend.glsl.vert.h"
#include "../drivers/gl_shaders/glsl/frag/modern_opaque.glsl.frag.h"
#include "../drivers/gl_shaders/glsl/frag/core_opaque.glsl.frag.h"
#include "../drivers/gl_shaders/glsl/frag/legacy_opaque.glsl.frag.h"
#include "../drivers/gl_shaders/glsl/frag/modern_alpha_blend.glsl.frag.h"
#include "../drivers/gl_shaders/glsl/frag/core_alpha_blend.glsl.frag.h"
#ifdef HAVE_SHADERPIPELINE
#include "../drivers/gl_shaders/core_pipeline_snow.glsl.frag.h"
#include "../drivers/gl_shaders/core_pipeline_snow_simple.glsl.frag.h"
#include "../drivers/gl_shaders/core_pipeline_xmb_ribbon.glsl.frag.h"
#include "../drivers/gl_shaders/core_pipeline_xmb_ribbon_simple.glsl.frag.h"
#include "../drivers/gl_shaders/core_pipeline_bokeh.glsl.frag.h"
#include "../drivers/gl_shaders/core_pipeline_snowflake.glsl.frag.h"
#include "../drivers/gl_shaders/legacy_pipeline_xmb_ribbon_simple.glsl.vert.h"
#include "../drivers/gl_shaders/modern_pipeline_xmb_ribbon_simple.glsl.vert.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.vert.h"
#include "../drivers/gl_shaders/pipeline_snow_core.glsl.vert.h"
#include "../drivers/gl_shaders/pipeline_snow_simple.glsl.frag.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/modern_pipeline_xmb_ribbon.glsl.vert.h"
#include "../drivers/gl_shaders/pipeline_xmb_ribbon.glsl.frag.h"
#include "../drivers/gl_shaders/pipeline_bokeh.glsl.frag.h"
#include "../drivers/gl_shaders/pipeline_snowflake.glsl.frag.h"
#include "../drivers/gl_shaders/glsl/vert/legacy_pipeline_xmb_ribbon_simple.glsl.vert.h"
#include "../drivers/gl_shaders/glsl/vert/modern_pipeline_xmb_ribbon_simple.glsl.vert.h"
#include "../drivers/gl_shaders/glsl/vert/pipeline_snow.glsl.vert.h"
#include "../drivers/gl_shaders/glsl/vert/pipeline_snow_core.glsl.vert.h"
#include "../drivers/gl_shaders/glsl/vert/legacy_pipeline_snow.glsl.vert.h"
#include "../drivers/gl_shaders/glsl/vert/legacy_pipeline_xmb_ribbon.glsl.vert.h"
#include "../drivers/gl_shaders/glsl/vert/modern_pipeline_xmb_ribbon.glsl.vert.h"
#include "../drivers/gl_shaders/glsl/frag/core_pipeline_snow.glsl.frag.h"
#include "../drivers/gl_shaders/glsl/frag/core_pipeline_snow_simple.glsl.frag.h"
#include "../drivers/gl_shaders/glsl/frag/core_pipeline_xmb_ribbon.glsl.frag.h"
#include "../drivers/gl_shaders/glsl/frag/core_pipeline_xmb_ribbon_simple.glsl.frag.h"
#include "../drivers/gl_shaders/glsl/frag/core_pipeline_bokeh.glsl.frag.h"
#include "../drivers/gl_shaders/glsl/frag/core_pipeline_snowflake.glsl.frag.h"
#include "../drivers/gl_shaders/glsl/frag/pipeline_xmb_ribbon_simple.glsl.frag.h"
#include "../drivers/gl_shaders/glsl/frag/pipeline_snow.glsl.frag.h"
#include "../drivers/gl_shaders/glsl/frag/pipeline_snow_simple.glsl.frag.h"
#include "../drivers/gl_shaders/glsl/frag/pipeline_xmb_ribbon.glsl.frag.h"
#include "../drivers/gl_shaders/glsl/frag/pipeline_bokeh.glsl.frag.h"
#include "../drivers/gl_shaders/glsl/frag/pipeline_snowflake.glsl.frag.h"
#endif
typedef struct glsl_shader_data