May 2016 - Wine-commits - list.winehq.org

Józef Kucia : wined3d: Add wined3d creation flag for selecting unbound resource color.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: e47a735f762ebe1545bb366c7e9e2b90db7c7f80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e47a735f762ebe1545bb366c7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 23 00:41:51 2016 +0200 wined3d: Add wined3d creation flag for selecting unbound resource color. 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/device.c | 18 +++++++++++------- include/wine/wined3d.h | 1 + 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 3f42c5e..18753cd 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -431,7 +431,8 @@ static const struct IDirect3D8Vtbl d3d8_vtbl = BOOL d3d8_init(struct d3d8 *d3d8) { DWORD flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING - | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER; + | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER + | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR; d3d8->IDirect3D8_iface.lpVtbl = &d3d8_vtbl; d3d8->refcount = 1; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index f6d32b0..8f5f143 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -664,7 +664,7 @@ static const struct IDirect3D9ExVtbl d3d9_vtbl = 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_SRGB_READ_WRITE_CONTROL | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR; if (!extended) flags |= WINED3D_VIDMEM_ACCOUNTING; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 26bc242..b3b171a 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -60,7 +60,8 @@ struct FvfToDecl #define DDRAW_STRIDE_ALIGNMENT 8 #define DDRAW_WINED3D_FLAGS (WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING \ - | WINED3D_RESTORE_MODE_ON_ACTIVATE | WINED3D_FOCUS_MESSAGES | WINED3D_PIXEL_CENTER_INTEGER) + | WINED3D_RESTORE_MODE_ON_ACTIVATE | WINED3D_FOCUS_MESSAGES | WINED3D_PIXEL_CENTER_INTEGER \ + | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR) enum ddraw_device_state { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 967a831..5bac3d0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -682,19 +682,23 @@ out: /* Context activation is done by the caller. */ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_context *context) { + const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; unsigned int i, j, count; + DWORD color; + + if (d3d_info->wined3d_creation_flags & WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR) + color = 0x000000ff; + else + color = 0x00000000; + /* Under DirectX you can sample even if no texture is bound, whereas * OpenGL will only allow that when a valid texture is bound. * We emulate this by creating dummy textures and binding them * to each texture stage when the currently set D3D texture is NULL. */ - count = min(MAX_COMBINED_SAMPLERS, gl_info->limits.combined_samplers); for (i = 0; i < count; ++i) { - static const DWORD d3d10_color = 0x00000000; - static const DWORD color = 0x000000ff; - /* Make appropriate texture active */ context_active_texture(context, gl_info, i); @@ -732,7 +736,8 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_3D, device->dummy_texture_3d[i]); checkGLcall("glBindTexture"); - GL_EXTCALL(glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA8, 1, 1, 1, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, &color)); + GL_EXTCALL(glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA8, 1, 1, 1, 0, + GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, &color)); checkGLcall("glTexImage3D"); } @@ -763,7 +768,7 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ checkGLcall("glBindTexture"); GL_EXTCALL(glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA8, 1, 1, 1, 0, - GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, &d3d10_color)); + GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, &color)); checkGLcall("glTexImage3D"); } } @@ -820,7 +825,6 @@ static void create_default_sampler(struct wined3d_device *device) * sampler object is used to emulate the direct resource access when there is no sampler state * to use. */ - if (gl_info->supported[ARB_SAMPLER_OBJECTS]) { GL_EXTCALL(glGenSamplers(1, &device->default_sampler)); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8429bea..e31f9ca 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1237,6 +1237,7 @@ enum wined3d_display_rotation #define WINED3D_PIXEL_CENTER_INTEGER 0x00000080 #define WINED3D_LEGACY_FFP_LIGHTING 0x00000100 #define WINED3D_SRGB_READ_WRITE_CONTROL 0x00000200 +#define WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR 0x00000400 #define WINED3D_RESZ_CODE 0x7fa05000

1 0

Józef Kucia : d3d11/tests: Add more tests for accessing unbound resources.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 42edcbca2528eb5ef763d0db59d3c42572082bd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42edcbca2528eb5ef763d0db5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 23 00:41:52 2016 +0200 d3d11/tests: Add more tests for accessing unbound resources. 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 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4d676be..a959c0b 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4246,6 +4246,8 @@ static void test_texture(void) {&ps_ld, &bc3_texture_srgb, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_ld, &bc4_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc4_colors}, {&ps_ld, &bc5_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc5_colors}, + {&ps_ld, NULL, POINT, 0.0f, 0.0f, 0.0f, 0.0f, zero_colors}, + {&ps_ld, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, zero_colors}, {&ps_ld_sint8, &sint8_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, sint8_colors}, {&ps_ld_uint8, &uint8_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, rgba_level_0}, {&ps_sample, &bc1_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, @@ -4259,6 +4261,8 @@ static void test_texture(void) {&ps_sample, &rgba_texture, POINT, 8.0f, 0.0f, MIP_MAX, 0.0f, level_1_colors}, {&ps_sample, &srgb_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, srgb_colors}, {&ps_sample, &a8_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, a8_colors}, + {&ps_sample, NULL, POINT, 0.0f, 0.0f, 0.0f, 0.0f, zero_colors}, + {&ps_sample, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, zero_colors}, {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, rgba_level_0}, {&ps_sample_b, &rgba_texture, POINT, 8.0f, 0.0f, MIP_MAX, 0.0f, level_1_colors}, {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 8.0f, level_1_colors}, @@ -4269,6 +4273,10 @@ static void test_texture(void) {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, 2.0f, 9.0f, level_2_colors}, {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, 1.0f, 9.0f, level_1_colors}, {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, 0.0f, 9.0f, rgba_level_0}, + {&ps_sample_b, NULL, POINT, 0.0f, 0.0f, 0.0f, 0.0f, zero_colors}, + {&ps_sample_b, NULL, POINT, 0.0f, 0.0f, 0.0f, 1.0f, zero_colors}, + {&ps_sample_b, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, zero_colors}, + {&ps_sample_b, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 1.0f, zero_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, -1.0f, rgba_level_0}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, rgba_level_0}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.4f, rgba_level_0}, @@ -4295,6 +4303,10 @@ static void test_texture(void) {&ps_sample_l, &rgba_texture, POINT, 2.0f, 2.0f, 2.0f, 0.0f, level_2_colors}, {&ps_sample_l, &rgba_texture, POINT, 2.0f, 2.0f, 2.0f, 1.0f, level_2_colors}, {&ps_sample_l, &rgba_texture, POINT, 2.0f, 2.0f, 2.0f, 9.0f, level_2_colors}, + {&ps_sample_l, NULL, POINT, 2.0f, 2.0f, 0.0f, 0.0f, zero_colors}, + {&ps_sample_l, NULL, POINT, 2.0f, 2.0f, 0.0f, 1.0f, zero_colors}, + {&ps_sample_l, NULL, POINT, 2.0f, 2.0f, MIP_MAX, 0.0f, zero_colors}, + {&ps_sample_l, NULL, POINT, 2.0f, 2.0f, MIP_MAX, 1.0f, zero_colors}, {&ps_sample_2d_array, &array_2d_texture, POINT, 0.0f, 0.0f, MIP_MAX, -9.0f, red_colors}, {&ps_sample_2d_array, &array_2d_texture, POINT, 0.0f, 0.0f, MIP_MAX, -1.0f, red_colors}, {&ps_sample_2d_array, &array_2d_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, red_colors}, @@ -4308,7 +4320,11 @@ static void test_texture(void) {&ps_sample_2d_array, &array_2d_texture, POINT, 0.0f, 0.0f, MIP_MAX, 3.1f, blue_colors}, {&ps_sample_2d_array, &array_2d_texture, POINT, 0.0f, 0.0f, MIP_MAX, 9.0f, blue_colors}, {&ps_sample_2d_array, NULL, POINT, 0.0f, 0.0f, 0.0f, 0.0f, zero_colors}, + {&ps_sample_2d_array, NULL, POINT, 0.0f, 0.0f, 0.0f, 1.0f, zero_colors}, + {&ps_sample_2d_array, NULL, POINT, 0.0f, 0.0f, 0.0f, 2.0f, zero_colors}, {&ps_sample_2d_array, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, zero_colors}, + {&ps_sample_2d_array, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 1.0f, zero_colors}, + {&ps_sample_2d_array, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 2.0f, zero_colors}, #undef POINT #undef POINT_LINEAR #undef MIP_MAX

1 0

Józef Kucia : d3d10core/tests: Add more tests for accessing unbound resources.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 58c01b392c70cc84bdd213b534f91bcee63e9b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=58c01b392c70cc84bdd213b53… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 23 00:41:53 2016 +0200 d3d10core/tests: Add more tests for accessing unbound resources. 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/d3d10core/tests/device.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index fc1d3c7..36878ed 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -4344,6 +4344,8 @@ static void test_texture(void) {&ps_ld, &bc1_texture_srgb, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_ld, &bc2_texture_srgb, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_ld, &bc3_texture_srgb, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, + {&ps_ld, NULL, POINT, 0.0f, 0.0f, 0.0f, 0.0f, zero_colors}, + {&ps_ld, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, zero_colors}, {&ps_ld_sint8, &sint8_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, sint8_colors}, {&ps_ld_uint8, &uint8_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, rgba_level_0}, {&ps_sample, &bc1_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, @@ -4357,6 +4359,8 @@ static void test_texture(void) {&ps_sample, &rgba_texture, POINT, 8.0f, 0.0f, MIP_MAX, 0.0f, level_1_colors}, {&ps_sample, &srgb_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, srgb_colors}, {&ps_sample, &a8_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, a8_colors}, + {&ps_sample, NULL, POINT, 0.0f, 0.0f, 0.0f, 0.0f, zero_colors}, + {&ps_sample, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, zero_colors}, {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, rgba_level_0}, {&ps_sample_b, &rgba_texture, POINT, 8.0f, 0.0f, MIP_MAX, 0.0f, level_1_colors}, {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 8.0f, level_1_colors}, @@ -4367,6 +4371,10 @@ static void test_texture(void) {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, 2.0f, 9.0f, level_2_colors}, {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, 1.0f, 9.0f, level_1_colors}, {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, 0.0f, 9.0f, rgba_level_0}, + {&ps_sample_b, NULL, POINT, 0.0f, 0.0f, 0.0f, 0.0f, zero_colors}, + {&ps_sample_b, NULL, POINT, 0.0f, 0.0f, 0.0f, 1.0f, zero_colors}, + {&ps_sample_b, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, zero_colors}, + {&ps_sample_b, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 1.0f, zero_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, -1.0f, rgba_level_0}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, rgba_level_0}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.4f, rgba_level_0}, @@ -4393,6 +4401,10 @@ static void test_texture(void) {&ps_sample_l, &rgba_texture, POINT, 2.0f, 2.0f, 2.0f, 0.0f, level_2_colors}, {&ps_sample_l, &rgba_texture, POINT, 2.0f, 2.0f, 2.0f, 1.0f, level_2_colors}, {&ps_sample_l, &rgba_texture, POINT, 2.0f, 2.0f, 2.0f, 9.0f, level_2_colors}, + {&ps_sample_l, NULL, POINT, 2.0f, 2.0f, 0.0f, 0.0f, zero_colors}, + {&ps_sample_l, NULL, POINT, 2.0f, 2.0f, 0.0f, 1.0f, zero_colors}, + {&ps_sample_l, NULL, POINT, 2.0f, 2.0f, MIP_MAX, 0.0f, zero_colors}, + {&ps_sample_l, NULL, POINT, 2.0f, 2.0f, MIP_MAX, 1.0f, zero_colors}, {&ps_sample_2d_array, &array_2d_texture, POINT, 0.0f, 0.0f, MIP_MAX, -9.0f, red_colors}, {&ps_sample_2d_array, &array_2d_texture, POINT, 0.0f, 0.0f, MIP_MAX, -1.0f, red_colors}, {&ps_sample_2d_array, &array_2d_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, red_colors}, @@ -4405,8 +4417,12 @@ static void test_texture(void) {&ps_sample_2d_array, &array_2d_texture, POINT, 0.0f, 0.0f, MIP_MAX, 3.0f, blue_colors}, {&ps_sample_2d_array, &array_2d_texture, POINT, 0.0f, 0.0f, MIP_MAX, 3.1f, blue_colors}, {&ps_sample_2d_array, &array_2d_texture, POINT, 0.0f, 0.0f, MIP_MAX, 9.0f, blue_colors}, + {&ps_sample_2d_array, NULL, POINT, 0.0f, 0.0f, 0.0f, 1.0f, zero_colors}, + {&ps_sample_2d_array, NULL, POINT, 0.0f, 0.0f, 0.0f, 2.0f, zero_colors}, {&ps_sample_2d_array, NULL, POINT, 0.0f, 0.0f, 0.0f, 0.0f, zero_colors}, {&ps_sample_2d_array, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, zero_colors}, + {&ps_sample_2d_array, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 1.0f, zero_colors}, + {&ps_sample_2d_array, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 2.0f, zero_colors}, #undef POINT #undef POINT_LINEAR #undef MIP_MAX

1 0

Józef Kucia : wined3d: Add more D3D11 vertex formats.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 91a67856dbfbfd7133fa46d670a8635ba0615b5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=91a67856dbfbfd7133fa46d67… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 23 00:41:54 2016 +0200 wined3d: Add more D3D11 vertex formats. 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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 85459a2..5c045d6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -342,6 +342,9 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R10G10B10A2_SNORM, WINED3D_FFP_EMIT_DEC3N, 3, GL_SHORT, 3, GL_TRUE, sizeof(short int)}, {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, 2, GL_FLOAT, 2, GL_FALSE, sizeof(GLhalfNV)}, {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, 4, GL_FLOAT, 4, GL_FALSE, sizeof(GLhalfNV)}, + {WINED3DFMT_R8G8B8A8_SNORM, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE, 4, GL_TRUE, sizeof(BYTE)}, + {WINED3DFMT_R8G8B8A8_SINT, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE, 4, GL_FALSE, sizeof(BYTE)}, + {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_SHORT, 4, GL_FALSE, sizeof(short int)}, {WINED3DFMT_R32_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_INT, 1, GL_FALSE, sizeof(UINT)}, {WINED3DFMT_R32G32_UINT, WINED3D_FFP_EMIT_INVALID, 2, GL_UNSIGNED_INT, 2, GL_FALSE, sizeof(UINT)}, {WINED3DFMT_R32G32B32_UINT, WINED3D_FFP_EMIT_INVALID, 3, GL_UNSIGNED_INT, 3, GL_FALSE, sizeof(UINT)},

1 0

Józef Kucia : wined3d: Simplify "ffp_attrib_ops" initialization.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 77608ba4fc457be76a34a6461e923aeee97f49e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77608ba4fc457be76a34a6461… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 23 00:41:55 2016 +0200 wined3d: Simplify "ffp_attrib_ops" initialization. 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/directx.c | 97 +++++++----------------------------------- dlls/wined3d/wined3d_private.h | 38 ++++++++--------- 2 files changed, 35 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77608ba4fc457be76a34a…

1 0

Alexandre Julliard : user32: Fix refcounting of window DCEs.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 5f7e4ce642d4deb615e09a3411dc7f416e7e4c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f7e4ce642d4deb615e09a341… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 21 09:54:01 2016 +0900 user32: Fix refcounting of window DCEs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 9e5bc0a..c0c92d8 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -311,7 +311,6 @@ static struct dce *get_window_dce( HWND hwnd ) { win->dce = dce; dce->hwnd = hwnd; - dce->count++; list_add_tail( &dce_list, &dce->entry ); } WIN_ReleasePtr( win ); @@ -501,14 +500,10 @@ static BOOL CALLBACK dc_hook( HDC hDC, WORD code, DWORD_PTR data, LPARAM lParam WARN("DC is not in use!\n"); break; case DCHC_DELETEDC: - /* - * Windows will not let you delete a DC that is busy - * (between GetDC and ReleaseDC) - */ USER_Lock(); - if (dce->count > 1) + if (!(dce->flags & DCX_CACHE)) { - WARN("Application trying to delete a busy DC %p\n", dce->hdc); + WARN("Application trying to delete an owned DC %p\n", dce->hdc); retv = FALSE; } else

1 0

Alexandre Julliard : user32: Completely free owned DCEs when the corresponding window/ class is destroyed.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: d341b0c3815a1b8872c8354dd0811e05a1ce7152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d341b0c3815a1b8872c8354dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 21 09:54:40 2016 +0900 user32: Completely free owned DCEs when the corresponding window/class is destroyed. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/dc.c | 1 - dlls/user32/painting.c | 16 ++++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index c9b7b31..a4088fd 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -812,7 +812,6 @@ static void test_DeleteDC(void) ok(ret, "UnregisterClassA failed\n"); ret = GetObjectType(hdc_test); -todo_wine ok(!ret, "GetObjectType should fail for a deleted DC\n"); /* CS_OWNDC */ diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index c0c92d8..ba1967c 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -338,16 +338,17 @@ static struct dce *get_window_dce( HWND hwnd ) */ void free_dce( struct dce *dce, HWND hwnd ) { + struct dce *dce_to_free = NULL; + USER_Lock(); if (dce) { if (!--dce->count) { - /* turn it into a cache entry */ - SetHookFlags( dce->hdc, DCHF_RESETDC ); release_dce( dce ); - dce->flags |= DCX_CACHE; + list_remove( &dce->entry ); + dce_to_free = dce; } else if (dce->hwnd == hwnd) { @@ -362,7 +363,7 @@ void free_dce( struct dce *dce, HWND hwnd ) LIST_FOR_EACH_ENTRY( dce, &dce_list, struct dce, entry ) { if (dce->hwnd != hwnd) continue; - if (!(dce->flags & DCX_CACHE)) continue; + if (!(dce->flags & DCX_CACHE)) break; if (dce->count) WARN( "GetDC() without ReleaseDC() for window %p\n", hwnd ); dce->count = 0; @@ -371,6 +372,13 @@ void free_dce( struct dce *dce, HWND hwnd ) } USER_Unlock(); + + if (dce_to_free) + { + SetDCHook( dce_to_free->hdc, NULL, 0 ); + DeleteDC( dce_to_free->hdc ); + HeapFree( GetProcessHeap(), 0, dce_to_free ); + } }

1 0

Alexandre Julliard : user32: Only start reusing DCEs after the cache reached its limit.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: d1048914332e118c2ae107177f24910807471367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1048914332e118c2ae107177… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 21 09:55:18 2016 +0900 user32: Only start reusing DCEs after the cache reached its limit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index ba1967c..30dabfe 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -56,6 +56,8 @@ struct dce static struct list dce_list = LIST_INIT(dce_list); +#define DCE_CACHE_SIZE 64 + static BOOL CALLBACK dc_hook( HDC hDC, WORD code, DWORD_PTR data, LPARAM lParam ); static const WCHAR displayW[] = { 'D','I','S','P','L','A','Y',0 }; @@ -429,10 +431,11 @@ void invalidate_dce( WND *win, const RECT *extra_rect ) LIST_FOR_EACH_ENTRY( dce, &dce_list, struct dce, entry ) { + if (!dce->hwnd) continue; + TRACE( "%p: hwnd %p dcx %08x %s %s\n", dce, dce->hwnd, dce->flags, (dce->flags & DCX_CACHE) ? "Cache" : "Owned", dce->count ? "InUse" : "" ); - if (!dce->hwnd) continue; if ((dce->hwnd == win->parent) && !(dce->flags & DCX_CLIPCHILDREN)) continue; /* child window positions don't bother us */ @@ -1001,7 +1004,8 @@ HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) if ((flags & DCX_CACHE) || !(dce = get_window_dce( hwnd ))) { - struct dce *dceEmpty = NULL, *dceUnused = NULL; + struct dce *dceEmpty = NULL, *dceUnused = NULL, *found = NULL; + unsigned int count = 0; /* Strategy: First, we attempt to find a non-empty but unused DCE with * compatible flags. Next, we look for an empty entry. If the cache is @@ -1010,24 +1014,23 @@ HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) USER_Lock(); LIST_FOR_EACH_ENTRY( dce, &dce_list, struct dce, entry ) { - if ((dce->flags & DCX_CACHE) && !dce->count) + if (!(dce->flags & DCX_CACHE)) break; + count++; + if (dce->count) continue; + dceUnused = dce; + if (!dce->hwnd) dceEmpty = dce; + else if ((dce->hwnd == hwnd) && !((dce->flags ^ flags) & clip_flags)) { - dceUnused = dce; - - if (!dce->hwnd) dceEmpty = dce; - else if ((dce->hwnd == hwnd) && !((dce->flags ^ flags) & clip_flags)) - { - TRACE("\tfound valid %p dce [%p], flags %08x\n", - dce, hwnd, dce->flags ); - bUpdateVisRgn = FALSE; - break; - } + TRACE( "found valid %p dce [%p], flags %08x\n", dce, hwnd, dce->flags ); + found = dce; + bUpdateVisRgn = FALSE; + break; } } + if (!found) found = dceEmpty; + if (!found && count >= DCE_CACHE_SIZE) found = dceUnused; - if (&dce->entry == &dce_list) /* nothing found */ - dce = dceEmpty ? dceEmpty : dceUnused; - + dce = found; if (dce) dce->count = 1; USER_Unlock();

1 0

Henri Verbeet : wined3d: Send shader constant updates through the command stream.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: aa666adfed929a2f711d9570fe389856bcaac346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa666adfed929a2f711d9570f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun May 22 18:23:07 2016 +0200 wined3d: Send shader constant updates through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 12 ----------- dlls/wined3d/cs.c | 44 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 22 ++++++-------------- dlls/wined3d/glsl_shader.c | 10 --------- dlls/wined3d/wined3d_private.h | 18 ++++++++++++++++ 5 files changed, 68 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0fb2f67..80702a2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -729,12 +729,6 @@ static void shader_arb_update_float_vertex_constants(struct wined3d_device *devi { struct wined3d_context *context = context_get_current(); struct shader_arb_priv *priv = device->shader_priv; - unsigned int i; - - for (i = 0; i < device->context_count; ++i) - { - device->contexts[i]->constant_update_mask |= WINED3D_SHADER_CONST_VS_F; - } /* We don't want shader constant dirtification to be an O(contexts), so just dirtify the active * context. On a context switch the old context will be fully dirtified */ @@ -748,12 +742,6 @@ static void shader_arb_update_float_pixel_constants(struct wined3d_device *devic { struct wined3d_context *context = context_get_current(); struct shader_arb_priv *priv = device->shader_priv; - unsigned int i; - - for (i = 0; i < device->context_count; ++i) - { - device->contexts[i]->constant_update_mask |= WINED3D_SHADER_CONST_PS_F; - } /* We don't want shader constant dirtification to be an O(contexts), so just dirtify the active * context. On a context switch the old context will be fully dirtified */ diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ea4778c..edb5cf2 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1070,10 +1070,54 @@ static void wined3d_cs_st_submit(struct wined3d_cs *cs) wined3d_cs_op_handlers[opcode](cs, cs->data); } +static void wined3d_cs_st_push_constants(struct wined3d_cs *cs, enum wined3d_push_constants p, + unsigned int start_idx, unsigned int count, const void *constants) +{ + struct wined3d_device *device = cs->device; + unsigned int context_count; + unsigned int i; + size_t offset; + + static const struct + { + size_t offset; + size_t size; + DWORD mask; + } + push_constant_info[] = + { + /* WINED3D_PUSH_CONSTANTS_VS_F */ + {FIELD_OFFSET(struct wined3d_state, vs_consts_f), sizeof(struct wined3d_vec4), WINED3D_SHADER_CONST_VS_F}, + /* WINED3D_PUSH_CONSTANTS_PS_F */ + {FIELD_OFFSET(struct wined3d_state, ps_consts_f), sizeof(struct wined3d_vec4), WINED3D_SHADER_CONST_PS_F}, + /* WINED3D_PUSH_CONSTANTS_VS_I */ + {FIELD_OFFSET(struct wined3d_state, vs_consts_i), sizeof(struct wined3d_ivec4), WINED3D_SHADER_CONST_VS_I}, + /* WINED3D_PUSH_CONSTANTS_PS_I */ + {FIELD_OFFSET(struct wined3d_state, ps_consts_i), sizeof(struct wined3d_ivec4), WINED3D_SHADER_CONST_PS_I}, + /* WINED3D_PUSH_CONSTANTS_VS_B */ + {FIELD_OFFSET(struct wined3d_state, vs_consts_b), sizeof(BOOL), WINED3D_SHADER_CONST_VS_B}, + /* WINED3D_PUSH_CONSTANTS_PS_B */ + {FIELD_OFFSET(struct wined3d_state, ps_consts_b), sizeof(BOOL), WINED3D_SHADER_CONST_PS_B}, + }; + + if (p == WINED3D_PUSH_CONSTANTS_VS_F) + device->shader_backend->shader_update_float_vertex_constants(device, start_idx, count); + else if (p == WINED3D_PUSH_CONSTANTS_PS_F) + device->shader_backend->shader_update_float_pixel_constants(device, start_idx, count); + + offset = push_constant_info[p].offset + start_idx * push_constant_info[p].size; + memcpy((BYTE *)&cs->state + offset, constants, count * push_constant_info[p].size); + for (i = 0, context_count = device->context_count; i < context_count; ++i) + { + device->contexts[i]->constant_update_mask |= push_constant_info[p].mask; + } +} + static const struct wined3d_cs_ops wined3d_cs_st_ops = { wined3d_cs_st_require_space, wined3d_cs_st_submit, + wined3d_cs_st_push_constants, }; struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index da83b56..967a831 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2363,16 +2363,6 @@ struct wined3d_sampler * CDECL wined3d_device_get_vs_sampler(const struct wined3 return device->state.sampler[WINED3D_SHADER_TYPE_VERTEX][idx]; } -static void device_invalidate_shader_constants(const struct wined3d_device *device, DWORD mask) -{ - UINT i; - - for (i = 0; i < device->context_count; ++i) - { - device->contexts[i]->constant_update_mask |= mask; - } -} - HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const BOOL *constants) { @@ -2400,7 +2390,7 @@ HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device, } else { - device_invalidate_shader_constants(device, WINED3D_SHADER_CONST_VS_B); + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_B, start_idx, count, constants); } return WINED3D_OK; @@ -2449,7 +2439,7 @@ HRESULT CDECL wined3d_device_set_vs_consts_i(struct wined3d_device *device, } else { - device_invalidate_shader_constants(device, WINED3D_SHADER_CONST_VS_I); + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_I, start_idx, count, constants); } return WINED3D_OK; @@ -2494,7 +2484,7 @@ HRESULT CDECL wined3d_device_set_vs_consts_f(struct wined3d_device *device, memset(&device->recording->changed.vs_consts_f[start_idx], 1, count * sizeof(*device->recording->changed.vs_consts_f)); else - device->shader_backend->shader_update_float_vertex_constants(device, start_idx, count); + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_F, start_idx, count, constants); return WINED3D_OK; } @@ -2633,7 +2623,7 @@ HRESULT CDECL wined3d_device_set_ps_consts_b(struct wined3d_device *device, } else { - device_invalidate_shader_constants(device, WINED3D_SHADER_CONST_PS_B); + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_B, start_idx, count, constants); } return WINED3D_OK; @@ -2682,7 +2672,7 @@ HRESULT CDECL wined3d_device_set_ps_consts_i(struct wined3d_device *device, } else { - device_invalidate_shader_constants(device, WINED3D_SHADER_CONST_PS_I); + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_I, start_idx, count, constants); } return WINED3D_OK; @@ -2728,7 +2718,7 @@ HRESULT CDECL wined3d_device_set_ps_consts_f(struct wined3d_device *device, memset(&device->recording->changed.ps_consts_f[start_idx], 1, count * sizeof(*device->recording->changed.ps_consts_f)); else - device->shader_backend->shader_update_float_pixel_constants(device, start_idx, count); + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_F, start_idx, count, constants); return WINED3D_OK; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8c22468..b228718 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1540,11 +1540,6 @@ static void shader_glsl_update_float_vertex_constants(struct wined3d_device *dev { update_heap_entry(heap, i, priv->next_constant_version); } - - for (i = 0; i < device->context_count; ++i) - { - device->contexts[i]->constant_update_mask |= WINED3D_SHADER_CONST_VS_F; - } } static void shader_glsl_update_float_pixel_constants(struct wined3d_device *device, UINT start, UINT count) @@ -1557,11 +1552,6 @@ static void shader_glsl_update_float_pixel_constants(struct wined3d_device *devi { update_heap_entry(heap, i, priv->next_constant_version); } - - for (i = 0; i < device->context_count; ++i) - { - device->contexts[i]->constant_update_mask |= WINED3D_SHADER_CONST_PS_F; - } } static unsigned int vec4_varyings(DWORD shader_major, const struct wined3d_gl_info *gl_info) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 00f34e9..65270d4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2837,10 +2837,22 @@ void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, DWORD flags) DECLSPEC_HIDDEN; void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; +enum wined3d_push_constants +{ + WINED3D_PUSH_CONSTANTS_VS_F, + WINED3D_PUSH_CONSTANTS_PS_F, + WINED3D_PUSH_CONSTANTS_VS_I, + WINED3D_PUSH_CONSTANTS_PS_I, + WINED3D_PUSH_CONSTANTS_VS_B, + WINED3D_PUSH_CONSTANTS_PS_B, +}; + struct wined3d_cs_ops { void *(*require_space)(struct wined3d_cs *cs, size_t size); void (*submit)(struct wined3d_cs *cs); + void (*push_constants)(struct wined3d_cs *cs, enum wined3d_push_constants p, + unsigned int start_idx, unsigned int count, const void *constants); }; struct wined3d_cs @@ -2905,6 +2917,12 @@ void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN; +static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d_push_constants p, + unsigned int start_idx, unsigned int count, const void *constants) +{ + cs->ops->push_constants(cs, p, start_idx, count, constants); +} + /* Direct3D terminology with little modifications. We do not have an issued state * because only the driver knows about it, but we have a created state because d3d * allows GetData on a created issue, but opengl doesn't

1 0

Henri Verbeet : wined3d: NP2 emulation is not allowed on array textures.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 3e29f952f953f66db5677a0be74bc75fd869bc68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e29f952f953f66db5677a0be… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun May 22 18:23:08 2016 +0200 wined3d: NP2 emulation is not allowed on array textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2f00e87..5534e73 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -784,13 +784,9 @@ static void surface_download_data(struct wined3d_surface *surface, const struct if (surface->texture_target == GL_TEXTURE_2D_ARRAY) { - /* We don't expect to ever need to emulate NP2 textures when we have EXT_texture_array. */ + /* NP2 emulation is not allowed on array textures. */ if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) - { - FIXME("Cannot download surface %p, level %u, layer %u.\n", - surface, surface->texture_level, surface->texture_layer); - return; - } + ERR("Array texture %p uses NP2 emulation.\n", texture); WARN_(d3d_perf)("Downloading all miplevel layers to get the surface data for a single sub-resource.\n");

1 0