diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index ec9863de..5f49e11f 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "4f53be1a6e7c15c3648b0770f9d92685dc9a9717" + echo "eb63713f606d81dee75d7fdbc5685cc3862bc63f" } # Show version information diff --git a/patches/wined3d-SWVP-shaders/0004-wined3d-Support-SWVP-vertex-shader-constants-limit-i.patch b/patches/wined3d-SWVP-shaders/0004-wined3d-Support-SWVP-vertex-shader-constants-limit-i.patch index de81a159..11893ed6 100644 --- a/patches/wined3d-SWVP-shaders/0004-wined3d-Support-SWVP-vertex-shader-constants-limit-i.patch +++ b/patches/wined3d-SWVP-shaders/0004-wined3d-Support-SWVP-vertex-shader-constants-limit-i.patch @@ -1,4 +1,4 @@ -From 61505b768160ab77740b5556abb3596c69054d00 Mon Sep 17 00:00:00 2001 +From 15026047d13543bb9f4c8ca21342299d219c99b8 Mon Sep 17 00:00:00 2001 From: Paul Gofman Date: Mon, 25 Feb 2019 15:05:12 +0300 Subject: [PATCH] wined3d: Support SWVP vertex shader constants limit in state @@ -7,15 +7,15 @@ Subject: [PATCH] wined3d: Support SWVP vertex shader constants limit in state --- dlls/d3d9/tests/device.c | 5 ----- dlls/d3d9/tests/visual.c | 1 - - dlls/wined3d/device.c | 17 +++++++++++++---- + dlls/wined3d/device.c | 18 ++++++++++++++++-- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/stateblock.c | 30 ++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 4 ++-- include/wine/wined3d.h | 2 +- - 7 files changed, 39 insertions(+), 22 deletions(-) + 7 files changed, 42 insertions(+), 20 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c -index 8c1ebc1719..b60468e013 100644 +index d00a26b942c..09446d0be62 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6413,13 +6413,10 @@ static void test_vertex_shader_constant(void) @@ -49,7 +49,7 @@ index 8c1ebc1719..b60468e013 100644 hr = IDirect3DDevice9_SetVertexShaderConstantF(device, consts_swvp - 1, c, 1); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c -index cb84ef6f28..2d6e1fa688 100644 +index cb84ef6f284..2d6e1fa688f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -24884,7 +24884,6 @@ static void test_mvp_software_vertex_shaders(void) @@ -61,43 +61,45 @@ index cb84ef6f28..2d6e1fa688 100644 hr = IDirect3DDevice9_BeginScene(device); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c -index e63d538bc1..2bc7ca8562 100644 +index a583df85307..46e7a0ad566 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c -@@ -2116,13 +2116,17 @@ HRESULT CDECL wined3d_device_set_vs_consts_f(struct wined3d_device *device, +@@ -2071,11 +2071,20 @@ static void wined3d_device_set_vs_consts_i(struct wined3d_device *device, + static void wined3d_device_set_vs_consts_f(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants) { - const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; ++ const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; + unsigned int constants_count; unsigned int i; TRACE("device %p, start_idx %u, count %u, constants %p.\n", device, start_idx, count, constants); -- if (!constants || start_idx >= d3d_info->limits.vs_uniform_count -- || count > d3d_info->limits.vs_uniform_count - start_idx) + constants_count = device->create_parms.flags + & (WINED3DCREATE_SOFTWARE_VERTEXPROCESSING | WINED3DCREATE_MIXED_VERTEXPROCESSING) + ? d3d_info->limits.vs_uniform_count_swvp : d3d_info->limits.vs_uniform_count; + if (!constants || start_idx >= constants_count + || count > constants_count - start_idx) - return WINED3DERR_INVALIDCALL; - ++ return WINED3DERR_INVALIDCALL; ++ memcpy(&device->state.vs_consts_f[start_idx], constants, count * sizeof(*constants)); -@@ -3586,10 +3590,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, + if (TRACE_ON(d3d)) + { +@@ -3506,11 +3515,12 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, struct wined3d_stateblock *stateblock) { const struct wined3d_stateblock_state *state = &stateblock->stateblock_state; + const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; const struct wined3d_saved_states *changed = &stateblock->changed; const unsigned int word_bit_count = sizeof(DWORD) * CHAR_BIT; + BOOL set_blend_state, set_rasterizer_state = FALSE; + unsigned int i, j, start, idx, vs_uniform_count; struct wined3d_blend_state *blend_state; - unsigned int i, j, start, idx; struct wined3d_color colour; struct wined3d_range range; - BOOL set_blend_state; -@@ -3602,9 +3607,13 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, + DWORD map, stage; +@@ -3522,9 +3532,13 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, if (changed->pixelShader) wined3d_device_set_pixel_shader(device, state->ps); @@ -113,7 +115,7 @@ index e63d538bc1..2bc7ca8562 100644 wined3d_device_set_vs_consts_f(device, range.offset, range.size, &state->vs_consts_f[range.offset]); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c -index 4f7cc772be..a88f92cc03 100644 +index 412b12184f1..33666d5eb8c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1913,7 +1913,7 @@ static void shader_glsl_update_float_vertex_constants(struct wined3d_device *dev @@ -126,7 +128,7 @@ index 4f7cc772be..a88f92cc03 100644 update_heap_entry(heap, i, priv->next_constant_version); } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c -index 70943afdda..22862403e9 100644 +index 70943afddaa..22862403e90 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -720,9 +720,10 @@ static void wined3d_state_record_lights(struct wined3d_light_state *dst_state, @@ -221,10 +223,10 @@ index 70943afdda..22862403e9 100644 default: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h -index 46ffe40e6f..2f83e1dd19 100644 +index 21d7f1e28f7..81f915b7c25 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h -@@ -3200,7 +3200,7 @@ struct wined3d_state +@@ -3208,7 +3208,7 @@ struct wined3d_state struct wined3d_shader_resource_view *shader_resource_view[WINED3D_SHADER_TYPE_COUNT][MAX_SHADER_RESOURCE_VIEWS]; struct wined3d_unordered_access_view *unordered_access_view[WINED3D_PIPELINE_COUNT][MAX_UNORDERED_ACCESS_VIEWS]; @@ -233,7 +235,7 @@ index 46ffe40e6f..2f83e1dd19 100644 struct wined3d_ivec4 vs_consts_i[WINED3D_MAX_CONSTS_I]; BOOL vs_consts_b[WINED3D_MAX_CONSTS_B]; -@@ -3918,7 +3918,7 @@ struct wined3d_vertex_declaration +@@ -3944,7 +3944,7 @@ struct wined3d_vertex_declaration struct wined3d_saved_states { @@ -243,10 +245,10 @@ index 46ffe40e6f..2f83e1dd19 100644 WORD vertexShaderConstantsB; /* WINED3D_MAX_CONSTS_B, 16 */ DWORD ps_consts_f[WINED3D_MAX_PS_CONSTS_F >> 5]; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h -index 2eeb3aee11..0fc6dc0ba2 100644 +index 08e7890b12b..e7e3af50166 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h -@@ -2149,7 +2149,7 @@ struct wined3d_stateblock_state +@@ -2161,7 +2161,7 @@ struct wined3d_stateblock_state int base_vertex_index; struct wined3d_shader *vs; @@ -256,5 +258,5 @@ index 2eeb3aee11..0fc6dc0ba2 100644 BOOL vs_consts_b[WINED3D_MAX_CONSTS_B]; -- -2.24.1 +2.25.1 diff --git a/patches/wined3d-WINED3D_RS_COLORWRITEENABLE/0001-wined3d-Implement-all-8-d3d11-color-write-masks.patch b/patches/wined3d-WINED3D_RS_COLORWRITEENABLE/0001-wined3d-Implement-all-8-d3d11-color-write-masks.patch index 713335eb..a800a674 100644 --- a/patches/wined3d-WINED3D_RS_COLORWRITEENABLE/0001-wined3d-Implement-all-8-d3d11-color-write-masks.patch +++ b/patches/wined3d-WINED3D_RS_COLORWRITEENABLE/0001-wined3d-Implement-all-8-d3d11-color-write-masks.patch @@ -1,23 +1,23 @@ -From a5242e0992b7e7dab04d32527b9b11564ea8efa0 Mon Sep 17 00:00:00 2001 +From 4e0ec516c5494db8c99e0f2e32f491a88b93cac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 20 Jul 2017 13:50:07 +0200 Subject: [PATCH] wined3d: Implement all 8 d3d11 color write masks. --- - dlls/d3d11/device.c | 29 +++++++++----------- - dlls/d3d11/state.c | 4 --- - dlls/wined3d/context.c | 10 +++---- + dlls/d3d11/device.c | 29 ++++++++++------------- + dlls/d3d11/state.c | 4 ---- + dlls/wined3d/context.c | 10 ++++---- dlls/wined3d/device.c | 6 ++--- - dlls/wined3d/state.c | 48 ++++++++++++++++++++-------------- - dlls/wined3d/stateblock.c | 11 +++++--- - dlls/wined3d/surface.c | 7 +++-- + dlls/wined3d/state.c | 43 ++++++++++++++++++++++++---------- + dlls/wined3d/stateblock.c | 11 +++++---- + dlls/wined3d/surface.c | 7 +++--- dlls/wined3d/utils.c | 6 ++++- dlls/wined3d/wined3d_private.h | 1 + - include/wine/wined3d.h | 14 +++++++++- - 10 files changed, 77 insertions(+), 59 deletions(-) + include/wine/wined3d.h | 14 ++++++++++- + 10 files changed, 78 insertions(+), 53 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c -index cb6712021c9..1966f146506 100644 +index 2ac8f2bf84c..15298d2cc97 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2088,6 +2088,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi @@ -71,7 +71,7 @@ index cb6712021c9..1966f146506 100644 } diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c -index 92b75f8e1fb..29dfec3baa9 100644 +index 4d56f7dc752..186cb1511c3 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -344,10 +344,6 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC @@ -86,10 +86,10 @@ index 92b75f8e1fb..29dfec3baa9 100644 /* glEnableIndexedEXT(GL_BLEND, ...) */ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c -index ded9b39a6b2..f63d0e6a049 100644 +index a634b6146ec..58ac8b6dfe1 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c -@@ -2796,7 +2796,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, +@@ -3059,7 +3059,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, const struct wined3d_gl_info *gl_info; uint32_t rt_mask, *cur_mask; struct wined3d_texture *rt; @@ -98,7 +98,7 @@ index ded9b39a6b2..f63d0e6a049 100644 SIZE rt_size; TRACE("Setting up context %p for blitting.\n", context); -@@ -2903,10 +2903,8 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, +@@ -3166,10 +3166,8 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, context_invalidate_state(context, STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE)); } gl_info->gl_ops.gl.p_glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); @@ -111,7 +111,7 @@ index ded9b39a6b2..f63d0e6a049 100644 context->last_was_rhw = TRUE; context_invalidate_state(context, STATE_VDECL); /* because of last_was_rhw = TRUE */ -@@ -4909,7 +4907,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s +@@ -5172,7 +5170,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (!(rtv = fb->render_targets[i]) || rtv->format->id == WINED3DFMT_NULL) continue; @@ -121,10 +121,10 @@ index ded9b39a6b2..f63d0e6a049 100644 wined3d_rendertarget_view_load_location(rtv, context, rtv->resource->draw_binding); wined3d_rendertarget_view_invalidate_location(rtv, ~rtv->resource->draw_binding); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c -index b0f387e4aca..84e43a12ea9 100644 +index 53dcdbc5622..7400902e620 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c -@@ -438,10 +438,8 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c +@@ -437,10 +437,8 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c } gl_info->gl_ops.gl.p_glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); @@ -138,10 +138,10 @@ index b0f387e4aca..84e43a12ea9 100644 checkGLcall("glClearColor"); clear_mask = clear_mask | GL_COLOR_BUFFER_BIT; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c -index b24372ca952..99deaf64522 100644 +index 58e0a7e53e9..4d8253254b6 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c -@@ -1553,9 +1553,6 @@ static void state_colorwrite(struct wined3d_context *context, const struct wined +@@ -1551,9 +1551,6 @@ static void state_colorwrite(struct wined3d_context *context, const struct wined { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; DWORD mask0 = state->render_states[WINED3D_RS_COLORWRITEENABLE]; @@ -151,7 +151,7 @@ index b24372ca952..99deaf64522 100644 TRACE("Color mask: r(%d) g(%d) b(%d) a(%d)\n", mask0 & WINED3DCOLORWRITEENABLE_RED ? 1 : 0, -@@ -1568,13 +1565,7 @@ static void state_colorwrite(struct wined3d_context *context, const struct wined +@@ -1566,13 +1563,7 @@ static void state_colorwrite(struct wined3d_context *context, const struct wined mask0 & WINED3DCOLORWRITEENABLE_ALPHA ? GL_TRUE : GL_FALSE); checkGLcall("glColorMask(...)"); @@ -166,7 +166,7 @@ index b24372ca952..99deaf64522 100644 } static void set_color_mask(const struct wined3d_gl_info *gl_info, UINT index, DWORD mask) -@@ -1587,9 +1578,20 @@ static void set_color_mask(const struct wined3d_gl_info *gl_info, UINT index, DW +@@ -1585,9 +1576,20 @@ static void set_color_mask(const struct wined3d_gl_info *gl_info, UINT index, DW checkGLcall("glColorMaski"); } @@ -189,7 +189,7 @@ index b24372ca952..99deaf64522 100644 } static void state_colorwrite1(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -@@ -4671,18 +4673,26 @@ const struct wined3d_state_entry_template misc_state_template[] = +@@ -4673,8 +4675,22 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), state_msaa_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_MULTISAMPLEMASK), { STATE_RENDER(WINED3D_RS_MULTISAMPLEMASK), state_multisampmask }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), { STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), state_debug_monitor }, WINED3D_GL_EXT_NONE }, @@ -213,18 +213,16 @@ index b24372ca952..99deaf64522 100644 { STATE_RENDER(WINED3D_RS_BLENDOP), { STATE_RENDER(WINED3D_RS_BLENDOP), state_blendop }, WINED3D_GL_BLEND_EQUATION }, { STATE_RENDER(WINED3D_RS_BLENDOP), { STATE_RENDER(WINED3D_RS_BLENDOP), state_blendop_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SCISSORTESTENABLE), { STATE_RENDER(WINED3D_RS_SCISSORTESTENABLE), state_scissor }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_SLOPESCALEDEPTHBIAS), { STATE_RENDER(WINED3D_RS_DEPTHBIAS), NULL }, WINED3D_GL_EXT_NONE }, -- { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE1), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE1), state_colorwrite1 }, EXT_DRAW_BUFFERS2 }, -- { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE1), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), NULL }, WINED3D_GL_EXT_NONE }, -- { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE2), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE2), state_colorwrite2 }, EXT_DRAW_BUFFERS2 }, -- { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE2), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), NULL }, WINED3D_GL_EXT_NONE }, -- { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE3), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE3), state_colorwrite3 }, EXT_DRAW_BUFFERS2 }, -- { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE3), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), NULL }, WINED3D_GL_EXT_NONE }, +@@ -4684,6 +4700,7 @@ const struct wined3d_state_entry_template misc_state_template[] = + { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE2), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE3), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE3), state_colorwrite3 }, EXT_DRAW_BUFFERS2 }, + { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE3), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), NULL }, WINED3D_GL_EXT_NONE }, ++ { STATE_RENDER(WINED3D_RS_SLOPESCALEDEPTHBIAS), { STATE_RENDER(WINED3D_RS_DEPTHBIAS), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DEPTHBIAS), { STATE_RENDER(WINED3D_RS_DEPTHBIAS), state_depthbias }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_ZVISIBLE), { STATE_RENDER(WINED3D_RS_ZVISIBLE), state_zvisible }, WINED3D_GL_EXT_NONE }, /* Samplers */ diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c -index 2f27fa94e39..3f0c87f0121 100644 +index 22862403e90..f4cca385dcf 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -45,6 +45,10 @@ static const DWORD pixel_states_render[] = @@ -238,7 +236,7 @@ index 2f27fa94e39..3f0c87f0121 100644 WINED3D_RS_DEPTHBIAS, WINED3D_RS_DESTBLEND, WINED3D_RS_DESTBLENDALPHA, -@@ -1694,6 +1698,7 @@ const struct wined3d_stateblock_state * CDECL wined3d_stateblock_get_state(const +@@ -1680,6 +1684,7 @@ HRESULT CDECL wined3d_stateblock_get_light(const struct wined3d_stateblock *stat static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { @@ -246,7 +244,7 @@ index 2f27fa94e39..3f0c87f0121 100644 union { struct wined3d_line_pattern lp; -@@ -1787,7 +1792,6 @@ static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], c +@@ -1773,7 +1778,6 @@ static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], c tmpfloat.f = d3d_info->limits.pointsize_max; rs[WINED3D_RS_POINTSIZE_MAX] = tmpfloat.d; rs[WINED3D_RS_INDEXEDVERTEXBLENDENABLE] = FALSE; @@ -254,7 +252,7 @@ index 2f27fa94e39..3f0c87f0121 100644 tmpfloat.f = 0.0f; rs[WINED3D_RS_TWEENFACTOR] = tmpfloat.d; rs[WINED3D_RS_BLENDOP] = WINED3D_BLEND_OP_ADD; -@@ -1813,9 +1817,6 @@ static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], c +@@ -1799,9 +1803,6 @@ static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], c rs[WINED3D_RS_BACK_STENCILZFAIL] = WINED3D_STENCIL_OP_KEEP; rs[WINED3D_RS_BACK_STENCILPASS] = WINED3D_STENCIL_OP_KEEP; rs[WINED3D_RS_BACK_STENCILFUNC] = WINED3D_CMP_ALWAYS; @@ -264,7 +262,7 @@ index 2f27fa94e39..3f0c87f0121 100644 rs[WINED3D_RS_BLENDFACTOR] = 0xffffffff; rs[WINED3D_RS_SRGBWRITEENABLE] = 0; rs[WINED3D_RS_DEPTHBIAS] = 0; -@@ -1831,6 +1832,8 @@ static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], c +@@ -1817,6 +1818,8 @@ static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], c rs[WINED3D_RS_SRCBLENDALPHA] = WINED3D_BLEND_ONE; rs[WINED3D_RS_DESTBLENDALPHA] = WINED3D_BLEND_ZERO; rs[WINED3D_RS_BLENDOPALPHA] = WINED3D_BLEND_OP_ADD; @@ -274,7 +272,7 @@ index 2f27fa94e39..3f0c87f0121 100644 static void init_default_texture_state(unsigned int i, DWORD stage[WINED3D_HIGHEST_TEXTURE_STATE + 1]) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c -index 100ec891187..9eb343117b1 100644 +index 8a545d821e5..6a5a8fc870c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -153,6 +153,7 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co @@ -299,10 +297,10 @@ index 100ec891187..9eb343117b1 100644 gl_info->gl_ops.gl.p_glDisable(GL_SCISSOR_TEST); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_SCISSORTESTENABLE)); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c -index 306eadf1243..0f44702e351 100644 +index 9ad294c597e..0e04fef296d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c -@@ -4961,7 +4961,6 @@ const char *debug_d3drenderstate(enum wined3d_render_state state) +@@ -4972,7 +4972,6 @@ const char *debug_d3drenderstate(enum wined3d_render_state state) D3DSTATE_TO_STR(WINED3D_RS_DEBUGMONITORTOKEN); D3DSTATE_TO_STR(WINED3D_RS_POINTSIZE_MAX); D3DSTATE_TO_STR(WINED3D_RS_INDEXEDVERTEXBLENDENABLE); @@ -310,7 +308,7 @@ index 306eadf1243..0f44702e351 100644 D3DSTATE_TO_STR(WINED3D_RS_TWEENFACTOR); D3DSTATE_TO_STR(WINED3D_RS_BLENDOP); D3DSTATE_TO_STR(WINED3D_RS_POSITIONDEGREE); -@@ -4981,9 +4980,14 @@ const char *debug_d3drenderstate(enum wined3d_render_state state) +@@ -4992,9 +4991,14 @@ const char *debug_d3drenderstate(enum wined3d_render_state state) D3DSTATE_TO_STR(WINED3D_RS_BACK_STENCILZFAIL); D3DSTATE_TO_STR(WINED3D_RS_BACK_STENCILPASS); D3DSTATE_TO_STR(WINED3D_RS_BACK_STENCILFUNC); @@ -326,10 +324,10 @@ index 306eadf1243..0f44702e351 100644 D3DSTATE_TO_STR(WINED3D_RS_DEPTHBIAS); D3DSTATE_TO_STR(WINED3D_RS_WRAP8); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h -index d35996d4590..418c0bb908d 100644 +index 5c0324273a0..e2f715becf2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h -@@ -285,6 +285,7 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup +@@ -291,6 +291,7 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup #define MAX_UNORDERED_ACCESS_VIEWS 8 #define MAX_TGSM_REGISTERS 8192 #define MAX_VERTEX_BLENDS 4 @@ -338,10 +336,10 @@ index d35996d4590..418c0bb908d 100644 struct min_lookup { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h -index 21533eac21e..30db4a7fe28 100644 +index e7e3af50166..d9a09f0f6b4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h -@@ -401,8 +401,20 @@ enum wined3d_render_state +@@ -404,8 +404,20 @@ enum wined3d_render_state WINED3D_RS_SRCBLENDALPHA = 207, WINED3D_RS_DESTBLENDALPHA = 208, WINED3D_RS_BLENDOPALPHA = 209, @@ -364,5 +362,5 @@ index 21533eac21e..30db4a7fe28 100644 enum wined3d_blend { -- -2.24.0 +2.25.1