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 21763489982177f4db9e5f8cc8ccb751441f5a2e.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-07-25 17:24:47 +02:00
parent d943e0bd51
commit 2c12e538dd
10 changed files with 94 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -619,7 +619,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
@@ -2822,6 +2822,16 @@ struct wined3d_state
@@ -2823,6 +2823,16 @@ struct wined3d_state
struct wined3d_rasterizer_state *rasterizer_state;
};
@@ -636,7 +636,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
@@ -2933,6 +2943,12 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL
@@ -2934,6 +2944,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;
@@ -649,7 +649,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)
{
@@ -3120,7 +3136,11 @@ struct wined3d_texture
@@ -3121,7 +3137,11 @@ struct wined3d_texture
unsigned int map_count;
DWORD locations;
@@ -661,7 +661,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
} sub_resources[1];
};
@@ -3435,6 +3455,9 @@ struct wined3d_cs_queue
@@ -3436,6 +3456,9 @@ struct wined3d_cs_queue
struct wined3d_cs_ops
{