wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Sebastian Lackner : rasapi32: Set *lpcDevices in RasEnumDevicesA.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: f3842e789b61964643e5000bb36366d1727ee122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3842e789b61964643e5000bb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 8 11:59:31 2017 -0300 rasapi32: Set *lpcDevices in RasEnumDevicesA. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rasapi32/rasapi.c | 2 ++ dlls/rasapi32/tests/rasapi.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index fcd0cb8..b1721c6 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -254,6 +254,8 @@ DWORD WINAPI RasEnumDevicesA(LPRASDEVINFOA lpRasDevinfo, LPDWORD lpcb, LPDWORD l if(lpRasDevinfo && lpRasDevinfo->dwSize != sizeof(RASDEVINFOA)) return ERROR_INVALID_SIZE; + *lpcDevices = 1; + if (!lpRasDevinfo || (*lpcb < sizeof(RASDEVINFOA))) { *lpcb = sizeof(RASDEVINFOA); return ERROR_BUFFER_TOO_SMALL; diff --git a/dlls/rasapi32/tests/rasapi.c b/dlls/rasapi32/tests/rasapi.c index e0ff25f..5171bb2 100644 --- a/dlls/rasapi32/tests/rasapi.c +++ b/dlls/rasapi32/tests/rasapi.c @@ -77,54 +77,71 @@ static void test_rasenum(void) /* test first parameter */ cb = bufsize; + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(NULL, &cb, &cDevices); + ok(0 < cDevices && cDevices < 32, "expected 0 < cDevices < 32, got %u\n", cDevices); ok(result == ERROR_BUFFER_TOO_SMALL || result == ERROR_INVALID_USER_BUFFER, /* win98 */ "Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result); rasDevInfo[0].dwSize = 0; cb = bufsize; + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); ok(result == ERROR_INVALID_SIZE || result == ERROR_INVALID_USER_BUFFER, /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result); rasDevInfo[0].dwSize = sizeof(RASDEVINFOA) -1; cb = bufsize; + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); ok(result == ERROR_INVALID_SIZE || result == ERROR_INVALID_USER_BUFFER, /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result); rasDevInfo[0].dwSize = sizeof(RASDEVINFOA) +1; cb = bufsize; + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); ok(result == ERROR_INVALID_SIZE || result == ERROR_INVALID_USER_BUFFER, /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result); /* test second parameter */ rasDevInfo[0].dwSize = sizeof(RASDEVINFOA); + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, NULL, &cDevices); + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); ok(result == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); rasDevInfo[0].dwSize = sizeof(RASDEVINFOA); cb = 0; + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); + todo_wine + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); ok(result == ERROR_BUFFER_TOO_SMALL || result == ERROR_INVALID_SIZE, /* vista, 2k8 */ "Expected ERROR_BUFFER_TOO_SMALL/ERROR_INVALID_SIZE, got %08d\n", result); rasDevInfo[0].dwSize = sizeof(RASDEVINFOA); cb = bufsize -1; + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); + ok(0 < cDevices && cDevices < 32, "expected 0 < cDevices < 32, got %u\n", cDevices); ok(result == ERROR_BUFFER_TOO_SMALL, "Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result); rasDevInfo[0].dwSize = sizeof(RASDEVINFOA); cb = bufsize +1; + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); + ok(0 < cDevices && cDevices < 32, "expected 0 < cDevices < 32, got %u\n", cDevices); ok(result == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08d\n", result); @@ -136,7 +153,9 @@ static void test_rasenum(void) "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); /* test combinations of invalid parameters */ + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(NULL, NULL, &cDevices); + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); ok(result == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); @@ -147,7 +166,9 @@ static void test_rasenum(void) cb = 0; rasDevInfo[0].dwSize = 0; + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); ok(result == ERROR_INVALID_SIZE || broken(result == ERROR_BUFFER_TOO_SMALL), /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result);

1 0

Julian Rüger : readme: Fix typo in German translation.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: a8082a634d9eaedda94e498fec3c971f30b5c31d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8082a634d9eaedda94e498fe… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Mar 8 15:58:41 2017 +0100 readme: Fix typo in German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.de | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/README.de b/documentation/README.de index 4467e9f..9e65e97 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -97,8 +97,8 @@ Um Wine zu kompilieren, führen Sie aus: make Damit werden das Programm "wine" und diverse unterstützende Bibliotheken und -Binärdateienerschiedener erstellt. Das Programm "wine" lädt ausführbare -Windows-Dateien und führt diese aus. +Binärdateien erstellt. Das Programm "wine" lädt ausführbare Windows-Dateien +und führt diese aus. Die Bibliothek "libwine" ("Winelib") kann benutzt werden, um Windows-Quelltexte unter Unix zu kompilieren und zu verlinken.

1 0

Józef Kucia : d3d11: Fix typo in TRACE() message.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: 918521109b4a9ba3743503868179aae25d7bf4ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=918521109b4a9ba3743503868… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 8 12:07:24 2017 +0100 d3d11: Fix typo in TRACE() message. 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/d3d11/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 336692e..c641ccf 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2078,7 +2078,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetConstantBuffers(ID3D1 struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); unsigned int i; - TRACE("iface %p, start_slot %u, buffer_count %u, buffer %p.\n", + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); wined3d_mutex_lock();

1 0

Józef Kucia : wined3d: Add support for seamless cube map filtering.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: c7f3308db7a6c5ff92a43095fdc260460f3b4d7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f3308db7a6c5ff92a43095f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 8 12:07:23 2017 +0100 wined3d: Add support for seamless cube map filtering. Seamless cube map filtering should always be enabled in D3D10+. 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/d3d8/directx.c | 3 ++- dlls/d3d9/directx.c | 2 +- dlls/ddraw/ddraw_private.h | 3 ++- dlls/wined3d/context.c | 8 +++++++- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + include/wine/wined3d.h | 1 + 7 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index f91e4af..107e32d 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -411,7 +411,8 @@ BOOL d3d8_init(struct d3d8 *d3d8) { DWORD flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER - | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART; + | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART + | WINED3D_LEGACY_CUBEMAP_FILTERING; d3d8->IDirect3D8_iface.lpVtbl = &d3d8_vtbl; d3d8->refcount = 1; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index cdbe2fc..fe7163f 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -580,7 +580,7 @@ BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) { DWORD flags = WINED3D_PRESENT_CONVERSION | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER | WINED3D_SRGB_READ_WRITE_CONTROL | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR - | WINED3D_NO_PRIMITIVE_RESTART; + | WINED3D_NO_PRIMITIVE_RESTART | WINED3D_LEGACY_CUBEMAP_FILTERING; if (!extended) flags |= WINED3D_VIDMEM_ACCOUNTING; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 1737ce6..48b6c70 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -61,7 +61,8 @@ struct FvfToDecl #define DDRAW_WINED3D_FLAGS (WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING \ | WINED3D_RESTORE_MODE_ON_ACTIVATE | WINED3D_FOCUS_MESSAGES | WINED3D_PIXEL_CENTER_INTEGER \ - | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART) + | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART \ + | WINED3D_LEGACY_CUBEMAP_FILTERING) enum ddraw_device_state { diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8fac19e..a423fac 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1969,13 +1969,19 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, if (gl_info->supported[ARB_ES3_COMPATIBILITY]) { gl_info->gl_ops.gl.p_glEnable(GL_PRIMITIVE_RESTART_FIXED_INDEX); - checkGLcall("Enable GL_PRIMITIVE_RESTART_FIXED_INDEX"); + checkGLcall("enable GL_PRIMITIVE_RESTART_FIXED_INDEX"); } else { FIXME("OpenGL implementation does not support GL_PRIMITIVE_RESTART_FIXED_INDEX.\n"); } } + if (!(d3d_info->wined3d_creation_flags & WINED3D_LEGACY_CUBEMAP_FILTERING) + && gl_info->supported[ARB_SEAMLESS_CUBE_MAP]) + { + gl_info->gl_ops.gl.p_glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS); + checkGLcall("enable seamless cube map filtering"); + } if (gl_info->supported[ARB_CLIP_CONTROL]) GL_EXTCALL(glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_LOWER_LEFT)); device->shader_backend->shader_init_context_state(ret); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 425d1fd..51c6ad2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -147,6 +147,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_point_sprite", ARB_POINT_SPRITE }, {"GL_ARB_provoking_vertex", ARB_PROVOKING_VERTEX }, {"GL_ARB_sampler_objects", ARB_SAMPLER_OBJECTS }, + {"GL_ARB_seamless_cube_map", ARB_SEAMLESS_CUBE_MAP }, {"GL_ARB_shader_atomic_counters", ARB_SHADER_ATOMIC_COUNTERS }, {"GL_ARB_shader_bit_encoding", ARB_SHADER_BIT_ENCODING }, {"GL_ARB_shader_image_load_store", ARB_SHADER_IMAGE_LOAD_STORE }, @@ -3765,6 +3766,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, * extension for core-only support. */ {ARB_FRAGMENT_COORD_CONVENTIONS, MAKEDWORD_VERSION(3, 2)}, {ARB_PROVOKING_VERTEX, MAKEDWORD_VERSION(3, 2)}, + {ARB_SEAMLESS_CUBE_MAP, MAKEDWORD_VERSION(3, 2)}, {ARB_SYNC, MAKEDWORD_VERSION(3, 2)}, {ARB_VERTEX_ARRAY_BGRA, MAKEDWORD_VERSION(3, 2)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 00fb7cb..99930c4 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -80,6 +80,7 @@ enum wined3d_gl_extension ARB_POINT_SPRITE, ARB_PROVOKING_VERTEX, ARB_SAMPLER_OBJECTS, + ARB_SEAMLESS_CUBE_MAP, ARB_SHADER_ATOMIC_COUNTERS, ARB_SHADER_BIT_ENCODING, ARB_SHADER_IMAGE_LOAD_STORE, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0fcf07c..acdb4f3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1279,6 +1279,7 @@ enum wined3d_shader_byte_code_format #define WINED3D_SRGB_READ_WRITE_CONTROL 0x00000200 #define WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR 0x00000400 #define WINED3D_NO_PRIMITIVE_RESTART 0x00000800 +#define WINED3D_LEGACY_CUBEMAP_FILTERING 0x00001000 #define WINED3D_RESZ_CODE 0x7fa05000

1 0

Józef Kucia : d3d11/tests: Add test for cube maps.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: 6144fb46703004b62d7c8f7ee046082c6db5e410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6144fb46703004b62d7c8f7ee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 8 12:07:22 2017 +0100 d3d11/tests: Add test for cube maps. 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/d3d11/tests/d3d11.c | 307 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 307 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6144fb46703004b62d7c8…

1 0

Józef Kucia : wined3d: Avoid FIXME() message for unhandled cube map arrays.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: 9cb650a3b82ffa5f11f72c56948a11f9b679c21b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb650a3b82ffa5f11f72c569… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 8 12:07:21 2017 +0100 wined3d: Avoid FIXME() message for unhandled cube map arrays. There are no GLSL functions with the type part for cube map array textures. 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/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e43a78b..490fcbf 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3206,7 +3206,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context type_part = resource_type_info[resource_type].type_part; if (resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2D && texrect) type_part = "2DRect"; - if (!type_part[0]) + if (!type_part[0] && resource_type != WINED3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY) FIXME("Unhandled resource type %#x.\n", resource_type); if (!lod && grad && !shader_glsl_has_core_grad(gl_info, &ctx->shader->reg_maps.shader_version))

1 0

Józef Kucia : wined3d: Create dummy cube array textures.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: 646cb95942431363308d1308a244f2a67f0771b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=646cb95942431363308d1308a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 8 12:07:20 2017 +0100 wined3d: Create dummy cube array textures. 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/context.c | 5 ++++- dlls/wined3d/device.c | 21 +++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ef11c5c..8fac19e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1525,6 +1525,9 @@ void context_bind_dummy_textures(const struct wined3d_device *device, const stru if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_CUBE_MAP, device->dummy_textures.tex_cube); + if (gl_info->supported[ARB_TEXTURE_CUBE_MAP_ARRAY]) + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_CUBE_MAP_ARRAY, device->dummy_textures.tex_cube_array); + if (gl_info->supported[EXT_TEXTURE_ARRAY]) gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D_ARRAY, device->dummy_textures.tex_2d_array); @@ -2419,7 +2422,7 @@ void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint checkGLcall("glBindTexture"); break; case GL_TEXTURE_CUBE_MAP_ARRAY: - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_CUBE_MAP_ARRAY, 0); + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_CUBE_MAP_ARRAY, device->dummy_textures.tex_cube_array); checkGLcall("glBindTexture"); break; case GL_TEXTURE_3D: diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 34421a8..eef9818 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -684,6 +684,24 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ } } + if (gl_info->supported[ARB_TEXTURE_CUBE_MAP_ARRAY]) + { + DWORD cube_array_data[6]; + + gl_info->gl_ops.gl.p_glGenTextures(1, &device->dummy_textures.tex_cube_array); + checkGLcall("glGenTextures"); + TRACE("Dummy cube array texture given name %u.\n", device->dummy_textures.tex_cube_array); + + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_CUBE_MAP_ARRAY, device->dummy_textures.tex_cube_array); + checkGLcall("glBindTexture"); + + for (i = 0; i < ARRAY_SIZE(cube_array_data); ++i) + cube_array_data[i] = color; + GL_EXTCALL(glTexImage3D(GL_TEXTURE_CUBE_MAP_ARRAY, 0, GL_RGBA8, 1, 1, 6, 0, + GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, cube_array_data)); + checkGLcall("glTexImage3D"); + } + if (gl_info->supported[EXT_TEXTURE_ARRAY]) { gl_info->gl_ops.gl.p_glGenTextures(1, &device->dummy_textures.tex_2d_array); @@ -735,6 +753,9 @@ static void destroy_dummy_textures(struct wined3d_device *device, struct wined3d if (gl_info->supported[EXT_TEXTURE_ARRAY]) gl_info->gl_ops.gl.p_glDeleteTextures(1, &device->dummy_textures.tex_2d_array); + if (gl_info->supported[ARB_TEXTURE_CUBE_MAP_ARRAY]) + gl_info->gl_ops.gl.p_glDeleteTextures(1, &device->dummy_textures.tex_cube_array); + if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) gl_info->gl_ops.gl.p_glDeleteTextures(1, &device->dummy_textures.tex_cube); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6d2412d..cdc2400 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2670,6 +2670,7 @@ struct wined3d_device GLuint tex_rect; GLuint tex_3d; GLuint tex_cube; + GLuint tex_cube_array; GLuint tex_2d_array; GLuint tex_buffer; } dummy_textures;

1 0

Józef Kucia : wined3d: Add FIXME() messages for unhandled shader bytecode UAV flags.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: f8723d096a7916241759988c7475f6f3bbeedc19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8723d096a7916241759988c7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 8 12:07:19 2017 +0100 wined3d: Add FIXME() messages for unhandled shader bytecode UAV flags. The new definition of WINED3D_SM5_UAV_FLAGS_MASK doesn't overlap with WINED3D_SM4_RESOURCE_TYPE_MASK. 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/shader.c | 11 +++++++++-- dlls/wined3d/shader_sm4.c | 7 +++++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 9601b2d..d7a4c04 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -995,6 +995,8 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } reg_maps->uav_resource_info[reg_idx].type = semantic->resource_type; reg_maps->uav_resource_info[reg_idx].data_type = semantic->resource_data_type; + if (ins.flags) + FIXME("Ignoring typed UAV flags %#x.\n", ins.flags); break; default: @@ -1110,6 +1112,8 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st ERR("Invalid UAV resource index %u.\n", reg_idx); break; } + if (ins.flags) + FIXME("Ignoring raw UAV flags %#x.\n", ins.flags); reg_maps->uav_resource_info[reg_idx].type = WINED3D_SHADER_RESOURCE_BUFFER; reg_maps->uav_resource_info[reg_idx].data_type = WINED3D_DATA_UINT; reg_maps->uav_resource_info[reg_idx].flags = WINED3D_VIEW_BUFFER_RAW; @@ -1731,7 +1735,8 @@ static void shader_dump_sysval_semantic(struct wined3d_string_buffer *buffer, en } static void shader_dump_decl_usage(struct wined3d_string_buffer *buffer, - const struct wined3d_shader_semantic *semantic, const struct wined3d_shader_version *shader_version) + const struct wined3d_shader_semantic *semantic, unsigned int flags, + const struct wined3d_shader_version *shader_version) { shader_addline(buffer, "dcl"); @@ -1808,6 +1813,8 @@ static void shader_dump_decl_usage(struct wined3d_string_buffer *buffer, shader_addline(buffer, "unknown"); break; } + if (semantic->reg.reg.type == WINED3DSPR_UAV) + shader_dump_uav_flags(buffer, flags); switch (semantic->resource_data_type) { case WINED3D_DATA_FLOAT: @@ -2502,7 +2509,7 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe if (ins.handler_idx == WINED3DSIH_DCL || ins.handler_idx == WINED3DSIH_DCL_UAV_TYPED) { - shader_dump_decl_usage(&buffer, &ins.declaration.semantic, &shader_version); + shader_dump_decl_usage(&buffer, &ins.declaration.semantic, ins.flags, &shader_version); shader_dump_ins_modifiers(&buffer, &ins.declaration.semantic.reg); shader_addline(&buffer, " "); shader_dump_dst_param(&buffer, &ins.declaration.semantic.reg, &shader_version); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index cd3c3ae..bd974a2 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -67,8 +67,8 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM5_FP_ARRAY_SIZE_SHIFT 16 #define WINED3D_SM5_FP_TABLE_COUNT_MASK 0xffffu -#define WINED3D_SM5_UAV_FLAGS_SHIFT 11 -#define WINED3D_SM5_UAV_FLAGS_MASK (0x1fffu << WINED3D_SM5_UAV_FLAGS_SHIFT) +#define WINED3D_SM5_UAV_FLAGS_SHIFT 15 +#define WINED3D_SM5_UAV_FLAGS_MASK (0x1ffu << WINED3D_SM5_UAV_FLAGS_SHIFT) #define WINED3D_SM5_SYNC_FLAGS_SHIFT 11 #define WINED3D_SM5_SYNC_FLAGS_MASK (0xffu << WINED3D_SM5_SYNC_FLAGS_SHIFT) @@ -546,6 +546,9 @@ static void shader_sm4_read_dcl_resource(struct wined3d_shader_instruction *ins, { ins->declaration.semantic.resource_data_type = data_type_table[data_type]; } + + if (reg_data_type == WINED3D_DATA_UAV) + ins->flags = (opcode_token & WINED3D_SM5_UAV_FLAGS_MASK) >> WINED3D_SM5_UAV_FLAGS_SHIFT; } static void shader_sm4_read_dcl_constant_buffer(struct wined3d_shader_instruction *ins, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b269c52..6d2412d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -562,8 +562,8 @@ enum wined3d_shader_sync_flags enum wined3d_shader_uav_flags { - WINED3DSUF_GLOBALLY_COHERENT = 0x20, - WINED3DSUF_ORDER_PRESERVING_COUNTER = 0x1000, + WINED3DSUF_GLOBALLY_COHERENT = 0x2, + WINED3DSUF_ORDER_PRESERVING_COUNTER = 0x100, }; enum wined3d_tessellator_domain

1 0

Józef Kucia : wined3d: Fix parsing of SM5 "_opc" flag.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: c4d4959e1c3b10062705204c2ea29d77d85ac937 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4d4959e1c3b10062705204c2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 8 12:07:18 2017 +0100 wined3d: Fix parsing of SM5 "_opc" flag. 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/shader_sm4.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 050f656..cd3c3ae 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -68,7 +68,7 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM5_FP_TABLE_COUNT_MASK 0xffffu #define WINED3D_SM5_UAV_FLAGS_SHIFT 11 -#define WINED3D_SM5_UAV_FLAGS_MASK (0x8fffu << WINED3D_SM5_UAV_FLAGS_SHIFT) +#define WINED3D_SM5_UAV_FLAGS_MASK (0x1fffu << WINED3D_SM5_UAV_FLAGS_SHIFT) #define WINED3D_SM5_SYNC_FLAGS_SHIFT 11 #define WINED3D_SM5_SYNC_FLAGS_MASK (0xffu << WINED3D_SM5_SYNC_FLAGS_SHIFT) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8d5eee5..b269c52 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -563,7 +563,7 @@ enum wined3d_shader_sync_flags enum wined3d_shader_uav_flags { WINED3DSUF_GLOBALLY_COHERENT = 0x20, - WINED3DSUF_ORDER_PRESERVING_COUNTER = 0x8000, + WINED3DSUF_ORDER_PRESERVING_COUNTER = 0x1000, }; enum wined3d_tessellator_domain

1 0

Bruno Jesus : wininet/test: Improve tests for InternetGetConnectedStateEx.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: 7207b3dbc97a8d8e2653db3b6eda560efd339709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7207b3dbc97a8d8e2653db3b6… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Mon Mar 6 23:27:25 2017 -0300 wininet/test: Improve tests for InternetGetConnectedStateEx. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/internet.c | 49 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 9b32117..0b43d01 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1595,12 +1595,16 @@ static void test_InternetGetConnectedStateExA(void) return; } + flags = 0; + buffer[0] = 0; res = pInternetGetConnectedStateExA(&flags, buffer, sizeof(buffer), 0); + trace("Internet Connection: Flags 0x%02x - Name '%s'\n", flags, buffer); +todo_wine + ok (flags & INTERNET_RAS_INSTALLED, "Missing RAS flag\n"); if(!res) { win_skip("InternetGetConnectedStateExA tests require a valid connection\n"); return; } - trace("Internet Connection: Flags 0x%02x - Name '%s'\n", flags, buffer); res = pInternetGetConnectedStateExA(NULL, NULL, 0, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); @@ -1608,7 +1612,16 @@ static void test_InternetGetConnectedStateExA(void) flags = 0; res = pInternetGetConnectedStateExA(&flags, NULL, 0, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); - ok(flags, "Expected at least one flag set\n"); + if (flags & INTERNET_CONNECTION_CONFIGURED) + { + ok(flags & INTERNET_CONNECTION_MODEM, "Modem connection flag missing\n"); + ok(flags & ~INTERNET_CONNECTION_LAN, "Mixed Modem and LAN flags\n"); + } + else + { + ok(flags & INTERNET_CONNECTION_LAN, "LAN connection flag missing\n"); + ok(flags & ~INTERNET_CONNECTION_MODEM, "Mixed Modem and LAN flags\n"); + } buffer[0] = 0; flags = 0; @@ -1684,12 +1697,16 @@ static void test_InternetGetConnectedStateExW(void) return; } + flags = 0; + buffer[0] = 0; res = pInternetGetConnectedStateExW(&flags, buffer, sizeof(buffer) / sizeof(buffer[0]), 0); + trace("Internet Connection: Flags 0x%02x - Name '%s'\n", flags, wine_dbgstr_w(buffer)); +todo_wine + ok (flags & INTERNET_RAS_INSTALLED, "Missing RAS flag\n"); if(!res) { win_skip("InternetGetConnectedStateExW tests require a valid connection\n"); return; } - trace("Internet Connection: Flags 0x%02x - Name '%s'\n", flags, wine_dbgstr_w(buffer)); res = pInternetGetConnectedStateExW(NULL, NULL, 0, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); @@ -1697,7 +1714,16 @@ static void test_InternetGetConnectedStateExW(void) flags = 0; res = pInternetGetConnectedStateExW(&flags, NULL, 0, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); - ok(flags, "Expected at least one flag set\n"); + if (flags & INTERNET_CONNECTION_CONFIGURED) + { + ok(flags & INTERNET_CONNECTION_MODEM, "Modem connection flag missing\n"); + ok(flags & ~INTERNET_CONNECTION_LAN, "Mixed Modem and LAN flags\n"); + } + else + { + ok(flags & INTERNET_CONNECTION_LAN, "LAN connection flag missing\n"); + ok(flags & ~INTERNET_CONNECTION_MODEM, "Mixed Modem and LAN flags\n"); + } buffer[0] = 0; flags = 0; @@ -1731,14 +1757,20 @@ static void test_InternetGetConnectedStateExW(void) res = pInternetGetConnectedStateExW(&flags, buffer, sz, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(sz - 1 == lstrlenW(buffer), "Expected %u bytes, got %u\n", sz - 1, lstrlenW(buffer)); + if (flags & INTERNET_CONNECTION_MODEM) + ok(!buffer[0], "Expected 0 bytes, got %u\n", lstrlenW(buffer)); + else + ok(sz - 1 == lstrlenW(buffer), "Expected %u bytes, got %u\n", sz - 1, lstrlenW(buffer)); buffer[0] = 0; flags = 0; res = pInternetGetConnectedStateExW(&flags, buffer, sz / 2, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(sz / 2 - 1 == lstrlenW(buffer), "Expected %u bytes, got %u\n", sz / 2 - 1, lstrlenW(buffer)); + if (flags & INTERNET_CONNECTION_MODEM) + ok(!buffer[0], "Expected 0 bytes, got %u\n", lstrlenW(buffer)); + else + ok(sz / 2 - 1 == lstrlenW(buffer), "Expected %u bytes, got %u\n", sz / 2 - 1, lstrlenW(buffer)); buffer[0] = 0; flags = 0; @@ -1752,7 +1784,10 @@ static void test_InternetGetConnectedStateExW(void) res = pInternetGetConnectedStateExW(&flags, buffer, 2, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(lstrlenW(buffer) == 1, "Expected 1 byte, got %u\n", lstrlenW(buffer)); + if (flags & INTERNET_CONNECTION_MODEM) + ok(!buffer[0], "Expected 0 bytes, got %u\n", lstrlenW(buffer)); + else + ok(lstrlenW(buffer) == 1, "Expected 1 byte, got %u\n", lstrlenW(buffer)); buffer[0] = 0xDEAD; flags = 0;

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
72
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 March 2017