wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against c92fddae8661233e7699e1914987f0cc4caa8217

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2019-06-04 09:10:22 +10:00
parent 671295089e
commit 3287f0fc9b
5 changed files with 84 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
patches/dsound-EAX/0002-dsound-Add-EAX-v1-constants-and-structs.patch
View File

@ -1,10 +1,10 @@
From 85367d69fb057ba4557d9195b324425bd0e84316 Mon Sep 17 00:00:00 2001
From 0204d4b3482b55cf3b4d74bbcabd8e95e6e192ef Mon Sep 17 00:00:00 2001
From: Mark Harmstone <mark@harmstone.com>
Date: Sun, 15 Mar 2015 18:04:16 +0000
Subject: dsound: Add EAX v1 constants and structs.
Subject: [PATCH] dsound: Add EAX v1 constants and structs.
---
dlls/dsound/dsound_eax.h | 89 ++++++++++++++++++++++++++++++++++++++++++++
dlls/dsound/dsound_eax.h | 89 ++++++++++++++++++++++++++++++++++++
dlls/dsound/dsound_private.h | 1 +
2 files changed, 90 insertions(+)
create mode 100644 dlls/dsound/dsound_eax.h
@ -105,7 +105,7 @@ index 00000000000..600029fa94f
+
+#endif
diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
index 45232cbd729..58163646fd7 100644
index b19acba2b98..eb9f5c9e3bc 100644
--- a/dlls/dsound/dsound_private.h
+++ b/dlls/dsound/dsound_private.h
@@ -29,6 +29,7 @@
@ -115,7 +115,7 @@ index 45232cbd729..58163646fd7 100644
+#include "dsound_eax.h"
#include "wine/list.h"
#include "wine/unicode.h"
--
2.13.1
2.17.1

22
patches/ntoskrnl-Stubs/0011-ntoskrnl.exe-Add-IoGetDeviceAttachmentBaseRef-stub.patch
View File

@ -1,7 +1,7 @@
From a6a3dee1aaa6276cd845043835dbd52098e5579a Mon Sep 17 00:00:00 2001
From a9f3caf61dd6cf1ace65e7c7e2edef0456f6a9d1 Mon Sep 17 00:00:00 2001
From: Jarkko Korpi <jarkko_korpi@hotmail.com>
Date: Sat, 19 Mar 2016 21:54:19 +0200
Subject: ntoskrnl.exe: Add IoGetDeviceAttachmentBaseRef stub.
Subject: [PATCH] ntoskrnl.exe: Add IoGetDeviceAttachmentBaseRef stub.
---
dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++
@ -9,13 +9,14 @@ Subject: ntoskrnl.exe: Add IoGetDeviceAttachmentBaseRef stub.
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
index 3bee2bf..9232ba6 100644
index 8f025a108d4..f5964b4d90b 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -993,6 +993,16 @@ NTSTATUS WINAPI IoDeleteSymbolicLink( UNICODE_STRING *name )
@@ -1580,6 +1580,16 @@ NTSTATUS WINAPI IoDeleteSymbolicLink( UNICODE_STRING *name )
return status;
}
/***********************************************************************
+/***********************************************************************
+ * IoGetDeviceAttachmentBaseRef (NTOSKRNL.EXE.@)
+ */
+PDEVICE_OBJECT WINAPI IoGetDeviceAttachmentBaseRef( PDEVICE_OBJECT device )
@ -25,15 +26,14 @@ index 3bee2bf..9232ba6 100644
+}
+
+
+/***********************************************************************
/***********************************************************************
* IoGetDeviceInterfaces (NTOSKRNL.EXE.@)
*/
NTSTATUS WINAPI IoGetDeviceInterfaces( const GUID *InterfaceClassGuid,
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
index 1414c53..c567b14 100644
index 87afae008e1..9ebedf21a5e 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
@@ -379,7 +379,7 @@
@@ -392,7 +392,7 @@
@ stub IoGetBootDiskInformation
@ stdcall IoGetConfigurationInformation()
@ stdcall IoGetCurrentProcess()
@ -43,5 +43,5 @@ index 1414c53..c567b14 100644
@ stdcall IoGetDeviceInterfaces(ptr ptr long ptr)
@ stdcall IoGetDeviceObjectPointer(ptr long ptr ptr)
--
2.7.1
2.17.1

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "1d9a3f6d12322891a2af4aadd66a92ea66479233"
echo "c92fddae8661233e7699e1914987f0cc4caa8217"
}
# Show version information

66
patches/wined3d-Dual_Source_Blending/0003-wined3d-Implement-dual-source-blending.patch
View File

@ -1,4 +1,4 @@
From 3bf17d57ac7a55640cf1c6f16f5bf41d96e31d43 Mon Sep 17 00:00:00 2001
From 7ef701a854c9f9ff4a8192239ec99c6cc5d3b496 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 18 Aug 2017 23:51:59 +0200
Subject: [PATCH] wined3d: Implement dual source blending.
@ -6,18 +6,18 @@ Subject: [PATCH] wined3d: Implement dual source blending.
---
dlls/d3d11/tests/d3d11.c | 2 +-
dlls/wined3d/adapter_gl.c | 10 ++++++++++
dlls/wined3d/context.c | 12 +++++++++++-
dlls/wined3d/context.c | 13 ++++++++++++-
dlls/wined3d/glsl_shader.c | 20 +++++++++++++++++---
dlls/wined3d/shader.c | 2 ++
dlls/wined3d/state.c | 14 ++++++++++++--
dlls/wined3d/wined3d_private.h | 24 ++++++++++++++++++++++--
7 files changed, 75 insertions(+), 9 deletions(-)
7 files changed, 76 insertions(+), 9 deletions(-)
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index 4b2f435..d6d4f0a 100644
index c5d57851bab..eb87e107257 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -29441,7 +29441,7 @@ static void test_dual_blending(void)
@@ -29429,7 +29429,7 @@ static void test_dual_blending(void)
ID3D11DeviceContext_ClearRenderTargetView(context, rtv[1], white);
ID3D11DeviceContext_Draw(context, 3, 0);
@ -27,10 +27,10 @@ index 4b2f435..d6d4f0a 100644
ID3D11BlendState_Release(blend_state);
diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c
index 09ea350..231955a 100644
index 110771f8ea9..24d370e6461 100644
--- a/dlls/wined3d/adapter_gl.c
+++ b/dlls/wined3d/adapter_gl.c
@@ -2924,6 +2924,12 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info, struct
@@ -2974,6 +2974,12 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info, struct
gl_info->limits.buffers = min(MAX_RENDER_TARGET_VIEWS, gl_max);
TRACE("Max draw buffers: %u.\n", gl_max);
}
@ -43,7 +43,7 @@ index 09ea350..231955a 100644
if (gl_info->supported[ARB_MULTITEXTURE])
{
if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT])
@@ -3751,6 +3757,10 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter,
@@ -3802,6 +3808,10 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter,
TRACE("Max texture stages: %u.\n", d3d_info->limits.ffp_blend_stages);
@ -55,11 +55,19 @@ index 09ea350..231955a 100644
{
/* We do not want to deal with re-creating immutable texture storage
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index aa4d260..2c7935c 100644
index 9dbdd945f09..473c8090c81 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -3153,10 +3153,20 @@ static unsigned int find_draw_buffers_mask(const struct wined3d_context *context
else if (!context->render_offscreen)
@@ -3122,6 +3122,7 @@ static uint32_t find_draw_buffers_mask(const struct wined3d_context_gl *context_
struct wined3d_rendertarget_view * const *rts = state->fb->render_targets;
struct wined3d_shader *ps = state->shader[WINED3D_SHADER_TYPE_PIXEL];
const struct wined3d_gl_info *gl_info = context_gl->c.gl_info;
+ const struct wined3d_d3d_info *d3d_info = &ps->device->adapter->d3d_info;
unsigned int rt_mask, mask;
unsigned int i;
@@ -3130,10 +3131,20 @@ static uint32_t find_draw_buffers_mask(const struct wined3d_context_gl *context_
else if (!context_gl->c.render_offscreen)
return context_generate_rt_mask_from_resource(rts[0]->resource);
+ /* If we attach more buffers than supported in dual blend mode, the NVIDIA
@ -70,8 +78,8 @@ index aa4d260..2c7935c 100644
rt_mask = ps ? ps->reg_maps.rt_mask : 1;
- rt_mask &= (1u << gl_info->limits.buffers) - 1;
+
+ if (wined3d_dualblend_enabled(state, context->gl_info))
+ rt_mask &= context->d3d_info->valid_dual_rt_mask;
+ if (wined3d_dualblend_enabled(state, gl_info))
+ rt_mask &= d3d_info->valid_dual_rt_mask;
+ else
+ rt_mask &= (1u << gl_info->limits.buffers) - 1;
@ -81,10 +89,10 @@ index aa4d260..2c7935c 100644
{
i = wined3d_bit_scan(&mask);
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index f85fb5a..066a8fd 100644
index 54dfd964cd9..4369033b42a 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -2811,6 +2811,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register *
@@ -2798,6 +2798,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register *
break;
case WINED3DSPR_COLOROUT:
@ -92,7 +100,7 @@ index f85fb5a..066a8fd 100644
if (reg->idx[0].offset >= gl_info->limits.buffers)
WARN("Write to render target %u, only %d supported.\n",
reg->idx[0].offset, gl_info->limits.buffers);
@@ -7715,7 +7716,10 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context
@@ -7702,7 +7703,10 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context
{
const struct wined3d_shader_signature *output_signature = &shader->output_signature;
@ -104,7 +112,7 @@ index f85fb5a..066a8fd 100644
if (output_signature->element_count)
{
for (i = 0; i < output_signature->element_count; ++i)
@@ -7730,7 +7734,12 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context
@@ -7717,7 +7721,12 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context
continue;
}
if (shader_glsl_use_explicit_attrib_location(gl_info))
@ -118,7 +126,7 @@ index f85fb5a..066a8fd 100644
shader_addline(buffer, "out %s4 color_out%u;\n",
component_type_info[output->component_type].glsl_vector_type, output->semantic_idx);
}
@@ -7743,7 +7752,12 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context
@@ -7730,7 +7739,12 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context
{
i = wined3d_bit_scan(&mask);
if (shader_glsl_use_explicit_attrib_location(gl_info))
@ -133,7 +141,7 @@ index f85fb5a..066a8fd 100644
}
}
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 609b574..138b2dd 100644
index a8fee07c6c3..52c817ea399 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -4137,6 +4137,8 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3
@ -146,7 +154,7 @@ index 609b574..138b2dd 100644
static HRESULT pixel_shader_init(struct wined3d_shader *shader, struct wined3d_device *device,
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 08423e8..b22122d 100644
index 08423e831fd..b22122d9818 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -533,12 +533,14 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st
@ -189,10 +197,10 @@ index 08423e8..b22122d 100644
state->render_states[WINED3D_RS_SRCBLEND],
state->render_states[WINED3D_RS_DESTBLEND], rt_format);
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index dca3e81..a1c6d4e 100644
index a373cc97b9b..f97c6e245cb 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -197,6 +197,7 @@ struct wined3d_d3d_info
@@ -198,6 +198,7 @@ struct wined3d_d3d_info
{
struct wined3d_d3d_limits limits;
struct wined3d_ffp_attrib_ops ffp_attrib_ops;
@ -200,7 +208,7 @@ index dca3e81..a1c6d4e 100644
unsigned int wined3d_creation_flags;
unsigned int xyzrhw : 1;
unsigned int emulated_flatshading : 1;
@@ -1384,7 +1385,8 @@ struct ps_compile_args
@@ -1386,7 +1387,8 @@ struct ps_compile_args
DWORD alpha_test_func : 3;
DWORD render_offscreen : 1;
DWORD rt_alpha_swizzle : 8; /* MAX_RENDER_TARGET_VIEWS, 8 */
@ -211,16 +219,16 @@ index dca3e81..a1c6d4e 100644
enum fog_src_type
@@ -1938,7 +1940,8 @@ struct wined3d_context
DWORD transform_feedback_paused : 1;
DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */
DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */
DWORD num_untracked_materials : 2; /* Max value 2 */
- DWORD padding : 9;
- DWORD padding : 11;
+ DWORD last_was_dual_blend : 1;
+ DWORD padding : 8;
+ DWORD padding : 10;
DWORD constant_update_mask;
DWORD numbered_array_mask;
@@ -2614,6 +2617,7 @@ struct wined3d_fbo_ops
@@ -2617,6 +2620,7 @@ struct wined3d_fbo_ops
struct wined3d_gl_limits
{
UINT buffers;
@ -228,7 +236,7 @@ index dca3e81..a1c6d4e 100644
UINT lights;
UINT textures;
UINT texture_coords;
@@ -3079,6 +3083,22 @@ struct wined3d_state
@@ -3082,6 +3086,22 @@ struct wined3d_state
struct wined3d_rasterizer_state *rasterizer_state;
};
@ -252,5 +260,5 @@ index dca3e81..a1c6d4e 100644
{
GLuint tex_1d;
--
1.9.1
2.17.1

58
patches/wined3d-WINED3D_RS_COLORWRITEENABLE/0001-wined3d-Implement-all-8-d3d11-color-write-masks.patch
View File

@ -1,23 +1,23 @@
From f123897b94017ed6e036ddf0e57d2173e6a19690 Mon Sep 17 00:00:00 2001
From 127aa8250b996bf6a390819580ed86f56dd8224a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
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/device.c | 29 ++++++++---------
dlls/d3d11/state.c | 4 ---
dlls/wined3d/context.c | 10 +++-----
dlls/wined3d/device.c | 6 ++---
dlls/wined3d/state.c | 57 +++++++++++++++++++-----------------------
dlls/wined3d/stateblock.c | 11 +++++---
dlls/wined3d/surface.c | 7 +++---
dlls/wined3d/utils.c | 6 ++++-
dlls/wined3d/context.c | 10 +++---
dlls/wined3d/device.c | 6 ++--
dlls/wined3d/state.c | 57 ++++++++++++++++------------------
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 ++++++++++-
include/wine/wined3d.h | 14 ++++++++-
10 files changed, 74 insertions(+), 71 deletions(-)
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index ffa9330..c3fe4d4 100644
index ffa933007f5..c3fe4d45095 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -2089,6 +2089,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi
@ -71,7 +71,7 @@ index ffa9330..c3fe4d4 100644
}
diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c
index 6de3502..2051749 100644
index 6de35029556..20517498e39 100644
--- a/dlls/d3d11/state.c
+++ b/dlls/d3d11/state.c
@@ -347,10 +347,6 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC
@ -86,19 +86,19 @@ index 6de3502..2051749 100644
/* glEnableIndexedEXT(GL_BLEND, ...) */
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 07649a9..a0d2128 100644
index 7585b4103bb..4f23aae2bad 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -2755,7 +2755,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl,
@@ -2741,7 +2741,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;
DWORD rt_mask, *cur_mask;
- unsigned int sampler;
+ unsigned int i, sampler;
SIZE rt_size;
TRACE("Setting up context %p for blitting.\n", context);
@@ -2865,10 +2865,8 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl,
@@ -2849,10 +2849,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 07649a9..a0d2128 100644
context->last_was_rhw = TRUE;
context_invalidate_state(context, STATE_VDECL); /* because of last_was_rhw = TRUE */
@@ -4862,7 +4860,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s
@@ -4852,7 +4850,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 07649a9..a0d2128 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 232f740..c00621a2 100644
index c978c094887..9c96bcb2e7c 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -412,10 +412,8 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c
@@ -447,10 +447,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,7 +138,7 @@ index 232f740..c00621a2 100644
checkGLcall("glClearColor");
clear_mask = clear_mask | GL_COLOR_BUFFER_BIT;
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index af8797c..99f2f43 100644
index 224e0ff1921..707e5400005 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -1564,9 +1564,6 @@ static void state_debug_monitor(struct wined3d_context *context, const struct wi
@ -201,7 +201,7 @@ index af8797c..99f2f43 100644
}
static void state_localviewer(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
@@ -4678,18 +4665,26 @@ const struct wined3d_state_entry_template misc_state_template[] =
@@ -4679,18 +4666,26 @@ 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 },
@ -236,7 +236,7 @@ index af8797c..99f2f43 100644
{ 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 05149ad..e16b0e2 100644
index 05149ad1af1..e16b0e2d489 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -44,6 +44,10 @@ static const DWORD pixel_states_render[] =
@ -286,10 +286,10 @@ index 05149ad..e16b0e2 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 c8c1d0d..e8bb1eb 100644
index 88fbb1b575b..f7aba06c935 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -160,6 +160,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3
@@ -162,6 +162,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3
GLenum gl_filter;
GLenum buffer;
RECT s, d;
@ -297,7 +297,7 @@ index c8c1d0d..e8bb1eb 100644
TRACE("device %p, context %p, filter %s, src_texture %p, src_sub_resource_idx %u, src_location %s, "
"src_rect %s, dst_texture %p, dst_sub_resource_idx %u, dst_location %s, dst_rect %s.\n",
@@ -272,10 +273,8 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3
@@ -275,10 +276,8 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3
context_invalidate_state(context, STATE_FRAMEBUFFER);
gl_info->gl_ops.gl.p_glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
@ -311,7 +311,7 @@ index c8c1d0d..e8bb1eb 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 8c292f6..567ef18 100644
index 096bf4f4935..764d96b1bbe 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -4915,7 +4915,6 @@ const char *debug_d3drenderstate(enum wined3d_render_state state)
@ -338,10 +338,10 @@ index 8c292f6..567ef18 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 ff36a74..0dd2c5d 100644
index b4186740cf5..b3337d5f12c 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -282,6 +282,7 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup
@@ -284,6 +284,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
@ -350,7 +350,7 @@ index ff36a74..0dd2c5d 100644
struct min_lookup
{
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index ad73c66..ec40ebc 100644
index 98c566d62fa..5caf8ea6635 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -404,8 +404,20 @@ enum wined3d_render_state
@ -376,5 +376,5 @@ index ad73c66..ec40ebc 100644
enum wined3d_blend
{
--
1.9.1
2.17.1