CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-17 07:50:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove header requirements for menu_display_d3d.c

Browse Source
This commit is contained in:
twinaphex 2018-01-26 03:53:37 +01:00
parent e2691c425c
commit 61971c2f0e
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/common/d3d_common.h
View File

@ -33,6 +33,12 @@ typedef struct d3d_texture
#define D3DCOLOR_ARGB(_a, _r, _g, _b) ( (DWORD)( ( ( (_a)&0xff)<<24)|( ( (_r)&0xff)<<16)|( ( (_g)&0xff)<<8)|( (_b)&0xff) ) )
#endif
#define D3DTADDRESS_COMM_CLAMP 3
#define D3DTEXF_COMM_LINEAR 2
#define D3DPT_COMM_TRIANGLESTRIP 5
#define D3D_COMM_CLEAR_TARGET 0x00000001l /* Clear target surface */
bool d3d_swap(void *data, void *dev);
void *d3d_vertex_buffer_new(void *dev,

26
menu/drivers_display/menu_display_d3d.c
View File

@ -27,14 +27,6 @@
#include "../../gfx/drivers/d3d.h"
#include "../../gfx/common/d3d_common.h"
#if defined(HAVE_D3D9)
#include <d3d9types.h>
#endif
#if defined(HAVE_D3D8)
#include <d3d8types.h>
#endif
#define BYTE_CLAMP(i) (int) ((((i) > 255) ? 255 : (((i) < 0) ? 0 : (i))))
static const float d3d_vertexes[] = {
@ -69,21 +61,21 @@ static void *menu_display_d3d_get_default_mvp(void)
return &id;
}
static D3DPRIMITIVETYPE menu_display_prim_to_d3d_enum(
static INT32 menu_display_prim_to_d3d_enum(
enum menu_display_prim_type prim_type)
{
switch (prim_type)
{
case MENU_DISPLAY_PRIM_TRIANGLES:
case MENU_DISPLAY_PRIM_TRIANGLESTRIP:
return D3DPT_TRIANGLESTRIP;
return D3DPT_COMM_TRIANGLESTRIP;
case MENU_DISPLAY_PRIM_NONE:
default:
break;
}
/* TOD/FIXME - hack */
return (D3DPRIMITIVETYPE)0;
return 0;
}
static void menu_display_d3d_blend_begin(void)
@ -120,11 +112,11 @@ static void menu_display_d3d_bind_texture(void *data)
d3d_set_texture(d3d->dev, 0, (void*)draw->texture);
d3d_set_sampler_address_u(d3d->dev, 0, D3DTADDRESS_CLAMP);
d3d_set_sampler_address_v(d3d->dev, 0, D3DTADDRESS_CLAMP);
d3d_set_sampler_minfilter(d3d->dev, 0, D3DTEXF_LINEAR);
d3d_set_sampler_magfilter(d3d->dev, 0, D3DTEXF_LINEAR);
d3d_set_sampler_mipfilter(d3d->dev, 0, D3DTEXF_LINEAR);
d3d_set_sampler_address_u(d3d->dev, 0, D3DTADDRESS_COMM_CLAMP);
d3d_set_sampler_address_v(d3d->dev, 0, D3DTADDRESS_COMM_CLAMP);
d3d_set_sampler_minfilter(d3d->dev, 0, D3DTEXF_COMM_LINEAR);
d3d_set_sampler_magfilter(d3d->dev, 0, D3DTEXF_COMM_LINEAR);
d3d_set_sampler_mipfilter(d3d->dev, 0, D3DTEXF_COMM_LINEAR);
}
@ -301,7 +293,7 @@ static void menu_display_d3d_clear_color(
BYTE_CLAMP(clearcolor->b * 255.0f) /* B */
);
d3d_clear(d3d->dev, 0, NULL, D3DCLEAR_TARGET, clear_color, 0, 0);
d3d_clear(d3d->dev, 0, NULL, D3D_COMM_CLEAR_TARGET, clear_color, 0, 0);
}
static bool menu_display_d3d_font_init_first(