From 7d662cf2d797ba0c267ac863e9f28a12f7e6ad8d Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 6 Sep 2015 10:29:21 +0200 Subject: [PATCH] wined3d-CSMT_Main: Fix compilation on x86_64. --- .../0001-wined3d-Merge-get_pitch-functions.patch | 2 +- patches/wined3d-CSMT_Main/9999-IfDefined.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/wined3d-CSMT_Main/0001-wined3d-Merge-get_pitch-functions.patch b/patches/wined3d-CSMT_Main/0001-wined3d-Merge-get_pitch-functions.patch index 733caa11..e7900cb8 100644 --- a/patches/wined3d-CSMT_Main/0001-wined3d-Merge-get_pitch-functions.patch +++ b/patches/wined3d-CSMT_Main/0001-wined3d-Merge-get_pitch-functions.patch @@ -20,7 +20,7 @@ index 1891165..86441d1 100644 resource->draw_binding = WINED3D_LOCATION_TEXTURE_RGB; } + -+void CDECL wined3d_resource_get_pitch(const struct wined3d_resource *resource, UINT *row_pitch, ++void wined3d_resource_get_pitch(const struct wined3d_resource *resource, UINT *row_pitch, + UINT *slice_pitch) +{ + unsigned int alignment; diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index 43e29631..c12d3fbc 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -10125,7 +10125,7 @@ diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c } +#if defined(STAGING_CSMT) - void CDECL wined3d_resource_get_pitch(const struct wined3d_resource *resource, UINT *row_pitch, + void wined3d_resource_get_pitch(const struct wined3d_resource *resource, UINT *row_pitch, UINT *slice_pitch) @@ -1024,3 +1043,4 @@