February 2017 - Wine-commits

Andrew Wesie : wined3d: Add cube array sampler support.
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: 73979e7112b42b7578ee7d70d036d5a49b6745d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73979e7112b42b7578ee7d70d… Author: Andrew Wesie <awesie(a)gmail.com> Date: Fri Feb 10 12:26:53 2017 +0100 wined3d: Add cube array sampler support. 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 | 2 ++ dlls/wined3d/glsl_shader.c | 9 +++++++++ dlls/wined3d/shader.c | 4 ++++ dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_private.h | 1 + 6 files changed, 19 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c47052c..3215a63 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -162,6 +162,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_compression_bptc", ARB_TEXTURE_COMPRESSION_BPTC }, {"GL_ARB_texture_compression_rgtc", ARB_TEXTURE_COMPRESSION_RGTC }, {"GL_ARB_texture_cube_map", ARB_TEXTURE_CUBE_MAP }, + {"GL_ARB_texture_cube_map_array", ARB_TEXTURE_CUBE_MAP_ARRAY }, {"GL_ARB_texture_env_combine", ARB_TEXTURE_ENV_COMBINE }, {"GL_ARB_texture_env_dot3", ARB_TEXTURE_ENV_DOT3 }, {"GL_ARB_texture_float", ARB_TEXTURE_FLOAT }, @@ -3674,6 +3675,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_VERTEX_TYPE_2_10_10_10_REV, MAKEDWORD_VERSION(3, 3)}, {ARB_GPU_SHADER5, MAKEDWORD_VERSION(4, 0)}, + {ARB_TEXTURE_CUBE_MAP_ARRAY, MAKEDWORD_VERSION(4, 0)}, {ARB_ES2_COMPATIBILITY, MAKEDWORD_VERSION(4, 1)}, {ARB_VIEWPORT_ARRAY, MAKEDWORD_VERSION(4, 1)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index cac8749..c16463b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -68,6 +68,7 @@ resource_type_info[] = {2, 2, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY */ {3, 3, "2DArray"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY */ {3, 3, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY */ + {4, 3, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY */ }; struct glsl_dst_param @@ -2150,6 +2151,12 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont sampler_type = "sampler2DArray"; break; + case WINED3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY: + if (shadow_sampler) + FIXME("Unsupported Cube array shadow sampler.\n"); + sampler_type = "samplerCubeArray"; + break; + default: sampler_type = "unsupported_sampler"; FIXME("Unhandled resource type %#x.\n", reg_maps->resource_info[entry->resource_idx].type); @@ -6273,6 +6280,8 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, shader_addline(buffer, "#extension GL_ARB_shader_image_size : enable\n"); if (gl_info->supported[ARB_SHADING_LANGUAGE_PACKING]) shader_addline(buffer, "#extension GL_ARB_shading_language_packing : enable\n"); + if (gl_info->supported[ARB_TEXTURE_CUBE_MAP_ARRAY]) + shader_addline(buffer, "#extension GL_ARB_texture_cube_map_array : enable\n"); if (gl_info->supported[ARB_TEXTURE_QUERY_LEVELS]) shader_addline(buffer, "#extension GL_ARB_texture_query_levels : enable\n"); if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 814da17..dcf77e9 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1668,6 +1668,10 @@ static void shader_dump_decl_usage(struct wined3d_string_buffer *buffer, shader_addline(buffer, "texture2dmsarray"); break; + case WINED3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY: + shader_addline(buffer, "texturecubearray"); + break; + default: shader_addline(buffer, "unknown"); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 991fad7..dff463f 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -361,6 +361,7 @@ enum wined3d_sm4_resource_type WINED3D_SM4_RESOURCE_TEXTURE_1DARRAY = 0x7, WINED3D_SM4_RESOURCE_TEXTURE_2DARRAY = 0x8, WINED3D_SM4_RESOURCE_TEXTURE_2DMSARRAY = 0x9, + WINED3D_SM4_RESOURCE_TEXTURE_CUBEARRAY = 0xa, }; enum wined3d_sm4_data_type @@ -449,6 +450,7 @@ static const enum wined3d_shader_resource_type resource_type_table[] = /* WINED3D_SM4_RESOURCE_TEXTURE_1DARRAY */ WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY, /* WINED3D_SM4_RESOURCE_TEXTURE_2DARRAY */ WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY, /* WINED3D_SM4_RESOURCE_TEXTURE_2DMSARRAY */ WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY, + /* WINED3D_SM4_RESOURCE_TEXTURE_CUBEARRAY */ WINED3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY, }; static const enum wined3d_data_type data_type_table[] = diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 5f57a41..72d617e 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -95,6 +95,7 @@ enum wined3d_gl_extension ARB_TEXTURE_COMPRESSION_BPTC, ARB_TEXTURE_COMPRESSION_RGTC, ARB_TEXTURE_CUBE_MAP, + ARB_TEXTURE_CUBE_MAP_ARRAY, ARB_TEXTURE_ENV_COMBINE, ARB_TEXTURE_ENV_DOT3, ARB_TEXTURE_FLOAT, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e9c1a35..ace10c6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -322,6 +322,7 @@ enum wined3d_shader_resource_type WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY, WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY, WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY, + WINED3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY, }; #define WINED3D_SHADER_CONST_VS_F 0x00000001

1 0

Józef Kucia : wined3d: Implement texture cube array views.
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: d4e439a36a30fae8f578f6cff227421f185ef703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4e439a36a30fae8f578f6cff… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 10 12:26:54 2017 +0100 wined3d: Implement texture cube array views. 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 | 4 ++++ dlls/wined3d/view.c | 18 +++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 53d15cc..2319ac5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2453,6 +2453,10 @@ void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_CUBE_MAP, device->dummy_textures.tex_cube); checkGLcall("glBindTexture"); break; + case GL_TEXTURE_CUBE_MAP_ARRAY: + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_CUBE_MAP_ARRAY, 0); + checkGLcall("glBindTexture"); + break; case GL_TEXTURE_3D: gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_3D, device->dummy_textures.tex_3d); checkGLcall("glBindTexture"); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index c63d913..c3e6d49 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -24,20 +24,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); +#define WINED3D_VIEW_CUBE_ARRAY (WINED3D_VIEW_TEXTURE_CUBE | WINED3D_VIEW_TEXTURE_ARRAY) + static BOOL is_stencil_view_format(const struct wined3d_format *format) { return format->id == WINED3DFMT_X24_TYPELESS_G8_UINT || format->id == WINED3DFMT_X32_TYPELESS_G8X24_UINT; } -static GLenum get_texture_view_target(const struct wined3d_view_desc *desc, - const struct wined3d_texture *texture) +static GLenum get_texture_view_target(const struct wined3d_gl_info *gl_info, + const struct wined3d_view_desc *desc, const struct wined3d_texture *texture) { static const struct { GLenum texture_target; unsigned int view_flags; GLenum view_target; + enum wined3d_gl_extension extension; } view_types[] = { @@ -46,14 +49,19 @@ static GLenum get_texture_view_target(const struct wined3d_view_desc *desc, {GL_TEXTURE_2D_ARRAY, 0, GL_TEXTURE_2D}, {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY}, {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_CUBE, GL_TEXTURE_CUBE_MAP}, + {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_CUBE_ARRAY, GL_TEXTURE_CUBE_MAP_ARRAY, ARB_TEXTURE_CUBE_MAP_ARRAY}, {GL_TEXTURE_3D, 0, GL_TEXTURE_3D}, }; unsigned int i; for (i = 0; i < ARRAY_SIZE(view_types); ++i) { - if (view_types[i].texture_target == texture->target && view_types[i].view_flags == desc->flags) + if (view_types[i].texture_target != texture->target || view_types[i].view_flags != desc->flags) + continue; + if (gl_info->supported[view_types[i].extension]) return view_types[i].view_target; + + FIXME("Extension %#x not supported.\n", view_types[i].extension); } FIXME("Unhandled view flags %#x for texture target %#x.\n", desc->flags, texture->target); @@ -478,7 +486,7 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ || desc->u.texture.layer_count > texture->layer_count - desc->u.texture.layer_idx) return E_INVALIDARG; - view_target = get_texture_view_target(desc, texture); + view_target = get_texture_view_target(gl_info, desc, texture); if (resource->format->id == view_format->id && texture->target == view_target && !desc->u.texture.level_idx && desc->u.texture.level_count == texture->level_count @@ -659,7 +667,7 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces if (desc->u.texture.layer_idx || desc->u.texture.layer_count != depth_or_layer_count) { - create_texture_view(&view->gl_view, get_texture_view_target(desc, texture), + create_texture_view(&view->gl_view, get_texture_view_target(gl_info, desc, texture), desc, texture, view->format); }

1 0

Józef Kucia : d3d11/tests: Add test for resinfo instruction.
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: 111a4b5b6435193ad77669861073511632ba0d27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=111a4b5b6435193ad77669861… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 10 12:26:55 2017 +0100 d3d11/tests: Add test for resinfo instruction. 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 | 368 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 368 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=111a4b5b6435193ad7766…

1 0

Józef Kucia : d3d11: Do not keep mutex locked when D3D11_BUFFER_DESC validation fails.
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: 6640bc323acb879b370eb7ba4875d4b1f947206b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6640bc323acb879b370eb7ba4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 10 12:26:56 2017 +0100 d3d11: Do not keep mutex locked when D3D11_BUFFER_DESC validation fails. 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/buffer.c | 61 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index 1e0469e..af3ab39 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -387,52 +387,58 @@ static const struct wined3d_parent_ops d3d_buffer_wined3d_parent_ops = d3d_buffer_wined3d_object_released, }; -static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *device, - const D3D11_BUFFER_DESC *desc, const D3D11_SUBRESOURCE_DATA *data) +static BOOL validate_buffer_desc(D3D11_BUFFER_DESC *desc) { - struct wined3d_buffer_desc wined3d_desc; - HRESULT hr; - - buffer->ID3D11Buffer_iface.lpVtbl = &d3d11_buffer_vtbl; - buffer->ID3D10Buffer_iface.lpVtbl = &d3d10_buffer_vtbl; - buffer->refcount = 1; - wined3d_mutex_lock(); - wined3d_private_store_init(&buffer->private_store); - buffer->desc = *desc; - - if (buffer->desc.MiscFlags & D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS) + if (desc->MiscFlags & D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS) { - if (buffer->desc.MiscFlags & D3D11_RESOURCE_MISC_BUFFER_STRUCTURED) + if (desc->MiscFlags & D3D11_RESOURCE_MISC_BUFFER_STRUCTURED) { WARN("Raw and structure buffers are mutually exclusive.\n"); - return E_INVALIDARG; + return FALSE; } - if (!(buffer->desc.BindFlags & (D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_UNORDERED_ACCESS))) + if (!(desc->BindFlags & (D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_UNORDERED_ACCESS))) { - WARN("Invalid bind flags %#x for raw buffer.\n", buffer->desc.BindFlags); - return E_INVALIDARG; + WARN("Invalid bind flags %#x for raw buffer.\n", desc->BindFlags); + return FALSE; } } - if (buffer->desc.MiscFlags & D3D11_RESOURCE_MISC_BUFFER_STRUCTURED) + if (desc->MiscFlags & D3D11_RESOURCE_MISC_BUFFER_STRUCTURED) { - if (!buffer->desc.StructureByteStride || buffer->desc.StructureByteStride % 4) + if (!desc->StructureByteStride || desc->StructureByteStride % 4) { - WARN("Invalid structure byte stride %u.\n", buffer->desc.StructureByteStride); - return E_INVALIDARG; + WARN("Invalid structure byte stride %u.\n", desc->StructureByteStride); + return FALSE; } - if (buffer->desc.ByteWidth % buffer->desc.StructureByteStride) + if (desc->ByteWidth % desc->StructureByteStride) { WARN("Byte width %u is not divisible by structure byte stride %u.\n", - buffer->desc.ByteWidth, buffer->desc.StructureByteStride); - return E_INVALIDARG; + desc->ByteWidth, desc->StructureByteStride); + return FALSE; } } else { - buffer->desc.StructureByteStride = 0; + desc->StructureByteStride = 0; } + return TRUE; +} + +static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *device, + const D3D11_BUFFER_DESC *desc, const D3D11_SUBRESOURCE_DATA *data) +{ + struct wined3d_buffer_desc wined3d_desc; + HRESULT hr; + + buffer->ID3D11Buffer_iface.lpVtbl = &d3d11_buffer_vtbl; + buffer->ID3D10Buffer_iface.lpVtbl = &d3d10_buffer_vtbl; + buffer->refcount = 1; + buffer->desc = *desc; + + if (!validate_buffer_desc(&buffer->desc)) + return E_INVALIDARG; + wined3d_desc.byte_width = buffer->desc.ByteWidth; wined3d_desc.usage = wined3d_usage_from_d3d11(0, buffer->desc.Usage); wined3d_desc.bind_flags = buffer->desc.BindFlags; @@ -442,6 +448,9 @@ static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *dev if (buffer->desc.StructureByteStride) FIXME("Ignoring structure byte stride %u.\n", buffer->desc.StructureByteStride); + wined3d_mutex_lock(); + wined3d_private_store_init(&buffer->private_store); + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &wined3d_desc, (const struct wined3d_sub_resource_data *)data, buffer, &d3d_buffer_wined3d_parent_ops, &buffer->wined3d_buffer)))

1 0

Józef Kucia : wined3d: Get rid of initPixelFormatsNoGL().
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: 2f6dd58099ae5ae54ff0543e8d4384740d0a8591 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f6dd58099ae5ae54ff0543e8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 10 12:26:57 2017 +0100 wined3d: Get rid of initPixelFormatsNoGL(). 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 | 20 +++++++++++--------- dlls/wined3d/utils.c | 19 ++++--------------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 15 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3215a63..9285fee 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -6394,7 +6394,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, return TRUE; } -static void wined3d_adapter_init_nogl(struct wined3d_adapter *adapter, UINT ordinal) +static BOOL wined3d_adapter_init_nogl(struct wined3d_adapter *adapter, UINT ordinal) { DISPLAY_DEVICEW display_device; @@ -6408,7 +6408,8 @@ static void wined3d_adapter_init_nogl(struct wined3d_adapter *adapter, UINT ordi else adapter->vram_bytes = 128 * 1024 * 1024; - initPixelFormatsNoGL(&adapter->gl_info); + if (!wined3d_adapter_init_format_info(adapter, NULL)) + return FALSE; adapter->vertex_pipe = &none_vertex_pipe; adapter->fragment_pipe = &none_fragment_pipe; @@ -6419,6 +6420,8 @@ static void wined3d_adapter_init_nogl(struct wined3d_adapter *adapter, UINT ordi EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); TRACE("DeviceName: %s\n", debugstr_w(display_device.DeviceName)); strcpyW(adapter->DeviceName, display_device.DeviceName); + + return TRUE; } static void STDMETHODCALLTYPE wined3d_null_wined3d_object_destroyed(void *parent) {} @@ -6430,19 +6433,18 @@ const struct wined3d_parent_ops wined3d_null_parent_ops = HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) { + BOOL ret; + wined3d->ref = 1; wined3d->flags = flags; TRACE("Initializing adapters.\n"); if (flags & WINED3D_NO3D) - { - wined3d_adapter_init_nogl(&wined3d->adapters[0], 0); - wined3d->adapter_count = 1; - return WINED3D_OK; - } - - if (!wined3d_adapter_init(&wined3d->adapters[0], 0, flags)) + ret = wined3d_adapter_init_nogl(&wined3d->adapters[0], 0); + else + ret = wined3d_adapter_init(&wined3d->adapters[0], 0, flags); + if (!ret) { WARN("Failed to initialize adapter.\n"); return E_FAIL; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 384fdce..6c3fd5e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3482,28 +3482,17 @@ static BOOL init_typeless_formats(struct wined3d_gl_info *gl_info) return TRUE; } -BOOL initPixelFormatsNoGL(struct wined3d_gl_info *gl_info) -{ - if (!init_format_base_info(gl_info)) return FALSE; - - if (!init_format_block_info(gl_info)) - { - HeapFree(GetProcessHeap(), 0, gl_info->formats); - gl_info->formats = NULL; - return FALSE; - } - - return TRUE; -} - /* Context activation is done by the caller. */ BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, struct wined3d_caps_gl_ctx *ctx) { struct wined3d_gl_info *gl_info = &adapter->gl_info; if (!init_format_base_info(gl_info)) return FALSE; - if (!init_format_block_info(gl_info)) goto fail; + + if (!ctx) /* WINED3D_NO3D */ + return TRUE; + if (!init_format_texture_info(adapter, gl_info)) goto fail; if (!init_format_vertex_info(gl_info)) goto fail; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ace10c6..f6252a2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2337,7 +2337,6 @@ BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) DECLSPEC_HIDDEN; -BOOL initPixelFormatsNoGL(struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void install_gl_compat_wrapper(struct wined3d_gl_info *gl_info, enum wined3d_gl_extension ext) DECLSPEC_HIDDEN; enum projection_types

1 0

Józef Kucia : wined3d: Simplify pixel format selection.
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: e30a5ce8f017060c0e741bf57aeb48c250e932fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e30a5ce8f017060c0e741bf57… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 10 12:26:58 2017 +0100 wined3d: Simplify pixel format selection. 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 | 51 +++++++++++++++++--------------------------------- 1 file changed, 17 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2319ac5..59a1367 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1432,16 +1432,17 @@ void context_invalidate_state(struct wined3d_context *context, DWORD state) /* This function takes care of wined3d pixel format selection. */ static int context_choose_pixel_format(const struct wined3d_device *device, HDC hdc, const struct wined3d_format *color_format, const struct wined3d_format *ds_format, - BOOL auxBuffers, BOOL findCompatible) + BOOL auxBuffers) { - int iPixelFormat=0; - unsigned int current_value; unsigned int cfg_count = device->adapter->cfg_count; + unsigned int current_value; + PIXELFORMATDESCRIPTOR pfd; + int iPixelFormat = 0; unsigned int i; - TRACE("device %p, dc %p, color_format %s, ds_format %s, aux_buffers %#x, find_compatible %#x.\n", + TRACE("device %p, dc %p, color_format %s, ds_format %s, aux_buffers %#x.\n", device, hdc, debug_d3dformat(color_format->id), debug_d3dformat(ds_format->id), - auxBuffers, findCompatible); + auxBuffers); current_value = 0; for (i = 0; i < cfg_count; ++i) @@ -1496,16 +1497,11 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC } } - /* When findCompatible is set and no suitable format was found, let ChoosePixelFormat choose a pixel format in order not to crash. */ - if(!iPixelFormat && !findCompatible) { - ERR("Can't find a suitable iPixelFormat\n"); - return FALSE; - } else if(!iPixelFormat) { - PIXELFORMATDESCRIPTOR pfd; + if (!iPixelFormat) + { + ERR("Trying to locate a compatible pixel format because an exact match failed.\n"); - TRACE("Falling back to ChoosePixelFormat as we weren't able to find an exactly matching pixel format\n"); - /* PixelFormat selection */ - ZeroMemory(&pfd, sizeof(pfd)); + memset(&pfd, 0, sizeof(pfd)); pfd.nSize = sizeof(pfd); pfd.nVersion = 1; pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER | PFD_DRAW_TO_WINDOW;/*PFD_GENERIC_ACCELERATED*/ @@ -1517,15 +1513,15 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC pfd.cStencilBits = ds_format->stencil_size; pfd.iLayerType = PFD_MAIN_PLANE; - iPixelFormat = ChoosePixelFormat(hdc, &pfd); - if(!iPixelFormat) { - /* If this happens something is very wrong as ChoosePixelFormat barely fails */ - ERR("Can't find a suitable iPixelFormat\n"); - return FALSE; + if (!(iPixelFormat = ChoosePixelFormat(hdc, &pfd))) + { + /* Something is very wrong as ChoosePixelFormat() barely fails. */ + ERR("Can't find a suitable pixel format.\n"); + return 0; } } - TRACE("Found iPixelFormat=%d for ColorFormat=%s, DepthStencilFormat=%s\n", + TRACE("Found iPixelFormat=%d for ColorFormat=%s, DepthStencilFormat=%s.\n", iPixelFormat, debug_d3dformat(color_format->id), debug_d3dformat(ds_format->id)); return iPixelFormat; } @@ -1780,21 +1776,8 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, } /* Try to find a pixel format which matches our requirements. */ - pixel_format = context_choose_pixel_format(device, hdc, color_format, ds_format, auxBuffers, FALSE); - - /* Try to locate a compatible format if we weren't able to find anything. */ - if (!pixel_format) - { - TRACE("Trying to locate a compatible pixel format because an exact match failed.\n"); - pixel_format = context_choose_pixel_format(device, hdc, color_format, ds_format, auxBuffers, TRUE); - } - - /* If we still don't have a pixel format, something is very wrong as ChoosePixelFormat barely fails */ - if (!pixel_format) - { - ERR("Can't find a suitable pixel format.\n"); + if (!(pixel_format = context_choose_pixel_format(device, hdc, color_format, ds_format, auxBuffers))) goto out; - } ret->gl_info = gl_info;

1 0

Nikolay Sivov : d2d1: Always create HWND target as gdi-compatible.
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: 71cb1be214315d315f6f523f13760f39960d0061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71cb1be214315d315f6f523f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 10 15:00:18 2017 +0300 d2d1: Always create HWND target as gdi-compatible. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/hwnd_render_target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c index 4f68afd..2ce7b71 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c @@ -839,7 +839,7 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target swapchain_desc.Windowed = TRUE; swapchain_desc.SwapEffect = hwnd_rt_desc->presentOptions & D2D1_PRESENT_OPTIONS_RETAIN_CONTENTS ? DXGI_SWAP_EFFECT_SEQUENTIAL : DXGI_SWAP_EFFECT_DISCARD; - swapchain_desc.Flags = 0; + swapchain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE; hr = IDXGIFactory_CreateSwapChain(dxgi_factory, (IUnknown *)device, &swapchain_desc, &render_target->swapchain); IDXGIFactory_Release(dxgi_factory);

1 0

Henri Verbeet : d3d8: Do not modify the "surface" pointer for D3DFMT_UNKNOWN in d3d8_device_CreateRenderTarget().
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: 177b3fc7c1ff5e2e85f8928c33fa5a597548cbfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=177b3fc7c1ff5e2e85f8928c3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 10 13:58:55 2017 +0100 d3d8: Do not modify the "surface" pointer for D3DFMT_UNKNOWN in d3d8_device_CreateRenderTarget(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 3 +++ dlls/d3d8/tests/device.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index fe2f54e..f8eb7ee 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -990,6 +990,9 @@ static HRESULT WINAPI d3d8_device_CreateRenderTarget(IDirect3DDevice8 *iface, UI TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, lockable %#x, surface %p.\n", iface, width, height, format, multisample_type, lockable, surface); + if (!format) + return D3DERR_INVALIDCALL; + *surface = NULL; if (lockable) flags |= WINED3D_TEXTURE_CREATE_MAPPABLE; diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 9a9278b..2295300 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8212,7 +8212,7 @@ static void test_format_unknown(void) hr = IDirect3DDevice8_CreateRenderTarget(device, 64, 64, D3DFMT_UNKNOWN, D3DMULTISAMPLE_NONE, FALSE, (IDirect3DSurface8 **)&iface); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - todo_wine ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); + ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); iface = (void *)0xdeadbeef; hr = IDirect3DDevice8_CreateDepthStencilSurface(device, 64, 64,

1 0

Henri Verbeet : d3d8: Do not modify the "surface" pointer for D3DFMT_UNKNOWN in d3d8_device_CreateDepthStencilSurface().
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: 04586f6328f6d8040b8ecf34fea50e1761d7cfac URL: http://source.winehq.org/git/wine.git/?a=commit;h=04586f6328f6d8040b8ecf34f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 10 13:58:56 2017 +0100 d3d8: Do not modify the "surface" pointer for D3DFMT_UNKNOWN in d3d8_device_CreateDepthStencilSurface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 3 +++ dlls/d3d8/tests/device.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index f8eb7ee..9592342 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1010,6 +1010,9 @@ static HRESULT WINAPI d3d8_device_CreateDepthStencilSurface(IDirect3DDevice8 *if TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, surface %p.\n", iface, width, height, format, multisample_type, surface); + if (!format) + return D3DERR_INVALIDCALL; + *surface = NULL; /* TODO: Verify that Discard is false */ diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 2295300..45969fe 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8218,7 +8218,7 @@ static void test_format_unknown(void) hr = IDirect3DDevice8_CreateDepthStencilSurface(device, 64, 64, D3DFMT_UNKNOWN, D3DMULTISAMPLE_NONE, (IDirect3DSurface8 **)&iface); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - todo_wine ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); + ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); iface = (void *)0xdeadbeef; hr = IDirect3DDevice8_CreateImageSurface(device, 64, 64,

1 0

Henri Verbeet : ddraw/tests: Rewrite GetDCTest().
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: e28a5fa393b57a87427b82df2a6c9fec494c1640 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e28a5fa393b57a87427b82df2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 10 13:58:57 2017 +0100 ddraw/tests: Rewrite GetDCTest(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 77 +++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 77 +++++++++++++++++++++++++++ dlls/ddraw/tests/dsurface.c | 124 -------------------------------------------- 3 files changed, 154 insertions(+), 124 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e28a5fa393b57a87427b8…

1 0