mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-25 03:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

(PS3) Set NO_GL_FF_VERTEX for PSGL-based builds

Browse Source
This commit is contained in:
TwinAphex51224 2012-09-25 04:07:36 +02:00
parent e42f515e11
commit accbb57e10
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/gl_common.h
View File

@ -262,7 +262,7 @@ extern PFNGLACTIVETEXTUREPROC pglActiveTexture;
#define NO_GL_READ_VIEWPORT #define NO_GL_READ_VIEWPORT
#endif #endif
#if defined(HAVE_OPENGL_MODERN) || defined(HAVE_OPENGLES2) #if defined(HAVE_OPENGL_MODERN) || defined(HAVE_OPENGLES2) || defined(HAVE_PSGL)
#define NO_GL_FF_VERTEX #define NO_GL_FF_VERTEX
#endif #endif

14
gfx/shader_cg.c
View File

@ -102,12 +102,10 @@ struct cg_program
CGprogram vprg; CGprogram vprg;
CGprogram fprg; CGprogram fprg;
#ifndef HAVE_PSGL
CGparameter tex; CGparameter tex;
CGparameter lut_tex; CGparameter lut_tex;
CGparameter color; CGparameter color;
CGparameter vertex; CGparameter vertex;
#endif
CGparameter vid_size_f; CGparameter vid_size_f;
CGparameter tex_size_f; CGparameter tex_size_f;
@ -168,13 +166,6 @@ bool gl_cg_set_mvp(const math_matrix *mat)
return false; return false;
} }
#ifdef HAVE_PSGL
bool gl_cg_set_coords(const struct gl_coords *coords)
{
(void)coords;
return false;
}
#else
#define SET_COORD(name, coords_name, len) do { \ #define SET_COORD(name, coords_name, len) do { \
if (prg[active_index].name) \ if (prg[active_index].name) \
{ \ { \
@ -196,7 +187,6 @@ bool gl_cg_set_coords(const struct gl_coords *coords)
return true; return true;
} }
#endif
#define set_param_2f(param, x, y) \ #define set_param_2f(param, x, y) \
if (param) cgGLSetParameter2f(param, x, y) if (param) cgGLSetParameter2f(param, x, y)
@ -1056,9 +1046,6 @@ end:
static void set_program_base_attrib(unsigned i) static void set_program_base_attrib(unsigned i)
{ {
#ifdef HAVE_PSGL
(void)i;
#else
CGparameter param = cgGetFirstParameter(prg[i].vprg, CG_PROGRAM); CGparameter param = cgGetFirstParameter(prg[i].vprg, CG_PROGRAM);
for (; param; param = cgGetNextParameter(param)) for (; param; param = cgGetNextParameter(param))
{ {
@ -1080,7 +1067,6 @@ static void set_program_base_attrib(unsigned i)
else if (strcmp(semantic, "TEXCOORD1") == 0) else if (strcmp(semantic, "TEXCOORD1") == 0)
prg[i].lut_tex = param; prg[i].lut_tex = param;
} }
#endif
} }
static void set_program_attributes(unsigned i) static void set_program_attributes(unsigned i)