mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move shader files to gfx/shader/

Browse Source
This commit is contained in:
twinaphex 2014-10-02 00:45:11 +02:00
parent 2afcb61f37
commit ca12482af0
24 changed files with 60 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.common
View File

@ -117,8 +117,8 @@ OBJ += frontend/frontend.o \
conf/config_file_userdata.o \ conf/config_file_userdata.o \
screenshot.o \ screenshot.o \
gfx/scaler/scaler.o \ gfx/scaler/scaler.o \
gfx/shader_common.o \ gfx/shader/shader_common.o \
gfx/shader_parse.o \ gfx/shader/shader_parse.o \
gfx/scaler/pixconv.o \ gfx/scaler/pixconv.o \
gfx/scaler/scaler_int.o \ gfx/scaler/scaler_int.o \
gfx/scaler/scaler_filter.o \ gfx/scaler/scaler_filter.o \
@ -413,7 +413,7 @@ ifeq ($(HAVE_OPENGL), 1)
endif endif
endif endif
OBJ += gfx/shader_glsl.o OBJ += gfx/shader/shader_glsl.o
DEFINES += -DHAVE_GLSL DEFINES += -DHAVE_GLSL
endif endif
@ -472,7 +472,7 @@ endif
ifeq ($(HAVE_CG), 1) ifeq ($(HAVE_CG), 1)
DEFINES += -DHAVE_CG DEFINES += -DHAVE_CG
OBJ += gfx/shader_cg.o OBJ += gfx/shader/shader_cg.o
LIBS += $(CG_LIBS) LIBS += $(CG_LIBS)
endif endif

2
driver.h
View File

@ -27,7 +27,7 @@
#include "gfx/scaler/scaler.h" #include "gfx/scaler/scaler.h"
#include "gfx/image/image.h" #include "gfx/image/image.h"
#include "gfx/filters/softfilter.h" #include "gfx/filters/softfilter.h"
#include "gfx/shader_parse.h" #include "gfx/shader/shader_parse.h"
#include "audio/dsp_filter.h" #include "audio/dsp_filter.h"
#include "input/overlay.h" #include "input/overlay.h"
#include "frontend/frontend_context.h" #include "frontend/frontend_context.h"

4
frontend/menu/disp/lakka.c
View File

@ -29,12 +29,12 @@
#include "../../../general.h" #include "../../../general.h"
#include "../../../gfx/gfx_common.h" #include "../../../gfx/gfx_common.h"
#include "../../../gfx/gl_common.h" #include "../../../gfx/gl_common.h"
#include "../../../gfx/shader_common.h" #include "../../../gfx/shader/shader_common.h"
#include "../../../config.def.h" #include "../../../config.def.h"
#include "../../../file.h" #include "../../../file.h"
#include "../../../dynamic.h" #include "../../../dynamic.h"
#include "../../../compat/posix_string.h" #include "../../../compat/posix_string.h"
#include "../../../gfx/shader_parse.h" #include "../../../gfx/shader/shader_parse.h"
#include "../../../performance.h" #include "../../../performance.h"
#include "../../../input/input_common.h" #include "../../../input/input_common.h"

2
frontend/menu/menu_common.h
View File

@ -31,7 +31,7 @@
#include "../../input/input_common.h" #include "../../input/input_common.h"
#include "../../input/keyboard_line.h" #include "../../input/keyboard_line.h"
#include "../../performance.h" #include "../../performance.h"
#include "../../gfx/shader_common.h" #include "../../gfx/shader/shader_common.h"
#ifdef HAVE_RGUI #ifdef HAVE_RGUI
#define MENU_TEXTURE_FULLSCREEN false #define MENU_TEXTURE_FULLSCREEN false

2
frontend/menu/menu_shader.c
View File

@ -14,7 +14,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../../gfx/shader_common.h" #include "../../gfx/shader/shader_common.h"
#include "menu_action.h" #include "menu_action.h"
#include "menu_common.h" #include "menu_common.h"
#include "menu_entries.h" #include "menu_entries.h"

2
frontend/menu/menu_shader.h
View File

@ -21,7 +21,7 @@
#define HAVE_SHADER_MANAGER #define HAVE_SHADER_MANAGER
#endif #endif
#include "../../gfx/shader_parse.h" #include "../../gfx/shader/shader_parse.h"
void menu_shader_manager_init(void *data); void menu_shader_manager_init(void *data);

4
gfx/d3d/d3d.cpp
View File

@ -42,14 +42,14 @@
#endif #endif
#ifdef HAVE_HLSL #ifdef HAVE_HLSL
#include "../../gfx/shader_hlsl.h" #include "../../gfx/shader/shader_hlsl.h"
#endif #endif
#include "d3d_defines.h" #include "d3d_defines.h"
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL) #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL)
#ifdef HAVE_HLSL #ifdef HAVE_HLSL
#include "../shader_hlsl.h" #include "../shader/shader_hlsl.h"
#endif #endif
#endif #endif

4
gfx/d3d/d3d.hpp
View File

@ -43,8 +43,8 @@
#include "../../driver.h" #include "../../driver.h"
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL) #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL)
#include "../shader_parse.h" #include "../shader/shader_parse.h"
#include "../shader_common.h" #include "../shader/shader_common.h"
#endif #endif
#include "../fonts/d3d_font.h" #include "../fonts/d3d_font.h"

2
gfx/d3d/render_chain.hpp
View File

@ -18,7 +18,7 @@
#include "d3d.hpp" #include "d3d.hpp"
#include "../state_tracker.h" #include "../state_tracker.h"
#include "../shader_parse.h" #include "../shader/shader_parse.h"
struct Vertex struct Vertex
{ {

2
gfx/fonts/gl_raster_font.c
View File

@ -16,7 +16,7 @@
#include "../gfx_common.h" #include "../gfx_common.h"
#include "../gl_common.h" #include "../gl_common.h"
#include "../shader_common.h" #include "../shader/shader_common.h"
#define emit(c, vx, vy) do { \ #define emit(c, vx, vy) do { \
font_vertex[ 2 * (6 * i + c) + 0] = (x + (delta_x + off_x + vx * width) * scale) * inv_win_width; \ font_vertex[ 2 * (6 * i + c) + 0] = (x + (delta_x + off_x + vx * width) * scale) * inv_win_width; \

6
gfx/gl.c
View File

@ -42,14 +42,14 @@
#include "../compat/strl.h" #include "../compat/strl.h"
#ifdef HAVE_CG #ifdef HAVE_CG
#include "shader_cg.h" #include "shader/shader_cg.h"
#endif #endif
#ifdef HAVE_GLSL #ifdef HAVE_GLSL
#include "shader_glsl.h" #include "shader/shader_glsl.h"
#endif #endif
#include "shader_common.h" #include "shader/shader_common.h"
/* Used for the last pass when rendering to the back buffer. */ /* Used for the last pass when rendering to the back buffer. */
static const GLfloat vertexes_flipped[] = { static const GLfloat vertexes_flipped[] = {

2
gfx/gl_common.h
View File

@ -22,7 +22,7 @@
#include "gfx_context.h" #include "gfx_context.h"
#include "scaler/scaler.h" #include "scaler/scaler.h"
#include "fonts/gl_font.h" #include "fonts/gl_font.h"
#include "shader_parse.h" #include "shader/shader_parse.h"
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "../config.h" #include "../config.h"

14
gfx/shader_cg.c → gfx/shader/shader_cg.c
View File

@ -22,15 +22,15 @@
#include "shader_common.h" #include "shader_common.h"
#include <Cg/cg.h> #include <Cg/cg.h>
#include <Cg/cgGL.h> #include <Cg/cgGL.h>
#include "../general.h" #include "../../general.h"
#include <string.h> #include <string.h>
#include "../compat/strl.h" #include "../../compat/strl.h"
#include "../conf/config_file.h" #include "../../conf/config_file.h"
#include "../dynamic.h" #include "../../dynamic.h"
#include "../compat/posix_string.h" #include "../../compat/posix_string.h"
#include "../file.h" #include "../../file.h"
#include "state_tracker.h" #include "../state_tracker.h"
#if 0 #if 0
#define RARCH_CG_DEBUG #define RARCH_CG_DEBUG

0
gfx/shader_cg.h → gfx/shader/shader_cg.h
View File

2
gfx/shader_common.c → gfx/shader/shader_common.c
View File

@ -14,7 +14,7 @@
*/ */
#include "shader_common.h" #include "shader_common.h"
#include "../retroarch_logger.h" #include "../../retroarch_logger.h"
#ifdef HAVE_OPENGL #ifdef HAVE_OPENGL
void gl_load_texture_data(GLuint obj, const struct texture_image *img, void gl_load_texture_data(GLuint obj, const struct texture_image *img,

10
gfx/shader_common.h → gfx/shader/shader_common.h
View File

@ -16,18 +16,18 @@
#ifndef SHADER_COMMON_H__ #ifndef SHADER_COMMON_H__
#define SHADER_COMMON_H__ #define SHADER_COMMON_H__
#include "../boolean.h" #include "../../boolean.h"
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "../config.h" #include "../../config.h"
#endif #endif
#ifdef HAVE_OPENGL #ifdef HAVE_OPENGL
#include "gl_common.h" #include "../gl_common.h"
#endif #endif
#include "gfx_context.h" #include "../gfx_context.h"
#include "math/matrix.h" #include "../math/matrix.h"
#if defined(_XBOX360) #if defined(_XBOX360)
#define DEFAULT_SHADER_TYPE RARCH_SHADER_HLSL #define DEFAULT_SHADER_TYPE RARCH_SHADER_HLSL

22
gfx/shader_glsl.c → gfx/shader/shader_glsl.c
View File

@ -13,26 +13,26 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../boolean.h" #include "../../boolean.h"
#include <string.h> #include <string.h>
#include "../general.h" #include "../../general.h"
#include "shader_glsl.h" #include "shader_glsl.h"
#include "../compat/strl.h" #include "../../compat/strl.h"
#include "../compat/posix_string.h" #include "../../compat/posix_string.h"
#include "state_tracker.h" #include "../state_tracker.h"
#include "../dynamic.h" #include "../../dynamic.h"
#include "../file.h" #include "../../file.h"
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "../config.h" #include "../../config.h"
#endif #endif
#include "glsym/glsym.h" #include "../glsym/glsym.h"
#include "gfx_context.h" #include "../gfx_context.h"
#include <stdlib.h> #include <stdlib.h>
#include "gl_common.h" #include "../gl_common.h"
#ifdef HAVE_OPENGLES2 #ifdef HAVE_OPENGLES2
#define BORDER_FUNC GL_CLAMP_TO_EDGE #define BORDER_FUNC GL_CLAMP_TO_EDGE

2
gfx/shader_glsl.h → gfx/shader/shader_glsl.h
View File

@ -17,7 +17,7 @@
#ifndef __RARCH_GLSL_H #ifndef __RARCH_GLSL_H
#define __RARCH_GLSL_H #define __RARCH_GLSL_H
#include "../boolean.h" #include "../../boolean.h"
#include "shader_common.h" #include "shader_common.h"
void gl_glsl_set_get_proc_address(gfx_ctx_proc_t (*proc)(const char*)); void gl_glsl_set_get_proc_address(gfx_ctx_proc_t (*proc)(const char*));

2
gfx/shader_hlsl.c → gfx/shader/shader_hlsl.c
View File

@ -16,7 +16,7 @@
#include "shader_hlsl.h" #include "shader_hlsl.h"
#include "shader_parse.h" #include "shader_parse.h"
#include "d3d/d3d.hpp" #include "../d3d/d3d.hpp"
static const char *stock_hlsl_program = static const char *stock_hlsl_program =
"void main_vertex\n" "void main_vertex\n"

0
gfx/shader_hlsl.h → gfx/shader/shader_hlsl.h
View File

10
gfx/shader_parse.c → gfx/shader/shader_parse.c
View File

@ -16,11 +16,11 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "shader_parse.h" #include "shader_parse.h"
#include "../compat/posix_string.h" #include "../../compat/posix_string.h"
#include "../msvc/msvc_compat.h" #include "../../msvc/msvc_compat.h"
#include "../file.h" #include "../../file.h"
#include "../compat/strl.h" #include "../../compat/strl.h"
#include "../general.h" #include "../../general.h"
#define print_buf(buf, ...) snprintf(buf, sizeof(buf), __VA_ARGS__) #define print_buf(buf, ...) snprintf(buf, sizeof(buf), __VA_ARGS__)

8
gfx/shader_parse.h → gfx/shader/shader_parse.h
View File

@ -16,10 +16,10 @@
#ifndef SHADER_PARSE_H #ifndef SHADER_PARSE_H
#define SHADER_PARSE_H #define SHADER_PARSE_H
#include "../boolean.h" #include "../../boolean.h"
#include "state_tracker.h" #include "../state_tracker.h"
#include "../conf/config_file.h" #include "../../conf/config_file.h"
#include "../miscellaneous.h" #include "../../miscellaneous.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

10
griffin/griffin.c
View File

@ -146,19 +146,19 @@ VIDEO CONTEXT
VIDEO SHADERS VIDEO SHADERS
============================================================ */ ============================================================ */
#ifdef HAVE_SHADERS #ifdef HAVE_SHADERS
#include "../gfx/shader_common.c" #include "../gfx/shader/shader_common.c"
#include "../gfx/shader_parse.c" #include "../gfx/shader/shader_parse.c"
#ifdef HAVE_CG #ifdef HAVE_CG
#include "../gfx/shader_cg.c" #include "../gfx/shader/shader_cg.c"
#endif #endif
#ifdef HAVE_HLSL #ifdef HAVE_HLSL
#include "../gfx/shader_hlsl.c" #include "../gfx/shader/shader_hlsl.c"
#endif #endif
#ifdef HAVE_GLSL #ifdef HAVE_GLSL
#include "../gfx/shader_glsl.c" #include "../gfx/shader/shader_glsl.c"
#endif #endif
#endif #endif

1
settings_data.c
View File

@ -16,7 +16,6 @@
#include "settings_data.h" #include "settings_data.h"
#include "file_path.h" #include "file_path.h"
#include "gfx/shader_common.h"
#include "input/input_common.h" #include "input/input_common.h"
#include "config.def.h" #include "config.def.h"
#include "retroarch_logger.h" #include "retroarch_logger.h"