wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against adffa11609093c3c21cf43970bbecda1b2c43eb1.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2021-07-07 12:21:45 +10:00
parent fcf7b80107
commit a0716c9cfe
8 changed files with 77 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
patches/mfplat-streaming-support/0014-winegstreamer-Introduce-AAC-decoder-transform.patch
View File

@ -1,7 +1,7 @@
From 8c2af2c3be9a337c07638206ba9d0c4035fda36e Mon Sep 17 00:00:00 2001
From d340cda54c6b51c8ee9fcd687ab9877f0451844a Mon Sep 17 00:00:00 2001
From: Derek Lesho <dlesho@codeweavers.com>
Date: Fri, 19 Mar 2021 16:59:29 -0400
Subject: [PATCH 14/39] winegstreamer: Introduce AAC decoder transform.
Subject: [PATCH] winegstreamer: Introduce AAC decoder transform.
Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
---
@ -83,7 +83,7 @@ index 25694aae84d..6407aff484c 100644
HRESULT decode_transform_create(REFIID riid, void **obj, enum decoder_type) DECLSPEC_HIDDEN;
diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
index f015ecc3f47..f3d9fb61a66 100644
index 35b2f2c3224..9c95450bd99 100644
--- a/dlls/winegstreamer/mfplat.c
+++ b/dlls/winegstreamer/mfplat.c
@@ -407,6 +407,11 @@ static HRESULT h264_decoder_create(REFIID riid, void **ret)
@ -113,10 +113,10 @@ index f015ecc3f47..f3d9fb61a66 100644
- IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_CHANNEL_MASK, format->u.audio.channel_mask);
+ if (format->u.audio.channel_mask)
+ IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_CHANNEL_MASK, format->u.audio.channel_mask);
IMFMediaType_SetUINT32(type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE);
return type;
}
@@ -687,6 +694,8 @@ static void mf_media_type_to_wg_format_audio(IMFMediaType *type, struct wg_forma
@@ -688,6 +695,8 @@ static void mf_media_type_to_wg_format_audio(IMFMediaType *type, struct wg_forma
channel_mask = KSAUDIO_SPEAKER_MONO;
else if (channels == 2)
channel_mask = KSAUDIO_SPEAKER_STEREO;
@ -125,7 +125,7 @@ index f015ecc3f47..f3d9fb61a66 100644
else
{
FIXME("Channel mask is not set.\n");
@@ -699,6 +708,58 @@ static void mf_media_type_to_wg_format_audio(IMFMediaType *type, struct wg_forma
@@ -700,6 +709,58 @@ static void mf_media_type_to_wg_format_audio(IMFMediaType *type, struct wg_forma
format->u.audio.channel_mask = channel_mask;
format->u.audio.rate = rate;
@ -197,7 +197,7 @@ index 1c68eba1872..b1e35521266 100644
case WG_AUDIO_FORMAT_MPEG1_LAYER1:
diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
index 9ca5abebfaf..2a982576ef5 100644
index 6c8cf1f85b1..7f06fd886d6 100644
--- a/dlls/winegstreamer/wg_parser.c
+++ b/dlls/winegstreamer/wg_parser.c
@@ -398,6 +398,13 @@ static void wg_set_caps_from_wg_format(GstCaps *caps, const struct wg_format *fo

15
patches/ntdll-aarch-TEB/0001-configure-Avoid-clobbering-x18-on-arm64-within-wine.patch
View File

@ -1,4 +1,4 @@
From d99a6180cdca6274f1a8b868c38a89883daf6e23 Mon Sep 17 00:00:00 2001
From 40088e644ecba6005de000c49b65cb168cc9ad5d Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Wed, 21 Jun 2017 11:42:40 +0300
Subject: [PATCH] configure: Avoid clobbering x18 on arm64 within wine
@ -16,17 +16,20 @@ been built with the same flag.
Signed-off-by: Martin Storsjo <martin@martin.st>
---
configure.ac | 4 ++++
1 file changed, 4 insertions(+)
configure.ac | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/configure.ac b/configure.ac
index d1502bacf7..6cf838ef09 100644
index b0981767977..67e82744dae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -212,6 +212,10 @@ case $host in
@@ -219,8 +219,13 @@ case $host in
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]], [[void func(__builtin_ms_va_list *args);]])],
[wine_cv_builtin_ms_va_list=yes],[wine_cv_builtin_ms_va_list=no])])
test $wine_cv_builtin_ms_va_list != no || AC_MSG_ERROR([You need clang >= 5.0 to build Wine for arm64.])
+
enable_wow64=${enable_wow64:-yes}
enable_wow64win=${enable_wow64win:-yes}
+ # Avoid clobbering the x18 register which is reserved in windows.
+ # This isn't complete/enough unless all of the system libraries have
+ # been built with the same flag though.
@ -35,5 +38,5 @@ index d1502bacf7..6cf838ef09 100644
i[[3456789]]86*)
enable_win16=${enable_win16:-yes}
--
2.17.1
2.30.2

18
patches/nvapi-Stub_DLL/0001-nvapi-First-implementation.patch
View File

@ -1,4 +1,4 @@
From 984214b365c072614c45f996074c092f3ca34d46 Mon Sep 17 00:00:00 2001
From 75e63f301be09d0e1e858bc4bde5774468852b1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Mon, 5 Jan 2015 18:11:53 +0100
Subject: [PATCH] nvapi: First implementation.
@ -25,13 +25,13 @@ Subject: [PATCH] nvapi: First implementation.
create mode 100644 include/nvapi.h
diff --git a/configure.ac b/configure.ac
index 69674311deb..d0117589326 100644
index 32cf76bb8fc..f83ae22cf5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -225,6 +225,12 @@ esac
dnl enable_win16 defaults to yes on x86, to no on other CPUs
enable_win16=${enable_win16:-no}
@@ -238,6 +238,12 @@ enable_win16=${enable_win16:-no}
enable_win64=${enable_win64:-no}
enable_wow64=${enable_wow64:-no}
enable_wow64win=${enable_wow64win:-no}
+if test "x$enable_win64" != "xyes"
+then
+ enable_win32="yes"
@ -41,7 +41,7 @@ index 69674311deb..d0117589326 100644
enable_wow64cpu=${enable_wow64cpu:-no}
dnl Disable winetest too if tests are disabled
@@ -3559,6 +3565,9 @@ WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe)
@@ -3569,6 +3575,9 @@ WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe)
WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe/tests)
WINE_CONFIG_MAKEFILE(dlls/ntprint)
WINE_CONFIG_MAKEFILE(dlls/ntprint/tests)
@ -858,10 +858,10 @@ index 00000000000..f0c054b2bf9
+@ stub DllRegisterServer
+@ stub DllUnregisterServer
diff --git a/include/Makefile.in b/include/Makefile.in
index 02ddf06df8f..f0600555cd9 100644
index 0cb69abe5d0..cd60b036710 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -539,6 +539,7 @@ SOURCES = \
@@ -549,6 +549,7 @@ SOURCES = \
ntsecapi.h \
ntsecpkg.h \
ntstatus.h \
@ -952,5 +952,5 @@ index 00000000000..4204256cca2
+
+#endif /* __WINE_NVAPI_H */
--
2.20.1
2.30.2

56
patches/nvapi-Stub_DLL/0019-wined3d-Make-depth-bounds-test-into-a-proper-state.patch
View File

@ -1,4 +1,4 @@
From 693d4ae06557d1c1021f908946a0f0fdc30bcc99 Mon Sep 17 00:00:00 2001
From cd91540817d4ead5855a3c21c54e6fd9d07af68a Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Sat, 22 May 2021 17:38:50 -0500
Subject: [PATCH] wined3d: Make depth bounds test into a proper state.
@ -12,10 +12,10 @@ Subject: [PATCH] wined3d: Make depth bounds test into a proper state.
5 files changed, 98 insertions(+), 31 deletions(-)
diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index a17926f6ff0..7c116e3f887 100644
index 1deafc2d4c3..2b765df30d8 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -128,6 +128,7 @@ enum wined3d_cs_op
@@ -132,6 +132,7 @@ enum wined3d_cs_op
WINED3D_CS_OP_SET_RENDER_STATE,
WINED3D_CS_OP_SET_TEXTURE_STATE,
WINED3D_CS_OP_SET_SAMPLER_STATE,
@ -23,7 +23,7 @@ index a17926f6ff0..7c116e3f887 100644
WINED3D_CS_OP_SET_TRANSFORM,
WINED3D_CS_OP_SET_CLIP_PLANE,
WINED3D_CS_OP_SET_COLOR_KEY,
@@ -382,6 +383,12 @@ struct wined3d_cs_set_sampler_state
@@ -388,6 +389,12 @@ struct wined3d_cs_set_sampler_state
DWORD value;
};
@ -36,7 +36,7 @@ index a17926f6ff0..7c116e3f887 100644
struct wined3d_cs_set_transform
{
enum wined3d_cs_op opcode;
@@ -615,6 +622,7 @@ static const char *debug_cs_op(enum wined3d_cs_op op)
@@ -613,6 +620,7 @@ static const char *debug_cs_op(enum wined3d_cs_op op)
WINED3D_TO_STR(WINED3D_CS_OP_SET_RENDER_STATE);
WINED3D_TO_STR(WINED3D_CS_OP_SET_TEXTURE_STATE);
WINED3D_TO_STR(WINED3D_CS_OP_SET_SAMPLER_STATE);
@ -44,7 +44,7 @@ index a17926f6ff0..7c116e3f887 100644
WINED3D_TO_STR(WINED3D_CS_OP_SET_TRANSFORM);
WINED3D_TO_STR(WINED3D_CS_OP_SET_CLIP_PLANE);
WINED3D_TO_STR(WINED3D_CS_OP_SET_COLOR_KEY);
@@ -1916,6 +1924,28 @@ void wined3d_device_context_emit_set_sampler_state(struct wined3d_device_context
@@ -1934,6 +1942,28 @@ void wined3d_device_context_emit_set_sampler_state(struct wined3d_device_context
wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT);
}
@ -73,7 +73,7 @@ index a17926f6ff0..7c116e3f887 100644
static void wined3d_cs_exec_set_transform(struct wined3d_cs *cs, const void *data)
{
const struct wined3d_cs_set_transform *op = data;
@@ -2892,6 +2922,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void
@@ -2926,6 +2956,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void
/* WINED3D_CS_OP_SET_RENDER_STATE */ wined3d_cs_exec_set_render_state,
/* WINED3D_CS_OP_SET_TEXTURE_STATE */ wined3d_cs_exec_set_texture_state,
/* WINED3D_CS_OP_SET_SAMPLER_STATE */ wined3d_cs_exec_set_sampler_state,
@ -82,10 +82,10 @@ index a17926f6ff0..7c116e3f887 100644
/* WINED3D_CS_OP_SET_CLIP_PLANE */ wined3d_cs_exec_set_clip_plane,
/* WINED3D_CS_OP_SET_COLOR_KEY */ wined3d_cs_exec_set_color_key,
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 7651713154c..b6550a1a4e4 100644
index 175a3b7ed0b..0d6cd8871c1 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1923,6 +1923,14 @@ void CDECL wined3d_device_context_set_rasterizer_state(struct wined3d_device_con
@@ -1925,6 +1925,14 @@ void CDECL wined3d_device_context_set_rasterizer_state(struct wined3d_device_con
wined3d_rasterizer_state_decref(prev);
}
@ -100,7 +100,7 @@ index 7651713154c..b6550a1a4e4 100644
void CDECL wined3d_device_context_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count,
const struct wined3d_viewport *viewports)
{
@@ -3546,7 +3554,8 @@ static void wined3d_device_set_texture(struct wined3d_device *device,
@@ -3568,7 +3576,8 @@ static void wined3d_device_set_texture(struct wined3d_device *device,
void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
struct wined3d_stateblock *stateblock)
{
@ -110,7 +110,7 @@ index 7651713154c..b6550a1a4e4 100644
const struct wined3d_stateblock_state *state = &stateblock->stateblock_state;
const struct wined3d_saved_states *changed = &stateblock->changed;
const unsigned int word_bit_count = sizeof(DWORD) * CHAR_BIT;
@@ -3652,7 +3661,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
@@ -3674,7 +3683,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
case WINED3D_RS_COLORWRITEENABLE1:
case WINED3D_RS_COLORWRITEENABLE2:
case WINED3D_RS_COLORWRITEENABLE3:
@ -119,7 +119,7 @@ index 7651713154c..b6550a1a4e4 100644
break;
case WINED3D_RS_BACK_STENCILFAIL:
@@ -3671,7 +3680,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
@@ -3693,7 +3702,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
case WINED3D_RS_ZENABLE:
case WINED3D_RS_ZFUNC:
case WINED3D_RS_ZWRITEENABLE:
@ -128,7 +128,7 @@ index 7651713154c..b6550a1a4e4 100644
break;
case WINED3D_RS_FILLMODE:
@@ -3680,9 +3689,15 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
@@ -3702,9 +3711,15 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
case WINED3D_RS_DEPTHBIAS:
case WINED3D_RS_SCISSORTESTENABLE:
case WINED3D_RS_ANTIALIASEDLINEENABLE:
@ -145,7 +145,7 @@ index 7651713154c..b6550a1a4e4 100644
default:
wined3d_device_set_render_state(device, idx, state->rs[idx]);
break;
@@ -3871,6 +3886,20 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
@@ -3893,6 +3908,20 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
}
}
@ -167,10 +167,10 @@ index 7651713154c..b6550a1a4e4 100644
{
map = changed->textureState[i];
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 1194604e7dc..551dd2e3cbf 100644
index a9183278d86..73a40628f21 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -2053,42 +2053,31 @@ static void state_tessellation(struct wined3d_context *context, const struct win
@@ -2040,42 +2040,31 @@ static void state_tessellation(struct wined3d_context *context, const struct win
state->render_states[WINED3D_RS_ENABLEADAPTIVETESSELLATION]);
}
@ -227,7 +227,7 @@ index 1194604e7dc..551dd2e3cbf 100644
}
static void state_wrapu(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
@@ -4698,6 +4687,8 @@ const struct wined3d_state_entry_template misc_state_template_gl[] =
@@ -4682,6 +4671,8 @@ const struct wined3d_state_entry_template misc_state_template_gl[] =
{ STATE_DEPTH_STENCIL, { STATE_DEPTH_STENCIL, depth_stencil_2s }, EXT_STENCIL_TWO_SIDE },
{ STATE_DEPTH_STENCIL, { STATE_DEPTH_STENCIL, depth_stencil }, WINED3D_GL_EXT_NONE },
{ STATE_STENCIL_REF, { STATE_DEPTH_STENCIL, NULL }, WINED3D_GL_EXT_NONE },
@ -236,7 +236,7 @@ index 1194604e7dc..551dd2e3cbf 100644
{ STATE_STREAMSRC, { STATE_STREAMSRC, streamsrc }, WINED3D_GL_EXT_NONE },
{ STATE_VDECL, { STATE_VDECL, vdecl_miscpart }, WINED3D_GL_EXT_NONE },
{ STATE_RASTERIZER, { STATE_RASTERIZER, rasterizer_cc }, ARB_CLIP_CONTROL },
@@ -4811,7 +4802,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] =
@@ -4795,7 +4786,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] =
{ STATE_RENDER(WINED3D_RS_ADAPTIVETESS_Y), { STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION),NULL }, WINED3D_GL_EXT_NONE },
{ STATE_RENDER(WINED3D_RS_ADAPTIVETESS_Z), { STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION),NULL }, WINED3D_GL_EXT_NONE },
{ STATE_RENDER(WINED3D_RS_ADAPTIVETESS_W), { STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION),NULL }, WINED3D_GL_EXT_NONE },
@ -245,10 +245,10 @@ index 1194604e7dc..551dd2e3cbf 100644
{ 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 },
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index dc7823b9534..7c7d14a7126 100644
index 4019dd4d812..9b58c217a0c 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -5244,6 +5244,8 @@ const char *debug_d3dstate(DWORD state)
@@ -5321,6 +5321,8 @@ const char *debug_d3dstate(DWORD state)
return "STATE_DEPTH_STENCIL";
if (STATE_IS_STENCIL_REF(state))
return "STATE_STENCIL_REF";
@ -258,10 +258,10 @@ index dc7823b9534..7c7d14a7126 100644
return wine_dbg_sprintf("UNKNOWN_STATE(%#x)", state);
}
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index e7a3e42d8bb..4f235fb04cd 100644
index 91fb681a691..cca8c9cf07d 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1832,7 +1832,10 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state
@@ -1838,7 +1838,10 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state
#define STATE_STENCIL_REF (STATE_DEPTH_STENCIL + 1)
#define STATE_IS_STENCIL_REF(a) ((a) == STATE_STENCIL_REF)
@ -273,7 +273,7 @@ index e7a3e42d8bb..4f235fb04cd 100644
#define STATE_COMPUTE_SHADER (STATE_COMPUTE_OFFSET)
#define STATE_IS_COMPUTE_SHADER(a) ((a) == STATE_COMPUTE_SHADER)
@@ -3665,6 +3668,13 @@ struct wined3d_light_state
@@ -3676,6 +3679,13 @@ struct wined3d_light_state
const struct wined3d_light_info *lights[WINED3D_MAX_ACTIVE_LIGHTS];
};
@ -287,7 +287,7 @@ index e7a3e42d8bb..4f235fb04cd 100644
#define WINED3D_STATE_NO_REF 0x00000001
#define WINED3D_STATE_INIT_DEFAULT 0x00000002
@@ -3719,8 +3729,11 @@ struct wined3d_state
@@ -3730,8 +3740,11 @@ struct wined3d_state
struct wined3d_blend_state *blend_state;
struct wined3d_color blend_factor;
unsigned int sample_mask;
@ -299,10 +299,10 @@ index e7a3e42d8bb..4f235fb04cd 100644
struct wined3d_rasterizer_state *rasterizer_state;
};
@@ -4789,6 +4802,8 @@ void wined3d_device_context_emit_set_clip_plane(struct wined3d_device_context *c
const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN;
void wined3d_device_context_emit_set_constant_buffer(struct wined3d_device_context *context,
enum wined3d_shader_type type, UINT cb_idx, struct wined3d_buffer *buffer) DECLSPEC_HIDDEN;
@@ -4813,6 +4826,8 @@ void wined3d_device_context_emit_set_clip_plane(struct wined3d_device_context *c
void wined3d_device_context_emit_set_constant_buffers(struct wined3d_device_context *context,
enum wined3d_shader_type type, unsigned int start_idx, unsigned int count,
struct wined3d_buffer *const *buffers) DECLSPEC_HIDDEN;
+void wined3d_device_context_emit_set_depth_bounds(struct wined3d_device_context *context,
+ BOOL enable, float min, float max) DECLSPEC_HIDDEN;
void wined3d_device_context_emit_set_depth_stencil_state(struct wined3d_device_context *context,

20
patches/nvapi-Stub_DLL/0021-nvapi-Implement-NvAPI_D3D11_SetDepthBoundsTest.patch
View File

@ -1,4 +1,4 @@
From 87d4d702d42242a9387e31a4da079066eda0471e Mon Sep 17 00:00:00 2001
From 929a7c148fd83663ffde2a853177a6ca2c30588c Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Sat, 22 May 2021 18:11:07 -0500
Subject: [PATCH] nvapi: Implement NvAPI_D3D11_SetDepthBoundsTest().
@ -117,10 +117,10 @@ index c8b66ac2fa3..b8b4750203a 100644
/* d3d9 tests */
wc.lpfnWndProc = DefWindowProcA;
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 3884c1d6c66..17969ea9a08 100644
index 0d6cd8871c1..9910b0e3529 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1923,7 +1923,7 @@ void CDECL wined3d_device_context_set_rasterizer_state(struct wined3d_device_con
@@ -1925,7 +1925,7 @@ void CDECL wined3d_device_context_set_rasterizer_state(struct wined3d_device_con
wined3d_rasterizer_state_decref(prev);
}
@ -130,25 +130,25 @@ index 3884c1d6c66..17969ea9a08 100644
{
TRACE("context %p, enable %d, min %.8e, max %.8e.\n", context, enable, min, max);
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 11351b60a7f..1751c97ae87 100644
index 4d4f34f8d6a..e83847aa9f9 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -124,6 +124,7 @@
@ cdecl wined3d_device_context_resolve_sub_resource(ptr ptr long ptr long long)
@ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long)
@ cdecl wined3d_device_context_set_constant_buffer(ptr long long ptr)
@ cdecl wined3d_device_context_set_constant_buffers(ptr long long long ptr)
+@ cdecl wined3d_device_context_set_depth_bounds(ptr long float float)
@ cdecl wined3d_device_context_set_depth_stencil_state(ptr ptr long)
@ cdecl wined3d_device_context_set_depth_stencil_view(ptr ptr)
@ cdecl wined3d_device_context_set_index_buffer(ptr ptr long long)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 53ae13b7df5..52f4b0aed24 100644
index 80a636edc9f..2167d95d0b8 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2498,6 +2498,8 @@ void __cdecl wined3d_device_context_set_blend_state(struct wined3d_device_contex
struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask);
void __cdecl wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context,
enum wined3d_shader_type type, unsigned int idx, struct wined3d_buffer *buffer);
@@ -2499,6 +2499,8 @@ void __cdecl wined3d_device_context_set_blend_state(struct wined3d_device_contex
void __cdecl wined3d_device_context_set_constant_buffers(struct wined3d_device_context *context,
enum wined3d_shader_type type, unsigned int start_idx, unsigned int count,
struct wined3d_buffer *const *buffers);
+void __cdecl wined3d_device_context_set_depth_bounds(struct wined3d_device_context *context,
+ BOOL enable, float min, float max);
void __cdecl wined3d_device_context_set_depth_stencil_state(struct wined3d_device_context *context,

2
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "14f03e84d46dbd94ae2e3711687420f816dc784f"
echo "adffa11609093c3c21cf43970bbecda1b2c43eb1"
}
# Show version information

24
patches/wined3d-Indexed_Vertex_Blending/0005-wined3d-Support-indexed-vertex-blending.patch
View File

@ -1,4 +1,4 @@
From 43d02082f72dd20c098e285877c24bce9312047b Mon Sep 17 00:00:00 2001
From d7ef3801994419f2101bf659e90e8dba7712f5ee Mon Sep 17 00:00:00 2001
From: Paul Gofman <gofmanp@gmail.com>
Date: Mon, 25 Feb 2019 20:28:35 +0300
Subject: [PATCH] wined3d: Support indexed vertex blending.
@ -124,16 +124,16 @@ index 3741a881da0..af0c8fa6c52 100644
- break;
+ if (priv->ubo_modelview == -1)
+ FIXME("UBO buffer with vertex blend matrices is not initialized.\n");
- get_modelview_matrix(context, state, i, &mat);
- GL_EXTCALL(glUniformMatrix4fv(prog->vs.modelview_matrix_location[i], 1, FALSE, &mat._11));
- checkGLcall("glUniformMatrix4fv");
+
+ GL_EXTCALL(glBindBuffer(GL_UNIFORM_BUFFER, priv->ubo_modelview));
+ checkGLcall("glBindBuffer (UBO)");
+ GL_EXTCALL(glBufferData(GL_UNIFORM_BUFFER, sizeof(*priv->modelview_buffer) * MAX_VERTEX_BLEND_UBO,
+ NULL, GL_STREAM_DRAW));
+ checkGLcall("glBufferData");
+
- get_modelview_matrix(context, state, i, &mat);
- GL_EXTCALL(glUniformMatrix4fv(prog->vs.modelview_matrix_location[i], 1, FALSE, &mat._11));
- checkGLcall("glUniformMatrix4fv");
+ for (i = 0; i < MAX_VERTEX_BLEND_UBO; ++i)
+ get_modelview_matrix(context, state, i, &priv->modelview_buffer[i]);
+
@ -355,10 +355,10 @@ index 3741a881da0..af0c8fa6c52 100644
static void glsl_vertex_pipe_vertexblend(struct wined3d_context *context,
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index a359b88931b..41c831b26b0 100644
index c4016c686c6..0f5521535d3 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -6726,6 +6726,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context,
@@ -6728,6 +6728,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context,
settings->flatshading = FALSE;
settings->swizzle_map = si->swizzle_map;
@ -387,7 +387,7 @@ index 45a01f4bdd4..46788da8e69 100644
switch(element->format)
{
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index f1de261ed8d..5df817d55ca 100644
index 7245354bd96..cdca5f01c93 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -295,6 +295,7 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup
@ -398,7 +398,7 @@ index f1de261ed8d..5df817d55ca 100644
#define WINED3D_MAX_ACTIVE_LIGHTS 8
#define WINED3D_MAX_SOFTWARE_ACTIVE_LIGHTS 32
#define MAX_CONSTANT_BUFFERS 15
@@ -3589,7 +3590,8 @@ struct wined3d_ffp_vs_settings
@@ -3592,7 +3593,8 @@ struct wined3d_ffp_vs_settings
DWORD ortho_fog : 1;
DWORD flatshading : 1;
DWORD swizzle_map : 16; /* MAX_ATTRIBS, 16 */
@ -408,8 +408,8 @@ index f1de261ed8d..5df817d55ca 100644
DWORD texgen[WINED3D_MAX_TEXTURES];
};
@@ -6065,6 +6067,13 @@ static inline void wined3d_not_from_cs(const struct wined3d_device *device)
assert(device->cs->thread_id != GetCurrentThreadId());
@@ -6082,6 +6084,13 @@ static inline void wined3d_not_from_cs(const struct wined3d_cs *cs)
assert(cs->thread_id != GetCurrentThreadId());
}
+static inline BOOL is_indexed_vertex_blending(const struct wined3d_context *context,

2
staging/upstream-commit
View File

@ -1 +1 @@
14f03e84d46dbd94ae2e3711687420f816dc784f
adffa11609093c3c21cf43970bbecda1b2c43eb1