Module: wine Branch: master Commit: c126a7eacd077fc9fa4ab040c51b688a7d7ba9fa URL: https://gitlab.winehq.org/wine/wine/-/commit/c126a7eacd077fc9fa4ab040c51b688...
Author: Max Figura maxfigura5061@gmail.com Date: Mon Dec 12 12:01:56 2022 -0600
wined3d: Move the WINED3D_RS_TEXTUREPERSPECTIVE stub to wined3d_device_apply_stateblock.
---
dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 3 +++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 3 +-- 4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 5d21c96c094..57f7996bbf9 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -96,7 +96,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] =
{STATE_VIEWPORT, {STATE_VIEWPORT, state_nop}}, {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, - {STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), {STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAPU), {STATE_RENDER(WINED3D_RS_WRAPU), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAPV), {STATE_RENDER(WINED3D_RS_WRAPV), state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index df2ac1c57df..d8ad324471b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4044,6 +4044,9 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Antialias not supported yet.\n"); break;
+ case WINED3D_RS_TEXTUREPERSPECTIVE: + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6a15ab937b8..e571a11b917 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2808,7 +2808,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] =
{STATE_VIEWPORT, {STATE_VDECL}}, {STATE_INDEXBUFFER, {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAPU), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAPV), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e1d4cf946b0..46880235f64 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4780,7 +4780,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_VIEWPORT, { STATE_VIEWPORT, viewport_miscpart }, WINED3D_GL_EXT_NONE }, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, indexbuffer }, ARB_VERTEX_BUFFER_OBJECT }, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, state_nop }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), { STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), state_nop }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAPU), { STATE_RENDER(WINED3D_RS_WRAPU), state_wrapu }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAPV), { STATE_RENDER(WINED3D_RS_WRAPV), state_wrapv }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, @@ -5586,7 +5585,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) } rs_holes[] = { - { 1, 3}, + { 1, 4}, { 7, 8}, { 14, 14}, { 17, 23},