mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Rebase against a7b33a6a428c9920d8130819373b1554bbd206c4
This commit is contained in:
Zebediah Figura
parent
8853cef050
commit
3fe54232fa
@ -1,50 +0,0 @@
|
||||
From 2449a79995ca680bb2b19ef558b2d060cd7cc196 Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
Date: Wed, 28 Mar 2018 17:41:31 +1100
|
||||
Subject: [PATCH] fltmgr.sys: Implement FltGetRoutineAddress
|
||||
|
||||
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
---
|
||||
dlls/fltmgr.sys/fltmgr.sys.spec | 2 +-
|
||||
dlls/fltmgr.sys/main.c | 15 +++++++++++++++
|
||||
2 files changed, 16 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec
|
||||
index c217ad3..7b1ba29 100644
|
||||
--- a/dlls/fltmgr.sys/fltmgr.sys.spec
|
||||
+++ b/dlls/fltmgr.sys/fltmgr.sys.spec
|
||||
@@ -79,7 +79,7 @@
|
||||
@ stub FltGetLowerInstance
|
||||
@ stub FltGetRequestorProcess
|
||||
@ stub FltGetRequestorProcessId
|
||||
-@ stub FltGetRoutineAddress
|
||||
+@ stdcall FltGetRoutineAddress(str)
|
||||
@ stub FltGetStreamContext
|
||||
@ stub FltGetStreamHandleContext
|
||||
@ stub FltGetSwappedBufferMdlAddress
|
||||
diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c
|
||||
index cedcdb1..75234f3 100644
|
||||
--- a/dlls/fltmgr.sys/main.c
|
||||
+++ b/dlls/fltmgr.sys/main.c
|
||||
@@ -64,3 +64,18 @@ void WINAPI FltUnregisterFilter (PFLT_FILTER filter)
|
||||
{
|
||||
FIXME( "(%p): stub\n", filter );
|
||||
}
|
||||
+
|
||||
+void* WINAPI FltGetRoutineAddress(LPCSTR name)
|
||||
+{
|
||||
+ static const WCHAR fltmgrW[] = {'f','l','t','m','g','r','.','s','y','s',0};
|
||||
+ HMODULE mod = GetModuleHandleW(fltmgrW);
|
||||
+ void *func;
|
||||
+
|
||||
+ func = GetProcAddress(mod, name);
|
||||
+ if (func)
|
||||
+ TRACE( "%s -> %p\n", debugstr_a(name), func );
|
||||
+ else
|
||||
+ FIXME( "%s not found\n", debugstr_a(name) );
|
||||
+
|
||||
+ return func;
|
||||
+}
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [44500] Add stubs for FltRegisterFilter, FltStartFiltering, FltUnregisterFilter
|
||||
@ -1,2 +1 @@
|
||||
# Fixes: [43607] Return S_OK from MFStartup stub
|
||||
Disabled: true
|
||||
Fixes: [43607] Return S_OK from MFStartup stub
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
Fixes: Fix wrong defition of ntoskrnl.IoReleaseCancelSpinLock function.
|
||||
Fixes: Add stub for ntoskrnl.Mm{Map,Unmap}LockedPages
|
||||
Fixes: [37355] Add stub for ntoskrnl.Mm{Map,Unmap}LockedPages
|
||||
Fixes: Implement ntoskrnl.KeInitializeMutex
|
||||
Fixes: Add stub for ntoskrnl.IoGetDeviceAttachmentBaseRef
|
||||
Fixes: Implement ntoskrnl.ExInterlockedPopEntrySList
|
||||
|
||||
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "aa27dd07aa55301f3e23acf9f74daa0f465e7b6d"
|
||||
echo "a7b33a6a428c9920d8130819373b1554bbd206c4"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -152,7 +152,6 @@ patch_enable_all ()
|
||||
enable_dxgi_MakeWindowAssociation="$1"
|
||||
enable_dxva2_Video_Decoder="$1"
|
||||
enable_explorer_Video_Registry_Key="$1"
|
||||
enable_fltmgr_sys_filters="$1"
|
||||
enable_fonts_Missing_Fonts="$1"
|
||||
enable_fsutil_Stub_Program="$1"
|
||||
enable_gdi32_GetCharacterPlacement="$1"
|
||||
@ -193,6 +192,7 @@ patch_enable_all ()
|
||||
enable_libs_Debug_Channel="$1"
|
||||
enable_libs_Unicode_Collation="$1"
|
||||
enable_loader_OSX_Preloader="$1"
|
||||
enable_mfplat_MFStartup="$1"
|
||||
enable_mmsystem_dll16_MIDIHDR_Refcount="$1"
|
||||
enable_mountmgr_DosDevices="$1"
|
||||
enable_mscoree_CorValidateImage="$1"
|
||||
@ -285,7 +285,6 @@ patch_enable_all ()
|
||||
enable_quartz_Silence_FIXMEs="$1"
|
||||
enable_riched20_Class_Tests="$1"
|
||||
enable_riched20_IText_Interface="$1"
|
||||
enable_rpcrt4_Race_Condition="$1"
|
||||
enable_secur32_Zero_Buffer_Length="$1"
|
||||
enable_server_ClipCursor="$1"
|
||||
enable_server_CreateProcess_ACLs="$1"
|
||||
@ -648,9 +647,6 @@ patch_enable ()
|
||||
explorer-Video_Registry_Key)
|
||||
enable_explorer_Video_Registry_Key="$2"
|
||||
;;
|
||||
fltmgr.sys-filters)
|
||||
enable_fltmgr_sys_filters="$2"
|
||||
;;
|
||||
fonts-Missing_Fonts)
|
||||
enable_fonts_Missing_Fonts="$2"
|
||||
;;
|
||||
@ -771,6 +767,9 @@ patch_enable ()
|
||||
loader-OSX_Preloader)
|
||||
enable_loader_OSX_Preloader="$2"
|
||||
;;
|
||||
mfplat-MFStartup)
|
||||
enable_mfplat_MFStartup="$2"
|
||||
;;
|
||||
mmsystem.dll16-MIDIHDR_Refcount)
|
||||
enable_mmsystem_dll16_MIDIHDR_Refcount="$2"
|
||||
;;
|
||||
@ -1047,9 +1046,6 @@ patch_enable ()
|
||||
riched20-IText_Interface)
|
||||
enable_riched20_IText_Interface="$2"
|
||||
;;
|
||||
rpcrt4-Race_Condition)
|
||||
enable_rpcrt4_Race_Condition="$2"
|
||||
;;
|
||||
secur32-Zero_Buffer_Length)
|
||||
enable_secur32_Zero_Buffer_Length="$2"
|
||||
;;
|
||||
@ -3845,21 +3841,6 @@ if test "$enable_explorer_Video_Registry_Key" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset fltmgr.sys-filters
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#44500] Add stubs for FltRegisterFilter, FltStartFiltering, FltUnregisterFilter
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/fltmgr.sys/fltmgr.sys.spec, dlls/fltmgr.sys/main.c
|
||||
# |
|
||||
if test "$enable_fltmgr_sys_filters" -eq 1; then
|
||||
patch_apply fltmgr.sys-filters/0005-fltmgr.sys-Implement-FltGetRoutineAddress.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Alistair Leslie-Hughes", "fltmgr.sys: Implement FltGetRoutineAddress.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset fonts-Missing_Fonts
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -4561,6 +4542,21 @@ if test "$enable_loader_OSX_Preloader" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset mfplat-MFStartup
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#43607] Return S_OK from MFStartup stub
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/mfplat/main.c, dlls/mfplat/tests/mfplat.c
|
||||
# |
|
||||
if test "$enable_mfplat_MFStartup" -eq 1; then
|
||||
patch_apply mfplat-MFStartup/0001-mfplat-Return-S_OK-from-MFStartup-stub.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Sebastian Lackner", "mfplat: Return S_OK from MFStartup stub.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset mmsystem.dll16-MIDIHDR_Refcount
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -5660,6 +5656,9 @@ fi
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
# | * Compiler_Warnings
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#37355] Add stub for ntoskrnl.Mm{Map,Unmap}LockedPages
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/ntoskrnl.exe/ntoskrnl.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec, include/ddk/wdm.h, include/winnt.h
|
||||
# |
|
||||
@ -6151,18 +6150,6 @@ if test "$enable_riched20_IText_Interface" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset rpcrt4-Race_Condition
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/rpcrt4/rpc_server.c
|
||||
# |
|
||||
if test "$enable_rpcrt4_Race_Condition" -eq 1; then
|
||||
patch_apply rpcrt4-Race_Condition/0001-rpcrt4-Hold-CS-while-iterating-through-protseqs-list.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Sebastian Lackner", "rpcrt4: Hold CS while iterating through protseqs list.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset secur32-Zero_Buffer_Length
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From 3a98fa11972dec8bdbc5139097f5c64f2a4fb1fb Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Fri, 21 Jul 2017 01:31:54 +0200
|
||||
Subject: rpcrt4: Hold CS while iterating through protseqs list.
|
||||
|
||||
---
|
||||
dlls/rpcrt4/rpc_server.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c
|
||||
index c350c5970c2..d1b5d64ecea 100644
|
||||
--- a/dlls/rpcrt4/rpc_server.c
|
||||
+++ b/dlls/rpcrt4/rpc_server.c
|
||||
@@ -806,8 +806,10 @@ static RPC_STATUS RPCRT4_stop_listen(BOOL auto_listen)
|
||||
|
||||
if (stop_listen) {
|
||||
RpcServerProtseq *cps;
|
||||
+ EnterCriticalSection(&server_cs);
|
||||
LIST_FOR_EACH_ENTRY(cps, &protseqs, RpcServerProtseq, entry)
|
||||
RPCRT4_sync_with_server_thread(cps);
|
||||
+ LeaveCriticalSection(&server_cs);
|
||||
}
|
||||
|
||||
if (!auto_listen)
|
||||
--
|
||||
2.13.1
|
||||
|
||||
@ -1,29 +1,17 @@
|
||||
From af9d21408075476f71d8f4d85d4c378227643566 Mon Sep 17 00:00:00 2001
|
||||
From 9d3a4a7d1bdfe70717fb0e3b3fa9ec615a861f4b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Fri, 18 Aug 2017 19:55:37 +0200
|
||||
Subject: wined3d: Unroll glsl pixel shader output.
|
||||
Subject: [PATCH] wined3d: Unroll glsl pixel shader output.
|
||||
|
||||
---
|
||||
dlls/wined3d/glsl_shader.c | 58 ++++++++++++++++++++++++++--------------------
|
||||
1 file changed, 33 insertions(+), 25 deletions(-)
|
||||
dlls/wined3d/glsl_shader.c | 53 +++++++++++++++++++++++++++++-----------------
|
||||
1 file changed, 33 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
|
||||
index a03f1792272..c8b35fb8af5 100644
|
||||
index 583c014..bde786e 100644
|
||||
--- a/dlls/wined3d/glsl_shader.c
|
||||
+++ b/dlls/wined3d/glsl_shader.c
|
||||
@@ -2213,11 +2213,6 @@ static void shader_glsl_declare_shader_outputs(const struct wined3d_gl_info *gl_
|
||||
}
|
||||
}
|
||||
|
||||
-static const char *get_fragment_output(const struct wined3d_gl_info *gl_info)
|
||||
-{
|
||||
- return needs_legacy_glsl_syntax(gl_info) ? "gl_FragData" : "ps_out";
|
||||
-}
|
||||
-
|
||||
static const char *glsl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type)
|
||||
{
|
||||
switch (primitive_type)
|
||||
@@ -2969,7 +2964,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register *
|
||||
@@ -3017,7 +3017,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register *
|
||||
WARN("Write to render target %u, only %d supported.\n",
|
||||
reg->idx[0].offset, gl_info->limits.buffers);
|
||||
|
||||
@ -33,7 +21,7 @@ index a03f1792272..c8b35fb8af5 100644
|
||||
break;
|
||||
|
||||
case WINED3DSPR_RASTOUT:
|
||||
@@ -7175,20 +7171,20 @@ static void shader_glsl_generate_patch_constant_setup(struct wined3d_string_buff
|
||||
@@ -7394,20 +7395,20 @@ static void shader_glsl_generate_patch_constant_setup(struct wined3d_string_buff
|
||||
static void shader_glsl_generate_srgb_write_correction(struct wined3d_string_buffer *buffer,
|
||||
const struct wined3d_gl_info *gl_info)
|
||||
{
|
||||
@ -61,7 +49,7 @@ index a03f1792272..c8b35fb8af5 100644
|
||||
|
||||
switch (mode)
|
||||
{
|
||||
@@ -7213,13 +7209,15 @@ static void shader_glsl_generate_fog_code(struct wined3d_string_buffer *buffer,
|
||||
@@ -7432,13 +7433,15 @@ static void shader_glsl_generate_fog_code(struct wined3d_string_buffer *buffer,
|
||||
return;
|
||||
}
|
||||
|
||||
@ -78,7 +66,7 @@ index a03f1792272..c8b35fb8af5 100644
|
||||
/* alpha_func is the PASS condition, not the DISCARD condition. Instead of
|
||||
* flipping all the operators here, just negate the comparison below. */
|
||||
static const char * const comparison_operator[] =
|
||||
@@ -7238,8 +7236,8 @@ static void shader_glsl_generate_alpha_test(struct wined3d_string_buffer *buffer
|
||||
@@ -7457,8 +7460,8 @@ static void shader_glsl_generate_alpha_test(struct wined3d_string_buffer *buffer
|
||||
return;
|
||||
|
||||
if (alpha_func != WINED3D_CMP_NEVER)
|
||||
@ -89,7 +77,7 @@ index a03f1792272..c8b35fb8af5 100644
|
||||
shader_addline(buffer, " discard;\n");
|
||||
}
|
||||
|
||||
@@ -7281,10 +7279,11 @@ static void shader_glsl_generate_ps_epilogue(const struct wined3d_gl_info *gl_in
|
||||
@@ -7502,10 +7505,11 @@ static void shader_glsl_generate_ps_epilogue(const struct wined3d_gl_info *gl_in
|
||||
const struct ps_compile_args *args)
|
||||
{
|
||||
const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps;
|
||||
@ -102,7 +90,7 @@ index a03f1792272..c8b35fb8af5 100644
|
||||
|
||||
if (args->srgb_correction)
|
||||
shader_glsl_generate_srgb_write_correction(buffer, gl_info);
|
||||
@@ -7474,9 +7473,12 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context
|
||||
@@ -7695,9 +7699,12 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context
|
||||
|
||||
if (!needs_legacy_glsl_syntax(gl_info))
|
||||
{
|
||||
@ -118,7 +106,7 @@ index a03f1792272..c8b35fb8af5 100644
|
||||
}
|
||||
|
||||
if (shader->limits->constant_float + extra_constants_needed >= gl_info->limits.glsl_ps_float_constants)
|
||||
@@ -9042,6 +9044,7 @@ static void shader_glsl_ffp_fragment_op(struct wined3d_string_buffer *buffer, un
|
||||
@@ -9272,6 +9279,7 @@ static void shader_glsl_ffp_fragment_op(struct wined3d_string_buffer *buffer, un
|
||||
static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv *priv,
|
||||
const struct ffp_frag_settings *settings, const struct wined3d_context *context)
|
||||
{
|
||||
@ -126,7 +114,7 @@ index a03f1792272..c8b35fb8af5 100644
|
||||
struct wined3d_string_buffer *tex_reg_name = string_buffer_get(&priv->string_buffers);
|
||||
enum wined3d_cmp_func alpha_test_func = settings->alpha_test_func + 1;
|
||||
struct wined3d_string_buffer *buffer = &priv->shader_buffer;
|
||||
@@ -9130,7 +9133,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv *
|
||||
@@ -9360,7 +9368,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv *
|
||||
{
|
||||
if (shader_glsl_use_explicit_attrib_location(gl_info))
|
||||
shader_addline(buffer, "layout(location = 0) ");
|
||||
@ -135,7 +123,7 @@ index a03f1792272..c8b35fb8af5 100644
|
||||
}
|
||||
|
||||
shader_addline(buffer, "vec4 tmp0, tmp1;\n");
|
||||
@@ -9461,8 +9464,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv *
|
||||
@@ -9691,8 +9699,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv *
|
||||
}
|
||||
}
|
||||
|
||||
@ -145,7 +133,7 @@ index a03f1792272..c8b35fb8af5 100644
|
||||
|
||||
if (settings->sRGB_write)
|
||||
shader_glsl_generate_srgb_write_correction(buffer, gl_info);
|
||||
@@ -10006,8 +10008,14 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
|
||||
@@ -10245,8 +10252,14 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
|
||||
|
||||
if (!needs_legacy_glsl_syntax(gl_info))
|
||||
{
|
||||
@ -163,5 +151,5 @@ index a03f1792272..c8b35fb8af5 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.14.2
|
||||
2.7.4
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 40043e895e7e66e43589ac25efc7dade42690656 Mon Sep 17 00:00:00 2001
|
||||
From d144b219097df75232e1c17ca2ba06b1a12b2e41 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.
|
||||
@ -17,7 +17,7 @@ Subject: [PATCH] wined3d: Implement all 8 d3d11 color write masks.
|
||||
10 files changed, 73 insertions(+), 71 deletions(-)
|
||||
|
||||
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
|
||||
index 835ea8b..2ef9b46 100644
|
||||
index 73cfd1a..73b0050 100644
|
||||
--- a/dlls/d3d11/device.c
|
||||
+++ b/dlls/d3d11/device.c
|
||||
@@ -688,6 +688,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi
|
||||
@ -86,10 +86,10 @@ index a14c9d3..2bec92e 100644
|
||||
|
||||
/* glEnableIndexedEXT(GL_BLEND, ...) */
|
||||
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
|
||||
index 6530b6f..15eb449 100644
|
||||
index e85e20d..6075a68 100644
|
||||
--- a/dlls/wined3d/context.c
|
||||
+++ b/dlls/wined3d/context.c
|
||||
@@ -2733,7 +2733,7 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine
|
||||
@@ -2730,7 +2730,7 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine
|
||||
const struct wined3d_gl_info *gl_info = context->gl_info;
|
||||
struct wined3d_texture *rt = context->current_rt.texture;
|
||||
DWORD rt_mask, *cur_mask;
|
||||
@ -98,8 +98,8 @@ index 6530b6f..15eb449 100644
|
||||
SIZE rt_size;
|
||||
|
||||
TRACE("Setting up context %p for blitting.\n", context);
|
||||
@@ -2832,10 +2832,8 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine
|
||||
context_invalidate_state(context, STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE));
|
||||
@@ -2834,10 +2834,8 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine
|
||||
context_invalidate_state(context, STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE));
|
||||
}
|
||||
gl_info->gl_ops.gl.p_glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
|
||||
- context_invalidate_state(context, STATE_RENDER(WINED3D_RS_COLORWRITEENABLE));
|
||||
@ -111,7 +111,7 @@ index 6530b6f..15eb449 100644
|
||||
|
||||
context->last_was_rhw = TRUE;
|
||||
context_invalidate_state(context, STATE_VDECL); /* because of last_was_rhw = TRUE */
|
||||
@@ -4812,7 +4810,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s
|
||||
@@ -4809,7 +4807,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 6530b6f..15eb449 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 92dfa0c..7e14b88 100644
|
||||
index 4ff1f06..0e7b7a0 100644
|
||||
--- a/dlls/wined3d/device.c
|
||||
+++ b/dlls/wined3d/device.c
|
||||
@@ -383,10 +383,8 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c
|
||||
@@ -392,10 +392,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 92dfa0c..7e14b88 100644
|
||||
checkGLcall("glClearColor");
|
||||
clear_mask = clear_mask | GL_COLOR_BUFFER_BIT;
|
||||
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
|
||||
index 9753186..d0a76a1 100644
|
||||
index f20507b..69ea814 100644
|
||||
--- a/dlls/wined3d/state.c
|
||||
+++ b/dlls/wined3d/state.c
|
||||
@@ -1556,9 +1556,6 @@ static void state_debug_monitor(struct wined3d_context *context, const struct wi
|
||||
@ -201,7 +201,7 @@ index 9753186..d0a76a1 100644
|
||||
}
|
||||
|
||||
static void state_localviewer(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
|
||||
@@ -5265,18 +5252,26 @@ const struct StateEntryTemplate misc_state_template[] =
|
||||
@@ -5128,18 +5115,26 @@ const struct StateEntryTemplate 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 },
|
||||
@ -278,10 +278,10 @@ index b9efcec..c9b3527 100644
|
||||
/* Texture Stage States - Put directly into state block, we will call function below */
|
||||
for (i = 0; i < MAX_TEXTURES; ++i)
|
||||
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
|
||||
index b0ccfb8..47275e5 100644
|
||||
index ad4ed1c..90f17cc 100644
|
||||
--- a/dlls/wined3d/surface.c
|
||||
+++ b/dlls/wined3d/surface.c
|
||||
@@ -365,6 +365,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3
|
||||
@@ -160,6 +160,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3
|
||||
GLenum gl_filter;
|
||||
GLenum buffer;
|
||||
RECT s, d;
|
||||
@ -289,7 +289,7 @@ index b0ccfb8..47275e5 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",
|
||||
@@ -477,10 +478,8 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3
|
||||
@@ -272,10 +273,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);
|
||||
@ -303,10 +303,10 @@ index b0ccfb8..47275e5 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 304214f..7cb2007 100644
|
||||
index d1d5adc..c36bb1e 100644
|
||||
--- a/dlls/wined3d/utils.c
|
||||
+++ b/dlls/wined3d/utils.c
|
||||
@@ -4442,7 +4442,6 @@ const char *debug_d3drenderstate(enum wined3d_render_state state)
|
||||
@@ -4396,7 +4396,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);
|
||||
@ -314,7 +314,7 @@ index 304214f..7cb2007 100644
|
||||
D3DSTATE_TO_STR(WINED3D_RS_TWEENFACTOR);
|
||||
D3DSTATE_TO_STR(WINED3D_RS_BLENDOP);
|
||||
D3DSTATE_TO_STR(WINED3D_RS_POSITIONDEGREE);
|
||||
@@ -4462,9 +4461,14 @@ const char *debug_d3drenderstate(enum wined3d_render_state state)
|
||||
@@ -4416,9 +4415,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);
|
||||
@ -330,7 +330,7 @@ index 304214f..7cb2007 100644
|
||||
D3DSTATE_TO_STR(WINED3D_RS_SRGBWRITEENABLE);
|
||||
D3DSTATE_TO_STR(WINED3D_RS_DEPTHBIAS);
|
||||
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
|
||||
index 4f02ae4..628da26 100644
|
||||
index 4a27b08..4bfb2cd 100644
|
||||
--- a/dlls/wined3d/wined3d_private.h
|
||||
+++ b/dlls/wined3d/wined3d_private.h
|
||||
@@ -276,6 +276,7 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup
|
||||
@ -342,7 +342,7 @@ index 4f02ae4..628da26 100644
|
||||
struct min_lookup
|
||||
{
|
||||
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
|
||||
index 23fffdf..e47eeb6 100644
|
||||
index 48701a9..a0942ae 100644
|
||||
--- a/include/wine/wined3d.h
|
||||
+++ b/include/wine/wined3d.h
|
||||
@@ -388,8 +388,20 @@ enum wined3d_render_state
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user