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 efb1cf0299c23385f934fa9b3abc920bfca46611.

Browse Source
This commit is contained in:
Sebastian Lackner 2015-09-10 16:06:52 +02:00
parent 357269a486
commit 929a331358
4 changed files with 136 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "e19a8fd706768aa2bcbeeec2f22ca991c4821ad3"
echo "efb1cf0299c23385f934fa9b3abc920bfca46611"
}
# Show version information

28
patches/wined3d-CSMT_Main/0137-wined3d-Clean-up-volume-resource-data-through-the-CS.patch
View File

@ -1,4 +1,4 @@
From baa69b6a987dfdefff4b205f1dabe6e485226256 Mon Sep 17 00:00:00 2001
From e092a5748fac188f5b214467cdb33b4df9a7163c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
Date: Wed, 2 Oct 2013 22:54:57 +0200
Subject: wined3d: Clean up volume resource data through the CS.
@ -10,10 +10,10 @@ Subject: wined3d: Clean up volume resource data through the CS.
3 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index 40cd85d..9cba57b 100644
index 54b6d1a..18b556d 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -84,6 +84,7 @@ enum wined3d_cs_op
@@ -85,6 +85,7 @@ enum wined3d_cs_op
WINED3D_CS_OP_CREATE_VBO,
WINED3D_CS_OP_RESOURCE_CLEANUP,
WINED3D_CS_OP_BUFFER_CLEANUP,
@ -21,7 +21,7 @@ index 40cd85d..9cba57b 100644
WINED3D_CS_OP_STOP,
};
@@ -491,6 +492,12 @@ struct wined3d_cs_buffer_cleanup
@@ -501,6 +502,12 @@ struct wined3d_cs_buffer_cleanup
struct wined3d_buffer *buffer;
};
@ -34,7 +34,7 @@ index 40cd85d..9cba57b 100644
static void wined3d_cs_mt_submit(struct wined3d_cs *cs, size_t size)
{
LONG new_val = (cs->queue.head + size) & (WINED3D_CS_QUEUE_SIZE - 1);
@@ -2392,6 +2399,26 @@ void wined3d_cs_emit_buffer_cleanup(struct wined3d_cs *cs, struct wined3d_buffer
@@ -2506,6 +2513,26 @@ void wined3d_cs_emit_buffer_cleanup(struct wined3d_cs *cs, struct wined3d_buffer
cs->ops->submit(cs, sizeof(*op));
}
@ -61,7 +61,7 @@ index 40cd85d..9cba57b 100644
static UINT (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) =
{
/* WINED3D_CS_OP_NOP */ wined3d_cs_exec_nop,
@@ -2454,6 +2481,7 @@ static UINT (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void
@@ -2569,6 +2596,7 @@ static UINT (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void
/* WINED3D_CS_OP_CREATE_VBO */ wined3d_cs_exec_create_vbo,
/* WINED3D_CS_OP_RESOURCE_CLEANUP */ wined3d_cs_exec_resource_cleanup,
/* WINED3D_CS_OP_BUFFER_CLEANUP */ wined3d_cs_exec_buffer_cleanup,
@ -70,10 +70,10 @@ index 40cd85d..9cba57b 100644
static inline void *_wined3d_cs_mt_require_space(struct wined3d_cs *cs, size_t size, BOOL prio)
diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
index a223f43..fb7ec1a 100644
index 7913a13..36dd640 100644
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -296,10 +296,8 @@ void wined3d_volume_destroy(struct wined3d_volume *volume)
@@ -313,10 +313,8 @@ void wined3d_volume_destroy(struct wined3d_volume *volume)
TRACE("volume %p.\n", volume);
resource_cleanup(&volume->resource);
@ -85,7 +85,7 @@ index a223f43..fb7ec1a 100644
}
static void volume_unload(struct wined3d_resource *resource)
@@ -340,6 +338,11 @@ ULONG CDECL wined3d_volume_incref(struct wined3d_volume *volume)
@@ -357,6 +355,11 @@ static ULONG CDECL wined3d_volume_incref(struct wined3d_volume *volume)
return wined3d_texture_incref(volume->container);
}
@ -94,14 +94,14 @@ index a223f43..fb7ec1a 100644
+ HeapFree(GetProcessHeap(), 0, volume);
+}
+
ULONG CDECL wined3d_volume_decref(struct wined3d_volume *volume)
static ULONG CDECL wined3d_volume_decref(struct wined3d_volume *volume)
{
TRACE("Forwarding to container %p.\n", volume->container);
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index ffcdcb4..8537000 100644
index 0933ae6..088bf72 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2358,6 +2358,7 @@ void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *
@@ -2423,6 +2423,7 @@ void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *
BOOL srgb_mode) DECLSPEC_HIDDEN;
void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context,
const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN;
@ -109,7 +109,7 @@ index ffcdcb4..8537000 100644
struct wined3d_surface_dib
{
@@ -2728,6 +2729,7 @@ void wined3d_cs_emit_create_vbo(struct wined3d_cs *cs, struct wined3d_buffer *bu
@@ -2797,6 +2798,7 @@ void wined3d_cs_emit_create_vbo(struct wined3d_cs *cs, struct wined3d_buffer *bu
void wined3d_cs_emit_resource_cleanup(struct wined3d_cs *cs,
struct wined3d_resource *resource) DECLSPEC_HIDDEN;
void wined3d_cs_emit_buffer_cleanup(struct wined3d_cs *cs, struct wined3d_buffer *buffer) DECLSPEC_HIDDEN;
@ -118,5 +118,5 @@ index ffcdcb4..8537000 100644
/* Direct3D terminology with little modifications. We do not have an issued state
* because only the driver knows about it, but we have a created state because d3d
--
1.9.1
2.5.1

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

File diff suppressed because it is too large Load Diff

26
patches/wined3d-DXTn/0002-wined3d-Improve-DXTn-support-and-export-conversion-f.patch
View File

@ -1,4 +1,4 @@
From 46e90808c84f3473966d59fbf7a30987d5c3791e Mon Sep 17 00:00:00 2001
From 5a9fbe80d7b3c6c5c9b6395f730c9ff6b08b0d57 Mon Sep 17 00:00:00 2001
From: Christian Costa <titan.costa@gmail.com>
Date: Tue, 4 Nov 2014 22:41:45 +0100
Subject: wined3d: Improve DXTn support and export conversion functions for
@ -13,7 +13,7 @@ Subject: wined3d: Improve DXTn support and export conversion functions for
5 files changed, 161 insertions(+), 10 deletions(-)
diff --git a/dlls/wined3d/dxtn.c b/dlls/wined3d/dxtn.c
index fcd2134..082f01c 100644
index ce98949..77f7d55 100644
--- a/dlls/wined3d/dxtn.c
+++ b/dlls/wined3d/dxtn.c
@@ -25,6 +25,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d);
@ -153,10 +153,10 @@ index fcd2134..082f01c 100644
#undef LOAD_FUNCPTR
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 03b5f4f..ec1f4a5 100644
index 603a6194..3530414 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2408,6 +2408,30 @@ static void convert_dxt1_x8r8g8b8(const BYTE *src, BYTE *dst,
@@ -2303,6 +2303,30 @@ static void convert_dxt1_x8r8g8b8(const BYTE *src, BYTE *dst,
wined3d_dxt1_decode(src, dst, pitch_in, pitch_out, WINED3DFMT_B8G8R8X8_UNORM, w, h);
}
@ -187,7 +187,7 @@ index 03b5f4f..ec1f4a5 100644
static void convert_a8r8g8b8_dxt1(const BYTE *src, BYTE *dst,
DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h)
{
@@ -2474,8 +2498,15 @@ static const struct d3dfmt_converter_desc converters[] =
@@ -2369,8 +2393,15 @@ static const struct d3dfmt_converter_desc converters[] =
static const struct d3dfmt_converter_desc dxtn_converters[] =
{
@ -204,12 +204,12 @@ index 03b5f4f..ec1f4a5 100644
{WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_DXT1, convert_x8r8g8b8_dxt1},
{WINED3DFMT_B5G5R5A1_UNORM, WINED3DFMT_DXT1, convert_a1r5g5b5_dxt1},
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 9de0baf..fb55abc 100644
index 9531dd3..845d36b 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -288,3 +288,11 @@
@@ -285,3 +285,11 @@
@ cdecl wined3d_volume_get_resource(ptr)
@ cdecl wined3d_volume_map(ptr ptr ptr long)
@ cdecl wined3d_volume_preload(ptr)
@ cdecl wined3d_volume_unmap(ptr)
+
+@ cdecl wined3d_dxtn_supported()
@ -220,10 +220,10 @@ index 9de0baf..fb55abc 100644
+@ cdecl wined3d_dxt5_decode(ptr ptr long long long long long)
+@ cdecl wined3d_dxt5_encode(ptr ptr long long long long long)
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 67105f4..01c0fc2 100644
index 01ea83c..e561137 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3176,17 +3176,7 @@ static inline void context_apply_state(struct wined3d_context *context,
@@ -3251,17 +3251,7 @@ static inline void context_apply_state(struct wined3d_context *context,
state_table[rep].apply(context, state, rep);
}
@ -242,10 +242,10 @@ index 67105f4..01c0fc2 100644
/* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 089db9e..bf4efe8 100644
index ac1e59e..4878b06 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2596,4 +2596,18 @@ static inline unsigned int wined3d_log2i(unsigned int x)
@@ -2601,4 +2601,18 @@ static inline unsigned int wined3d_log2i(unsigned int x)
#endif
}
@ -265,5 +265,5 @@ index 089db9e..bf4efe8 100644
+
#endif /* __WINE_WINED3D_H */
--
2.3.0
2.5.1