Module: wine Branch: master Commit: 79ea470d4d67f454133e1d41e0d3c5de3e083023 URL: https://gitlab.winehq.org/wine/wine/-/commit/79ea470d4d67f454133e1d41e0d3c5d...
Author: Max Figura maxfigura5061@gmail.com Date: Tue Dec 13 09:16:13 2022 -0600
wined3d: Move the WINED3D_RS_DEBUGMONITORTOKEN stub to wined3d_device_apply_stateblock.
---
dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 4 ++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 8 +------- 4 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index f743d6386d7..7e33aea747b 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -108,7 +108,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_RENDER(WINED3D_RS_ADAPTIVETESS_W), {STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION)}}, {STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION), {STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION), state_nop}}, {STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), {STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), state_nop}}, - {STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), {STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), state_nop}}, /* Samplers */ {STATE_SAMPLER(0), {STATE_SAMPLER(0), state_nop}}, {STATE_SAMPLER(1), {STATE_SAMPLER(1), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ea2900eeae7..f823e2ffa4a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4200,6 +4200,10 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, break; }
+ case WINED3D_RS_DEBUGMONITORTOKEN: + WARN("token: %#x.\n", state->rs[WINED3D_RS_DEBUGMONITORTOKEN]); + 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 bb34c0f03af..db335652d8e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2821,7 +2821,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_ADAPTIVETESS_W), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), {STATE_VDECL}}, /* Samplers */ {STATE_SAMPLER(0), {STATE_VDECL}}, {STATE_SAMPLER(1), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 78ad0ed1062..af26b3f9404 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1766,11 +1766,6 @@ static void state_pscale(struct wined3d_context *context, const struct wined3d_s checkGLcall("glPointSize(...);"); }
-static void state_debug_monitor(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - WARN("token: %#x.\n", state->render_states[WINED3D_RS_DEBUGMONITORTOKEN]); -} - static void state_localviewer(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; @@ -4619,7 +4614,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION),{ STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION),state_tessellation }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), state_msaa }, ARB_MULTISAMPLE }, { STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), state_msaa_w }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), { STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), state_debug_monitor }, WINED3D_GL_EXT_NONE }, /* Samplers */ { STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(1), { STATE_SAMPLER(1), sampler }, WINED3D_GL_EXT_NONE }, @@ -5387,7 +5381,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) {144, 144}, {149, 150}, {153, 153}, - {162, 164}, + {162, 165}, {168, 169}, {171, 171}, {174, 177},