mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some C89 build fixes

Browse Source
This commit is contained in:
twinaphex 2015-04-12 19:29:38 +02:00
parent a68253940f
commit 7fbbac544e
5 changed files with 45 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gfx/drivers/gl.c
View File

@ -538,11 +538,13 @@ static bool gl_create_fbo_targets(gl_t *gl)
glGenFramebuffers(gl->fbo_pass, gl->fbo); glGenFramebuffers(gl->fbo_pass, gl->fbo);
for (i = 0; i < gl->fbo_pass; i++) for (i = 0; i < gl->fbo_pass; i++)
{ {
GLenum status;
glBindFramebuffer(RARCH_GL_FRAMEBUFFER, gl->fbo[i]); glBindFramebuffer(RARCH_GL_FRAMEBUFFER, gl->fbo[i]);
glFramebufferTexture2D(RARCH_GL_FRAMEBUFFER, glFramebufferTexture2D(RARCH_GL_FRAMEBUFFER,
RARCH_GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, gl->fbo_texture[i], 0); RARCH_GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, gl->fbo_texture[i], 0);
GLenum status = glCheckFramebufferStatus(RARCH_GL_FRAMEBUFFER); status = glCheckFramebufferStatus(RARCH_GL_FRAMEBUFFER);
if (status != RARCH_GL_FRAMEBUFFER_COMPLETE) if (status != RARCH_GL_FRAMEBUFFER_COMPLETE)
goto error; goto error;
} }
@ -573,11 +575,11 @@ static void gl_deinit_fbo(gl_t *gl)
static void gl_init_fbo(gl_t *gl, unsigned width, unsigned height) static void gl_init_fbo(gl_t *gl, unsigned width, unsigned height)
{ {
int i; int i;
struct gfx_fbo_scale scale, scale_last;
if (!gl || gl->shader->num_shaders() == 0) if (!gl || gl->shader->num_shaders() == 0)
return; return;
struct gfx_fbo_scale scale, scale_last;
gl_shader_scale(gl, 1, &scale); gl_shader_scale(gl, 1, &scale);
gl_shader_scale(gl, gl->shader->num_shaders(), &scale_last); gl_shader_scale(gl, gl->shader->num_shaders(), &scale_last);
@ -657,6 +659,7 @@ static void gl_deinit_hw_render(gl_t *gl)
static bool gl_init_hw_render(gl_t *gl, unsigned width, unsigned height) static bool gl_init_hw_render(gl_t *gl, unsigned width, unsigned height)
{ {
GLenum status;
unsigned i; unsigned i;
bool depth = false, stencil = false; bool depth = false, stencil = false;
GLint max_fbo_size = 0, max_renderbuffer_size = 0; GLint max_fbo_size = 0, max_renderbuffer_size = 0;
@ -732,7 +735,7 @@ static bool gl_init_hw_render(gl_t *gl, unsigned width, unsigned height)
} }
} }
GLenum status = glCheckFramebufferStatus(RARCH_GL_FRAMEBUFFER); status = glCheckFramebufferStatus(RARCH_GL_FRAMEBUFFER);
if (status != RARCH_GL_FRAMEBUFFER_COMPLETE) if (status != RARCH_GL_FRAMEBUFFER_COMPLETE)
{ {
RARCH_ERR("[GL]: Failed to create HW render FBO #%u, error: 0x%u.\n", RARCH_ERR("[GL]: Failed to create HW render FBO #%u, error: 0x%u.\n",
@ -1188,6 +1191,10 @@ static void gl_init_textures_data(gl_t *gl)
static void gl_init_textures(gl_t *gl, const video_info_t *video) static void gl_init_textures(gl_t *gl, const video_info_t *video)
{ {
unsigned i; unsigned i;
GLenum internal_fmt, texture_type, texture_fmt;
(void)texture_type;
(void)texture_fmt;
#if defined(HAVE_EGL) && defined(HAVE_OPENGLES2) #if defined(HAVE_EGL) && defined(HAVE_OPENGLES2)
// Use regular textures if we use HW render. // Use regular textures if we use HW render.
@ -1206,10 +1213,10 @@ static void gl_init_textures(gl_t *gl, const video_info_t *video)
gl->tex_w * gl->tex_h * gl->base_size * gl->textures, NULL, GL_STREAM_DRAW); gl->tex_w * gl->tex_h * gl->base_size * gl->textures, NULL, GL_STREAM_DRAW);
#endif #endif
GLenum internal_fmt = gl->internal_fmt; internal_fmt = gl->internal_fmt;
#ifndef HAVE_PSGL #ifndef HAVE_PSGL
GLenum texture_type = gl->texture_type; texture_type = gl->texture_type;
GLenum texture_fmt = gl->texture_fmt; texture_fmt = gl->texture_fmt;
#endif #endif
#ifdef HAVE_OPENGLES2 #ifdef HAVE_OPENGLES2
@ -1269,9 +1276,11 @@ static void gl_init_textures(gl_t *gl, const video_info_t *video)
static INLINE void gl_copy_frame(gl_t *gl, const void *frame, static INLINE void gl_copy_frame(gl_t *gl, const void *frame,
unsigned width, unsigned height, unsigned pitch) unsigned width, unsigned height, unsigned pitch)
{ {
RARCH_PERFORMANCE_INIT(copy_frame); RARCH_PERFORMANCE_INIT(copy_frame);
RARCH_PERFORMANCE_START(copy_frame); RARCH_PERFORMANCE_START(copy_frame);
(void)data_buf;
#if defined(HAVE_OPENGLES2) #if defined(HAVE_OPENGLES2)
#if defined(HAVE_EGL) #if defined(HAVE_EGL)
if (gl->egl_images) if (gl->egl_images)

21
gfx/drivers_shader/shader_gl_cg.c
View File

@ -230,6 +230,7 @@ static void gl_cg_set_params(void *data, unsigned width, unsigned height,
unsigned fbo_info_cnt) unsigned fbo_info_cnt)
{ {
unsigned i; unsigned i;
CGparameter param;
const struct gl_tex_info *info = (const struct gl_tex_info*)_info; const struct gl_tex_info *info = (const struct gl_tex_info*)_info;
const struct gl_tex_info *prev_info = (const struct gl_tex_info*)_prev_info; const struct gl_tex_info *prev_info = (const struct gl_tex_info*)_prev_info;
const struct gl_tex_info *fbo_info = (const struct gl_tex_info*)_fbo_info; const struct gl_tex_info *fbo_info = (const struct gl_tex_info*)_fbo_info;
@ -266,7 +267,7 @@ static void gl_cg_set_params(void *data, unsigned width, unsigned height,
} }
/* Set orig texture. */ /* Set orig texture. */
CGparameter param = cg->prg[cg->active_idx].orig.tex; param = cg->prg[cg->active_idx].orig.tex;
if (param) if (param)
{ {
cgGLSetTextureParameter(param, info->tex); cgGLSetTextureParameter(param, info->tex);
@ -321,6 +322,7 @@ static void gl_cg_set_params(void *data, unsigned width, unsigned height,
/* Set lookup textures. */ /* Set lookup textures. */
for (i = 0; i < cg->cg_shader->luts; i++) for (i = 0; i < cg->cg_shader->luts; i++)
{ {
CGparameter vparam;
CGparameter fparam = cgGetNamedParameter( CGparameter fparam = cgGetNamedParameter(
cg->prg[cg->active_idx].fprg, cg->cg_shader->lut[i].id); cg->prg[cg->active_idx].fprg, cg->cg_shader->lut[i].id);
@ -330,8 +332,8 @@ static void gl_cg_set_params(void *data, unsigned width, unsigned height,
cgGLEnableTextureParameter(fparam); cgGLEnableTextureParameter(fparam);
} }
CGparameter vparam = cgGetNamedParameter( vparam = cgGetNamedParameter(cg->prg[cg->active_idx].vprg,
cg->prg[cg->active_idx].vprg, cg->cg_shader->lut[i].id); cg->cg_shader->lut[i].id);
if (vparam) if (vparam)
{ {
@ -662,11 +664,13 @@ static bool load_shader(cg_shader_data_t *cg, unsigned i)
static bool load_preset(cg_shader_data_t *cg, const char *path) static bool load_preset(cg_shader_data_t *cg, const char *path)
{ {
unsigned i; unsigned i;
config_file_t *conf = NULL;
if (!load_stock(cg)) if (!load_stock(cg))
return false; return false;
RARCH_LOG("Loading Cg meta-shader: %s\n", path); RARCH_LOG("Loading Cg meta-shader: %s\n", path);
config_file_t *conf = config_file_new(path); conf = config_file_new(path);
if (!conf) if (!conf)
{ {
RARCH_ERR("Failed to load preset.\n"); RARCH_ERR("Failed to load preset.\n");
@ -886,11 +890,14 @@ static void set_program_attributes(cg_shader_data_t *cg, unsigned i)
static bool gl_cg_init(void *data, const char *path) static bool gl_cg_init(void *data, const char *path)
{ {
cg_shader_data_t *cg = NULL;
driver_t *driver = NULL;
unsigned i; unsigned i;
(void)data; (void)data;
cg_shader_data_t *cg = (cg_shader_data_t*)
calloc(1, sizeof(cg_shader_data_t)); cg = (cg_shader_data_t*)calloc(1, sizeof(cg_shader_data_t));
driver_t *driver = driver_get_ptr(); driver = driver_get_ptr();
if (!cg) if (!cg)
return false; return false;

2
gfx/drivers_shader/shader_glsl.c
View File

@ -315,6 +315,7 @@ static bool compile_shader(glsl_shader_data_t *glsl,
GLuint shader, GLuint shader,
const char *define, const char *program) const char *define, const char *program)
{ {
GLint status;
char version[32] = {0}; char version[32] = {0};
if (glsl_core && !strstr(program, "#version")) if (glsl_core && !strstr(program, "#version"))
{ {
@ -345,7 +346,6 @@ static bool compile_shader(glsl_shader_data_t *glsl,
glShaderSource(shader, ARRAY_SIZE(source), source, NULL); glShaderSource(shader, ARRAY_SIZE(source), source, NULL);
glCompileShader(shader); glCompileShader(shader);
GLint status;
glGetShaderiv(shader, GL_COMPILE_STATUS, &status); glGetShaderiv(shader, GL_COMPILE_STATUS, &status);
print_shader_log(shader); print_shader_log(shader);

13
gfx/drivers_wm/win32_shader_dlg.c
View File

@ -164,8 +164,11 @@ static void shader_dlg_params_clear(void)
void shader_dlg_params_reload(void) void shader_dlg_params_reload(void)
{ {
HFONT hFont;
RECT parent_rect;
int i, pos_x, pos_y; int i, pos_x, pos_y;
struct video_shader* shader = video_shader_driver_get_current_shader(); struct video_shader* shader = video_shader_driver_get_current_shader();
shader_dlg_params_clear(); shader_dlg_params_clear();
if (!shader) if (!shader)
@ -174,7 +177,7 @@ void shader_dlg_params_reload(void)
if (shader->num_parameters > GFX_MAX_PARAMETERS) if (shader->num_parameters > GFX_MAX_PARAMETERS)
return; return;
HFONT hFont = (HFONT)GetStockObject(DEFAULT_GUI_FONT); hFont = (HFONT)GetStockObject(DEFAULT_GUI_FONT);
pos_y = g_shader_dlg.parameters_start_y; pos_y = g_shader_dlg.parameters_start_y;
pos_x = SHADER_DLG_CTRL_X; pos_x = SHADER_DLG_CTRL_X;
@ -240,7 +243,6 @@ void shader_dlg_params_reload(void)
shader_dlg_params_refresh(); shader_dlg_params_refresh();
RECT parent_rect;
GetWindowRect(g_shader_dlg.hwnd, &parent_rect); GetWindowRect(g_shader_dlg.hwnd, &parent_rect);
SetWindowPos(g_shader_dlg.hwnd, NULL, 0, 0, SetWindowPos(g_shader_dlg.hwnd, NULL, 0, 0,
(pos_x - SHADER_DLG_CTRL_X) + SHADER_DLG_WIDTH, (pos_x - SHADER_DLG_CTRL_X) + SHADER_DLG_WIDTH,
@ -348,8 +350,10 @@ static LRESULT CALLBACK ShaderDlgWndProc(HWND hwnd, UINT message,
bool wgl_shader_dlg_init(void) bool wgl_shader_dlg_init(void)
{ {
static bool inited = false; static bool inited = false;
const video_driver_t* vid_drv; const video_driver_t* vid_drv;
int pos_y;
HFONT hFont;
video_driver_get_ptr(&vid_drv); video_driver_get_ptr(&vid_drv);
if(vid_drv != &video_gl) if(vid_drv != &video_gl)
return false; return false;
@ -385,8 +389,7 @@ bool wgl_shader_dlg_init(void)
inited = true; inited = true;
} }
int pos_y; hFont = (HFONT)GetStockObject(DEFAULT_GUI_FONT);
HFONT hFont = (HFONT)GetStockObject(DEFAULT_GUI_FONT);
g_shader_dlg.hwnd = CreateWindowEx(0, "Shader Dialog", "Shader Parameters", WS_POPUPWINDOW | WS_CAPTION, 100, 100, g_shader_dlg.hwnd = CreateWindowEx(0, "Shader Dialog", "Shader Parameters", WS_POPUPWINDOW | WS_CAPTION, 100, 100,
SHADER_DLG_WIDTH, SHADER_DLG_MIN_HEIGHT, NULL, NULL, NULL, NULL); SHADER_DLG_WIDTH, SHADER_DLG_MIN_HEIGHT, NULL, NULL, NULL, NULL);

10
libretro-common/file/config_file_userdata.c
View File

@ -57,13 +57,14 @@
int config_userdata_get_float(void *userdata, const char *key_str, int config_userdata_get_float(void *userdata, const char *key_str,
float *value, float default_value) float *value, float default_value)
{ {
bool got;
char key[2][256];
struct config_file_userdata *usr = (struct config_file_userdata*)userdata; struct config_file_userdata *usr = (struct config_file_userdata*)userdata;
char key[2][256];
snprintf(key[0], sizeof(key[0]), "%s_%s", usr->prefix[0], key_str); snprintf(key[0], sizeof(key[0]), "%s_%s", usr->prefix[0], key_str);
snprintf(key[1], sizeof(key[1]), "%s_%s", usr->prefix[1], key_str); snprintf(key[1], sizeof(key[1]), "%s_%s", usr->prefix[1], key_str);
bool got = config_get_float (usr->conf, key[0], value); got = config_get_float (usr->conf, key[0], value);
got = got || config_get_float(usr->conf, key[1], value); got = got || config_get_float(usr->conf, key[1], value);
if (!got) if (!got)
@ -74,13 +75,14 @@ int config_userdata_get_float(void *userdata, const char *key_str,
int config_userdata_get_int(void *userdata, const char *key_str, int config_userdata_get_int(void *userdata, const char *key_str,
int *value, int default_value) int *value, int default_value)
{ {
bool got;
char key[2][256];
struct config_file_userdata *usr = (struct config_file_userdata*)userdata; struct config_file_userdata *usr = (struct config_file_userdata*)userdata;
char key[2][256];
snprintf(key[0], sizeof(key[0]), "%s_%s", usr->prefix[0], key_str); snprintf(key[0], sizeof(key[0]), "%s_%s", usr->prefix[0], key_str);
snprintf(key[1], sizeof(key[1]), "%s_%s", usr->prefix[1], key_str); snprintf(key[1], sizeof(key[1]), "%s_%s", usr->prefix[1], key_str);
bool got = config_get_int (usr->conf, key[0], value); got = config_get_int (usr->conf, key[0], value);
got = got || config_get_int(usr->conf, key[1], value); got = got || config_get_int(usr->conf, key[1], value);
if (!got) if (!got)