ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add inclusion of gfx/shader_common.c to other Makefiles

This commit is contained in:
twinaphex 2014-05-08 21:49:18 +02:00
parent dc24e41d8b
commit 853179a2fb
5 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.emscripten
View File

@ -29,6 +29,7 @@ OBJ = frontend/platform/platform_emscripten.o \
input/overlay.o \ input/overlay.o \
fifo_buffer.o \ fifo_buffer.o \
gfx/scaler/scaler.o \ gfx/scaler/scaler.o \
gfx/shader_common.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 \

1
Makefile.win
View File

@ -34,6 +34,7 @@ OBJ = frontend/frontend.o \
media/rarch.o \ media/rarch.o \
gfx/context/win32_common.o \ gfx/context/win32_common.o \
gfx/scaler/scaler.o \ gfx/scaler/scaler.o \
gfx/shader_common.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 \

2
gfx/shader_common.c
View File

@ -24,7 +24,7 @@ void gl_load_texture_data(GLuint obj, const struct texture_image *img,
glBindTexture(GL_TEXTURE_2D, obj); glBindTexture(GL_TEXTURE_2D, obj);
#ifdef HAVE_OPENGLES2 #ifdef HAVE_OPENGLES2
GLenum wrap = GL_CLAMP_TO_EDGE; wrap = GL_CLAMP_TO_EDGE;
#endif #endif
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap);

11
griffin/griffin.c
View File

@ -18,6 +18,10 @@
#define HAVE_FILTERS_BUILTIN #define HAVE_FILTERS_BUILTIN
#endif #endif
#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL)
#define HAVE_SHADERS
#endif
#if defined(_XBOX) #if defined(_XBOX)
#include "../msvc/msvc_compat.h" #include "../msvc/msvc_compat.h"
#endif #endif
@ -141,9 +145,10 @@ VIDEO CONTEXT
/*============================================================ /*============================================================
VIDEO SHADERS VIDEO SHADERS
============================================================ */ ============================================================ */
#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) #include "../gfx/shader_common.c"
#ifdef HAVE_SHADERS
#include "../gfx/shader_parse.c" #include "../gfx/shader_parse.c"
#endif
#ifdef HAVE_CG #ifdef HAVE_CG
#include "../gfx/shader_cg.c" #include "../gfx/shader_cg.c"
@ -157,6 +162,8 @@ VIDEO SHADERS
#include "../gfx/shader_glsl.c" #include "../gfx/shader_glsl.c"
#endif #endif
#endif
/*============================================================ /*============================================================
VIDEO IMAGE VIDEO IMAGE
============================================================ */ ============================================================ */

2
msvc/msvc-2010/RetroArch-msvc2010.vcxproj
View File

@ -288,6 +288,8 @@
</ClCompile> </ClCompile>
<ClCompile Include="..\..\gfx\scaler\scaler.c"> <ClCompile Include="..\..\gfx\scaler\scaler.c">
</ClCompile> </ClCompile>
<ClCompile Include="..\..\gfx\shader_common.c">
</ClCompile>
<ClCompile Include="..\..\gfx\scaler\scaler_int.c"> <ClCompile Include="..\..\gfx\scaler\scaler_int.c">
</ClCompile> </ClCompile>
<ClCompile Include="..\..\gfx\state_tracker.c"> <ClCompile Include="..\..\gfx\state_tracker.c">