libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 16:39:43 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(D3D8/9) Don't do allocation for this struct

Browse Source
This commit is contained in:
twinaphex 2018-02-10 22:27:38 +01:00
parent b45b1b3e55
commit b31779c588
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gfx/drivers/d3d8.c
View File

@ -1690,7 +1690,6 @@ static int d3d8_video_texture_load_wrap_d3d(void *data)
if (!info)
return 0;
d3d8_video_texture_load_d3d(info, &id);
free(info);
return id;
}
@ -1698,21 +1697,17 @@ static uintptr_t d3d8_load_texture(void *video_data, void *data,
bool threaded, enum texture_filter_type filter_type)
{
uintptr_t id = 0;
struct d3d8_texture_info *info = (struct d3d8_texture_info*)
calloc(1, sizeof(*info));
if (!info)
return 0;
struct d3d8_texture_info info;
info->userdata = video_data;
info->data = data;
info->type = filter_type;
info.userdata = video_data;
info.data = data;
info.type = filter_type;
if (threaded)
return video_thread_texture_load(info,
return video_thread_texture_load(&info,
d3d8_video_texture_load_wrap_d3d);
d3d8_video_texture_load_d3d(info, &id);
free(info);
d3d8_video_texture_load_d3d(&info, &id);
return id;
}

17
gfx/drivers/d3d9.c
View File

@ -1702,7 +1702,6 @@ static int d3d9_video_texture_load_wrap_d3d(void *data)
if (!info)
return 0;
d3d9_video_texture_load_d3d(info, &id);
free(info);
return id;
}
@ -1710,21 +1709,17 @@ static uintptr_t d3d9_load_texture(void *video_data, void *data,
bool threaded, enum texture_filter_type filter_type)
{
uintptr_t id = 0;
struct d3d9_texture_info *info = (struct d3d9_texture_info*)
calloc(1, sizeof(*info));
if (!info)
return 0;
struct d3d9_texture_info info;
info->userdata = video_data;
info->data = data;
info->type = filter_type;
info.userdata = video_data;
info.data = data;
info.type = filter_type;
if (threaded)
return video_thread_texture_load(info,
return video_thread_texture_load(&info,
d3d9_video_texture_load_wrap_d3d);
d3d9_video_texture_load_d3d(info, &id);
free(info);
d3d9_video_texture_load_d3d(&info, &id);
return id;
}