Skip to content

W
wine-winehq
Commit 1289842d authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

wined3d: Move handling of the unimplemented WINED3DRS_STIPPLEPATTERN states to ddraw.

parent 2e5976a8
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 67 deletions
dlls/ddraw/device.c
View file @ 1289842d
......@@ -2447,7 +2447,14 @@ IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface,
break;
default:
/* FIXME: Unhandled: D3DRENDERSTATE_STIPPLEPATTERN00 - 31 */
if (RenderStateType >= D3DRENDERSTATE_STIPPLEPATTERN00
&& RenderStateType <= D3DRENDERSTATE_STIPPLEPATTERN31)
{
FIXME("Unhandled stipple pattern render state (%#x).\n",
RenderStateType);
hr = E_NOTIMPL;
break;
}
hr = IWineD3DDevice_GetRenderState(This->wineD3DDevice,
RenderStateType,
Value);
......@@ -2736,8 +2743,14 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface,
break;
default:
/* FIXME: Unhandled: D3DRENDERSTATE_STIPPLEPATTERN00 - 31 */
if (RenderStateType >= D3DRENDERSTATE_STIPPLEPATTERN00
&& RenderStateType <= D3DRENDERSTATE_STIPPLEPATTERN31)
{
FIXME("Unhandled stipple pattern render state (%#x).\n",
RenderStateType);
hr = E_NOTIMPL;
break;
}
hr = IWineD3DDevice_SetRenderState(This->wineD3DDevice,
RenderStateType,
......
dlls/wined3d/utils.c
View file @ 1289842d
......@@ -1548,38 +1548,6 @@ const char* debug_d3drenderstate(DWORD state) {
D3DSTATE_TO_STR(WINED3DRS_STENCILMASK );
D3DSTATE_TO_STR(WINED3DRS_STENCILWRITEMASK );
D3DSTATE_TO_STR(WINED3DRS_TEXTUREFACTOR );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN00 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN01 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN02 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN03 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN04 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN05 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN06 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN07 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN08 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN09 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN10 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN11 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN12 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN13 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN14 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN15 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN16 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN17 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN18 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN19 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN20 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN21 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN22 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN23 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN24 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN25 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN26 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN27 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN28 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN29 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN30 );
D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN31 );
D3DSTATE_TO_STR(WINED3DRS_WRAP0 );
D3DSTATE_TO_STR(WINED3DRS_WRAP1 );
D3DSTATE_TO_STR(WINED3DRS_WRAP2 );
......
include/wine/wined3d.idl
View file @ 1289842d
......@@ -330,38 +330,6 @@ typedef enum _WINED3DRENDERSTATETYPE
WINED3DRS_STENCILMASK = 58,
WINED3DRS_STENCILWRITEMASK = 59,
WINED3DRS_TEXTUREFACTOR = 60,
WINED3DRS_STIPPLEPATTERN00 = 64,
WINED3DRS_STIPPLEPATTERN01 = 65,
WINED3DRS_STIPPLEPATTERN02 = 66,
WINED3DRS_STIPPLEPATTERN03 = 67,
WINED3DRS_STIPPLEPATTERN04 = 68,
WINED3DRS_STIPPLEPATTERN05 = 69,
WINED3DRS_STIPPLEPATTERN06 = 70,
WINED3DRS_STIPPLEPATTERN07 = 71,
WINED3DRS_STIPPLEPATTERN08 = 72,
WINED3DRS_STIPPLEPATTERN09 = 73,
WINED3DRS_STIPPLEPATTERN10 = 74,
WINED3DRS_STIPPLEPATTERN11 = 75,
WINED3DRS_STIPPLEPATTERN12 = 76,
WINED3DRS_STIPPLEPATTERN13 = 77,
WINED3DRS_STIPPLEPATTERN14 = 78,
WINED3DRS_STIPPLEPATTERN15 = 79,
WINED3DRS_STIPPLEPATTERN16 = 80,
WINED3DRS_STIPPLEPATTERN17 = 81,
WINED3DRS_STIPPLEPATTERN18 = 82,
WINED3DRS_STIPPLEPATTERN19 = 83,
WINED3DRS_STIPPLEPATTERN20 = 84,
WINED3DRS_STIPPLEPATTERN21 = 85,
WINED3DRS_STIPPLEPATTERN22 = 86,
WINED3DRS_STIPPLEPATTERN23 = 87,
WINED3DRS_STIPPLEPATTERN24 = 88,
WINED3DRS_STIPPLEPATTERN25 = 89,
WINED3DRS_STIPPLEPATTERN26 = 90,
WINED3DRS_STIPPLEPATTERN27 = 91,
WINED3DRS_STIPPLEPATTERN28 = 92,
WINED3DRS_STIPPLEPATTERN29 = 93,
WINED3DRS_STIPPLEPATTERN30 = 94,
WINED3DRS_STIPPLEPATTERN31 = 95,
WINED3DRS_WRAP0 = 128,
WINED3DRS_WRAP1 = 129,
WINED3DRS_WRAP2 = 130,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment