libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-10-08 15:13:24 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Rename shader_common to shader_context

Browse Source
This commit is contained in:
twinaphex 2014-10-02 13:21:45 +02:00
parent 28ab662668
commit 6b054da299
16 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.common
View File

@ -118,7 +118,7 @@ OBJ += frontend/frontend.o \
screenshot.o \ screenshot.o \
gfx/scaler/scaler.o \ gfx/scaler/scaler.o \
gfx/shader/shader_null.o \ gfx/shader/shader_null.o \
gfx/shader/shader_common.o \ gfx/shader/shader_context.o \
gfx/shader/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 \

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

@ -28,12 +28,11 @@
#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/shader_common.h" #include "../../../gfx/shader/shader_context.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/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/shader_common.h" #include "../../gfx/shader/shader_context.h"
#ifdef HAVE_RGUI #ifdef HAVE_RGUI
#define MENU_TEXTURE_FULLSCREEN false #define MENU_TEXTURE_FULLSCREEN false

3
frontend/menu/menu_shader.c
View File

@ -14,11 +14,10 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../../gfx/shader/shader_common.h" #include "menu_shader.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"
#include "menu_shader.h"
#include "../../settings_data.h" #include "../../settings_data.h"
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER

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/shader_parse.h" #include "../../gfx/shader/shader_context.h"
void menu_shader_manager_init(void *data); void menu_shader_manager_init(void *data);

3
gfx/d3d/d3d.hpp
View File

@ -43,8 +43,7 @@
#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/shader_parse.h" #include "../shader/shader_context.h"
#include "../shader/shader_common.h"
#endif #endif
#include "../fonts/d3d_font.h" #include "../fonts/d3d_font.h"

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/shader_common.h" #include "../shader/shader_context.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; \

2
gfx/gl.c
View File

@ -45,7 +45,7 @@
#include "shader/shader_glsl.h" #include "shader/shader_glsl.h"
#endif #endif
#include "shader/shader_common.h" #include "shader/shader_context.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[] = {

3
gfx/gl_common.h
View File

@ -22,8 +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/shader_common.h" #include "shader/shader_context.h"
#include "shader/shader_parse.h"
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "../config.h" #include "../config.h"

2
gfx/shader/shader_cg.c
View File

@ -23,7 +23,7 @@
#endif #endif
#include <stdint.h> #include <stdint.h>
#include "shader_common.h" #include "shader_context.h"
#include <Cg/cg.h> #include <Cg/cg.h>
#include <Cg/cgGL.h> #include <Cg/cgGL.h>
#include "../../general.h" #include "../../general.h"

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

@ -13,7 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "shader_common.h" #include "shader_context.h"
#include "../../retroarch_logger.h" #include "../../retroarch_logger.h"
#ifdef HAVE_OPENGL #ifdef HAVE_OPENGL

4
gfx/shader/shader_common.h → gfx/shader/shader_context.h
View File

@ -14,8 +14,8 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef SHADERS_COMMON_H__ #ifndef SHADER_CONTEXT_H__
#define SHADERS_COMMON_H__ #define SHADER_CONTEXT_H__
#include "../../boolean.h" #include "../../boolean.h"

2
gfx/shader/shader_glsl.h
View File

@ -18,7 +18,7 @@
#define __RARCH_GLSL_H #define __RARCH_GLSL_H
#include "../../boolean.h" #include "../../boolean.h"
#include "shader_common.h" #include "shader_context.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*));
void gl_glsl_set_context_type(bool core_profile, unsigned major, unsigned minor); void gl_glsl_set_context_type(bool core_profile, unsigned major, unsigned minor);

2
gfx/shader/shader_hlsl.h
View File

@ -18,7 +18,7 @@
#ifndef __RARCH_HLSL_H #ifndef __RARCH_HLSL_H
#define __RARCH_HLSL_H #define __RARCH_HLSL_H
#include "shader_common.h" #include "shader_context.h"
#include <stdint.h> #include <stdint.h>
void hlsl_set_proj_matrix(XMMATRIX rotation_value); void hlsl_set_proj_matrix(XMMATRIX rotation_value);

2
gfx/shader/shader_null.c
View File

@ -29,7 +29,7 @@
#endif #endif
#include "../gfx_context.h" #include "../gfx_context.h"
#include "shader_common.h" #include "shader_context.h"
#include <stdlib.h> #include <stdlib.h>
static void shader_null_deinit(void) { } static void shader_null_deinit(void) { }

2
griffin/griffin.c
View File

@ -146,7 +146,7 @@ VIDEO CONTEXT
VIDEO SHADERS VIDEO SHADERS
============================================================ */ ============================================================ */
#ifdef HAVE_SHADERS #ifdef HAVE_SHADERS
#include "../gfx/shader/shader_common.c" #include "../gfx/shader/shader_context.c"
#include "../gfx/shader/shader_parse.c" #include "../gfx/shader/shader_parse.c"
#include "../gfx/shader/shader_null.c" #include "../gfx/shader/shader_null.c"