One ifdef less

This commit is contained in:
twinaphex 2018-01-15 22:04:15 +01:00
parent f26b18c7a4
commit fdffc1a178

View File

@ -818,15 +818,6 @@ static bool d3d_initialize(d3d_video_t *d3d, const video_info_t *info)
unsigned width, height;
bool ret = true;
settings_t *settings = config_get_ptr();
#ifdef HAVE_D3D9
static const D3DVERTEXELEMENT VertexElements[] =
{
{ 0, 0 * sizeof(float), D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0 },
{ 0, 2 * sizeof(float), D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0 },
{ 0, 4 * sizeof(float), D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0 },
D3DDECL_END()
};
#endif
if (!d3d)
return false;
@ -880,9 +871,18 @@ static bool d3d_initialize(d3d_video_t *d3d, const video_info_t *info)
FONT_DRIVER_RENDER_DIRECT3D_API);
#ifdef HAVE_D3D9
if (!d3d_vertex_declaration_new(d3d->dev,
(void*)VertexElements, (void**)&d3d->menu_display.decl))
return false;
{
static const D3DVERTEXELEMENT VertexElements[] =
{
{ 0, 0 * sizeof(float), D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0 },
{ 0, 2 * sizeof(float), D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0 },
{ 0, 4 * sizeof(float), D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0 },
D3DDECL_END()
};
if (!d3d_vertex_declaration_new(d3d->dev,
(void*)VertexElements, (void**)&d3d->menu_display.decl))
return false;
}
#endif
d3d->menu_display.offset = 0;