Skip to content

W
wine-winehq
Commit fc9324f2 authored by Max Figura's avatar Max Figura Committed by Alexandre Julliard
Browse files
Options

wined3d: Move the WINED3D_RS_WRAP0 stub to wined3d_device_apply_stateblock.

parent 8f2a2dfb
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 29 deletions
dlls/wined3d/adapter_vk.c
View file @ fc9324f2
...@@ -98,7 +98,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = ...@@ -98,7 +98,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] =
{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_DITHERENABLE), {STATE_RENDER(WINED3D_RS_DITHERENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_RENDER(WINED3D_RS_DITHERENABLE), state_nop}},
{STATE_RENDER(WINED3D_RS_WRAP0), {STATE_RENDER(WINED3D_RS_WRAP0), state_nop}},
{STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_RENDER(WINED3D_RS_EXTENTS), state_nop}}, {STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_RENDER(WINED3D_RS_EXTENTS), state_nop}},
{STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_nop}},
{STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_nop}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_nop}},
......
dlls/wined3d/device.c
View file @ fc9324f2
...@@ -4129,6 +4129,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, ...@@ -4129,6 +4129,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
FIXME("Render state WINED3D_RS_TRANSLUCENTSORTINDEPENDENT not implemented yet.\n"); FIXME("Render state WINED3D_RS_TRANSLUCENTSORTINDEPENDENT not implemented yet.\n");
break; break;
case WINED3D_RS_WRAP0:
case WINED3D_RS_WRAP1: case WINED3D_RS_WRAP1:
case WINED3D_RS_WRAP2: case WINED3D_RS_WRAP2:
case WINED3D_RS_WRAP3: case WINED3D_RS_WRAP3:
......
dlls/wined3d/directx.c
View file @ fc9324f2
...@@ -2811,7 +2811,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = ...@@ -2811,7 +2811,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] =
{STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {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}},
{STATE_RENDER(WINED3D_RS_WRAP0), {STATE_VDECL}},
{STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_VDECL}},
{STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_VDECL}},
{STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_VDECL}},
......
dlls/wined3d/state.c
View file @ fc9324f2
...@@ -1816,30 +1816,6 @@ void state_pointsprite(struct wined3d_context *context, const struct wined3d_sta ...@@ -1816,30 +1816,6 @@ void state_pointsprite(struct wined3d_context *context, const struct wined3d_sta
} }
} }
static void state_wrap(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
{
static unsigned int once;
if ((state->render_states[WINED3D_RS_WRAP0]
|| state->render_states[WINED3D_RS_WRAP1]
|| state->render_states[WINED3D_RS_WRAP2]
|| state->render_states[WINED3D_RS_WRAP3]
|| state->render_states[WINED3D_RS_WRAP4]
|| state->render_states[WINED3D_RS_WRAP5]
|| state->render_states[WINED3D_RS_WRAP6]
|| state->render_states[WINED3D_RS_WRAP7]
|| state->render_states[WINED3D_RS_WRAP8]
|| state->render_states[WINED3D_RS_WRAP9]
|| state->render_states[WINED3D_RS_WRAP10]
|| state->render_states[WINED3D_RS_WRAP11]
|| state->render_states[WINED3D_RS_WRAP12]
|| state->render_states[WINED3D_RS_WRAP13]
|| state->render_states[WINED3D_RS_WRAP14]
|| state->render_states[WINED3D_RS_WRAP15])
&& !once++)
FIXME("(WINED3D_RS_WRAP0) Texture wrapping not yet supported.\n");
}
static void state_msaa_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) static void state_msaa_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
{ {
if (state->render_states[WINED3D_RS_MULTISAMPLEANTIALIAS]) if (state->render_states[WINED3D_RS_MULTISAMPLEANTIALIAS])
...@@ -4681,7 +4657,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = ...@@ -4681,7 +4657,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] =
{ 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_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_WRAP0), { STATE_RENDER(WINED3D_RS_WRAP0), state_wrap }, WINED3D_GL_EXT_NONE },
{ STATE_RENDER(WINED3D_RS_EXTENTS), { STATE_RENDER(WINED3D_RS_EXTENTS), state_extents }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_EXTENTS), { STATE_RENDER(WINED3D_RS_EXTENTS), state_extents }, WINED3D_GL_EXT_NONE },
{ STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_ckeyblend }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_ckeyblend }, WINED3D_GL_EXT_NONE },
{ STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_swvp }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_swvp }, WINED3D_GL_EXT_NONE },
...@@ -5461,8 +5436,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) ...@@ -5461,8 +5436,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table)
{ 39, 40}, { 39, 40},
{ 42, 47}, { 42, 47},
{ 49, 59}, { 49, 59},
{ 61, 127}, { 61, 135},
{129, 135},
{149, 150}, {149, 150},
{162, 162}, {162, 162},
{168, 169}, {168, 169},
......
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