libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-16 07:29:53 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

(gfx) Cleanups

Browse Source
This commit is contained in:
twinaphex 2014-08-03 02:16:02 +02:00
parent 675b8370e3
commit 85688004ab
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gfx/gfx_common.c
View File

@ -76,15 +76,14 @@ static bool dwm_composition_disabled;
static void gfx_dwm_shutdown(void)
{
if (dwmlib)
{
dylib_close(dwmlib);
dwmlib = NULL;
}
dwmlib = NULL;
}
static void gfx_init_dwm(void)
{
static bool inited;
}
if (inited)
return;
inited = true;
@ -136,7 +135,7 @@ void gfx_scale_integer(struct rarch_viewport *vp, unsigned width, unsigned heigh
if (g_settings.video.aspect_ratio_idx == ASPECT_RATIO_CUSTOM)
{
const struct rarch_viewport *custom =
&g_extern.console.screen.viewports.custom_vp;
(const struct rarch_viewport*)&g_extern.console.screen.viewports.custom_vp;
padding_x = width - custom->width;
padding_y = height - custom->height;
@ -242,6 +241,7 @@ void gfx_set_square_pixel_viewport(unsigned width, unsigned height)
void gfx_set_core_viewport(void)
{
const struct retro_game_geometry *geom = &g_extern.system.av_info.geometry;
if (geom->base_width <= 0.0f || geom->base_height <= 0.0f)
return;
@ -257,13 +257,13 @@ void gfx_set_config_viewport(void)
if (g_settings.video.aspect_ratio < 0.0f)
{
const struct retro_game_geometry *geom = &g_extern.system.av_info.geometry;
if (geom->aspect_ratio > 0.0f && g_settings.video.aspect_ratio_auto)
aspectratio_lut[ASPECT_RATIO_CONFIG].value = geom->aspect_ratio;
else
{
unsigned base_width, base_height;
base_width = geom->base_width;
base_height = geom->base_height;
unsigned base_width = geom->base_width;
unsigned base_height = geom->base_height;
// Get around division by zero errors
if (base_width == 0)

5
gfx/shader_common.c
View File

@ -48,9 +48,8 @@ void gl_load_texture_data(GLuint obj, const struct texture_image *img,
bool gl_load_luts(const struct gfx_shader *generic_shader, GLuint *lut_textures)
{
unsigned i, num_luts;
num_luts = min(generic_shader->luts, GFX_MAX_TEXTURES);
unsigned i;
unsigned num_luts = min(generic_shader->luts, GFX_MAX_TEXTURES);
if (!generic_shader->luts)
return true;