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

Don't use std::vector

Browse Source
This commit is contained in:
twinaphex 2017-10-02 06:12:33 +02:00
parent 5ef6de4d4e
commit 9c639ec529
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gfx/drivers/d3d.cpp
View File

@ -1190,9 +1190,11 @@ static void d3d_free_overlays(d3d_video_t *d3d)
if (!d3d)
return;
for (i = 0; i < d3d->overlays.size(); i++)
for (i = 0; i < d3d->overlays_size; i++)
d3d_free_overlay(d3d, &d3d->overlays[i]);
d3d->overlays.clear();
free(d3d->overlays);
d3d->overlays = NULL;
d3d->overlays_size = 0;
}
#endif
@ -1203,22 +1205,25 @@ static void d3d_free(void *data)
if (!d3d)
return;
d3d_deinitialize(d3d);
#ifdef HAVE_OVERLAY
d3d_free_overlays(d3d);
if (d3d->overlays)
free(d3d->overlays);
d3d->overlays = NULL;
d3d->overlays_size = 0;
#endif
video_context_driver_free();
#ifndef _XBOX
#ifdef HAVE_MENU
d3d_free_overlay(d3d, d3d->menu);
if (d3d->menu)
free(d3d->menu);
d3d->menu = NULL;
#endif
d3d->menu = NULL;
#endif
d3d_deinitialize(d3d);
video_context_driver_free();
if (!string_is_empty(d3d->shader_path))
free(d3d->shader_path);
@ -1278,7 +1283,8 @@ static bool d3d_overlay_load(void *data,
const void *image_data, unsigned num_images)
{
unsigned i, y;
d3d_video_t *d3d = (d3d_video_t*)data;
overlay_t *new_overlays = NULL;
d3d_video_t *d3d = (d3d_video_t*)data;
const struct texture_image *images = (const struct texture_image*)
image_data;
@ -1286,7 +1292,8 @@ static bool d3d_overlay_load(void *data,
return false;
d3d_free_overlays(d3d);
d3d->overlays.resize(num_images);
d3d->overlays = (overlay_t*)calloc(num_images, sizeof(*d3d->overlays));
d3d->overlays_size = num_images;
for (i = 0; i < num_images; i++)
{
@ -1339,7 +1346,7 @@ static void d3d_overlay_enable(void *data, bool state)
if (!d3d)
return;
for (i = 0; i < d3d->overlays.size(); i++)
for (i = 0; i < d3d->overlays_size; i++)
d3d->overlays_enabled = state;
video_context_driver_show_mouse(&state);
@ -1350,7 +1357,7 @@ static void d3d_overlay_full_screen(void *data, bool enable)
unsigned i;
d3d_video_t *d3d = (d3d_video_t*)data;
for (i = 0; i < d3d->overlays.size(); i++)
for (i = 0; i < d3d->overlays_size; i++)
d3d->overlays[i].fullscreen = enable;
}
@ -1468,7 +1475,7 @@ static bool d3d_frame(void *data, const void *frame,
#ifdef HAVE_OVERLAY
if (d3d->overlays_enabled)
{
for (i = 0; i < d3d->overlays.size(); i++)
for (i = 0; i < d3d->overlays_size; i++)
d3d_overlay_render(d3d, video_info, &d3d->overlays[i]);
}
#endif

5
gfx/drivers/d3d.h
View File

@ -17,8 +17,6 @@
#ifndef __D3DVIDEO_INTF_H__
#define __D3DVIDEO_INTF_H__
#include <vector>
#ifdef HAVE_CONFIG_H
#include "../../config.h"
#endif
@ -98,7 +96,8 @@ typedef struct d3d_video
char *shader_path;
#ifdef HAVE_OVERLAY
std::vector<overlay_t> overlays;
size_t overlays_size;
overlay_t *overlays;
#endif
} d3d_video_t;