Commit abebd41e authored by Max Figura's avatar Max Figura Committed by Alexandre Julliard

wined3d: Move the WINED3D_RS_PLANEMASK stub to wined3d_device_apply_stateblock.

parent a9967c94
...@@ -97,7 +97,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = ...@@ -97,7 +97,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] =
{STATE_VIEWPORT, {STATE_VIEWPORT, state_nop}}, {STATE_VIEWPORT, {STATE_VIEWPORT, state_nop}},
{STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}},
{STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}},
{STATE_RENDER(WINED3D_RS_PLANEMASK), {STATE_RENDER(WINED3D_RS_PLANEMASK), state_nop}},
{STATE_RENDER(WINED3D_RS_LASTPIXEL), {STATE_RENDER(WINED3D_RS_LASTPIXEL), state_nop}}, {STATE_RENDER(WINED3D_RS_LASTPIXEL), {STATE_RENDER(WINED3D_RS_LASTPIXEL), state_nop}},
{STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_RENDER(WINED3D_RS_DITHERENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_RENDER(WINED3D_RS_DITHERENABLE), state_nop}},
{STATE_RENDER(WINED3D_RS_SUBPIXEL), {STATE_RENDER(WINED3D_RS_SUBPIXEL), state_nop}}, {STATE_RENDER(WINED3D_RS_SUBPIXEL), {STATE_RENDER(WINED3D_RS_SUBPIXEL), state_nop}},
......
...@@ -4067,6 +4067,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, ...@@ -4067,6 +4067,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
FIXME("Render state WINED3D_RS_ROP2 not implemented yet.\n"); FIXME("Render state WINED3D_RS_ROP2 not implemented yet.\n");
break; break;
case WINED3D_RS_PLANEMASK:
if (state->rs[WINED3D_RS_PLANEMASK])
FIXME("Render state WINED3D_RS_PLANEMASK not implemented yet.\n");
break;
default: default:
wined3d_device_set_render_state(device, idx, state->rs[idx]); wined3d_device_set_render_state(device, idx, state->rs[idx]);
break; break;
......
...@@ -2809,7 +2809,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = ...@@ -2809,7 +2809,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] =
{STATE_VIEWPORT, {STATE_VDECL}}, {STATE_VIEWPORT, {STATE_VDECL}},
{STATE_INDEXBUFFER, {STATE_VDECL}}, {STATE_INDEXBUFFER, {STATE_VDECL}},
{STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}},
{STATE_RENDER(WINED3D_RS_PLANEMASK), {STATE_VDECL}},
{STATE_RENDER(WINED3D_RS_LASTPIXEL), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_LASTPIXEL), {STATE_VDECL}},
{STATE_RENDER(WINED3D_RS_ZFUNC), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_ZFUNC), {STATE_VDECL}},
{STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_VDECL}},
......
...@@ -2072,12 +2072,6 @@ static void state_tessellation(struct wined3d_context *context, const struct win ...@@ -2072,12 +2072,6 @@ static void state_tessellation(struct wined3d_context *context, const struct win
state->render_states[WINED3D_RS_ENABLEADAPTIVETESSELLATION]); state->render_states[WINED3D_RS_ENABLEADAPTIVETESSELLATION]);
} }
static void state_planemask(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
{
if (state->render_states[WINED3D_RS_PLANEMASK])
FIXME("Render state WINED3D_RS_PLANEMASK not implemented yet.\n");
}
static void state_subpixel(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) static void state_subpixel(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
{ {
if (state->render_states[WINED3D_RS_SUBPIXEL]) if (state->render_states[WINED3D_RS_SUBPIXEL])
...@@ -4758,7 +4752,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = ...@@ -4758,7 +4752,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] =
{ STATE_INDEXBUFFER, { STATE_INDEXBUFFER, state_nop }, WINED3D_GL_EXT_NONE }, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, state_nop }, WINED3D_GL_EXT_NONE },
{ STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT },
{ STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE },
{ STATE_RENDER(WINED3D_RS_PLANEMASK), { STATE_RENDER(WINED3D_RS_PLANEMASK), state_planemask }, WINED3D_GL_EXT_NONE },
{ STATE_RENDER(WINED3D_RS_LASTPIXEL), { STATE_RENDER(WINED3D_RS_LASTPIXEL), state_lastpixel }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LASTPIXEL), { STATE_RENDER(WINED3D_RS_LASTPIXEL), state_lastpixel }, WINED3D_GL_EXT_NONE },
{ STATE_RENDER(WINED3D_RS_DITHERENABLE), { STATE_RENDER(WINED3D_RS_DITHERENABLE), state_ditherenable }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DITHERENABLE), { STATE_RENDER(WINED3D_RS_DITHERENABLE), state_ditherenable }, WINED3D_GL_EXT_NONE },
{ STATE_RENDER(WINED3D_RS_SUBPIXEL), { STATE_RENDER(WINED3D_RS_SUBPIXEL), state_subpixel }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SUBPIXEL), { STATE_RENDER(WINED3D_RS_SUBPIXEL), state_subpixel }, WINED3D_GL_EXT_NONE },
...@@ -5558,8 +5551,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) ...@@ -5558,8 +5551,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table)
rs_holes[] = rs_holes[] =
{ {
{ 1, 8}, { 1, 8},
{ 11, 12}, { 11, 14},
{ 14, 14},
{ 17, 23}, { 17, 23},
{ 27, 27}, { 27, 27},
{ 40, 40}, { 40, 40},
......
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