wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Nikolay Sivov : uxtheme: Fix buffer bitmap leak.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: e015928a8583024ba4a69c3c9c37659c5226c10c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e015928a8583024ba4a69c3c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 21 23:09:16 2017 +0300 uxtheme: Fix buffer bitmap leak. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/buffer.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c index 17bdf3d..bbf4c9d 100644 --- a/dlls/uxtheme/buffer.c +++ b/dlls/uxtheme/buffer.c @@ -39,12 +39,14 @@ struct paintbuffer { HDC targetdc; HDC memorydc; + HBITMAP bitmap; RECT rect; void *bits; }; static void free_paintbuffer(struct paintbuffer *buffer) { + DeleteObject(buffer->bitmap); DeleteDC(buffer->memorydc); HeapFree(GetProcessHeap(), 0, buffer); } @@ -83,7 +85,6 @@ HPAINTBUFFER WINAPI BeginBufferedPaint(HDC targetdc, const RECT *rect, char bmibuf[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; BITMAPINFO *bmi = (BITMAPINFO *)bmibuf; struct paintbuffer *buffer; - HBITMAP hbm; TRACE("(%p %s %d %p %p)\n", targetdc, wine_dbgstr_rect(rect), format, params, retdc); @@ -105,7 +106,7 @@ HPAINTBUFFER WINAPI BeginBufferedPaint(HDC targetdc, const RECT *rect, switch (format) { case BPBF_COMPATIBLEBITMAP: - hbm = CreateCompatibleBitmap(targetdc, rect->right - rect->left, rect->bottom - rect->top); + buffer->bitmap = CreateCompatibleBitmap(targetdc, rect->right - rect->left, rect->bottom - rect->top); buffer->bits = NULL; break; case BPBF_DIB: @@ -120,22 +121,23 @@ HPAINTBUFFER WINAPI BeginBufferedPaint(HDC targetdc, const RECT *rect, bmi->bmiHeader.biBitCount = format == BPBF_TOPDOWNMONODIB ? 1 : 32; bmi->bmiHeader.biPlanes = 1; bmi->bmiHeader.biCompression = BI_RGB; - hbm = CreateDIBSection(buffer->memorydc, bmi, DIB_RGB_COLORS, &buffer->bits, NULL, 0); + buffer->bitmap = CreateDIBSection(buffer->memorydc, bmi, DIB_RGB_COLORS, &buffer->bits, NULL, 0); break; default: WARN("Unknown buffer format %d\n", format); + buffer->bitmap = NULL; free_paintbuffer(buffer); return NULL; } - if (!hbm) + if (!buffer->bitmap) { WARN("Failed to create buffer bitmap\n"); free_paintbuffer(buffer); return NULL; } - DeleteObject(SelectObject(buffer->memorydc, hbm)); + DeleteObject(SelectObject(buffer->memorydc, buffer->bitmap)); *retdc = buffer->memorydc;

1 0

Henri Verbeet : ddraw/tests: Introduce a helper function to create windows.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: a86af72270e61cafb37454bbdc8020681dd49b07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a86af72270e61cafb37454bbd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 23 17:57:29 2017 +0200 ddraw/tests: Introduce a helper function to create windows. Mostly for consistency with other D3D tests. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 151 ++++++++++++------------------ dlls/ddraw/tests/ddraw2.c | 173 +++++++++++++--------------------- dlls/ddraw/tests/ddraw4.c | 216 +++++++++++++++--------------------------- dlls/ddraw/tests/ddraw7.c | 232 ++++++++++++++++------------------------------ 4 files changed, 273 insertions(+), 499 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a86af72270e61cafb3745…

1 0

Henri Verbeet : wined3d: Avoid touching the output value on failure in get_config_key_dword(); .
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 449308ec5d2025058d46b17352c9fa05dbe0889e URL: http://source.winehq.org/git/wine.git/?a=commit;h=449308ec5d2025058d46b1735… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 23 17:57:28 2017 +0200 wined3d: Avoid touching the output value on failure in get_config_key_dword();. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_main.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 1a4e2f2..8f5da3c 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -127,13 +127,20 @@ static DWORD get_config_key(HKEY defkey, HKEY appkey, const char *name, char *bu return ERROR_FILE_NOT_FOUND; } -static DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char *name, DWORD *data) +static DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char *name, DWORD *value) { - DWORD type; - DWORD size = sizeof(DWORD); - if (appkey && !RegQueryValueExA(appkey, name, 0, &type, (BYTE *)data, &size) && (type == REG_DWORD)) return 0; - if (defkey && !RegQueryValueExA(defkey, name, 0, &type, (BYTE *)data, &size) && (type == REG_DWORD)) return 0; + DWORD type, data, size; + + size = sizeof(data); + if (appkey && !RegQueryValueExA(appkey, name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD) goto success; + size = sizeof(data); + if (defkey && !RegQueryValueExA(defkey, name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD) goto success; + return ERROR_FILE_NOT_FOUND; + +success: + *value = data; + return 0; } static BOOL wined3d_dll_init(HINSTANCE hInstDLL)

1 0

Henri Verbeet : wined3d: Get rid of the "Multisampling" setting.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: c09bb22c81cd391998cae632380d3a50504d0d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c09bb22c81cd391998cae6323… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 23 17:57:27 2017 +0200 wined3d: Get rid of the "Multisampling" setting. There should be no reason to set this anymore. Note that "SampleCount" can be used to force a specific sample count. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 3 +-- dlls/wined3d/wined3d_main.c | 9 --------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b5a8e47..e89cd6d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3710,8 +3710,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) else gl_info->limits.shininess = 128.0f; - if ((gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_FRAMEBUFFER_MULTISAMPLE]) - && wined3d_settings.allow_multisampling) + if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_FRAMEBUFFER_MULTISAMPLE]) { gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_SAMPLES, &gl_max); gl_info->limits.samples = gl_max; diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index f662c3a..1a4e2f2 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -80,7 +80,6 @@ struct wined3d_settings wined3d_settings = PCI_DEVICE_NONE,/* PCI Device ID */ 0, /* The default of memory is set in init_driver_info */ NULL, /* No wine logo by default */ - TRUE, /* Multisampling enabled by default. */ ~0u, /* Don't force a specific sample count by default. */ FALSE, /* No strict draw ordering. */ FALSE, /* Don't range check relative addressing indices in float constants. */ @@ -289,14 +288,6 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) if (!wined3d_settings.logo) ERR("Failed to allocate logo path memory.\n"); else memcpy(wined3d_settings.logo, buffer, len); } - if ( !get_config_key( hkey, appkey, "Multisampling", buffer, size) ) - { - if (!strcmp(buffer, "disabled")) - { - TRACE("Multisampling disabled.\n"); - wined3d_settings.allow_multisampling = FALSE; - } - } if (!get_config_key_dword(hkey, appkey, "SampleCount", &wined3d_settings.sample_count)) ERR_(winediag)("Forcing sample count to %u. This may not be compatible with all applications.\n", wined3d_settings.sample_count); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bab0fea..829360c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -388,7 +388,6 @@ struct wined3d_settings /* Memory tracking and object counting. */ UINT64 emulated_textureram; char *logo; - int allow_multisampling; unsigned int sample_count; BOOL strict_draw_ordering; BOOL check_float_constants;

1 0

Henri Verbeet : wined3d: Use doubles to convert 24 and 32 bpc formats in wined3d_format_convert_from_float ().
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 546be1b80bc1e44b9ed1ad5c159cdbd9f945e7f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=546be1b80bc1e44b9ed1ad5c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 23 17:57:26 2017 +0200 wined3d: Use doubles to convert 24 and 32 bpc formats in wined3d_format_convert_from_float(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 46 +++++++++++++++++++++++++++++++++++----------- include/wine/wined3d.h | 8 ++++++++ 2 files changed, 43 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8c53f45..bd83446 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4974,7 +4974,7 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con struct wined3d_vec4 mul; struct wined3d_uvec4 shift; } - conv[] = + float_conv[] = { {WINED3DFMT_B8G8R8A8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, {16, 8, 0, 24}}, {WINED3DFMT_B8G8R8X8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, {16, 8, 0, 24}}, @@ -4994,24 +4994,48 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con {WINED3DFMT_P8_UINT, { 0.0f, 0.0f, 0.0f, 255.0f}, { 0, 0, 0, 0}}, {WINED3DFMT_S1_UINT_D15_UNORM, { 32767.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, {WINED3DFMT_D16_UNORM, { 65535.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, - {WINED3DFMT_D24_UNORM_S8_UINT, { 16777215.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, - {WINED3DFMT_X8D24_UNORM, { 16777215.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, - {WINED3DFMT_D32_UNORM, {4294967295.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, + }; + static const struct + { + enum wined3d_format_id format_id; + struct wined3d_dvec4 mul; + struct wined3d_uvec4 shift; + } + double_conv[] = + { + {WINED3DFMT_D24_UNORM_S8_UINT, { 16777215.0, 0.0, 0.0, 0.0}, {0, 0, 0, 0}}, + {WINED3DFMT_X8D24_UNORM, { 16777215.0, 0.0, 0.0, 0.0}, {0, 0, 0, 0}}, + {WINED3DFMT_D32_UNORM, {4294967295.0, 0.0, 0.0, 0.0}, {0, 0, 0, 0}}, }; unsigned int i; + DWORD ret; TRACE("Converting color %s to format %s.\n", debug_color(color), debug_d3dformat(format->id)); - for (i = 0; i < sizeof(conv) / sizeof(*conv); ++i) + for (i = 0; i < ARRAY_SIZE(float_conv); ++i) { - DWORD ret; + if (format->id != float_conv[i].format_id) + continue; - if (format->id != conv[i].format_id) continue; + ret = ((DWORD)((color->r * float_conv[i].mul.x) + 0.5f)) << float_conv[i].shift.x; + ret |= ((DWORD)((color->g * float_conv[i].mul.y) + 0.5f)) << float_conv[i].shift.y; + ret |= ((DWORD)((color->b * float_conv[i].mul.z) + 0.5f)) << float_conv[i].shift.z; + ret |= ((DWORD)((color->a * float_conv[i].mul.w) + 0.5f)) << float_conv[i].shift.w; + + TRACE("Returning 0x%08x.\n", ret); + + return ret; + } + + for (i = 0; i < ARRAY_SIZE(double_conv); ++i) + { + if (format->id != double_conv[i].format_id) + continue; - ret = ((DWORD)((color->r * conv[i].mul.x) + 0.5f)) << conv[i].shift.x; - ret |= ((DWORD)((color->g * conv[i].mul.y) + 0.5f)) << conv[i].shift.y; - ret |= ((DWORD)((color->b * conv[i].mul.z) + 0.5f)) << conv[i].shift.z; - ret |= ((DWORD)((color->a * conv[i].mul.w) + 0.5f)) << conv[i].shift.w; + ret = ((DWORD)((color->r * double_conv[i].mul.x) + 0.5)) << double_conv[i].shift.x; + ret |= ((DWORD)((color->g * double_conv[i].mul.y) + 0.5)) << double_conv[i].shift.y; + ret |= ((DWORD)((color->b * double_conv[i].mul.z) + 0.5)) << double_conv[i].shift.z; + ret |= ((DWORD)((color->a * double_conv[i].mul.w) + 0.5)) << double_conv[i].shift.w; TRACE("Returning 0x%08x.\n", ret); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9c3246b..e0929ae 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1559,6 +1559,14 @@ struct wined3d_vec4 float w; }; +struct wined3d_dvec4 +{ + double x; + double y; + double z; + double w; +}; + struct wined3d_ivec4 { int x;

1 0

Henri Verbeet : wined3d: Use vector types in wined3d_format_convert_from_float().
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: fa6dba885c495f92f8e1a72fdb706c214b645a7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa6dba885c495f92f8e1a72fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 23 17:57:25 2017 +0200 wined3d: Use vector types in wined3d_format_convert_from_float(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 60 +++++++++++++++++++++++--------------------------- include/wine/wined3d.h | 8 +++++++ 2 files changed, 35 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0eacc82..8c53f45 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4971,38 +4971,32 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con static const struct { enum wined3d_format_id format_id; - float r_mul; - float g_mul; - float b_mul; - float a_mul; - BYTE r_shift; - BYTE g_shift; - BYTE b_shift; - BYTE a_shift; + struct wined3d_vec4 mul; + struct wined3d_uvec4 shift; } conv[] = { - {WINED3DFMT_B8G8R8A8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 16, 8, 0, 24}, - {WINED3DFMT_B8G8R8X8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 16, 8, 0, 24}, - {WINED3DFMT_B8G8R8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 16, 8, 0, 24}, - {WINED3DFMT_B5G6R5_UNORM, 31.0f, 63.0f, 31.0f, 0.0f, 11, 5, 0, 0}, - {WINED3DFMT_B5G5R5A1_UNORM, 31.0f, 31.0f, 31.0f, 1.0f, 10, 5, 0, 15}, - {WINED3DFMT_B5G5R5X1_UNORM, 31.0f, 31.0f, 31.0f, 1.0f, 10, 5, 0, 15}, - {WINED3DFMT_R8_UNORM, 255.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, - {WINED3DFMT_A8_UNORM, 0.0f, 0.0f, 0.0f, 255.0f, 0, 0, 0, 0}, - {WINED3DFMT_B4G4R4A4_UNORM, 15.0f, 15.0f, 15.0f, 15.0f, 8, 4, 0, 12}, - {WINED3DFMT_B4G4R4X4_UNORM, 15.0f, 15.0f, 15.0f, 15.0f, 8, 4, 0, 12}, - {WINED3DFMT_B2G3R3_UNORM, 7.0f, 7.0f, 3.0f, 0.0f, 5, 2, 0, 0}, - {WINED3DFMT_R8G8B8A8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 0, 8, 16, 24}, - {WINED3DFMT_R8G8B8X8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 0, 8, 16, 24}, - {WINED3DFMT_B10G10R10A2_UNORM, 1023.0f, 1023.0f, 1023.0f, 3.0f, 20, 10, 0, 30}, - {WINED3DFMT_R10G10B10A2_UNORM, 1023.0f, 1023.0f, 1023.0f, 3.0f, 0, 10, 20, 30}, - {WINED3DFMT_P8_UINT, 0.0f, 0.0f, 0.0f, 255.0f, 0, 0, 0, 0}, - {WINED3DFMT_S1_UINT_D15_UNORM, 32767.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, - {WINED3DFMT_D16_UNORM, 65535.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, - {WINED3DFMT_D24_UNORM_S8_UINT, 16777215.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, - {WINED3DFMT_X8D24_UNORM, 16777215.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, - {WINED3DFMT_D32_UNORM, 4294967295.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, + {WINED3DFMT_B8G8R8A8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, {16, 8, 0, 24}}, + {WINED3DFMT_B8G8R8X8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, {16, 8, 0, 24}}, + {WINED3DFMT_B8G8R8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, {16, 8, 0, 24}}, + {WINED3DFMT_B5G6R5_UNORM, { 31.0f, 63.0f, 31.0f, 0.0f}, {11, 5, 0, 0}}, + {WINED3DFMT_B5G5R5A1_UNORM, { 31.0f, 31.0f, 31.0f, 1.0f}, {10, 5, 0, 15}}, + {WINED3DFMT_B5G5R5X1_UNORM, { 31.0f, 31.0f, 31.0f, 1.0f}, {10, 5, 0, 15}}, + {WINED3DFMT_R8_UNORM, { 255.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, + {WINED3DFMT_A8_UNORM, { 0.0f, 0.0f, 0.0f, 255.0f}, { 0, 0, 0, 0}}, + {WINED3DFMT_B4G4R4A4_UNORM, { 15.0f, 15.0f, 15.0f, 15.0f}, { 8, 4, 0, 12}}, + {WINED3DFMT_B4G4R4X4_UNORM, { 15.0f, 15.0f, 15.0f, 15.0f}, { 8, 4, 0, 12}}, + {WINED3DFMT_B2G3R3_UNORM, { 7.0f, 7.0f, 3.0f, 0.0f}, { 5, 2, 0, 0}}, + {WINED3DFMT_R8G8B8A8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, { 0, 8, 16, 24}}, + {WINED3DFMT_R8G8B8X8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, { 0, 8, 16, 24}}, + {WINED3DFMT_B10G10R10A2_UNORM, { 1023.0f, 1023.0f, 1023.0f, 3.0f}, {20, 10, 0, 30}}, + {WINED3DFMT_R10G10B10A2_UNORM, { 1023.0f, 1023.0f, 1023.0f, 3.0f}, { 0, 10, 20, 30}}, + {WINED3DFMT_P8_UINT, { 0.0f, 0.0f, 0.0f, 255.0f}, { 0, 0, 0, 0}}, + {WINED3DFMT_S1_UINT_D15_UNORM, { 32767.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, + {WINED3DFMT_D16_UNORM, { 65535.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, + {WINED3DFMT_D24_UNORM_S8_UINT, { 16777215.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, + {WINED3DFMT_X8D24_UNORM, { 16777215.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, + {WINED3DFMT_D32_UNORM, {4294967295.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, }; unsigned int i; @@ -5014,10 +5008,10 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con if (format->id != conv[i].format_id) continue; - ret = ((DWORD)((color->r * conv[i].r_mul) + 0.5f)) << conv[i].r_shift; - ret |= ((DWORD)((color->g * conv[i].g_mul) + 0.5f)) << conv[i].g_shift; - ret |= ((DWORD)((color->b * conv[i].b_mul) + 0.5f)) << conv[i].b_shift; - ret |= ((DWORD)((color->a * conv[i].a_mul) + 0.5f)) << conv[i].a_shift; + ret = ((DWORD)((color->r * conv[i].mul.x) + 0.5f)) << conv[i].shift.x; + ret |= ((DWORD)((color->g * conv[i].mul.y) + 0.5f)) << conv[i].shift.y; + ret |= ((DWORD)((color->b * conv[i].mul.z) + 0.5f)) << conv[i].shift.z; + ret |= ((DWORD)((color->a * conv[i].mul.w) + 0.5f)) << conv[i].shift.w; TRACE("Returning 0x%08x.\n", ret); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 29a8431..9c3246b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1567,6 +1567,14 @@ struct wined3d_ivec4 int w; }; +struct wined3d_uvec4 +{ + unsigned int x; + unsigned int y; + unsigned int z; + unsigned int w; +}; + struct wined3d_matrix { float _11, _12, _13, _14;

1 0

Stefan Dösinger : d3d9/tests: WARP returns a random color in uninitialized color attributes.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 9ce5b4096fd6ccab6ea9fac5f7033db09cd2167a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce5b4096fd6ccab6ea9fac5f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 21 22:47:55 2017 +0200 d3d9/tests: WARP returns a random color in uninitialized color attributes. ea8ba70a made the broken(warp) condition too strict. This patch reverts back to the old behavior of accepting any result from WARP. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f9b147e..25aa35b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8087,14 +8087,13 @@ static void test_vshader_input(void) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - /* WARP and r500 return a color from a previous draw. In case of WARP it is the last draw, which happens to - * be the one with quad4_color above. AMD's r500 uses the last D3DCOLOR attribute, which is the one from - * quad3_color. + /* WARP and r500 return a color from a previous draw. In case of WARP it is random, although most of the + * time it is the color of the last draw, which happens to be the one with quad4_color above. AMD's r500 + * uses the last D3DCOLOR attribute, which is the one from quad3_color. * * Newer AMD cards and Nvidia return zero. */ color = getPixelColor(device, 160, 360); - ok(color_match(color, 0x00000000, 1) || broken(color_match(color, 0x00ff8040, 1)) - || broken(color_match(color, 0x00ffff00, 1) && warp), + ok(color_match(color, 0x00000000, 1) || broken(color_match(color, 0x00ff8040, 1)) || broken(warp), "Got unexpected color 0x%08x for no color attribute test.\n", color); IDirect3DDevice9_SetVertexShader(device, NULL);

1 0

Stefan Dösinger : d3d8/tests: Accept alpha channel differences in shadow_test.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 688493bb3ceef292a7a607decb008ed0d63f8e1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=688493bb3ceef292a7a607dec… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 21 17:01:52 2017 +0200 d3d8/tests: Accept alpha channel differences in shadow_test. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 4f0c397..14eb6ea 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -4069,7 +4069,11 @@ static void shadow_test(void) for (j = 0; j < sizeof(expected_colors) / sizeof(*expected_colors); ++j) { D3DCOLOR color = get_readback_color(&rb, expected_colors[j].x, expected_colors[j].y); - ok(color_match(color, expected_colors[j].color, 0), + /* Geforce 7 on Windows returns 1.0 in alpha when the depth format is D24S8 or D24X8, + * whereas other GPUs (all AMD, newer Nvidia) return the same value they return in .rgb. + * Accept alpha mismatches as broken but make sure to check the color channels. */ + ok(color_match(color, expected_colors[j].color, 0) + || broken(color_match(color & 0x00ffffff, expected_colors[j].color & 0x00ffffff, 0)), "Expected color 0x%08x at (%u, %u) for format %s, got 0x%08x.\n", expected_colors[j].color, expected_colors[j].x, expected_colors[j].y, formats[i].name, color);

1 0

Stefan Dösinger : d3d9/tests: Accept alpha channel differences in shadow_test.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 2303b5a896312670e8c37c89abcfbb36c5465149 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2303b5a896312670e8c37c89a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 21 17:01:51 2017 +0200 d3d9/tests: Accept alpha channel differences in shadow_test. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index db29c3f..f9b147e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -14670,7 +14670,11 @@ static void shadow_test(void) for (j = 0; j < sizeof(expected_colors) / sizeof(*expected_colors); ++j) { D3DCOLOR color = get_readback_color(&rb, expected_colors[j].x, expected_colors[j].y); - ok(color_match(color, expected_colors[j].color, 0), + /* Geforce 7 on Windows returns 1.0 in alpha when the depth format is D24S8 or D24X8, + * whereas other GPUs (all AMD, newer Nvidia) return the same value they return in .rgb. + * Accept alpha mismatches as broken but make sure to check the color channels. */ + ok(color_match(color, expected_colors[j].color, 0) + || broken(color_match(color & 0x00ffffff, expected_colors[j].color & 0x00ffffff, 0)), "Expected color 0x%08x at (%u, %u) for format %s, got 0x%08x.\n", expected_colors[j].color, expected_colors[j].x, expected_colors[j].y, formats[i].name, color);

1 0

Stefan Dösinger : ddraw/tests: Prefer 16 bit depth buffers in ddraw1 and 2.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 0aa9302b086c18fc9423e31ff1fc7ee3d6e67107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aa9302b086c18fc9423e31ff… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 21 17:01:50 2017 +0200 ddraw/tests: Prefer 16 bit depth buffers in ddraw1 and 2. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 6 +++++- dlls/ddraw/tests/ddraw2.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 26d0423..ea8a3b0 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -431,7 +431,11 @@ static IDirectDraw *create_ddraw(void) static IDirect3DDevice *create_device(IDirectDraw *ddraw, HWND window, DWORD coop_level) { - static const DWORD z_depths[] = {32, 24, 16}; + /* Prefer 16 bit depth buffers because Nvidia gives us an unpadded D24 buffer if we ask + * for 24 bit and handles such buffers incorrectly in DDBLT_DEPTHFILL. AMD only supports + * 16 bit buffers in ddraw1/2. Stencil was added in ddraw4, so we cannot create a D24S8 + * buffer here. */ + static const DWORD z_depths[] = {16, 32, 24}; IDirectDrawSurface *surface, *ds; IDirect3DDevice *device = NULL; DDSURFACEDESC surface_desc; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 2784a55..39e9190 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -301,7 +301,11 @@ static IDirectDraw2 *create_ddraw(void) static IDirect3DDevice2 *create_device(IDirectDraw2 *ddraw, HWND window, DWORD coop_level) { - static const DWORD z_depths[] = {32, 24, 16}; + /* Prefer 16 bit depth buffers because Nvidia gives us an unpadded D24 buffer if we ask + * for 24 bit and handles such buffers incorrectly in DDBLT_DEPTHFILL. AMD only supports + * 16 bit buffers in ddraw1/2. Stencil was added in ddraw4, so we cannot create a D24S8 + * buffer here. */ + static const DWORD z_depths[] = {16, 32, 24}; IDirectDrawSurface *surface, *ds; IDirect3DDevice2 *device = NULL; DDSURFACEDESC surface_desc;

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2017