mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-02 14:54:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create video_common.c

Browse Source
This commit is contained in:
twinaphex 2015-07-12 05:30:04 +02:00
parent 38fd0592f5
commit c697923eb6
9 changed files with 115 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.common
View File

@ -141,6 +141,7 @@ OBJ += frontend/frontend.o \
audio/audio_driver.o \
input/input_driver.o \
input/input_hid_driver.o \
gfx/video_common.o \
gfx/video_driver.o \
gfx/video_pixel_converter.o \
gfx/video_viewport.o \

84
gfx/drivers/gl_common.c
View File

@ -157,87 +157,3 @@ bool gl_load_luts(const struct video_shader *shader,
glBindTexture(GL_TEXTURE_2D, 0);
return true;
}
static INLINE bool realloc_checked(void **ptr, size_t size)
{
void *nptr;
if (*ptr)
nptr = realloc(*ptr, size);
else
nptr = malloc(size);
if (nptr)
*ptr = nptr;
return *ptr == nptr;
}
bool gl_coord_array_add(gfx_coord_array_t *ca, const gfx_coords_t *coords, unsigned count)
{
size_t base_size, offset;
bool success = false;
count = min(count, coords->vertices);
if (ca->coords.vertices + count >= ca->allocated)
{
unsigned alloc_size = next_pow2(ca->coords.vertices + count);
size_t base_size = sizeof(GLfloat) * alloc_size;
bool vert_ok = realloc_checked((void**)&ca->coords.vertex, 2 * base_size);
bool color_ok = realloc_checked((void**)&ca->coords.color, 4 * base_size);
bool tex_ok = realloc_checked((void**)&ca->coords.tex_coord, 2 * base_size);
bool lut_ok = realloc_checked((void**)&ca->coords.lut_tex_coord, 2 * base_size);
if (vert_ok && color_ok && tex_ok && lut_ok)
{
ca->allocated = alloc_size;
success = true;
}
}
else
success = true;
if (!success)
{
RARCH_WARN("Allocation failed.");
return false;
}
base_size = count * sizeof(GLfloat);
offset = ca->coords.vertices;
/* XXX: i wish we used interlaced arrays so we could call memcpy only once */
memcpy(ca->coords.vertex + offset * 2, coords->vertex, base_size * 2);
memcpy(ca->coords.color + offset * 4, coords->color, base_size * 4);
memcpy(ca->coords.tex_coord + offset * 2, coords->tex_coord, base_size * 2);
memcpy(ca->coords.lut_tex_coord + offset * 2, coords->lut_tex_coord, base_size * 2);
ca->coords.vertices += count;
return true;
}
void gl_coord_array_free(gfx_coord_array_t *ca)
{
if (!ca->allocated)
return;
if (ca->coords.vertex)
free(ca->coords.vertex);
if (ca->coords.color)
free(ca->coords.color);
if (ca->coords.tex_coord)
free(ca->coords.tex_coord);
if (ca->coords.lut_tex_coord)
free(ca->coords.lut_tex_coord);
ca->coords.vertex = NULL;
ca->coords.color = NULL;
ca->coords.tex_coord = NULL;
ca->coords.lut_tex_coord = NULL;
ca->coords.vertices = 0;
ca->allocated = 0;
}

3
gfx/drivers/gl_common.h
View File

@ -360,9 +360,6 @@ static INLINE unsigned gl_wrap_type_to_enum(enum gfx_wrap_type type)
return 0;
}
bool gl_coord_array_add(gfx_coord_array_t *ca, const gfx_coords_t *coords, unsigned count);
void gl_coord_array_free(gfx_coord_array_t *ca);
void gl_ff_vertex(const void *data);
void gl_ff_matrix(const void *data);

2
gfx/drivers_font/gl_raster_font.c
View File

@ -251,7 +251,7 @@ static void gl_raster_font_render_line(
coords.lut_tex_coord = font_lut_tex_coord;
if (font->block)
gl_coord_array_add(&font->block->carr, &coords, coords.vertices);
gfx_coord_array_add(&font->block->carr, &coords, coords.vertices);
else
gl_raster_font_draw_vertices(gl, &coords);

103
gfx/video_common.c Normal file
View File

@ -0,0 +1,103 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2010-2014 - Hans-Kristian Arntzen
* Copyright (C) 2011-2015 - Daniel De Matteis
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with RetroArch.
* If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdlib.h>
#include <retro_inline.h>
#include <retro_miscellaneous.h>
#include "video_common.h"
static INLINE bool realloc_checked(void **ptr, size_t size)
{
void *nptr;
if (*ptr)
nptr = realloc(*ptr, size);
else
nptr = malloc(size);
if (nptr)
*ptr = nptr;
return *ptr == nptr;
}
bool gfx_coord_array_add(gfx_coord_array_t *ca, const gfx_coords_t *coords, unsigned count)
{
size_t base_size, offset;
bool success = false;
count = min(count, coords->vertices);
if (ca->coords.vertices + count >= ca->allocated)
{
unsigned alloc_size = next_pow2(ca->coords.vertices + count);
size_t base_size = sizeof(float) * alloc_size;
bool vert_ok = realloc_checked((void**)&ca->coords.vertex, 2 * base_size);
bool color_ok = realloc_checked((void**)&ca->coords.color, 4 * base_size);
bool tex_ok = realloc_checked((void**)&ca->coords.tex_coord, 2 * base_size);
bool lut_ok = realloc_checked((void**)&ca->coords.lut_tex_coord, 2 * base_size);
if (vert_ok && color_ok && tex_ok && lut_ok)
{
ca->allocated = alloc_size;
success = true;
}
}
else
success = true;
if (!success) /* Allocation failed. */
return false;
base_size = count * sizeof(float);
offset = ca->coords.vertices;
/* XXX: i wish we used interlaced arrays so we could call memcpy only once */
memcpy(ca->coords.vertex + offset * 2, coords->vertex, base_size * 2);
memcpy(ca->coords.color + offset * 4, coords->color, base_size * 4);
memcpy(ca->coords.tex_coord + offset * 2, coords->tex_coord, base_size * 2);
memcpy(ca->coords.lut_tex_coord + offset * 2, coords->lut_tex_coord, base_size * 2);
ca->coords.vertices += count;
return true;
}
void gfx_coord_array_free(gfx_coord_array_t *ca)
{
if (!ca->allocated)
return;
if (ca->coords.vertex)
free(ca->coords.vertex);
if (ca->coords.color)
free(ca->coords.color);
if (ca->coords.tex_coord)
free(ca->coords.tex_coord);
if (ca->coords.lut_tex_coord)
free(ca->coords.lut_tex_coord);
ca->coords.vertex = NULL;
ca->coords.color = NULL;
ca->coords.tex_coord = NULL;
ca->coords.lut_tex_coord = NULL;
ca->coords.vertices = 0;
ca->allocated = 0;
}

7
gfx/video_common.h
View File

@ -20,6 +20,8 @@
#include <stdint.h>
#include <string.h>
#include <boolean.h>
struct gfx_fbo_rect
{
unsigned img_width;
@ -78,4 +80,9 @@ typedef struct gfx_raster_block
gfx_coord_array_t carr;
} gfx_font_raster_block_t;
bool gfx_coord_array_add(gfx_coord_array_t *ca,
const gfx_coords_t *coords, unsigned count);
void gfx_coord_array_free(gfx_coord_array_t *ca);
#endif

1
griffin/griffin.c
View File

@ -505,6 +505,7 @@ AUDIO
DRIVERS
============================================================ */
#include "../gfx/video_driver.c"
#include "../gfx/video_common.c"
#include "../gfx/video_pixel_converter.c"
#include "../gfx/video_viewport.c"
#include "../input/input_driver.c"

2
menu/drivers/glui.c
View File

@ -577,7 +577,7 @@ static void glui_free(void *data)
if (!glui || !menu)
return;
gl_coord_array_free(&glui->list_block.carr);
gfx_coord_array_free(&glui->list_block.carr);
gl = (gl_t*)video_driver_get_ptr(NULL);

2
menu/drivers/xmb.c
View File

@ -1937,7 +1937,7 @@ static void xmb_free(void *data)
file_list_free(xmb->horizontal_list);
xmb->horizontal_list = NULL;
gl_coord_array_free(&xmb->raster_block.carr);
gfx_coord_array_free(&xmb->raster_block.carr);
if (menu->userdata)
free(menu->userdata);