wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against ef267f115f76a3041e0da4a0f0dbd7ffb4a022e1.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-05-25 01:19:21 +02:00
parent 8b1d3d07ab
commit 91f6a8ad80
7 changed files with 48 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -622,7 +622,7 @@ diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2694,6 +2694,16 @@ struct wined3d_state
@@ -2695,6 +2695,16 @@ struct wined3d_state
struct wined3d_rasterizer_state *rasterizer_state;
};
@@ -639,7 +639,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
@@ -2805,6 +2815,12 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL
@@ -2806,6 +2816,12 @@ 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;
@@ -652,7 +652,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)
{
@@ -2991,7 +3007,11 @@ struct wined3d_texture
@@ -2992,7 +3008,11 @@ struct wined3d_texture
unsigned int map_count;
DWORD locations;
@@ -664,7 +664,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
} sub_resources[1];
};
@@ -3306,6 +3326,9 @@ struct wined3d_cs_queue
@@ -3307,6 +3327,9 @@ struct wined3d_cs_queue
struct wined3d_cs_ops
{