wine-commits November 2016

wine-commits@winehq.org

2 participants
465 discussions

Nikolay Sivov : gdiplus/tests: A couple more GdipSetPenCompoundArray() tests.
by Alexandre Julliard 29 Nov '16

29 Nov '16

Module: wine Branch: master Commit: 8e8c991cd72a5a47c89fc5faa525c8fbba94cad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e8c991cd72a5a47c89fc5faa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 29 08:18:32 2016 +0300 gdiplus/tests: A couple more GdipSetPenCompoundArray() tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/pen.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 2cdb44a..19a180b 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -364,6 +364,8 @@ todo_wine { expect(Ok, status); ok(count == 0, "Unexpected compound count %d\n", count); } + status = GdipSetPenCompoundArray(pen, NULL, 0); + expect(InvalidParameter, status); status = GdipSetPenCompoundArray(pen, NULL, 4); expect(InvalidParameter, status); status = GdipSetPenCompoundArray(pen, testvalues, 3); @@ -375,6 +377,8 @@ todo_wine { status = GdipSetPenCompoundArray(pen, testvalues, 4); todo_wine expect(Ok, status); + status = GdipSetPenCompoundArray(pen, NULL, 0); + expect(InvalidParameter, status); count = 0; status = GdipGetPenCompoundCount(pen, &count);

1 0

Nikolay Sivov : gdiplus/tests: Some tests for GdipGetPenCompoundCount().
by Alexandre Julliard 29 Nov '16

29 Nov '16

Module: wine Branch: master Commit: 919d9facea33b8d3da30bfdb62ccfecb19db0cd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=919d9facea33b8d3da30bfdb6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 29 08:18:31 2016 +0300 gdiplus/tests: Some tests for GdipGetPenCompoundCount(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/pen.c | 19 +++++++++++++++++++ include/gdiplusflat.h | 1 + 2 files changed, 20 insertions(+) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 8591a3a..2cdb44a 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -344,6 +344,7 @@ static void test_compoundarray(void) GpStatus status; GpPen *pen; static const REAL testvalues[] = {0.2, 0.4, 0.6, 0.8}; + INT count; status = GdipSetPenCompoundArray(NULL, testvalues, 4); expect(InvalidParameter, status); @@ -351,6 +352,18 @@ static void test_compoundarray(void) status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); expect(Ok, status); + status = GdipGetPenCompoundCount(NULL, NULL); + expect(InvalidParameter, status); + + status = GdipGetPenCompoundCount(pen, NULL); + expect(InvalidParameter, status); + + count = 10; + status = GdipGetPenCompoundCount(pen, &count); +todo_wine { + expect(Ok, status); + ok(count == 0, "Unexpected compound count %d\n", count); +} status = GdipSetPenCompoundArray(pen, NULL, 4); expect(InvalidParameter, status); status = GdipSetPenCompoundArray(pen, testvalues, 3); @@ -363,6 +376,12 @@ static void test_compoundarray(void) status = GdipSetPenCompoundArray(pen, testvalues, 4); todo_wine expect(Ok, status); + count = 0; + status = GdipGetPenCompoundCount(pen, &count); +todo_wine { + expect(Ok, status); + ok(count == 4, "Unexpected compound count %d\n", count); +} GdipDeletePen(pen); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 0c40223..101d73d 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -616,6 +616,7 @@ GpStatus WINGDIPAPI GdipCreatePen2(GpBrush*,REAL,GpUnit,GpPen**); GpStatus WINGDIPAPI GdipDeletePen(GpPen*); GpStatus WINGDIPAPI GdipGetPenBrushFill(GpPen*,GpBrush**); GpStatus WINGDIPAPI GdipGetPenColor(GpPen*,ARGB*); +GpStatus WINGDIPAPI GdipGetPenCompoundCount(GpPen*,INT*); GpStatus WINGDIPAPI GdipGetPenCustomStartCap(GpPen*,GpCustomLineCap**); GpStatus WINGDIPAPI GdipGetPenCustomEndCap(GpPen*,GpCustomLineCap**); GpStatus WINGDIPAPI GdipGetPenDashArray(GpPen*,REAL*,INT);

1 0

Józef Kucia : wined3d: Implement SM5 ld_uav_typed instruction.
by Alexandre Julliard 29 Nov '16

29 Nov '16

Module: wine Branch: master Commit: fae0f7309ef362a4c557656b54cf5ff2b7f99b7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fae0f7309ef362a4c557656b5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 29 12:06:31 2016 +0100 wined3d: Implement SM5 ld_uav_typed 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/wined3d/glsl_shader.c | 36 +++++++++++++++++++++++++++++++++++- dlls/wined3d/shader.c | 9 +++++++-- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ca91908..c95dc00 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4773,6 +4773,40 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) image_coord_param.param_str, image_data_param.param_str); } +static void shader_glsl_ld_uav(const struct wined3d_shader_instruction *ins) +{ + const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + const struct wined3d_shader_version *version = &reg_maps->shader_version; + enum wined3d_shader_resource_type resource_type; + struct glsl_src_param image_coord_param; + enum wined3d_data_type data_type; + DWORD coord_mask, write_mask; + unsigned int uav_idx; + char dst_swizzle[6]; + + uav_idx = ins->src[1].reg.idx[0].offset; + if (uav_idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) + { + ERR("Invalid UAV index %u.\n", uav_idx); + return; + } + resource_type = reg_maps->uav_resource_info[uav_idx].type; + if (resource_type >= ARRAY_SIZE(resource_type_info)) + { + ERR("Unexpected resource type %#x.\n", resource_type); + resource_type = WINED3D_SHADER_RESOURCE_TEXTURE_2D; + } + data_type = reg_maps->uav_resource_info[uav_idx].data_type; + coord_mask = (1u << resource_type_info[resource_type].coord_size) - 1; + + write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &ins->dst[0], data_type); + shader_glsl_get_swizzle(&ins->src[1], FALSE, write_mask, dst_swizzle); + + shader_glsl_add_src_param(ins, &ins->src[0], coord_mask, &image_coord_param); + shader_addline(ins->ctx->buffer, "imageLoad(%s_image%u, %s)%s);\n", + shader_glsl_get_prefix(version->type), uav_idx, image_coord_param.param_str, dst_swizzle); +} + static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_version *version = &ins->ctx->reg_maps->shader_version; @@ -8937,7 +8971,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_LD2DMS */ NULL, /* WINED3DSIH_LD_RAW */ NULL, /* WINED3DSIH_LD_STRUCTURED */ NULL, - /* WINED3DSIH_LD_UAV_TYPED */ NULL, + /* WINED3DSIH_LD_UAV_TYPED */ shader_glsl_ld_uav, /* WINED3DSIH_LIT */ shader_glsl_lit, /* WINED3DSIH_LOD */ NULL, /* WINED3DSIH_LOG */ shader_glsl_scalar_op, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e1c097a..eadf331 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1228,9 +1228,14 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } } - if (ins.handler_idx == WINED3DSIH_ATOMIC_IADD) + if (ins.handler_idx == WINED3DSIH_ATOMIC_IADD + || ins.handler_idx == WINED3DSIH_LD_UAV_TYPED) { - unsigned int reg_idx = ins.dst[0].reg.idx[0].offset; + unsigned int reg_idx; + if (ins.handler_idx == WINED3DSIH_ATOMIC_IADD) + reg_idx = ins.dst[0].reg.idx[0].offset; + else + reg_idx = ins.src[1].reg.idx[0].offset; if (reg_idx >= MAX_UNORDERED_ACCESS_VIEWS) { ERR("Invalid UAV index %u.\n", reg_idx);

1 0

Józef Kucia : wined3d: Extend resinfo instruction to support UAVs.
by Alexandre Julliard 29 Nov '16

29 Nov '16

Module: wine Branch: master Commit: 752c14462e5b86d51d6f36be87f51888abdd1dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=752c14462e5b86d51d6f36be8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 29 12:06:30 2016 +0100 wined3d: Extend resinfo instruction to support UAVs. 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 | 50 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0d9eb67..ca91908 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4778,7 +4778,8 @@ static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) const struct wined3d_shader_version *version = &ins->ctx->reg_maps->shader_version; const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; enum wined3d_shader_resource_type resource_type; - unsigned int resource_idx, sampler_bind_idx, i; + enum wined3d_shader_register_type reg_type; + unsigned int resource_idx, bind_idx, i; enum wined3d_data_type dst_data_type; struct glsl_src_param lod_param; char dst_swizzle[6]; @@ -4793,11 +4794,20 @@ static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &ins->dst[0], dst_data_type); shader_glsl_get_swizzle(&ins->src[1], FALSE, write_mask, dst_swizzle); + reg_type = ins->src[1].reg.type; resource_idx = ins->src[1].reg.idx[0].offset; - resource_type = ins->ctx->reg_maps->resource_info[resource_idx].type; shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &lod_param); - sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, - resource_idx, WINED3D_SAMPLER_DEFAULT); + if (reg_type == WINED3DSPR_RESOURCE) + { + resource_type = ins->ctx->reg_maps->resource_info[resource_idx].type; + bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, + resource_idx, WINED3D_SAMPLER_DEFAULT); + } + else + { + resource_type = ins->ctx->reg_maps->uav_resource_info[resource_idx].type; + bind_idx = resource_idx; + } if (resource_type >= ARRAY_SIZE(resource_type_info)) { @@ -4810,20 +4820,34 @@ static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) else shader_addline(ins->ctx->buffer, "vec4("); - shader_addline(ins->ctx->buffer, "textureSize(%s_sampler%u, %s), ", - shader_glsl_get_prefix(version->type), sampler_bind_idx, lod_param.param_str); + if (reg_type == WINED3DSPR_RESOURCE) + { + shader_addline(ins->ctx->buffer, "textureSize(%s_sampler%u, %s), ", + shader_glsl_get_prefix(version->type), bind_idx, lod_param.param_str); - for (i = 0; i < 3 - resource_type_info[resource_type].resinfo_size; ++i) - shader_addline(ins->ctx->buffer, "0, "); + for (i = 0; i < 3 - resource_type_info[resource_type].resinfo_size; ++i) + shader_addline(ins->ctx->buffer, "0, "); - if (gl_info->supported[ARB_TEXTURE_QUERY_LEVELS]) - { - shader_addline(ins->ctx->buffer, "textureQueryLevels(%s_sampler%u)", - shader_glsl_get_prefix(version->type), sampler_bind_idx); + if (gl_info->supported[ARB_TEXTURE_QUERY_LEVELS]) + { + shader_addline(ins->ctx->buffer, "textureQueryLevels(%s_sampler%u)", + shader_glsl_get_prefix(version->type), bind_idx); + } + else + { + FIXME("textureQueryLevels is not supported, returning 1 mipmap level.\n"); + shader_addline(ins->ctx->buffer, "1"); + } } else { - FIXME("textureQueryLevels is not supported, returning 1 mipmap level.\n"); + shader_addline(ins->ctx->buffer, "imageSize(%s_image%u), ", + shader_glsl_get_prefix(version->type), bind_idx); + + for (i = 0; i < 3 - resource_type_info[resource_type].resinfo_size; ++i) + shader_addline(ins->ctx->buffer, "0, "); + + /* For UAVs the returned miplevel count is always 1. */ shader_addline(ins->ctx->buffer, "1"); }

1 0

Józef Kucia : wined3d: Add ARB_shader_image_size extension.
by Alexandre Julliard 29 Nov '16

29 Nov '16

Module: wine Branch: master Commit: 8fa59b8d10e3cf98e7cce8948caee80efddb7f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fa59b8d10e3cf98e7cce8948… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 29 12:06:29 2016 +0100 wined3d: Add ARB_shader_image_size extension. 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 | 5 ++++- dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5b56ae4..f3bb385 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -146,6 +146,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_sampler_objects", ARB_SAMPLER_OBJECTS }, {"GL_ARB_shader_bit_encoding", ARB_SHADER_BIT_ENCODING }, {"GL_ARB_shader_image_load_store", ARB_SHADER_IMAGE_LOAD_STORE }, + {"GL_ARB_shader_image_size", ARB_SHADER_IMAGE_SIZE }, {"GL_ARB_shader_texture_lod", ARB_SHADER_TEXTURE_LOD }, {"GL_ARB_shading_language_100", ARB_SHADING_LANGUAGE_100 }, {"GL_ARB_shadow", ARB_SHADOW }, @@ -3632,6 +3633,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_DEBUG_OUTPUT, MAKEDWORD_VERSION(4, 3)}, {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, + {ARB_SHADER_IMAGE_SIZE, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_QUERY_LEVELS, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_VIEW, MAKEDWORD_VERSION(4, 3)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 74a6060..0d9eb67 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5995,6 +5995,8 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, shader_addline(buffer, "#extension GL_ARB_shader_bit_encoding : enable\n"); if (gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE]) shader_addline(buffer, "#extension GL_ARB_shader_image_load_store : enable\n"); + if (gl_info->supported[ARB_SHADER_IMAGE_SIZE]) + shader_addline(buffer, "#extension GL_ARB_shader_image_size : 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]) @@ -8731,7 +8733,8 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s * accordingly. */ if (gl_info->glsl_version >= MAKEDWORD_VERSION(4, 30) && gl_info->supported[WINED3D_GL_VERSION_4_3] && gl_info->supported[ARB_DERIVATIVE_CONTROL] - && gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE]) + && gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE] + && gl_info->supported[ARB_SHADER_IMAGE_SIZE]) shader_model = 5; else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) && gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_SAMPLER_OBJECTS] diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index d0b3102..2bafa89 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -79,6 +79,7 @@ enum wined3d_gl_extension ARB_SAMPLER_OBJECTS, ARB_SHADER_BIT_ENCODING, ARB_SHADER_IMAGE_LOAD_STORE, + ARB_SHADER_IMAGE_SIZE, ARB_SHADER_TEXTURE_LOD, ARB_SHADING_LANGUAGE_100, ARB_SHADOW,

1 0

Józef Kucia : wined3d: Implement wined3d_unordered_access_view_invalidate_location() for 3D textures.
by Alexandre Julliard 29 Nov '16

29 Nov '16

Module: wine Branch: master Commit: 03ceb5fa84ecbc9f76339c542271c9fbc58a3d87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03ceb5fa84ecbc9f76339c542… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 29 12:06:28 2016 +0100 wined3d: Implement wined3d_unordered_access_view_invalidate_location() for 3D textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index e2b52ef..86d3ebb 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -508,11 +508,10 @@ void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_ DWORD location) { struct wined3d_resource *resource = view->resource; + unsigned int i, sub_resource_idx, layer_count; struct wined3d_texture *texture; - unsigned int sub_resource_idx; - unsigned int i; - if (resource->type == WINED3D_RTYPE_BUFFER || resource->type == WINED3D_RTYPE_TEXTURE_3D) + if (resource->type == WINED3D_RTYPE_BUFFER) { FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); return; @@ -521,7 +520,8 @@ void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_ texture = texture_from_resource(resource); sub_resource_idx = view->layer_idx * texture->level_count + view->level_idx; - for (i = 0; i < view->layer_count; ++i, sub_resource_idx += texture->level_count) + layer_count = (resource->type != WINED3D_RTYPE_TEXTURE_3D) ? view->layer_count : 1; + for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) wined3d_texture_invalidate_location(texture, sub_resource_idx, location); }

1 0

Józef Kucia : wined3d: Unbind image textures in context_bind_unordered_access_views().
by Alexandre Julliard 29 Nov '16

29 Nov '16

Module: wine Branch: master Commit: 66aa910bd0395de5a0bed604e08861000ad287b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66aa910bd0395de5a0bed604e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 29 12:06:27 2016 +0100 wined3d: Unbind image textures in context_bind_unordered_access_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 | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 989daf2..727f074 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3409,6 +3409,7 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, if (!(view = state->unordered_access_view[i])) { WARN("No unordered access view bound at index %u.\n", i); + GL_EXTCALL(glBindImageTexture(i, 0, 0, GL_FALSE, 0, GL_READ_WRITE, GL_R8)); continue; }

1 0

Józef Kucia : d3d11: Fix d3d11_immediate_context_OMSetRenderTargetsAndUnorderedAccessViews().
by Alexandre Julliard 29 Nov '16

29 Nov '16

Module: wine Branch: master Commit: 3f9fb98ab33a82cd66209dcc116aa8d4dddf8b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f9fb98ab33a82cd66209dcc1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 29 12:06:26 2016 +0100 d3d11: Fix d3d11_immediate_context_OMSetRenderTargetsAndUnorderedAccessViews(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 1765591..16230c5 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -671,7 +671,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargetsAndUnord } for (; unordered_access_view_start_slot + i < D3D11_PS_CS_UAV_REGISTER_COUNT; ++i) { - wined3d_device_set_unordered_access_view(device->wined3d_device, i, NULL); + wined3d_device_set_unordered_access_view(device->wined3d_device, + unordered_access_view_start_slot + i, NULL); } wined3d_mutex_unlock(); }

1 0

Józef Kucia : d3d10core/tests: Add test for shader input register limits.
by Alexandre Julliard 29 Nov '16

29 Nov '16

Module: wine Branch: master Commit: 0e415b5d7dcbbcd04bab4023de1d25eec4f29393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e415b5d7dcbbcd04bab4023d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 29 12:06:25 2016 +0100 d3d10core/tests: Add test for shader input register limits. 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 | 98 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 18e6753..3db875c 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -9767,6 +9767,103 @@ float4 main(struct ps_data ps_input) : SV_Target release_test_context(&test_context); } +static void test_shader_input_registers_limits(void) +{ + struct d3d10core_test_context test_context; + D3D10_SUBRESOURCE_DATA resource_data; + D3D10_TEXTURE2D_DESC texture_desc; + D3D10_SAMPLER_DESC sampler_desc; + ID3D10ShaderResourceView *srv; + ID3D10SamplerState *sampler; + ID3D10Texture2D *texture; + ID3D10PixelShader *ps; + ID3D10Device *device; + HRESULT hr; + + static const DWORD ps_last_register_code[] = + { +#if 0 + Texture2D t : register(t127); + SamplerState s : register(s15); + + void main(out float4 target : SV_Target) + { + target = t.Sample(s, float2(0, 0)); + } +#endif + 0x43425844, 0xd81ff2f8, 0x8c704b9c, 0x8c6f4857, 0xd02949ac, 0x00000001, 0x000000dc, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000064, 0x00000040, 0x00000019, + 0x0300005a, 0x00106000, 0x0000000f, 0x04001858, 0x00107000, 0x0000007f, 0x00005555, 0x03000065, + 0x001020f2, 0x00000000, 0x0c000045, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00107e46, 0x0000007f, 0x00106000, 0x0000000f, 0x0100003e, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const DWORD texture_data[] = {0xff00ff00}; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + texture_desc.Width = 1; + texture_desc.Height = 1; + texture_desc.MipLevels = 0; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + resource_data.pSysMem = texture_data; + resource_data.SysMemPitch = sizeof(texture_data); + resource_data.SysMemSlicePitch = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &srv); + ok(SUCCEEDED(hr), "Failed to create shader resource view, hr %#x.\n", hr); + + sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.AddressU = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressV = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D10_COMPARISON_NEVER; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 0.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 0.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = 0.0f; + + hr = ID3D10Device_CreateSamplerState(device, &sampler_desc, &sampler); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + + hr = ID3D10Device_CreatePixelShader(device, ps_last_register_code, sizeof(ps_last_register_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + + ID3D10Device_PSSetShaderResources(device, + D3D10_COMMONSHADER_INPUT_RESOURCE_REGISTER_COUNT - 1, 1, &srv); + ID3D10Device_PSSetSamplers(device, D3D10_COMMONSHADER_SAMPLER_REGISTER_COUNT - 1, 1, &sampler); + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 1); + + ID3D10PixelShader_Release(ps); + ID3D10SamplerState_Release(sampler); + ID3D10ShaderResourceView_Release(srv); + ID3D10Texture2D_Release(texture); + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -9821,4 +9918,5 @@ START_TEST(device) test_line_antialiasing_blending(); test_required_format_support(); test_ddy(); + test_shader_input_registers_limits(); }

1 0

Józef Kucia : d3d11/tests: Add test for shader input register limits.
by Alexandre Julliard 29 Nov '16

29 Nov '16

Module: wine Branch: master Commit: eb3f7b92b5afef1d32a9abd1a13e5d1d2e3b7ceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb3f7b92b5afef1d32a9abd1a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 29 12:06:24 2016 +0100 d3d11/tests: Add test for shader input register limits. 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 | 100 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 703800f..fd231d2 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11163,6 +11163,105 @@ float4 main(struct ps_data ps_input) : SV_Target release_test_context(&test_context); } +static void test_shader_input_registers_limits(void) +{ + struct d3d11_test_context test_context; + D3D11_SUBRESOURCE_DATA resource_data; + D3D11_TEXTURE2D_DESC texture_desc; + D3D11_SAMPLER_DESC sampler_desc; + ID3D11ShaderResourceView *srv; + ID3D11DeviceContext *context; + ID3D11SamplerState *sampler; + ID3D11Texture2D *texture; + ID3D11PixelShader *ps; + ID3D11Device *device; + HRESULT hr; + + static const DWORD ps_last_register_code[] = + { +#if 0 + Texture2D t : register(t127); + SamplerState s : register(s15); + + void main(out float4 target : SV_Target) + { + target = t.Sample(s, float2(0, 0)); + } +#endif + 0x43425844, 0xd81ff2f8, 0x8c704b9c, 0x8c6f4857, 0xd02949ac, 0x00000001, 0x000000dc, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000064, 0x00000040, 0x00000019, + 0x0300005a, 0x00106000, 0x0000000f, 0x04001858, 0x00107000, 0x0000007f, 0x00005555, 0x03000065, + 0x001020f2, 0x00000000, 0x0c000045, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00107e46, 0x0000007f, 0x00106000, 0x0000000f, 0x0100003e, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const DWORD texture_data[] = {0xff00ff00}; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + texture_desc.Width = 1; + texture_desc.Height = 1; + texture_desc.MipLevels = 0; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + resource_data.pSysMem = texture_data; + resource_data.SysMemPitch = sizeof(texture_data); + resource_data.SysMemSlicePitch = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srv); + ok(SUCCEEDED(hr), "Failed to create shader resource view, hr %#x.\n", hr); + + sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D11_COMPARISON_NEVER; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 0.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 0.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = 0.0f; + + hr = ID3D11Device_CreateSamplerState(device, &sampler_desc, &sampler); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + + hr = ID3D11Device_CreatePixelShader(device, ps_last_register_code, sizeof(ps_last_register_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + ID3D11DeviceContext_PSSetShaderResources(context, + D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_COUNT - 1, 1, &srv); + ID3D11DeviceContext_PSSetSamplers(context, D3D11_COMMONSHADER_SAMPLER_REGISTER_COUNT - 1, 1, &sampler); + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 1); + + ID3D11PixelShader_Release(ps); + ID3D11SamplerState_Release(sampler); + ID3D11ShaderResourceView_Release(srv); + ID3D11Texture2D_Release(texture); + release_test_context(&test_context); +} + START_TEST(d3d11) { test_create_device(); @@ -11224,4 +11323,5 @@ START_TEST(d3d11) run_for_each_feature_level(test_required_format_support); run_for_each_9_x_feature_level(test_fl9_draw); test_ddy(); + test_shader_input_registers_limits(); }

1 0

← Newer
1
2
3
4
5
6
7
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2016