February 2017 - Wine-Commits

Henri Verbeet : wined3d: Use the command stream state in device_clear_render_targets().
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: 29326406c34c0dce4baab08e544e70ce0001c70a URL: http://source.winehq.org/git/wine.git/?a=commit;h=29326406c34c0dce4baab08e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 26 07:46:34 2017 +0100 wined3d: Use the command stream state in device_clear_render_targets(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 2 +- dlls/wined3d/device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 682b1d8..fa7c6dd 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -397,7 +397,7 @@ static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) state = &device->state; wined3d_get_draw_rect(state, &draw_rect); device_clear_render_targets(device, device->adapter->gl_info.limits.buffers, - &device->fb, op->rect_count, op->rects, &draw_rect, op->flags, + cs->state.fb, op->rect_count, op->rects, &draw_rect, op->flags, &op->color, op->depth, op->stencil); if (op->flags & WINED3DCLEAR_TARGET) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2b95f50..c3703a5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -223,7 +223,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c struct wined3d_surface *target = rtv ? wined3d_rendertarget_view_get_surface(rtv) : NULL; struct wined3d_rendertarget_view *dsv = fb->depth_stencil; struct wined3d_surface *depth_stencil = dsv ? wined3d_rendertarget_view_get_surface(dsv) : NULL; - const struct wined3d_state *state = &device->state; + const struct wined3d_state *state = &device->cs->state; const struct wined3d_gl_info *gl_info; UINT drawable_width, drawable_height; struct wined3d_color corrected_color;

1 0

Nikolay Sivov : ddraw: Remove references to IWineD3DDevice that doesn' t exist anymore.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: f55a10a07d5918c59cd8019a713ba4f4646987bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f55a10a07d5918c59cd8019a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 25 09:10:15 2017 +0300 ddraw: Remove references to IWineD3DDevice that doesn't exist anymore. 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/ddraw/ddraw.c | 4 +--- dlls/ddraw/device.c | 50 ++++++-------------------------------------------- dlls/ddraw/palette.c | 2 -- 3 files changed, 7 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f55a10a07d5918c59cd80…

1 0

Matteo Bruni : wined3d: Don' t require a separate sRGB GL texture if the format doesn' t support sRGB reads.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: ce77ef4ea0d38c9fe21584bbc777249f65092a57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce77ef4ea0d38c9fe21584bbc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 24 19:37:24 2017 +0100 wined3d: Don't require a separate sRGB GL texture if the format doesn't support sRGB reads. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7950011..4ccef50 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3914,11 +3914,11 @@ static inline void context_apply_state(struct wined3d_context *context, static inline BOOL needs_separate_srgb_gl_texture(const struct wined3d_context *context, const struct wined3d_texture *texture) { - unsigned int flags = texture->resource.format_flags; + unsigned int flags = texture->resource.format_flags + & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); return (!context->gl_info->supported[EXT_TEXTURE_SRGB_DECODE] - || (flags & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE)) - != (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE)) + || (flags && flags != (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE))) && context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL; }

1 0

Matteo Bruni : wined3d: Fix querying texture-related limits on core profile.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: 4f8c502ea75afe2dd01acf8288f0d1a90a333d87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f8c502ea75afe2dd01acf828… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 24 19:37:25 2017 +0100 wined3d: Fix querying texture-related limits on core profile. Signed-off-by: Matteo Bruni <mbruni(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 | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5b1605d..2b4fa10 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3346,8 +3346,8 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.blends = 1; gl_info->limits.buffers = 1; - gl_info->limits.textures = 1; - gl_info->limits.texture_coords = 1; + gl_info->limits.textures = 0; + gl_info->limits.texture_coords = 0; for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) gl_info->limits.uniform_blocks[i] = 0; gl_info->limits.fragment_samplers = 1; @@ -3412,23 +3412,33 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) } if (gl_info->supported[ARB_MULTITEXTURE]) { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &gl_max); - gl_info->limits.textures = min(MAX_TEXTURES, gl_max); - TRACE("Max textures: %d.\n", gl_info->limits.textures); + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + { + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &gl_max); + gl_info->limits.textures = min(MAX_TEXTURES, gl_max); + TRACE("Max textures: %d.\n", gl_info->limits.textures); + + if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) + { + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, &gl_max); + gl_info->limits.texture_coords = min(MAX_TEXTURES, gl_max); + } + else + { + gl_info->limits.texture_coords = gl_info->limits.textures; + } + TRACE("Max texture coords: %d.\n", gl_info->limits.texture_coords); + } - if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) + if (gl_info->supported[ARB_FRAGMENT_PROGRAM] || gl_info->supported[ARB_FRAGMENT_SHADER]) { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, &gl_max); - gl_info->limits.texture_coords = min(MAX_TEXTURES, gl_max); - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &gl_max); + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &gl_max); gl_info->limits.fragment_samplers = gl_max; } else { - gl_info->limits.texture_coords = max(gl_info->limits.texture_coords, gl_max); - gl_info->limits.fragment_samplers = max(gl_info->limits.fragment_samplers, gl_max); + gl_info->limits.fragment_samplers = gl_info->limits.textures; } - TRACE("Max texture coords: %d.\n", gl_info->limits.texture_coords); TRACE("Max fragment samplers: %d.\n", gl_info->limits.fragment_samplers); if (gl_info->supported[ARB_VERTEX_SHADER]) @@ -3475,6 +3485,12 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) TRACE("Max vertex attributes: %u.\n", gl_info->limits.vertex_attribs); gl_info->limits.graphics_samplers = gl_info->limits.combined_samplers; } + else + { + gl_info->limits.textures = 1; + gl_info->limits.texture_coords = 1; + } + if (gl_info->supported[ARB_VERTEX_BLEND]) { gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_VERTEX_UNITS_ARB, &gl_max);

1 0

Matteo Bruni : ddraw: Get rid of multiple interfaces from vertex buffer objects.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: 68709850f17d04bb908b5d4069dd06d1a0773f47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68709850f17d04bb908b5d406… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 24 19:37:26 2017 +0100 ddraw: Get rid of multiple interfaces from vertex buffer objects. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 4 +- dlls/ddraw/vertexbuffer.c | 164 +++------------------------------------------ 4 files changed, 12 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=68709850f17d04bb908b5…

1 0

Nikolay Sivov : dxgi: Fix naming in error traces.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: cb2b733b5a2f39b9fd7fa0f63c02663babb0a60d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb2b733b5a2f39b9fd7fa0f63… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 25 09:10:13 2017 +0300 dxgi: Fix naming in error traces. 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/dxgi/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 268b6f0..9e62e25 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -175,7 +175,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *ifac hr = IWineDXGIDevice_QueryInterface(iface, &IID_IWineDXGIDeviceParent, (void **)&dxgi_device_parent); if (FAILED(hr)) { - ERR("Device should implement IWineD3DDeviceParent\n"); + ERR("Device should implement IWineDXGIDeviceParent\n"); return E_FAIL; } @@ -405,7 +405,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l if (FAILED(hr = IWineDXGIDevice_QueryInterface(&device->IWineDXGIDevice_iface, &IID_IWineDXGIDeviceParent, (void **)&dxgi_device_parent))) { - ERR("DXGI device should implement IWineD3DDeviceParent.\n"); + ERR("DXGI device should implement IWineDXGIDeviceParent.\n"); IUnknown_Release(device->child_layer); wined3d_private_store_cleanup(&device->private_store); wined3d_mutex_unlock();

1 0

Hugh McMaster : regedit/tests: Test import with non-standard registry file headers.
by Alexandre Julliard Feb. 24, 2017

Feb. 24, 2017

Module: wine Branch: master Commit: 00bd109e1f7adf4018df29947b07a2e68ac85a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00bd109e1f7adf4018df29947… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Feb 24 11:33:49 2017 +0000 regedit/tests: Test import with non-standard registry file headers. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 56 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index f369b59..c82dfe3 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -415,6 +415,62 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "MixedQuotes"); verify_reg_nonexist(hkey, "MixedQuotes=Asdffdsa"); + /* Test import with non-standard registry file headers */ + exec_import_str("REGEDIT3\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test1\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test1"); + + exec_import_str("regedit4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test2\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test2"); + + exec_import_str("Regedit4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test3\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test3"); + + exec_import_str("REGEDIT 4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test4\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test4"); + + exec_import_str("REGEDIT4FOO\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test5\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test5"); + + exec_import_str("REGEDIT4 FOO\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test6\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test6"); + + exec_import_str("REGEDIT5\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test7\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test7"); + + exec_import_str("Windows Registry Editor Version 4.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test8\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test8"); + + exec_import_str("Windows Registry Editor Version 5\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test9\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test9"); + + exec_import_str("WINDOWS REGISTRY EDITOR VERSION 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test10\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test10"); + + exec_import_str("Windows Registry Editor version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test11\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test11"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Henri Verbeet : wined3d: Get rid of the depth/ stencil FIXME in texture_resource_sub_resource_unmap().
by Alexandre Julliard Feb. 24, 2017

Feb. 24, 2017

Module: wine Branch: master Commit: e3f55717e2e1230fd2243c6dc5aa42e6895b3cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3f55717e2e1230fd2243c6dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 24 08:10:31 2017 +0100 wined3d: Get rid of the depth/stencil FIXME in texture_resource_sub_resource_unmap(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1746404..20a6c0e 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1957,10 +1957,6 @@ static HRESULT texture_resource_sub_resource_unmap(struct wined3d_resource *reso if (!(sub_resource->locations & (WINED3D_LOCATION_DRAWABLE | WINED3D_LOCATION_TEXTURE_RGB))) texture->swapchain->swapchain_ops->swapchain_frontbuffer_updated(texture->swapchain); } - else if (resource->format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) - { - FIXME("Depth / stencil buffer locking is not implemented.\n"); - } --sub_resource->map_count; if (!--resource->map_count && texture->update_map_binding)

1 0

Józef Kucia : wined3d: Extract common code to validate_shader_resource_view().
by Alexandre Julliard Feb. 24, 2017

Feb. 24, 2017

Module: wine Branch: master Commit: f0bff11738b0858d370e2e7eefff03de0488df72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0bff11738b0858d370e2e7ee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 24 12:27:35 2017 +0100 wined3d: Extract common code to validate_shader_resource_view(). 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 | 214 ++++++++++++++++++++-------------------------------- 1 file changed, 83 insertions(+), 131 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index b64b5e7..a74a2ea 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -68,6 +68,82 @@ 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, + struct wined3d_resource *resource, BOOL mip_slice) +{ + const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; + const struct wined3d_format *format; + + format = wined3d_get_format(gl_info, desc->format_id, resource->usage); + if (resource->type == WINED3D_RTYPE_BUFFER && (desc->flags & WINED3D_VIEW_BUFFER_RAW)) + { + if (format->id != WINED3DFMT_R32_TYPELESS) + { + WARN("Invalid format %s for raw buffer view.\n", debug_d3dformat(format->id)); + return NULL; + } + + format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); + } + + if (wined3d_format_is_typeless(format)) + { + WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(format->id)); + return NULL; + } + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + struct wined3d_buffer *buffer = buffer_from_resource(resource); + unsigned int buffer_size, element_size; + + if (buffer->desc.structure_byte_stride) + { + if (desc->format_id != WINED3DFMT_UNKNOWN) + { + WARN("Invalid format %s for structured buffer view.\n", debug_d3dformat(desc->format_id)); + return NULL; + } + + format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); + element_size = buffer->desc.structure_byte_stride; + } + else + { + element_size = format->byte_count; + } + + if (!element_size) + return NULL; + + buffer_size = buffer->resource.size / element_size; + if (desc->u.buffer.start_idx >= buffer_size + || desc->u.buffer.count > buffer_size - desc->u.buffer.start_idx) + return NULL; + } + else + { + struct wined3d_texture *texture = texture_from_resource(resource); + unsigned int depth_or_layer_count; + + if (mip_slice && 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_count + || (mip_slice && desc->u.texture.level_count != 1) + || desc->u.texture.level_idx >= texture->level_count + || desc->u.texture.level_count > texture->level_count - desc->u.texture.level_idx + || !desc->u.texture.layer_count + || desc->u.texture.layer_idx >= depth_or_layer_count + || desc->u.texture.layer_count > depth_or_layer_count - desc->u.texture.layer_idx) + return NULL; + } + + return format; +} + static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target, const struct wined3d_view_desc *desc, struct wined3d_texture *texture, const struct wined3d_format *view_format) @@ -524,76 +600,16 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ 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; - const struct wined3d_format *view_format; - - view_format = wined3d_get_format(gl_info, desc->format_id, resource->usage); - if (resource->type == WINED3D_RTYPE_BUFFER && desc->flags & WINED3D_VIEW_BUFFER_RAW) - { - if (view_format->id != WINED3DFMT_R32_TYPELESS) - { - WARN("Invalid format %s for raw buffer view.\n", debug_d3dformat(view_format->id)); - return E_INVALIDARG; - } - - view_format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); - } - - if (wined3d_format_is_typeless(view_format)) - { - WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(view_format->id)); - return E_INVALIDARG; - } - - if (resource->type == WINED3D_RTYPE_BUFFER) - { - struct wined3d_buffer *buffer = buffer_from_resource(resource); - unsigned int buffer_size, element_size; - - if (buffer->desc.structure_byte_stride) - { - if (desc->format_id != WINED3DFMT_UNKNOWN) - { - WARN("Invalid format %s for structured buffer view.\n", debug_d3dformat(desc->format_id)); - return E_INVALIDARG; - } - - view_format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); - element_size = buffer->desc.structure_byte_stride; - } - else - { - element_size = view_format->byte_count; - } - - if (!element_size) - return E_INVALIDARG; - - buffer_size = buffer->resource.size / element_size; - if (desc->u.buffer.start_idx >= buffer_size - || desc->u.buffer.count > buffer_size - desc->u.buffer.start_idx) - return E_INVALIDARG; - } - else - { - struct wined3d_texture *texture = texture_from_resource(resource); - - if (!desc->u.texture.level_count - || desc->u.texture.level_idx >= texture->level_count - || desc->u.texture.level_count > texture->level_count - desc->u.texture.level_idx - || !desc->u.texture.layer_count - || desc->u.texture.layer_idx >= texture->layer_count - || desc->u.texture.layer_count > texture->layer_count - desc->u.texture.layer_idx) - return E_INVALIDARG; - } - view->refcount = 1; - wined3d_resource_incref(view->resource = resource); view->parent = parent; view->parent_ops = parent_ops; - view->format = view_format; + + if (!(view->format = validate_shader_resource_view(desc, resource, FALSE))) + return E_INVALIDARG; view->desc = *desc; + wined3d_resource_incref(view->resource = resource); + wined3d_cs_init_object(resource->device->cs, wined3d_shader_resource_view_cs_init, view); return WINED3D_OK; @@ -746,78 +762,14 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces 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->desc = *desc; - - if (resource->type == WINED3D_RTYPE_BUFFER && desc->flags & WINED3D_VIEW_BUFFER_RAW) - { - if (view->format->id != WINED3DFMT_R32_TYPELESS) - { - WARN("Invalid format %s for raw buffer view.\n", debug_d3dformat(view->format->id)); - return E_INVALIDARG; - } - - view->format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); - } - - 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_shader_resource_view(desc, resource, TRUE))) return E_INVALIDARG; - } - - if (resource->type == WINED3D_RTYPE_BUFFER) - { - struct wined3d_buffer *buffer = buffer_from_resource(resource); - unsigned int buffer_size, element_size; - - if (buffer->desc.structure_byte_stride) - { - if (desc->format_id != WINED3DFMT_UNKNOWN) - { - WARN("Invalid format %s for structured buffer view.\n", debug_d3dformat(desc->format_id)); - return E_INVALIDARG; - } - - view->format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); - element_size = buffer->desc.structure_byte_stride; - } - else - { - element_size = view->format->byte_count; - } - - if (!element_size) - return E_INVALIDARG; - - buffer_size = buffer->resource.size / element_size; - if (desc->u.buffer.start_idx >= buffer_size - || desc->u.buffer.count > buffer_size - desc->u.buffer.start_idx) - return E_INVALIDARG; - } - 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; + view->desc = *desc; - 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; - } wined3d_resource_incref(view->resource = resource); wined3d_cs_init_object(resource->device->cs, wined3d_unordered_access_view_cs_init, view);

1 0

Józef Kucia : wined3d: Handle structured resource declarations.
by Alexandre Julliard Feb. 24, 2017

Feb. 24, 2017

Module: wine Branch: master Commit: 7cdd18f392882de4d779129d8e519b3dd3830305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cdd18f392882de4d779129d8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 24 12:27:38 2017 +0100 wined3d: Handle structured resource declarations. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 13 +++++++++++++ dlls/wined3d/shader_sm4.c | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index eefc248..28a3b3b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9364,7 +9364,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_OUTPUT_SIV */ shader_glsl_nop, /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_glsl_nop, /* WINED3DSIH_DCL_RESOURCE_RAW */ shader_glsl_nop, - /* WINED3DSIH_DCL_RESOURCE_STRUCTURED */ NULL, + /* WINED3DSIH_DCL_RESOURCE_STRUCTURED */ shader_glsl_nop, /* WINED3DSIH_DCL_SAMPLER */ shader_glsl_nop, /* WINED3DSIH_DCL_STREAM */ NULL, /* WINED3DSIH_DCL_TEMPS */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 37c4352..14cb243 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1025,6 +1025,19 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st reg_maps->resource_info[reg_idx].data_type = WINED3D_DATA_UINT; reg_maps->resource_info[reg_idx].flags = WINED3D_VIEW_BUFFER_RAW; } + else if (ins.handler_idx == WINED3DSIH_DCL_RESOURCE_STRUCTURED) + { + unsigned int reg_idx = ins.declaration.structured_resource.reg.reg.idx[0].offset; + if (reg_idx >= ARRAY_SIZE(reg_maps->resource_info)) + { + ERR("Invalid resource index %u.\n", reg_idx); + break; + } + reg_maps->resource_info[reg_idx].type = WINED3D_SHADER_RESOURCE_BUFFER; + reg_maps->resource_info[reg_idx].data_type = WINED3D_DATA_UINT; + reg_maps->resource_info[reg_idx].flags = 0; + reg_maps->resource_info[reg_idx].stride = ins.declaration.structured_resource.byte_stride / 4; + } else if (ins.handler_idx == WINED3DSIH_DCL_SAMPLER) { if (ins.flags & WINED3DSI_SAMPLER_COMPARISON_MODE) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 877b27d..26aacc7 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -780,6 +780,8 @@ static void shader_sm5_read_dcl_resource_structured(struct wined3d_shader_instru { shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_RESOURCE, &ins->declaration.structured_resource.reg); ins->declaration.structured_resource.byte_stride = *tokens; + if (ins->declaration.structured_resource.byte_stride % 4) + FIXME("Byte stride %u is not multiple of 4.\n", ins->declaration.structured_resource.byte_stride); } static void shader_sm5_read_dcl_resource_raw(struct wined3d_shader_instruction *ins,

1 0