mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-26 15:39:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Android) Build fix

Browse Source
This commit is contained in:
twinaphex 2013-04-07 04:17:44 +02:00
parent 4102d1cfb8
commit d4e8a3c682
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/gl.c
View File

@ -558,9 +558,9 @@ static void gl_create_fbo_textures(void *data)
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F,
gl->fbo_rect[i].width, gl->fbo_rect[i].height, gl->fbo_rect[i].width, gl->fbo_rect[i].height,
0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
#endif
} }
else else
#endif
{ {
glTexImage2D(GL_TEXTURE_2D, glTexImage2D(GL_TEXTURE_2D,
0, driver.gfx_use_rgba ? GL_RGBA : RARCH_GL_INTERNAL_FORMAT32, 0, driver.gfx_use_rgba ? GL_RGBA : RARCH_GL_INTERNAL_FORMAT32,

4
gfx/shader_parse.c
View File

@ -211,6 +211,10 @@ static bool shader_parse_imports(config_file_t *conf, struct gfx_shader *shader)
char *save; char *save;
const char *id = strtok_r(imports, ";", &save); const char *id = strtok_r(imports, ";", &save);
/* FIXME - unused variable and then redefined again in for loop? */
(void)id;
for (const char *id = strtok_r(imports, ";", &save); for (const char *id = strtok_r(imports, ";", &save);
id && shader->variables < GFX_MAX_VARIABLES; id && shader->variables < GFX_MAX_VARIABLES;
shader->variables++, id = strtok_r(NULL, ";", &save)) shader->variables++, id = strtok_r(NULL, ";", &save))

2
griffin/griffin.c
View File

@ -109,7 +109,7 @@ VIDEO CONTEXT
VIDEO SHADERS VIDEO SHADERS
============================================================ */ ============================================================ */
#if defined(HAVE_CG) || defined(HAVE_HLSL) #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL)
#include "../gfx/shader_parse.c" #include "../gfx/shader_parse.c"
#endif #endif