[PATCH v2 0/2] MR1705: Some more long type enabling in wined3d.
Note: using a standalone MR to stress external change in type. -- v2: wined3d: Enable long types in surface.c. wined3d: Reduce usage of long integral types in surface.c. https://gitlab.winehq.org/wine/wine/-/merge_requests/1705
From: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/surface.c | 16 +++++++++------- include/wine/wined3d.h | 10 +++++----- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ad854e7f790..4d2ef06be86 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -41,7 +41,7 @@ static void get_color_masks(const struct wined3d_format *format, uint32_t *masks } static void convert_r32_float_r16_float(const BYTE *src, BYTE *dst, - DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) + unsigned int pitch_in, unsigned int pitch_out, unsigned int w, unsigned int h) { unsigned short *dst_s; const float *src_f; @@ -61,7 +61,7 @@ static void convert_r32_float_r16_float(const BYTE *src, BYTE *dst, } static void convert_r5g6b5_x8r8g8b8(const BYTE *src, BYTE *dst, - DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) + unsigned int pitch_in, unsigned int pitch_out, unsigned int w, unsigned int h) { static const unsigned char convert_5to8[] = { @@ -103,7 +103,7 @@ static void convert_r5g6b5_x8r8g8b8(const BYTE *src, BYTE *dst, /* We use this for both B8G8R8A8 -> B8G8R8X8 and B8G8R8X8 -> B8G8R8A8, since * in both cases we're just setting the X / Alpha channel to 0xff. */ static void convert_a8r8g8b8_x8r8g8b8(const BYTE *src, BYTE *dst, - DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) + unsigned int pitch_in, unsigned int pitch_out, unsigned int w, unsigned int h) { unsigned int x, y; @@ -127,7 +127,7 @@ static inline BYTE cliptobyte(int x) } static void convert_yuy2_x8r8g8b8(const BYTE *src, BYTE *dst, - DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) + unsigned int pitch_in, unsigned int pitch_out, unsigned int w, unsigned int h) { int c2, d, e, r2 = 0, g2 = 0, b2 = 0; unsigned int x, y; @@ -169,7 +169,7 @@ static void convert_yuy2_x8r8g8b8(const BYTE *src, BYTE *dst, } static void convert_yuy2_r5g6b5(const BYTE *src, BYTE *dst, - DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) + unsigned int pitch_in, unsigned int pitch_out, unsigned int w, unsigned int h) { unsigned int x, y; int c2, d, e, r2 = 0, g2 = 0, b2 = 0; @@ -212,7 +212,9 @@ static void convert_yuy2_r5g6b5(const BYTE *src, BYTE *dst, struct d3dfmt_converter_desc { enum wined3d_format_id from, to; - void (*convert)(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h); + void (*convert)(const BYTE *src, BYTE *dst, + unsigned int pitch_in, unsigned int pitch_out, + unsigned int w, unsigned int h); }; static const struct d3dfmt_converter_desc converters[] = @@ -968,7 +970,7 @@ do { \ } else { - DWORD masks[3]; + uint32_t masks[3]; get_color_masks(src_format, masks); keymask = masks[0] | masks[1] | masks[2]; } diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1660b424441..6c984b7726a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1994,15 +1994,15 @@ struct wined3d_caps struct wined3d_color_key { - DWORD color_space_low_value; /* low boundary of color space that is to - * be treated as Color Key, inclusive */ - DWORD color_space_high_value; /* high boundary of color space that is - * to be treated as Color Key, inclusive */ + unsigned int color_space_low_value; /* low boundary of color space that is to + * be treated as Color Key, inclusive */ + unsigned int color_space_high_value; /* high boundary of color space that is + * to be treated as Color Key, inclusive */ }; struct wined3d_blt_fx { - DWORD fx; + uint32_t fx; struct wined3d_color_key dst_color_key; struct wined3d_color_key src_color_key; enum wined3d_format_id resolve_format_id; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1705
From: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/surface.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4d2ef06be86..8bee9b6d83b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -25,7 +25,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_NO_LONG_TYPES /* temporary */ #include "wined3d_private.h" -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1705
pushed V2 integrating Zebediah's remark -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1705#note_18968
This merge request was approved by Zebediah Figura. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1705
participants (3)
-
Eric Pouech -
eric pouech (＠epo)
-
Zebediah Figura (＠zfigura)