April 2017 - Wine-Commits - list.winehq.org

Owen Rudge : wsdapi: Add implementation of SetAddressFamily.
by Alexandre Julliard April 10, 2017

April 10, 2017

Module: wine Branch: master Commit: f227d9c7a7298b9e375f8825c200b60c6081a267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f227d9c7a7298b9e375f8825c… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Apr 6 22:19:46 2017 +0100 wsdapi: Add implementation of SetAddressFamily. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/discovery.c | 22 ++++++++++++++++++++-- include/wsdbase.idl | 3 +++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/wsdapi/discovery.c b/dlls/wsdapi/discovery.c index 990f030..a3d7b9b 100644 --- a/dlls/wsdapi/discovery.c +++ b/dlls/wsdapi/discovery.c @@ -36,6 +36,7 @@ typedef struct IWSDiscoveryPublisherImpl { IWSDiscoveryPublisher IWSDiscoveryPublisher_iface; LONG ref; IWSDXMLContext *xmlContext; + DWORD addressFamily; } IWSDiscoveryPublisherImpl; static inline IWSDiscoveryPublisherImpl *impl_from_IWSDiscoveryPublisher(IWSDiscoveryPublisher *iface) @@ -101,8 +102,25 @@ static ULONG WINAPI IWSDiscoveryPublisherImpl_Release(IWSDiscoveryPublisher *ifa static HRESULT WINAPI IWSDiscoveryPublisherImpl_SetAddressFamily(IWSDiscoveryPublisher *This, DWORD dwAddressFamily) { - FIXME("(%p, %d)\n", This, dwAddressFamily); - return E_NOTIMPL; + IWSDiscoveryPublisherImpl *impl = impl_from_IWSDiscoveryPublisher(This); + + TRACE("(%p, %d)\n", This, dwAddressFamily); + + /* Has the address family already been set? */ + if (impl->addressFamily != 0) + { + return STG_E_INVALIDFUNCTION; + } + + if ((dwAddressFamily == WSDAPI_ADDRESSFAMILY_IPV4) || (dwAddressFamily == WSDAPI_ADDRESSFAMILY_IPV6) || + (dwAddressFamily == (WSDAPI_ADDRESSFAMILY_IPV4 | WSDAPI_ADDRESSFAMILY_IPV6))) + { + /* TODO: Check that the address family is supported by the system */ + impl->addressFamily = dwAddressFamily; + return S_OK; + } + + return E_INVALIDARG; } static HRESULT WINAPI IWSDiscoveryPublisherImpl_RegisterNotificationSink(IWSDiscoveryPublisher *This, IWSDiscoveryPublisherNotify *pSink) diff --git a/include/wsdbase.idl b/include/wsdbase.idl index 35db5b9..c93262d 100644 --- a/include/wsdbase.idl +++ b/include/wsdbase.idl @@ -18,6 +18,9 @@ import "objidl.idl"; +cpp_quote("#define WSDAPI_ADDRESSFAMILY_IPV4 1") +cpp_quote("#define WSDAPI_ADDRESSFAMILY_IPV6 2") + interface IWSDAddress; interface IWSDMessageParameters;

1 0

Józef Kucia : wined3d: Differentiate between single layer and layered render target views.
by Alexandre Julliard April 10, 2017

April 10, 2017

Module: wine Branch: master Commit: 706652025e7d7411565928baa590ebfb66587349 URL: http://source.winehq.org/git/wine.git/?a=commit;h=706652025e7d7411565928baa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 10 12:27:43 2017 +0200 wined3d: Differentiate between single layer and layered render target 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 | 10 ++++++++-- dlls/wined3d/device.c | 2 +- dlls/wined3d/view.c | 6 +++--- dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index aaf9ab0..48b9347 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -139,7 +139,7 @@ static void context_attach_gl_texture_fbo(struct wined3d_context *context, gl_info->fbo_ops.glFramebufferTexture(fbo_target, attachment, resource->object, resource->level); } - else if (resource->target == GL_TEXTURE_2D_ARRAY) + else if (resource->target == GL_TEXTURE_2D_ARRAY || resource->target == GL_TEXTURE_3D) { if (!gl_info->fbo_ops.glFramebufferTextureLayer) { @@ -433,8 +433,10 @@ static inline void context_set_fbo_key_for_render_target(const struct wined3d_co { key->objects[idx].target = texture->target; key->objects[idx].level = sub_resource_idx % texture->level_count; - key->objects[idx].layer = WINED3D_ALL_LAYERS; + key->objects[idx].layer = sub_resource_idx / texture->level_count; } + if (render_target->layer_count != 1) + key->objects[idx].layer = WINED3D_ALL_LAYERS; switch (location) { @@ -475,6 +477,7 @@ static void context_generate_fbo_key(const struct wined3d_context *context, { depth_stencil.resource = &depth_stencil_surface->container->resource; depth_stencil.sub_resource_idx = surface_get_sub_resource_idx(depth_stencil_surface); + depth_stencil.layer_count = 1; } context_set_fbo_key_for_render_target(context, key, 0, &depth_stencil, ds_location); @@ -738,6 +741,7 @@ void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target { context->blit_targets[0].resource = &render_target->container->resource; context->blit_targets[0].sub_resource_idx = surface_get_sub_resource_idx(render_target); + context->blit_targets[0].layer_count = 1; } context_apply_fbo_state(context, target, context->blit_targets, depth_stencil, location, location); } @@ -2745,6 +2749,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win context->blit_targets[i].gl_view = rts[i]->gl_view; context->blit_targets[i].resource = rts[i]->resource; context->blit_targets[i].sub_resource_idx = rts[i]->sub_resource_idx; + context->blit_targets[i].layer_count = rts[i]->layer_count; } if (rts[i] && rts[i]->format->id != WINED3DFMT_NULL) rt_mask |= (1u << i); @@ -2879,6 +2884,7 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat context->blit_targets[i].gl_view = fb->render_targets[i]->gl_view; context->blit_targets[i].resource = fb->render_targets[i]->resource; context->blit_targets[i].sub_resource_idx = fb->render_targets[i]->sub_resource_idx; + context->blit_targets[i].layer_count = fb->render_targets[i]->layer_count; } } context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8c3cd16..9bf3600 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4129,7 +4129,7 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi return WINED3DERR_INVALIDCALL; } - if (view->depth > 1) + if (view->layer_count > 1) { FIXME("Layered clears not implemented.\n"); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 4e503e8..294ed9a 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -419,7 +419,7 @@ static void wined3d_render_target_view_cs_init(void *object) depth_or_layer_count = texture->layer_count; if (resource->format->id != view->format->id - || (desc->u.texture.layer_count != 1 && desc->u.texture.layer_count != depth_or_layer_count)) + || (view->layer_count != 1 && view->layer_count != depth_or_layer_count)) { if (resource->format->gl_view_class != view->format->gl_view_class) { @@ -454,9 +454,9 @@ static HRESULT wined3d_rendertarget_view_init(struct wined3d_rendertarget_view * if (resource->type == WINED3D_RTYPE_BUFFER) { view->sub_resource_idx = 0; + view->layer_count = 1; view->width = desc->u.buffer.count; view->height = 1; - view->depth = 1; } else { @@ -465,9 +465,9 @@ static HRESULT wined3d_rendertarget_view_init(struct wined3d_rendertarget_view * view->sub_resource_idx = desc->u.texture.level_idx; if (resource->type != WINED3D_RTYPE_TEXTURE_3D) view->sub_resource_idx += desc->u.texture.layer_idx * texture->level_count; + view->layer_count = desc->u.texture.layer_count; view->width = wined3d_texture_get_level_width(texture, desc->u.texture.level_idx); view->height = wined3d_texture_get_level_height(texture, desc->u.texture.level_idx); - view->depth = desc->u.texture.layer_count; } wined3d_resource_incref(view->resource = resource); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5050ab4..b40e132 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1643,6 +1643,7 @@ struct wined3d_rendertarget_info struct wined3d_gl_view gl_view; struct wined3d_resource *resource; unsigned int sub_resource_idx; + unsigned int layer_count; }; #define MAX_GL_FRAGMENT_SAMPLERS 32 @@ -3394,10 +3395,10 @@ struct wined3d_rendertarget_view const struct wined3d_format *format; unsigned int format_flags; unsigned int sub_resource_idx; + unsigned int layer_count; unsigned int width; unsigned int height; - unsigned int depth; struct wined3d_view_desc desc; };

1 0

Józef Kucia : wined3d: Attach render target texture views to FBO.
by Alexandre Julliard April 10, 2017

April 10, 2017

Module: wine Branch: master Commit: e500cf7d973f002cab7d7a08e01803425b7473e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e500cf7d973f002cab7d7a08e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 10 12:27:42 2017 +0200 wined3d: Attach render target texture views to FBO. 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 | 6 ++++-- dlls/d3d11/tests/d3d11.c | 2 +- dlls/wined3d/context.c | 36 ++++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 13 +++++++------ 4 files changed, 36 insertions(+), 21 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index b0bc8f9..5665290 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -8457,7 +8457,9 @@ static void test_clear_render_target_view(void) check_texture_color(texture, expected_color, 1); } else - win_skip("D3D11 is not available, skipping test.\n"); + { + win_skip("D3D11 is not available.\n"); + } ID3D10Device_ClearRenderTargetView(device, srgb_rtv, color); check_texture_color(srgb_texture, expected_srgb_color, 1); @@ -8494,7 +8496,7 @@ static void test_clear_render_target_view(void) { BOOL broken_device = is_warp_device(device) || is_nvidia_device(device); DWORD color = get_readback_color(&rb, 80 + i * 160, 60 + j * 120); - todo_wine ok(compare_color(color, expected_srgb_color, 1) + ok(compare_color(color, expected_srgb_color, 1) || broken(compare_color(color, expected_color, 1) && broken_device), "Got unexpected color 0x%08x.\n", color); } diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 94fd367..897a929 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -8958,7 +8958,7 @@ static void test_clear_render_target_view(void) { BOOL broken_device = is_warp_device(device) || is_nvidia_device(device); DWORD color = get_readback_color(&rb, 80 + i * 160, 60 + j * 120); - todo_wine ok(compare_color(color, expected_srgb_color, 1) + ok(compare_color(color, expected_srgb_color, 1) || broken(compare_color(color, expected_color, 1) && broken_device), "Got unexpected color 0x%08x.\n", color); } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7c090d4..aaf9ab0 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -34,6 +34,7 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); WINE_DECLARE_DEBUG_CHANNEL(d3d_synchronous); #define WINED3D_MAX_FBO_ENTRIES 64 +#define WINED3D_ALL_LAYERS (~0u) static DWORD wined3d_context_tls_idx; @@ -127,27 +128,27 @@ static void context_attach_gl_texture_fbo(struct wined3d_context *context, { gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, attachment, GL_TEXTURE_2D, 0, 0); } - else if (resource->target == GL_TEXTURE_2D_ARRAY) + else if (resource->layer == WINED3D_ALL_LAYERS) { - if (!gl_info->fbo_ops.glFramebufferTextureLayer) + if (!gl_info->fbo_ops.glFramebufferTexture) { - FIXME("OpenGL implementation doesn't support glFramebufferTextureLayer().\n"); + FIXME("OpenGL implementation doesn't support glFramebufferTexture().\n"); return; } - gl_info->fbo_ops.glFramebufferTextureLayer(fbo_target, attachment, - resource->object, resource->level, resource->layer); + gl_info->fbo_ops.glFramebufferTexture(fbo_target, attachment, + resource->object, resource->level); } - else if (resource->target == GL_TEXTURE_3D) + else if (resource->target == GL_TEXTURE_2D_ARRAY) { - if (!gl_info->fbo_ops.glFramebufferTexture) + if (!gl_info->fbo_ops.glFramebufferTextureLayer) { - FIXME("OpenGL implementation doesn't support glFramebufferTexture().\n"); + FIXME("OpenGL implementation doesn't support glFramebufferTextureLayer().\n"); return; } - gl_info->fbo_ops.glFramebufferTexture(fbo_target, attachment, - resource->object, resource->level); + gl_info->fbo_ops.glFramebufferTextureLayer(fbo_target, attachment, + resource->object, resource->level, resource->layer); } else { @@ -401,6 +402,15 @@ static inline void context_set_fbo_key_for_render_target(const struct wined3d_co return; } + if (render_target->gl_view.name) + { + key->objects[idx].object = render_target->gl_view.name; + key->objects[idx].target = render_target->gl_view.target; + key->objects[idx].level = 0; + key->objects[idx].layer = WINED3D_ALL_LAYERS; + return; + } + texture = wined3d_texture_from_resource(resource); if (resource->type == WINED3D_RTYPE_TEXTURE_2D) { @@ -423,7 +433,7 @@ static inline void context_set_fbo_key_for_render_target(const struct wined3d_co { key->objects[idx].target = texture->target; key->objects[idx].level = sub_resource_idx % texture->level_count; - key->objects[idx].layer = 0; + key->objects[idx].layer = WINED3D_ALL_LAYERS; } switch (location) @@ -457,7 +467,7 @@ static void context_generate_fbo_key(const struct wined3d_context *context, struct wined3d_surface *depth_stencil_surface, DWORD color_location, DWORD ds_location) { - struct wined3d_rendertarget_info depth_stencil = {0}; + struct wined3d_rendertarget_info depth_stencil = {{0}}; unsigned int i; key->rb_namespace = 0; @@ -2732,6 +2742,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win { if (rts[i]) { + context->blit_targets[i].gl_view = rts[i]->gl_view; context->blit_targets[i].resource = rts[i]->resource; context->blit_targets[i].sub_resource_idx = rts[i]->sub_resource_idx; } @@ -2865,6 +2876,7 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat { if (fb->render_targets[i]) { + context->blit_targets[i].gl_view = fb->render_targets[i]->gl_view; context->blit_targets[i].resource = fb->render_targets[i]->resource; context->blit_targets[i].sub_resource_idx = fb->render_targets[i]->sub_resource_idx; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a2f6e1c..5050ab4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1632,8 +1632,15 @@ struct wined3d_timestamp_query void context_alloc_timestamp_query(struct wined3d_context *context, struct wined3d_timestamp_query *query) DECLSPEC_HIDDEN; void context_free_timestamp_query(struct wined3d_timestamp_query *query) DECLSPEC_HIDDEN; +struct wined3d_gl_view +{ + GLenum target; + GLuint name; +}; + struct wined3d_rendertarget_info { + struct wined3d_gl_view gl_view; struct wined3d_resource *resource; unsigned int sub_resource_idx; }; @@ -3375,12 +3382,6 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_box *box, const void *data) DECLSPEC_HIDDEN; -struct wined3d_gl_view -{ - GLenum target; - GLuint name; -}; - struct wined3d_rendertarget_view { LONG refcount;

1 0

Józef Kucia : wined3d: Create texture views for render target views.
by Alexandre Julliard April 10, 2017

April 10, 2017

Module: wine Branch: master Commit: d394a6b728366444f5226f0cbc79ec364ab0cbdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d394a6b728366444f5226f0cb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 10 12:27:40 2017 +0200 wined3d: Create texture views for render target 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/view.c | 64 ++++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 26 +++++++++-------- 2 files changed, 75 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index beb5853..4e503e8 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -281,7 +281,23 @@ ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *v static void wined3d_rendertarget_view_destroy_object(void *object) { - HeapFree(GetProcessHeap(), 0, object); + struct wined3d_rendertarget_view *view = object; + struct wined3d_device *device = view->resource->device; + + if (view->gl_view.name) + { + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + + context = context_acquire(device, NULL, 0); + gl_info = context->gl_info; + context_gl_resource_released(device, view->gl_view.name, FALSE); + gl_info->gl_ops.gl.p_glDeleteTextures(1, &view->gl_view.name); + checkGLcall("glDeleteTextures"); + context_release(context); + } + + HeapFree(GetProcessHeap(), 0, view); } ULONG CDECL wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *view) @@ -382,6 +398,46 @@ void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarg } } +static void wined3d_render_target_view_cs_init(void *object) +{ + struct wined3d_rendertarget_view *view = object; + struct wined3d_resource *resource = view->resource; + const struct wined3d_view_desc *desc = &view->desc; + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + FIXME("Not implemented for resources %s.\n", debug_d3dresourcetype(resource->type)); + } + else + { + struct wined3d_texture *texture = texture_from_resource(resource); + unsigned int depth_or_layer_count; + + if (resource->type == WINED3D_RTYPE_TEXTURE_3D) + depth_or_layer_count = wined3d_texture_get_level_depth(texture, desc->u.texture.level_idx); + else + depth_or_layer_count = texture->layer_count; + + if (resource->format->id != view->format->id + || (desc->u.texture.layer_count != 1 && desc->u.texture.layer_count != depth_or_layer_count)) + { + if (resource->format->gl_view_class != view->format->gl_view_class) + { + FIXME("Render target view not supported, resource format %s, view format %s.\n", + debug_d3dformat(resource->format->id), debug_d3dformat(view->format->id)); + return; + } + if (texture->swapchain && texture->swapchain->desc.backbuffer_count > 1) + { + FIXME("Swapchain views not supported.\n"); + return; + } + + create_texture_view(&view->gl_view, texture->target, desc, texture, view->format); + } + } +} + static HRESULT wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *view, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) @@ -393,11 +449,11 @@ static HRESULT wined3d_rendertarget_view_init(struct wined3d_rendertarget_view * if (!(view->format = validate_resource_view(desc, resource, TRUE))) return E_INVALIDARG; view->format_flags = view->format->flags[resource->gl_type]; + view->desc = *desc; if (resource->type == WINED3D_RTYPE_BUFFER) { view->sub_resource_idx = 0; - view->buffer_offset = desc->u.buffer.start_idx; view->width = desc->u.buffer.count; view->height = 1; view->depth = 1; @@ -409,13 +465,15 @@ static HRESULT wined3d_rendertarget_view_init(struct wined3d_rendertarget_view * view->sub_resource_idx = desc->u.texture.level_idx; if (resource->type != WINED3D_RTYPE_TEXTURE_3D) view->sub_resource_idx += desc->u.texture.layer_idx * texture->level_count; - view->buffer_offset = 0; view->width = wined3d_texture_get_level_width(texture, desc->u.texture.level_idx); view->height = wined3d_texture_get_level_height(texture, desc->u.texture.level_idx); view->depth = desc->u.texture.layer_count; } + wined3d_resource_incref(view->resource = resource); + wined3d_cs_init_object(resource->device->cs, wined3d_render_target_view_cs_init, view); + return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 761ef18..a2f6e1c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3375,6 +3375,12 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_box *box, const void *data) DECLSPEC_HIDDEN; +struct wined3d_gl_view +{ + GLenum target; + GLuint name; +}; + struct wined3d_rendertarget_view { LONG refcount; @@ -3383,14 +3389,16 @@ struct wined3d_rendertarget_view void *parent; const struct wined3d_parent_ops *parent_ops; + struct wined3d_gl_view gl_view; const struct wined3d_format *format; unsigned int format_flags; unsigned int sub_resource_idx; - unsigned int buffer_offset; unsigned int width; unsigned int height; unsigned int depth; + + struct wined3d_view_desc desc; }; static inline struct wined3d_surface *wined3d_rendertarget_view_get_surface( @@ -3409,12 +3417,6 @@ static inline struct wined3d_surface *wined3d_rendertarget_view_get_surface( void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarget_view *view, const struct wined3d_context *context, unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN; -struct wined3d_gl_view -{ - GLenum target; - GLuint name; -}; - struct wined3d_shader_resource_view { LONG refcount; @@ -3423,10 +3425,10 @@ struct wined3d_shader_resource_view void *parent; const struct wined3d_parent_ops *parent_ops; + struct wined3d_gl_view gl_view; const struct wined3d_format *format; - struct wined3d_view_desc desc; - struct wined3d_gl_view gl_view; + struct wined3d_view_desc desc; }; void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view, unsigned int unit, @@ -3440,11 +3442,11 @@ struct wined3d_unordered_access_view void *parent; const struct wined3d_parent_ops *parent_ops; - const struct wined3d_format *format; - struct wined3d_view_desc desc; - struct wined3d_gl_view gl_view; + const struct wined3d_format *format; GLuint counter_bo; + + struct wined3d_view_desc desc; }; void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_access_view *view,

1 0

Józef Kucia : wined3d: Allow copying 3D texture resources.
by Alexandre Julliard April 10, 2017

April 10, 2017

Module: wine Branch: master Commit: 291146b1477aac931b5e9750f1f40b9876518291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=291146b1477aac931b5e9750f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 10 12:27:38 2017 +0200 wined3d: Allow copying 3D texture 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/wined3d/device.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ce02af4..8c3cd16 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3887,12 +3887,6 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, return; } - if (dst_resource->type != WINED3D_RTYPE_TEXTURE_2D) - { - FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(dst_resource->type)); - return; - } - dst_texture = texture_from_resource(dst_resource); src_texture = texture_from_resource(src_resource);

1 0

Paul Gofman : d3dx9: Support effect state manager.
by Alexandre Julliard April 10, 2017

April 10, 2017

Module: wine Branch: master Commit: d6ab655a0936509628f5c8d5ef5e49653ad8fe03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6ab655a0936509628f5c8d5e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 10 20:45:43 2017 +0200 d3dx9: Support effect state manager. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 6 +++- dlls/d3dx9_36/effect.c | 75 +++++++++++++++++++++++++++---------------- dlls/d3dx9_36/preshader.c | 22 ++++++------- dlls/d3dx9_36/tests/effect.c | 2 -- 4 files changed, 64 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6ab655a0936509628f5c…

1 0

Stefan Dösinger : comctl32: Don' t touch the new child twice in PGM_SETCHILD.
by Alexandre Julliard April 10, 2017

April 10, 2017

Module: wine Branch: master Commit: 692656467729c5548c45244aa05ca946620afa72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=692656467729c5548c45244aa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 7 16:02:04 2017 +0200 comctl32: Don't touch the new child twice in PGM_SETCHILD. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/pager.c | 15 ++++----------- dlls/comctl32/tests/pager.c | 2 +- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index a10d3bb..ae759fb 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -248,10 +248,9 @@ PAGER_PositionChildWnd(PAGER_INFO* infoPtr) TRACE("[%p] SWP %dx%d at (%d,%d)\n", infoPtr->hwndSelf, infoPtr->nWidth, infoPtr->nHeight, -nPos, 0); - SetWindowPos(infoPtr->hwndChild, 0, + SetWindowPos(infoPtr->hwndChild, HWND_TOP, -nPos, 0, - infoPtr->nWidth, infoPtr->nHeight, - SWP_NOZORDER); + infoPtr->nWidth, infoPtr->nHeight, 0); } else { @@ -262,10 +261,9 @@ PAGER_PositionChildWnd(PAGER_INFO* infoPtr) TRACE("[%p] SWP %dx%d at (%d,%d)\n", infoPtr->hwndSelf, infoPtr->nWidth, infoPtr->nHeight, 0, -nPos); - SetWindowPos(infoPtr->hwndChild, 0, + SetWindowPos(infoPtr->hwndChild, HWND_TOP, 0, -nPos, - infoPtr->nWidth, infoPtr->nHeight, - SWP_NOZORDER); + infoPtr->nWidth, infoPtr->nHeight, 0); } InvalidateRect(infoPtr->hwndChild, NULL, TRUE); @@ -481,11 +479,6 @@ PAGER_SetChild (PAGER_INFO* infoPtr, HWND hwndChild) SetWindowPos(infoPtr->hwndSelf, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE); - /* position child within the page scroller */ - SetWindowPos(infoPtr->hwndChild, HWND_TOP, - 0,0,0,0, - SWP_SHOWWINDOW | SWP_NOSIZE); /* native is 0 */ - infoPtr->nPos = -1; PAGER_SetPos(infoPtr, 0, FALSE); } diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index e7ce748..7a9cdbb 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -283,7 +283,7 @@ static void test_pager(void) GetWindowRect(pager, &rect); ok(rect.right - rect.left == 100 && rect.bottom - rect.top == 100, "pager resized %dx%d\n", rect.right - rect.left, rect.bottom - rect.top); - todo_wine ok(!IsWindowVisible(child2_wnd), "Child window 2 is visible\n"); + ok(!IsWindowVisible(child2_wnd), "Child window 2 is visible\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); SendMessageA(pager, PGM_SETCHILD, 0, (LPARAM)child1_wnd);

1 0

Paul Gofman : d3dx9: Preserve states regardless of state manager presence.
by Alexandre Julliard April 10, 2017

April 10, 2017

Module: wine Branch: master Commit: 2b18cd43215144e3c81e10fb05b792b47c5f9467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b18cd43215144e3c81e10fb0… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 10 20:45:44 2017 +0200 d3dx9: Preserve states regardless of state manager presence. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 9 +++++++-- dlls/d3dx9_36/tests/effect.c | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 49409ae..813b57e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3788,7 +3788,7 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW if (flags & ~(D3DXFX_DONOTSAVESTATE | D3DXFX_DONOTSAVESAMPLERSTATE | D3DXFX_DONOTSAVESHADERSTATE)) WARN("Invalid flags (%#x) specified.\n", flags); - if (effect->manager || flags & D3DXFX_DONOTSAVESTATE) + if (flags & D3DXFX_DONOTSAVESTATE) { TRACE("State capturing disabled.\n"); } @@ -3799,12 +3799,17 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW if (!technique->saved_state) { + ID3DXEffectStateManager *manager; + + manager = effect->manager; + effect->manager = NULL; if (FAILED(hr = IDirect3DDevice9_BeginStateBlock(effect->device))) ERR("BeginStateBlock failed, hr %#x.\n", hr); for (i = 0; i < technique->pass_count; i++) d3dx9_apply_pass_states(effect, &technique->passes[i], TRUE); if (FAILED(hr = IDirect3DDevice9_EndStateBlock(effect->device, &technique->saved_state))) ERR("EndStateBlock failed, hr %#x.\n", hr); + effect->manager = manager; } if (FAILED(hr = IDirect3DStateBlock9_Capture(technique->saved_state))) ERR("StateBlock Capture failed, hr %#x.\n", hr); @@ -3883,7 +3888,7 @@ static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect *iface) if (!effect->started) return D3D_OK; - if (effect->manager || effect->flags & D3DXFX_DONOTSAVESTATE) + if (effect->flags & D3DXFX_DONOTSAVESTATE) { TRACE("State restoring disabled.\n"); } diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index fd41156..de5ae69 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -5673,7 +5673,6 @@ static void test_effect_state_manager(IDirect3DDevice9 *device) hr = IDirect3DDevice9_GetLight(device, i, &light); ok(hr == D3D_OK, "Got result %#x.\n", hr); - todo_wine ok(!memcmp(&light, &light_filler, sizeof(light)), "Light %u mismatch.\n", i); }

1 0

Józef Kucia : wined3d: Change GL internal format for R32_TYPELESS.
by Alexandre Julliard April 10, 2017

April 10, 2017

Module: wine Branch: master Commit: 73d57ce7a9a40359a485ba441c5322d6ed91da34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73d57ce7a9a40359a485ba441… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 10 12:27:41 2017 +0200 wined3d: Change GL internal format for R32_TYPELESS. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 959635b..0eacc82 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -238,9 +238,9 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R16G16_SINT, WINED3DFMT_R16G16_TYPELESS, "II"}, {WINED3DFMT_R16G16_FLOAT, WINED3DFMT_R16G16_TYPELESS, "FF"}, {WINED3DFMT_D32_FLOAT, WINED3DFMT_R32_TYPELESS, "D"}, + {WINED3DFMT_R32_FLOAT, WINED3DFMT_R32_TYPELESS, "F"}, {WINED3DFMT_R32_UINT, WINED3DFMT_R32_TYPELESS, "U"}, {WINED3DFMT_R32_SINT, WINED3DFMT_R32_TYPELESS, "I"}, - {WINED3DFMT_R32_FLOAT, WINED3DFMT_R32_TYPELESS, "F"}, {WINED3DFMT_R24_UNORM_X8_TYPELESS, WINED3DFMT_R24G8_TYPELESS, "DX"}, {WINED3DFMT_X24_TYPELESS_G8_UINT, WINED3DFMT_R24G8_TYPELESS, "XS"}, {WINED3DFMT_D24_UNORM_S8_UINT, WINED3DFMT_R24G8_TYPELESS, "DS"},

1 0

Józef Kucia : wined3d: Reuse view validation function for render target views.
by Alexandre Julliard April 10, 2017

April 10, 2017

Module: wine Branch: master Commit: 9e1d7a0fc3435703a5f88c648f710ebdfec85572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e1d7a0fc3435703a5f88c648… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 10 12:27:39 2017 +0200 wined3d: Reuse view validation function for render target 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/view.c | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 22fd7de..beb5853 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -70,7 +70,7 @@ static GLenum get_texture_view_target(const struct wined3d_gl_info *gl_info, return texture->target; } -static const struct wined3d_format *validate_shader_resource_view(const struct wined3d_view_desc *desc, +static const struct wined3d_format *validate_resource_view(const struct wined3d_view_desc *desc, struct wined3d_resource *resource, BOOL mip_slice) { const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; @@ -386,20 +386,13 @@ static HRESULT wined3d_rendertarget_view_init(struct wined3d_rendertarget_view * const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) { - const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; - view->refcount = 1; view->parent = parent; view->parent_ops = parent_ops; - view->format = wined3d_get_format(gl_info, desc->format_id, resource->usage); - view->format_flags = view->format->flags[resource->gl_type]; - - if (wined3d_format_is_typeless(view->format)) - { - WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(view->format->id)); + if (!(view->format = validate_resource_view(desc, resource, TRUE))) return E_INVALIDARG; - } + view->format_flags = view->format->flags[resource->gl_type]; if (resource->type == WINED3D_RTYPE_BUFFER) { @@ -412,19 +405,6 @@ static HRESULT wined3d_rendertarget_view_init(struct wined3d_rendertarget_view * else { struct wined3d_texture *texture = texture_from_resource(resource); - unsigned int depth_or_layer_count; - - if (resource->type == WINED3D_RTYPE_TEXTURE_3D) - depth_or_layer_count = wined3d_texture_get_level_depth(texture, desc->u.texture.level_idx); - else - depth_or_layer_count = texture->layer_count; - - if (desc->u.texture.level_idx >= texture->level_count - || desc->u.texture.level_count != 1 - || desc->u.texture.layer_idx >= depth_or_layer_count - || !desc->u.texture.layer_count - || desc->u.texture.layer_count > depth_or_layer_count - desc->u.texture.layer_idx) - return E_INVALIDARG; view->sub_resource_idx = desc->u.texture.level_idx; if (resource->type != WINED3D_RTYPE_TEXTURE_3D) @@ -600,7 +580,7 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ view->parent = parent; view->parent_ops = parent_ops; - if (!(view->format = validate_shader_resource_view(desc, resource, FALSE))) + if (!(view->format = validate_resource_view(desc, resource, FALSE))) return E_INVALIDARG; view->desc = *desc; @@ -797,7 +777,7 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces view->parent = parent; view->parent_ops = parent_ops; - if (!(view->format = validate_shader_resource_view(desc, resource, TRUE))) + if (!(view->format = validate_resource_view(desc, resource, TRUE))) return E_INVALIDARG; view->desc = *desc;

1 0