wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 0128e1a18f25848e6f47146580a8f0db69687dd6.

Browse Source
This commit is contained in:
Sebastian Lackner 2017-04-10 22:39:05 +02:00
parent d06996cabd
commit fbc61357d3
6 changed files with 67 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
patches/api-ms-win-Stub_DLLs/0027-uiautomationcore-Add-dll-and-stub-some-functions.patch
View File

@ -1,14 +1,14 @@
From b9d73e9b13df905bfab65d07babae2f40469c405 Mon Sep 17 00:00:00 2001
From 988abb92ab5dc363b9ea734e256959eb542391e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Tue, 12 Apr 2016 01:02:34 +0200
Subject: uiautomationcore: Add dll and stub some functions.
---
dlls/uiautomationcore/Makefile.in | 1 +
dlls/uiautomationcore/uia_main.c | 65 +++++++++++++++++++++++++----
dlls/uiautomationcore/uiautomationcore.spec | 8 +++-
include/uiautomationcoreapi.h | 10 +++--
4 files changed, 72 insertions(+), 12 deletions(-)
dlls/uiautomationcore/uia_main.c | 57 +++++++++++++++++++++++++----
dlls/uiautomationcore/uiautomationcore.spec | 6 +++
include/uiautomationcoreapi.h | 9 +++--
4 files changed, 61 insertions(+), 12 deletions(-)
diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in
index 78d6254a01..029fc2e499 100644
@ -21,7 +21,7 @@ index 78d6254a01..029fc2e499 100644
C_SRCS = \
uia_main.c
diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c
index af986810f5..0f1e84450c 100644
index 6e795ab88f..37c56dacd5 100644
--- a/dlls/uiautomationcore/uia_main.c
+++ b/dlls/uiautomationcore/uia_main.c
@@ -1,4 +1,5 @@
@ -38,7 +38,7 @@ index af986810f5..0f1e84450c 100644
#include "uiautomation.h"
#include "wine/debug.h"
@@ -37,12 +39,61 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, void *lpv)
@@ -37,12 +39,51 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, void *lpv)
return TRUE;
}
@ -80,16 +80,6 @@ index af986810f5..0f1e84450c 100644
+};
+
+static IUnknown dummy = { &dummy_Vtbl };
+
+/***********************************************************************
+ * UiaReturnRawElementProvider (uiautomationcore.@)
+ */
+LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wparam, LPARAM lparam,
+ IRawElementProviderSimple *provider)
+{
+ FIXME("(%p, %lx, %lx, %p): stub\n", hwnd, wparam, lparam, provider);
+ return 0;
+}
+
/***********************************************************************
* UiaClientsAreListening (uiautomationcore.@)
@ -101,7 +91,7 @@ index af986810f5..0f1e84450c 100644
return FALSE;
}
@@ -51,8 +102,8 @@ BOOL WINAPI UiaClientsAreListening(void)
@@ -51,8 +92,8 @@ BOOL WINAPI UiaClientsAreListening(void)
*/
HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value)
{
@ -112,7 +102,7 @@ index af986810f5..0f1e84450c 100644
return S_OK;
}
@@ -61,16 +112,16 @@ HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value)
@@ -61,17 +102,17 @@ HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value)
*/
HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value)
{
@ -133,8 +123,17 @@ index af986810f5..0f1e84450c 100644
+ FIXME("(%d, %s): stub!\n", type, debugstr_guid(guid));
return 1;
}
@@ -81,6 +122,6 @@ int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid)
LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam,
LPARAM lParam, IRawElementProviderSimple *elprov)
{
- FIXME("(%p, %lx, %lx, %p) stub!\n", hwnd, wParam, lParam, elprov);
+ FIXME("(%p, %lx, %lx, %p): stub!\n", hwnd, wParam, lParam, elprov);
return 0;
}
diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec
index ddf84f63c0..221711c41d 100644
index bff1303eda..221711c41d 100644
--- a/dlls/uiautomationcore/uiautomationcore.spec
+++ b/dlls/uiautomationcore/uiautomationcore.spec
@@ -53,6 +53,8 @@
@ -154,7 +153,7 @@ index ddf84f63c0..221711c41d 100644
@ stdcall UiaLookupId(long ptr)
@ stub UiaNavigate
@ stub UiaNodeFromFocus
@@ -77,13 +80,16 @@
@@ -77,10 +80,13 @@
@ stub UiaNodeFromProvider
@ stub UiaNodeRelease
@ stub UiaPatternRelease
@ -167,16 +166,12 @@ index ddf84f63c0..221711c41d 100644
+@ stub UiaRaiseTextEditTextChangedEvent
@ stub UiaRegisterProviderCallback
@ stub UiaRemoveEvent
-@ stub UiaReturnRawElementProvider
+@ stdcall UiaReturnRawElementProvider(long long long ptr)
@ stub UiaSetFocus
@ stub UiaTextRangeRelease
@ stub ValuePattern_SetValue
@ stdcall UiaReturnRawElementProvider(long long long ptr)
diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h
index fbe47ad184..8d13a16c53 100644
index 6c1752ec64..1a844d0cb7 100644
--- a/include/uiautomationcoreapi.h
+++ b/include/uiautomationcoreapi.h
@@ -39,20 +39,22 @@ DECLARE_HANDLE(HUIAPATTERNOBJECT);
@@ -39,18 +39,19 @@ DECLARE_HANDLE(HUIAPATTERNOBJECT);
DECLARE_HANDLE(HUIATEXTRANGE);
DECLARE_HANDLE(HUIAEVENT);
@ -198,11 +193,8 @@ index fbe47ad184..8d13a16c53 100644
-int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid);
+int WINAPI UiaLookupId(AutomationIdentifierType type, const GUID *guid);
BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj);
LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov);
BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj);
+LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wparam, LPARAM lparam, IRawElementProviderSimple *provider);
#ifdef __cplusplus
}
--
2.11.0

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "35ca862025fa14065d4ebed761783de225cb6690"
echo "0128e1a18f25848e6f47146580a8f0db69687dd6"
}
# Show version information

34
patches/vulkan-Vulkan_Implementation/0001-vulkan-Initial-implementation.patch
View File

@ -1,4 +1,4 @@
From b79f80c148b4ce39db9f16dfaf4fa11ae2f0c1ac Mon Sep 17 00:00:00 2001
From 0da9aff4d35c89ec2c03effe12e93ef164710b20 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 19 Mar 2016 00:42:10 +0100
Subject: vulkan: Initial implementation. (v2)
@ -22,10 +22,10 @@ Subject: vulkan: Initial implementation. (v2)
create mode 100644 dlls/vulkan/vulkan_thunks.c
diff --git a/configure.ac b/configure.ac
index 8c22a4f..ef03473 100644
index fa27a6c132..b0e9ea40e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,6 +80,8 @@ AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xco
@@ -81,6 +81,8 @@ AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xco
[if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi])
AC_ARG_WITH(xcursor, AS_HELP_STRING([--without-xcursor],[do not use the Xcursor extension]),
[if test "x$withval" = "xno"; then ac_cv_header_X11_Xcursor_Xcursor_h=no; fi])
@ -34,7 +34,7 @@ index 8c22a4f..ef03473 100644
AC_ARG_WITH(xinerama, AS_HELP_STRING([--without-xinerama],[do not use Xinerama (multi-monitor support)]),
[if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xinerama_h=no; fi])
AC_ARG_WITH(xinput, AS_HELP_STRING([--without-xinput],[do not use the Xinput extension]),
@@ -985,6 +987,7 @@ then
@@ -992,6 +994,7 @@ then
dnl *** All of the following tests require X11/Xlib.h
AC_CHECK_HEADERS([X11/Xlib.h \
@ -42,7 +42,7 @@ index 8c22a4f..ef03473 100644
X11/XKBlib.h \
X11/Xutil.h \
X11/Xcursor/Xcursor.h \
@@ -1108,6 +1111,14 @@ then
@@ -1115,6 +1118,14 @@ then
WINE_NOTICE_WITH(xcomposite,[test "x$ac_cv_lib_soname_Xcomposite" = "x"],
[libxcomposite ${notice_platform}development files not found, Xcomposite won't be supported.])
@ -57,17 +57,17 @@ index 8c22a4f..ef03473 100644
dnl *** Check for XICCallback struct
AC_CHECK_MEMBERS([XICCallback.callback, XEvent.xcookie],,,
[#ifdef HAVE_X11_XLIB_H
@@ -1160,6 +1171,9 @@ without X support, which probably isn't what you want. You will need
@@ -1167,6 +1178,9 @@ without X support, which probably isn't what you want. You will need
to install ${notice_platform}development packages of Xlib/Xfree86 at the very least.],
[enable_winex11_drv])
+test "x$X_LIBS" = "x" && enable_vulkan=${enable_vulkan:-no}
+test "x$X_LIBS" = "x" && enable_vulkan_1=${enable_vulkan_1:-no}
+
test "x$ac_cv_lib_GLU_gluLookAt" != xyes && enable_glu32=${enable_glu32:-no}
dnl **** Check for OpenCL ****
@@ -3311,6 +3325,8 @@ WINE_CONFIG_DLL(vnbt.vxd,enable_win16)
if test "$ac_cv_header_CL_cl_h" = "yes"
then
@@ -3446,6 +3460,8 @@ WINE_CONFIG_DLL(vnbt.vxd,enable_win16)
WINE_CONFIG_DLL(vnetbios.vxd,enable_win16)
WINE_CONFIG_DLL(vssapi)
WINE_CONFIG_DLL(vtdapi.vxd,enable_win16)
@ -78,14 +78,14 @@ index 8c22a4f..ef03473 100644
WINE_CONFIG_DLL(w32sys.dll16,enable_win16)
diff --git a/dlls/vulkan-1/Makefile.in b/dlls/vulkan-1/Makefile.in
new file mode 100644
index 0000000..4960141
index 0000000000..4960141473
--- /dev/null
+++ b/dlls/vulkan-1/Makefile.in
@@ -0,0 +1 @@
+MODULE = vulkan-1.dll
diff --git a/dlls/vulkan-1/vulkan-1.spec b/dlls/vulkan-1/vulkan-1.spec
new file mode 100644
index 0000000..51bcfff
index 0000000000..51bcfff1fd
--- /dev/null
+++ b/dlls/vulkan-1/vulkan-1.spec
@@ -0,0 +1,160 @@
@ -251,7 +251,7 @@ index 0000000..51bcfff
+@ stdcall vkWaitForFences(ptr long ptr long int64) vulkan.vkWaitForFences
diff --git a/dlls/vulkan/Makefile.in b/dlls/vulkan/Makefile.in
new file mode 100644
index 0000000..7ee6d18
index 0000000000..7ee6d18cbe
--- /dev/null
+++ b/dlls/vulkan/Makefile.in
@@ -0,0 +1,8 @@
@ -265,7 +265,7 @@ index 0000000..7ee6d18
+ vulkan_thunks.c
diff --git a/dlls/vulkan/vulkan.spec b/dlls/vulkan/vulkan.spec
new file mode 100644
index 0000000..9b689ad
index 0000000000..9b689adc20
--- /dev/null
+++ b/dlls/vulkan/vulkan.spec
@@ -0,0 +1,160 @@
@ -431,7 +431,7 @@ index 0000000..9b689ad
+@ stdcall vkWaitForFences(ptr long ptr long int64)
diff --git a/dlls/vulkan/vulkan_main.c b/dlls/vulkan/vulkan_main.c
new file mode 100644
index 0000000..b060dc2
index 0000000000..b060dc258c
--- /dev/null
+++ b/dlls/vulkan/vulkan_main.c
@@ -0,0 +1,328 @@
@ -765,7 +765,7 @@ index 0000000..b060dc2
+}
diff --git a/dlls/vulkan/vulkan_private.h b/dlls/vulkan/vulkan_private.h
new file mode 100644
index 0000000..0f85854
index 0000000000..0f85854d25
--- /dev/null
+++ b/dlls/vulkan/vulkan_private.h
@@ -0,0 +1,3296 @@
@ -4067,7 +4067,7 @@ index 0000000..0f85854
+#endif /* __VULKAN_PRIVATE_H */
diff --git a/dlls/vulkan/vulkan_thunks.c b/dlls/vulkan/vulkan_thunks.c
new file mode 100644
index 0000000..8af28e7c
index 0000000000..8af28e7ce3
--- /dev/null
+++ b/dlls/vulkan/vulkan_thunks.c
@@ -0,0 +1,6593 @@
@ -10665,5 +10665,5 @@ index 0000000..8af28e7c
+ libvulkan_handle = NULL;
+}
--
2.7.1
2.11.0

10
patches/wined3d-1DTextures/0012-wined3d-Generate-glsl-samplers-for-1d-texture-arrays.patch
View File

@ -1,4 +1,4 @@
From d899bbed65bd73ee3c18a55bda617b96d19c126e Mon Sep 17 00:00:00 2001
From 82eb096a5585a8baaf2258943229b3a001d1bdb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 25 Aug 2016 17:06:41 +0200
Subject: wined3d: Generate glsl samplers for 1d texture arrays.
@ -8,11 +8,11 @@ Subject: wined3d: Generate glsl samplers for 1d texture arrays.
1 file changed, 7 insertions(+)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 5ccb027..654a988 100644
index c8a970f1eb..1a25701cb9 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -2005,6 +2005,13 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont
sampler_type = "samplerCube";
@@ -2401,6 +2401,13 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont
sampler_type = "samplerCube";
break;
+ case WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY:
@ -26,5 +26,5 @@ index 5ccb027..654a988 100644
if (shadow_sampler)
sampler_type = "sampler2DArrayShadow";
--
2.8.1
2.11.0

16
patches/wined3d-1DTextures/0013-wined3d-Add-support-for-1d-textures-in-context_attac.patch
View File

@ -1,4 +1,4 @@
From 628042ee68362bf3d57801084143e9e7d724b262 Mon Sep 17 00:00:00 2001
From 05249b5d5e76a7b5badf6daf22865712a36e39bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 25 Aug 2016 19:09:41 +0200
Subject: wined3d: Add support for 1d textures in
@ -9,21 +9,21 @@ Subject: wined3d: Add support for 1d textures in
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 74c3a49..1cd2463 100644
index 239dc38fa9..bc450e5249 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -128,7 +128,7 @@ static void context_attach_gl_texture_fbo(struct wined3d_context *context,
@@ -127,7 +127,7 @@ static void context_attach_gl_texture_fbo(struct wined3d_context *context,
{
gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, attachment, GL_TEXTURE_2D, 0, 0);
checkGLcall("glFramebufferTexture2D()");
}
- else if (resource->target == GL_TEXTURE_2D_ARRAY)
+ else if (resource->target == GL_TEXTURE_2D_ARRAY || resource->target == GL_TEXTURE_1D_ARRAY)
{
if (!gl_info->fbo_ops.glFramebufferTextureLayer)
{
@@ -140,6 +140,12 @@ static void context_attach_gl_texture_fbo(struct wined3d_context *context,
resource->object, resource->level, resource->layer);
checkGLcall("glFramebufferTextureLayer()");
@@ -149,6 +149,12 @@ static void context_attach_gl_texture_fbo(struct wined3d_context *context,
gl_info->fbo_ops.glFramebufferTexture(fbo_target, attachment,
resource->object, resource->level);
}
+ else if (resource->target == GL_TEXTURE_1D)
+ {
@ -35,5 +35,5 @@ index 74c3a49..1cd2463 100644
{
gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, attachment,
--
2.8.1
2.11.0

24
patches/wined3d-CSMT_Main/9999-IfDefined.patch
View File

@ -39,7 +39,7 @@ diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -3787,6 +3787,11 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device,
@@ -3841,6 +3841,11 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device,
TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx);
@ -2914,7 +2914,7 @@ diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2463,7 +2463,11 @@ static BOOL surface_load_texture(struct wined3d_surface *surface,
@@ -2474,7 +2474,11 @@ static BOOL surface_load_texture(struct wined3d_surface *surface,
/* Don't use PBOs for converted surfaces. During PBO conversion we look at
* WINED3D_TEXTURE_CONVERTED but it isn't set (yet) in all cases it is
* getting called. */
@ -3440,7 +3440,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
};
struct wined3d_timestamp_query
@@ -2604,6 +2614,16 @@ struct wined3d_state
@@ -2614,6 +2624,16 @@ struct wined3d_state
struct wined3d_rasterizer_state *rasterizer_state;
};
@ -3457,7 +3457,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
#define WINED3D_UNMAPPED_STAGE ~0u
/* Multithreaded flag. Removed from the public header to signal that
@@ -2715,6 +2735,14 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL
@@ -2725,6 +2745,14 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL
void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN;
void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN;
void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN;
@ -3472,7 +3472,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state)
{
@@ -2790,11 +2818,13 @@ static inline void wined3d_resource_release(struct wined3d_resource *resource)
@@ -2800,11 +2828,13 @@ static inline void wined3d_resource_release(struct wined3d_resource *resource)
InterlockedDecrement(&resource->access_count);
}
@ -3486,7 +3486,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
void resource_cleanup(struct wined3d_resource *resource) DECLSPEC_HIDDEN;
HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *device,
enum wined3d_resource_type type, const struct wined3d_format *format,
@@ -2905,7 +2935,11 @@ struct wined3d_texture
@@ -2915,7 +2945,11 @@ struct wined3d_texture
unsigned int map_count;
DWORD locations;
@ -3498,7 +3498,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
} sub_resources[1];
};
@@ -3206,6 +3240,7 @@ enum wined3d_push_constants
@@ -3216,6 +3250,7 @@ enum wined3d_push_constants
WINED3D_PUSH_CONSTANTS_PS_B,
};
@ -3506,7 +3506,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
struct wined3d_cs_ops
{
void *(*require_space)(struct wined3d_cs *cs, size_t size);
@@ -3213,6 +3248,33 @@ struct wined3d_cs_ops
@@ -3223,6 +3258,33 @@ struct wined3d_cs_ops
void (*push_constants)(struct wined3d_cs *cs, enum wined3d_push_constants p,
unsigned int start_idx, unsigned int count, const void *constants);
};
@ -3540,7 +3540,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
struct wined3d_cs
{
@@ -3223,8 +3285,31 @@ struct wined3d_cs
@@ -3233,8 +3295,31 @@ struct wined3d_cs
size_t data_size, start, end;
void *data;
@ -3572,7 +3572,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) DECLSPEC_HIDDEN;
void wined3d_cs_destroy(struct wined3d_cs *cs) DECLSPEC_HIDDEN;
void wined3d_cs_destroy_object(struct wined3d_cs *cs,
@@ -3242,10 +3327,20 @@ void wined3d_cs_emit_dispatch(struct wined3d_cs *cs,
@@ -3252,10 +3337,20 @@ void wined3d_cs_emit_dispatch(struct wined3d_cs *cs,
void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, int base_vertex_idx,
unsigned int start_idx, unsigned int index_count, unsigned int start_instance,
unsigned int instance_count, BOOL indexed) DECLSPEC_HIDDEN;
@ -3593,7 +3593,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) DECLSPEC_HIDDEN;
void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx,
const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN;
@@ -3293,10 +3388,20 @@ void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, enum wined
@@ -3303,10 +3398,20 @@ void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, enum wined
void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs,
struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN;
void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN;
@ -3614,7 +3614,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
void wined3d_cs_init_object(struct wined3d_cs *cs,
void (*callback)(void *object), void *object) DECLSPEC_HIDDEN;
HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx,
@@ -3304,12 +3409,14 @@ HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource,
@@ -3314,12 +3419,14 @@ HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource,
HRESULT wined3d_cs_unmap(struct wined3d_cs *cs, struct wined3d_resource *resource,
unsigned int sub_resource_idx) DECLSPEC_HIDDEN;