mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-15 08:20:20 +00:00
wined3d: Use nameless unions/structs.
This commit is contained in:
parent
d75127d41a
commit
e8f82d4d15
|
@ -139,7 +139,7 @@ static HRESULT wined3d_output_init(struct wined3d_output *output, unsigned int o
|
||||||
close_adapter_desc.hAdapter = open_adapter_desc.hAdapter;
|
close_adapter_desc.hAdapter = open_adapter_desc.hAdapter;
|
||||||
D3DKMTCloseAdapter(&close_adapter_desc);
|
D3DKMTCloseAdapter(&close_adapter_desc);
|
||||||
|
|
||||||
create_device_desc.u.hAdapter = adapter->kmt_adapter;
|
create_device_desc.hAdapter = adapter->kmt_adapter;
|
||||||
if (D3DKMTCreateDevice(&create_device_desc))
|
if (D3DKMTCreateDevice(&create_device_desc))
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
|
|
||||||
|
@ -1261,7 +1261,7 @@ static void wined3d_output_update_modes(struct wined3d_output *output, bool cach
|
||||||
|
|
||||||
if (mode.dmFields & DM_DISPLAYFLAGS)
|
if (mode.dmFields & DM_DISPLAYFLAGS)
|
||||||
{
|
{
|
||||||
if (mode.u2.dmDisplayFlags & DM_INTERLACED)
|
if (mode.dmDisplayFlags & DM_INTERLACED)
|
||||||
wined3d_mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_INTERLACED;
|
wined3d_mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_INTERLACED;
|
||||||
else
|
else
|
||||||
wined3d_mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_PROGRESSIVE;
|
wined3d_mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_PROGRESSIVE;
|
||||||
|
@ -1511,14 +1511,14 @@ HRESULT CDECL wined3d_output_get_display_mode(const struct wined3d_output *outpu
|
||||||
|
|
||||||
if (!(m.dmFields & DM_DISPLAYFLAGS))
|
if (!(m.dmFields & DM_DISPLAYFLAGS))
|
||||||
mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN;
|
mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN;
|
||||||
else if (m.u2.dmDisplayFlags & DM_INTERLACED)
|
else if (m.dmDisplayFlags & DM_INTERLACED)
|
||||||
mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_INTERLACED;
|
mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_INTERLACED;
|
||||||
else
|
else
|
||||||
mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_PROGRESSIVE;
|
mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_PROGRESSIVE;
|
||||||
|
|
||||||
if (rotation)
|
if (rotation)
|
||||||
{
|
{
|
||||||
switch (m.u1.s2.dmDisplayOrientation)
|
switch (m.dmDisplayOrientation)
|
||||||
{
|
{
|
||||||
case DMDO_DEFAULT:
|
case DMDO_DEFAULT:
|
||||||
*rotation = WINED3D_DISPLAY_ROTATION_0;
|
*rotation = WINED3D_DISPLAY_ROTATION_0;
|
||||||
|
@ -1533,7 +1533,7 @@ HRESULT CDECL wined3d_output_get_display_mode(const struct wined3d_output *outpu
|
||||||
*rotation = WINED3D_DISPLAY_ROTATION_270;
|
*rotation = WINED3D_DISPLAY_ROTATION_270;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
FIXME("Unhandled display rotation %#lx.\n", m.u1.s2.dmDisplayOrientation);
|
FIXME("Unhandled display rotation %#lx.\n", m.dmDisplayOrientation);
|
||||||
*rotation = WINED3D_DISPLAY_ROTATION_UNSPECIFIED;
|
*rotation = WINED3D_DISPLAY_ROTATION_UNSPECIFIED;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -1560,7 +1560,7 @@ static BOOL equal_display_mode(const DEVMODEW *mode1, const DEVMODEW *mode2)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
if (mode1->dmFields & mode2->dmFields & DM_DISPLAYFLAGS
|
if (mode1->dmFields & mode2->dmFields & DM_DISPLAYFLAGS
|
||||||
&& mode1->u2.dmDisplayFlags != mode2->u2.dmDisplayFlags)
|
&& mode1->dmDisplayFlags != mode2->dmDisplayFlags)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
if (mode1->dmFields & mode2->dmFields & DM_DISPLAYFREQUENCY
|
if (mode1->dmFields & mode2->dmFields & DM_DISPLAYFREQUENCY
|
||||||
|
@ -1568,12 +1568,12 @@ static BOOL equal_display_mode(const DEVMODEW *mode1, const DEVMODEW *mode2)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
if (mode1->dmFields & mode2->dmFields & DM_DISPLAYORIENTATION
|
if (mode1->dmFields & mode2->dmFields & DM_DISPLAYORIENTATION
|
||||||
&& mode1->u1.s2.dmDisplayOrientation != mode2->u1.s2.dmDisplayOrientation)
|
&& mode1->dmDisplayOrientation != mode2->dmDisplayOrientation)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
if (mode1->dmFields & mode2->dmFields & DM_POSITION
|
if (mode1->dmFields & mode2->dmFields & DM_POSITION
|
||||||
&& (mode1->u1.s2.dmPosition.x != mode2->u1.s2.dmPosition.x
|
&& (mode1->dmPosition.x != mode2->dmPosition.x
|
||||||
|| mode1->u1.s2.dmPosition.y != mode2->u1.s2.dmPosition.y))
|
|| mode1->dmPosition.y != mode2->dmPosition.y))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
@ -1684,7 +1684,7 @@ HRESULT CDECL wined3d_output_set_display_mode(struct wined3d_output *output,
|
||||||
{
|
{
|
||||||
new_mode.dmFields |= DM_DISPLAYFLAGS;
|
new_mode.dmFields |= DM_DISPLAYFLAGS;
|
||||||
if (mode->scanline_ordering == WINED3D_SCANLINE_ORDERING_INTERLACED)
|
if (mode->scanline_ordering == WINED3D_SCANLINE_ORDERING_INTERLACED)
|
||||||
new_mode.u2.dmDisplayFlags |= DM_INTERLACED;
|
new_mode.dmDisplayFlags |= DM_INTERLACED;
|
||||||
}
|
}
|
||||||
new_format_id = mode->format_id;
|
new_format_id = mode->format_id;
|
||||||
|
|
||||||
|
|
|
@ -38,8 +38,6 @@
|
||||||
#include <vkd3d_shader.h>
|
#include <vkd3d_shader.h>
|
||||||
#include "ntstatus.h"
|
#include "ntstatus.h"
|
||||||
#define WIN32_NO_STATUS
|
#define WIN32_NO_STATUS
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
#define COBJMACROS
|
#define COBJMACROS
|
||||||
#include "windef.h"
|
#include "windef.h"
|
||||||
#include "winbase.h"
|
#include "winbase.h"
|
||||||
|
|
Loading…
Reference in a new issue