mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Buildfixes

Browse Source
This commit is contained in:
twinaphex 2015-12-20 21:08:03 +01:00
parent 4a89303cb9
commit 6362c86c31
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gfx/d3d/d3d.cpp
View File

@ -99,6 +99,7 @@ static void d3d_free_overlay(d3d_video_t *d3d, overlay_t *overlay);
static void d3d_deinit_chain(d3d_video_t *d3d)
{
if (d3d && d3d->renderchain_driver && d3d->renderchain_driver->chain_free)
d3d->renderchain_driver->chain_free(d3d->renderchain_data);
d3d->renderchain_driver = NULL;
@ -1698,19 +1699,23 @@ static void video_texture_load_d3d(struct texture_image *ti,
static int video_texture_load_wrap_d3d_mipmap(void *data)
{
return video_texture_load_d3d(data, TEXTURE_BACKEND_DIRECT3D,
TEXTURE_FILTER_MIPMAP_LINEAR);
uintptr_t id = 0;
video_texture_load_d3d((texture_image*)data, TEXTURE_FILTER_MIPMAP_LINEAR, &id);
return id;
}
static int video_texture_load_wrap_d3d(void *data)
{
return video_texture_load_d3d(data, TEXTURE_BACKEND_DIRECT3D,
TEXTURE_FILTER_LINEAR);
uintptr_t id = 0;
video_texture_load_d3d((texture_image*)data, TEXTURE_FILTER_LINEAR, &id);
return id;
}
static unsigned d3d_load_texture(void *video_data, void *data,
bool threaded, enum texture_filter_type filter_type)
{
uintptr_t id = 0;
if (threaded)
{
custom_command_method_t func = video_texture_load_wrap_d3d;
@ -1731,7 +1736,8 @@ static unsigned d3d_load_texture(void *video_data, void *data,
return rarch_threaded_video_texture_load(data, func);
}
return video_texture_load_d3d(data, type, filter_type);
video_texture_load_d3d((texture_image*)data, filter_type, &id);
return id;
}
static void d3d_unload_texture(void *data, uintptr_t *id)

6
gfx/drivers/gl.c
View File

@ -3498,7 +3498,7 @@ static int video_texture_load_wrap_gl_mipmap(void *data)
if (!data)
return 0;
video_texture_load_gl(data, TEXTURE_FILTER_MIPMAP_LINEAR, &id);
video_texture_load_gl((struct texture_image*)data, TEXTURE_FILTER_MIPMAP_LINEAR, &id);
return id;
}
@ -3508,7 +3508,7 @@ static int video_texture_load_wrap_gl(void *data)
if (!data)
return 0;
video_texture_load_gl(data, TEXTURE_FILTER_LINEAR, &id);
video_texture_load_gl((struct texture_image*)data, TEXTURE_FILTER_LINEAR, &id);
return id;
}
@ -3533,7 +3533,7 @@ static unsigned gl_load_texture(void *video_data, void *data,
return rarch_threaded_video_texture_load(data, func);
}
video_texture_load_gl(data, filter_type, &id);
video_texture_load_gl((struct texture_image*)data, filter_type, &id);
return id;
}