November 2016 - Wine-commits

Józef Kucia : wined3d: Add support for WINED3DFMT_R8G8_UINT format.
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: 5471465863e5a53fb1039811214252389b8a4784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5471465863e5a53fb10398112… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 10 12:39:09 2016 +0100 wined3d: Add support for WINED3DFMT_R8G8_UINT format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9e16416..3471131 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -243,6 +243,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_D24_UNORM_S8_UINT, WINED3DFMT_R24G8_TYPELESS, "DS"}, {WINED3DFMT_R8G8_SNORM, WINED3DFMT_R8G8_TYPELESS, "ii"}, {WINED3DFMT_R8G8_UNORM, WINED3DFMT_R8G8_TYPELESS, "uu"}, + {WINED3DFMT_R8G8_UINT, WINED3DFMT_R8G8_TYPELESS, "UU"}, {WINED3DFMT_R16_UNORM, WINED3DFMT_R16_TYPELESS, "u"}, {WINED3DFMT_R16_UINT, WINED3DFMT_R16_TYPELESS, "U"}, {WINED3DFMT_R16_SINT, WINED3DFMT_R16_TYPELESS, "I"}, @@ -1308,6 +1309,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RG, NULL}, + {WINED3DFMT_R8G8_UINT, GL_RG8UI, GL_RG8UI, 0, + GL_RG_INTEGER, GL_UNSIGNED_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, + ARB_TEXTURE_RG, NULL}, {WINED3DFMT_R32_UINT, GL_R32UI, GL_R32UI, 0, GL_RED_INTEGER, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET,

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_R8G8_SINT format.
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: dbbb7217c676b6cf668a03c217235059918f43c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbbb7217c676b6cf668a03c21… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 10 12:39:10 2016 +0100 wined3d: Add support for WINED3DFMT_R8G8_SINT format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 3471131..103a5b6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -244,6 +244,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R8G8_SNORM, WINED3DFMT_R8G8_TYPELESS, "ii"}, {WINED3DFMT_R8G8_UNORM, WINED3DFMT_R8G8_TYPELESS, "uu"}, {WINED3DFMT_R8G8_UINT, WINED3DFMT_R8G8_TYPELESS, "UU"}, + {WINED3DFMT_R8G8_SINT, WINED3DFMT_R8G8_TYPELESS, "II"}, {WINED3DFMT_R16_UNORM, WINED3DFMT_R16_TYPELESS, "u"}, {WINED3DFMT_R16_UINT, WINED3DFMT_R16_TYPELESS, "U"}, {WINED3DFMT_R16_SINT, WINED3DFMT_R16_TYPELESS, "I"}, @@ -1313,6 +1314,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RG_INTEGER, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RG, NULL}, + {WINED3DFMT_R8G8_SINT, GL_RG8I, GL_RG8I, 0, + GL_RG_INTEGER, GL_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, + ARB_TEXTURE_RG, NULL}, {WINED3DFMT_R32_UINT, GL_R32UI, GL_R32UI, 0, GL_RED_INTEGER, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET,

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_R32G32_UINT format.
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: fa04582bf7ea83ec5615f7da0b3c3917ae6cbad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa04582bf7ea83ec5615f7da0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 10 12:39:11 2016 +0100 wined3d: Add support for WINED3DFMT_R32G32_UINT format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 103a5b6..7790e40 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1318,6 +1318,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RG_INTEGER, GL_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RG, NULL}, + {WINED3DFMT_R32G32_UINT, GL_RG32UI, GL_RG32UI, 0, + GL_RG_INTEGER, GL_UNSIGNED_INT, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, + ARB_TEXTURE_RG, NULL}, {WINED3DFMT_R32_UINT, GL_R32UI, GL_R32UI, 0, GL_RED_INTEGER, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET,

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_R32G32_SINT format.
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: 30cf7bb5bce2f7240b370e0a8d1b73156fe3e4bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=30cf7bb5bce2f7240b370e0a8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 10 12:39:12 2016 +0100 wined3d: Add support for WINED3DFMT_R32G32_SINT format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7790e40..4cce6e0 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1322,6 +1322,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RG_INTEGER, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RG, NULL}, + {WINED3DFMT_R32G32_SINT, GL_RG32I, GL_RG32I, 0, + GL_RG_INTEGER, GL_INT, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, + ARB_TEXTURE_RG, NULL}, {WINED3DFMT_R32_UINT, GL_R32UI, GL_R32UI, 0, GL_RED_INTEGER, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET,

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_R16G16_UINT format.
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: 594b9010dc962524bffc751178c3616389ece65c URL: http://source.winehq.org/git/wine.git/?a=commit;h=594b9010dc962524bffc75117… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 10 12:39:13 2016 +0100 wined3d: Add support for WINED3DFMT_R16G16_UINT format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4cce6e0..9ad9b21 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1326,6 +1326,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RG_INTEGER, GL_INT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RG, NULL}, + {WINED3DFMT_R16G16_UINT, GL_RG16UI, GL_RG16UI, 0, + GL_RG_INTEGER, GL_UNSIGNED_SHORT, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, + ARB_TEXTURE_RG, NULL}, {WINED3DFMT_R32_UINT, GL_R32UI, GL_R32UI, 0, GL_RED_INTEGER, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET,

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_R16G16_SINT format.
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: 6d87eff6105c9a5ef32bcad11027ddbd3b9505bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d87eff6105c9a5ef32bcad11… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 10 12:39:14 2016 +0100 wined3d: Add support for WINED3DFMT_R16G16_SINT format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9ad9b21..d59f86f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1330,6 +1330,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RG_INTEGER, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RG, NULL}, + {WINED3DFMT_R16G16_SINT, GL_RG16I, GL_RG16I, 0, + GL_RG_INTEGER, GL_SHORT, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, + ARB_TEXTURE_RG, NULL}, {WINED3DFMT_R32_UINT, GL_R32UI, GL_R32UI, 0, GL_RED_INTEGER, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET,

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_R16G16B16A16_UINT format.
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: c3b9811a802a01128c0835d33cec6be722dad325 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3b9811a802a01128c0835d33… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 10 12:39:15 2016 +0100 wined3d: Add support for WINED3DFMT_R16G16B16A16_UINT format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d59f86f..dd75035 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1318,6 +1318,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RG_INTEGER, GL_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RG, NULL}, + {WINED3DFMT_R16G16B16A16_UINT, GL_RGBA16UI, GL_RGBA16UI, 0, + GL_RGBA_INTEGER, GL_UNSIGNED_SHORT, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, + EXT_TEXTURE_INTEGER, NULL}, {WINED3DFMT_R32G32_UINT, GL_RG32UI, GL_RG32UI, 0, GL_RG_INTEGER, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET,

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_R16G16B16A16_SINT format.
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: d7a23cf2be56f27d6bf4736f8b33c9d50fb16b5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7a23cf2be56f27d6bf4736f8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 10 12:39:16 2016 +0100 wined3d: Add support for WINED3DFMT_R16G16B16A16_SINT format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index dd75035..afbfd92 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1322,6 +1322,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RGBA_INTEGER, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, EXT_TEXTURE_INTEGER, NULL}, + {WINED3DFMT_R16G16B16A16_SINT, GL_RGBA16I, GL_RGBA16I, 0, + GL_RGBA_INTEGER, GL_SHORT, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, + EXT_TEXTURE_INTEGER, NULL}, {WINED3DFMT_R32G32_UINT, GL_RG32UI, GL_RG32UI, 0, GL_RG_INTEGER, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET,

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: b86f6b939ba69f12b2e969984d87d57b617f81f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b86f6b939ba69f12b2e969984… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Nov 10 15:40:04 2016 +0200 po: Update Ukrainian translation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/uk.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/uk.po b/po/uk.po index 0626aa5..49f814b 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-10-24 22:55+0200\n" +"PO-Revision-Date: 2016-11-10 15:09+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -8121,10 +8121,8 @@ msgid "Wine was brought to you by:" msgstr "Розробники Wine:" #: shell32.rc:334 -#, fuzzy -#| msgid "&Run..." msgid "Run" -msgstr "&Запустити..." +msgstr "Запустити" #: shell32.rc:338 msgid ""

1 0

Henri Verbeet : d3drm: Introduce d3drm_set_color().
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: 060ea15ae2c1604d51d3df1460e99c7d6e6211cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=060ea15ae2c1604d51d3df146… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 10 16:17:37 2016 +0100 d3drm: Introduce d3drm_set_color(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 16 ++++++++++++++++ dlls/d3drm/frame.c | 5 ++--- dlls/d3drm/light.c | 2 +- dlls/d3drm/math.c | 29 +++++++++-------------------- dlls/d3drm/meshbuilder.c | 7 +++---- 5 files changed, 31 insertions(+), 28 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index e75fe45..49e4af1 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -21,6 +21,7 @@ #ifndef __D3DRM_PRIVATE_INCLUDED__ #define __D3DRM_PRIVATE_INCLUDED__ +#include <math.h> #include "d3drm.h" #include "dxfile.h" #include "d3drmwin.h" @@ -140,4 +141,19 @@ struct d3drm_file_header extern char templates[] DECLSPEC_HIDDEN; +static inline BYTE d3drm_color_component(float c) +{ + if (c <= 0.0f) + return 0u; + if (c >= 1.0f) + return 0xffu; + return floor(c * 255.0f); +} + +static inline void d3drm_set_color(D3DCOLOR *color, float r, float g, float b, float a) +{ + *color = RGBA_MAKE(d3drm_color_component(r), d3drm_color_component(g), + d3drm_color_component(b), d3drm_color_component(a)); +} + #endif /* __D3DRM_PRIVATE_INCLUDED__ */ diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 978b1d8..39b2f87 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -2004,8 +2004,7 @@ static HRESULT WINAPI d3drm_frame3_SetSceneBackgroundRGB(IDirect3DRMFrame3 *ifac TRACE("iface %p, red %.8e, green %.8e, blue %.8e.\n", iface, red, green, blue); - frame->scenebackground = RGBA_MAKE((BYTE)(red * 255.0f), - (BYTE)(green * 255.0f), (BYTE)(blue * 255.0f), 0xff); + d3drm_set_color(&frame->scenebackground, red, green, blue, 1.0f); return D3DRM_OK; } @@ -2949,7 +2948,7 @@ HRESULT d3drm_frame_create(struct d3drm_frame **frame, IUnknown *parent_frame, I object->IDirect3DRMFrame3_iface.lpVtbl = &d3drm_frame3_vtbl; object->d3drm = d3drm; object->ref = 1; - object->scenebackground = RGBA_MAKE(0, 0, 0, 0xff); + d3drm_set_color(&object->scenebackground, 0.0f, 0.0f, 0.0f, 1.0f); memcpy(object->transform, identity, sizeof(D3DRMMATRIX4D)); diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 53accbf..7a7ccd4 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -183,7 +183,7 @@ static HRESULT WINAPI d3drm_light_SetColorRGB(IDirect3DRMLight *iface, TRACE("iface %p, red %.8e, green %.8e, blue %.8e.\n", iface, red, green, blue); - light->color = RGBA_MAKE((BYTE)(red * 255.0f), (BYTE)(green * 255.0f), (BYTE)(blue * 255.0f), 0xff); + d3drm_set_color(&light->color, red, green, blue, 1.0f); return D3DRM_OK; } diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index a1ad727..4ccde60 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -19,12 +19,10 @@ #define NONAMELESSUNION -#include <math.h> -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "d3drmdef.h" +#include "config.h" +#include "wine/port.h" + +#include "d3drm_private.h" /* Create a RGB color from its components */ D3DCOLOR WINAPI D3DRMCreateColorRGB(D3DVALUE red, D3DVALUE green, D3DVALUE blue) @@ -34,20 +32,11 @@ D3DCOLOR WINAPI D3DRMCreateColorRGB(D3DVALUE red, D3DVALUE green, D3DVALUE blue) /* Create a RGBA color from its components */ D3DCOLOR WINAPI D3DRMCreateColorRGBA(D3DVALUE red, D3DVALUE green, D3DVALUE blue, D3DVALUE alpha) { - int Red, Green, Blue, Alpha; - Red=floor(red*255); - Green=floor(green*255); - Blue=floor(blue*255); - Alpha=floor(alpha*255); - if (red < 0) Red=0; - if (red > 1) Red=255; - if (green < 0) Green=0; - if (green > 1) Green=255; - if (blue < 0) Blue=0; - if (blue > 1) Blue=255; - if (alpha < 0) Alpha=0; - if (alpha > 1) Alpha=255; - return (RGBA_MAKE(Red, Green, Blue, Alpha)); + D3DCOLOR color; + + d3drm_set_color(&color, red, green, blue, alpha); + + return color; } /* Determine the alpha part of a color */ diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 958e759..0028f12 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1235,8 +1235,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, values = (float*)ptr; - This->materials[i].color = RGBA_MAKE((BYTE)(values[0] * 255.0f), (BYTE)(values[1] * 255.0f), - (BYTE)(values[2] * 255.0f), (BYTE)(values[3] * 255.0f)); + d3drm_set_color(&This->materials[i].color, values[0], values[1], values[2], values[3]); IDirect3DRMMaterial2_SetAmbient(This->materials[i].material, values[0], values [1], values[2]); /* Alpha ignored */ IDirect3DRMMaterial2_SetPower(This->materials[i].material, values[4]); @@ -1694,7 +1693,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetColorRGB(IDirect3DRMMeshBuilder3 *i TRACE("iface %p, red %.8e, green %.8e, blue %.8e.\n", iface, red, green, blue); - mesh_builder->color = RGBA_MAKE((BYTE)(red * 255.0f), (BYTE)(green * 255.0f), (BYTE)(blue * 255.0f), 0xff); + d3drm_set_color(&mesh_builder->color, red, green, blue, 1.0f); return D3DRM_OK; } @@ -2595,7 +2594,7 @@ static HRESULT WINAPI d3drm_mesh_SetGroupColorRGB(IDirect3DRMMesh *iface, if (id >= mesh->nb_groups) return D3DRMERR_BADVALUE; - mesh->groups[id].color = RGBA_MAKE((BYTE)(red * 255.0f), (BYTE)(green * 255.0f), (BYTE)(blue * 255.0f), 0xff); + d3drm_set_color(&mesh->groups[id].color, red, green, blue, 1.0f); return D3DRM_OK; }

1 0