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

(D3D) Remove Coords struct

Browse Source
This commit is contained in:
twinaphex 2015-11-11 03:48:05 +01:00
parent 7e592df3e8
commit 2fb91683a1
2 changed files with 36 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
gfx/d3d/d3d.cpp
View File

@ -602,14 +602,14 @@ static bool d3d_construct(d3d_video_t *d3d,
if (!d3d->menu) if (!d3d->menu)
return false; return false;
d3d->menu->tex_coords.x = 0; d3d->menu->tex_coords[0] = 0;
d3d->menu->tex_coords.y = 0; d3d->menu->tex_coords[1] = 0;
d3d->menu->tex_coords.w = 1; d3d->menu->tex_coords[2] = 1;
d3d->menu->tex_coords.h = 1; d3d->menu->tex_coords[3] = 1;
d3d->menu->vert_coords.x = 0; d3d->menu->vert_coords[0] = 0;
d3d->menu->vert_coords.y = 1; d3d->menu->vert_coords[1] = 1;
d3d->menu->vert_coords.w = 1; d3d->menu->vert_coords[2] = 1;
d3d->menu->vert_coords.h = -1; d3d->menu->vert_coords[3] = -1;
#endif #endif
#if defined(HAVE_WINDOW) && !defined(_XBOX) #if defined(HAVE_WINDOW) && !defined(_XBOX)
@ -1335,27 +1335,27 @@ static void d3d_overlay_render(d3d_video_t *d3d, overlay_t *overlay)
overlay_width = vp.width; overlay_width = vp.width;
overlay_height = vp.height; overlay_height = vp.height;
vert[0].x = overlay->vert_coords.x * overlay_width; vert[0].x = overlay->vert_coords[0] * overlay_width;
vert[1].x = (overlay->vert_coords.x + overlay->vert_coords.w) vert[1].x = (overlay->vert_coords[0] + overlay->vert_coords[2])
* overlay_width; * overlay_width;
vert[2].x = overlay->vert_coords.x * overlay_width; vert[2].x = overlay->vert_coords[0] * overlay_width;
vert[3].x = (overlay->vert_coords.x + overlay->vert_coords.w) vert[3].x = (overlay->vert_coords[0] + overlay->vert_coords[2])
* overlay_width; * overlay_width;
vert[0].y = overlay->vert_coords.y * overlay_height; vert[0].y = overlay->vert_coords[1] * overlay_height;
vert[1].y = overlay->vert_coords.y * overlay_height; vert[1].y = overlay->vert_coords[1] * overlay_height;
vert[2].y = (overlay->vert_coords.y + overlay->vert_coords.h) vert[2].y = (overlay->vert_coords[1] + overlay->vert_coords[3])
* overlay_height; * overlay_height;
vert[3].y = (overlay->vert_coords.y + overlay->vert_coords.h) vert[3].y = (overlay->vert_coords[1] + overlay->vert_coords[3])
* overlay_height; * overlay_height;
vert[0].u = overlay->tex_coords.x; vert[0].u = overlay->tex_coords[0];
vert[1].u = overlay->tex_coords.x + overlay->tex_coords.w; vert[1].u = overlay->tex_coords[0] + overlay->tex_coords[2];
vert[2].u = overlay->tex_coords.x; vert[2].u = overlay->tex_coords[0];
vert[3].u = overlay->tex_coords.x + overlay->tex_coords.w; vert[3].u = overlay->tex_coords[0] + overlay->tex_coords[2];
vert[0].v = overlay->tex_coords.y; vert[0].v = overlay->tex_coords[1];
vert[1].v = overlay->tex_coords.y; vert[1].v = overlay->tex_coords[1];
vert[2].v = overlay->tex_coords.y + overlay->tex_coords.h; vert[2].v = overlay->tex_coords[1] + overlay->tex_coords[3];
vert[3].v = overlay->tex_coords.y + overlay->tex_coords.h; vert[3].v = overlay->tex_coords[1] + overlay->tex_coords[3];
/* Align texels and vertices. */ /* Align texels and vertices. */
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
@ -1428,10 +1428,10 @@ static void d3d_overlay_tex_geom(
if (!d3d) if (!d3d)
return; return;
d3d->overlays[index].tex_coords.x = x; d3d->overlays[index].tex_coords[0] = x;
d3d->overlays[index].tex_coords.y = y; d3d->overlays[index].tex_coords[1] = y;
d3d->overlays[index].tex_coords.w = w; d3d->overlays[index].tex_coords[2] = w;
d3d->overlays[index].tex_coords.h = h; d3d->overlays[index].tex_coords[3] = h;
} }
static void d3d_overlay_vertex_geom( static void d3d_overlay_vertex_geom(
@ -1444,12 +1444,12 @@ static void d3d_overlay_vertex_geom(
if (!d3d) if (!d3d)
return; return;
y = 1.0f - y; y = 1.0f - y;
h = -h; h = -h;
d3d->overlays[index].vert_coords.x = x; d3d->overlays[index].vert_coords[0] = x;
d3d->overlays[index].vert_coords.y = y; d3d->overlays[index].vert_coords[1] = y;
d3d->overlays[index].vert_coords.w = w; d3d->overlays[index].vert_coords[2] = w;
d3d->overlays[index].vert_coords.h = h; d3d->overlays[index].vert_coords[3] = h;
} }
static bool d3d_overlay_load(void *data, static bool d3d_overlay_load(void *data,

8
gfx/d3d/d3d.h
View File

@ -60,12 +60,8 @@
typedef struct typedef struct
{ {
struct Coords float tex_coords[4];
{ float vert_coords[4];
float x, y, w, h;
};
Coords tex_coords;
Coords vert_coords;
unsigned tex_w, tex_h; unsigned tex_w, tex_h;
bool fullscreen; bool fullscreen;
bool enabled; bool enabled;