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

Nikolay Sivov : dwrite: Update to IDWriteFactory3.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: d04a54857cc84f881393e4bc794185650a302084 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d04a54857cc84f881393e4bc7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 28 13:33:57 2016 +0300 dwrite: Update to IDWriteFactory3. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 10 +- dlls/dwrite/dwrite_private.h | 16 +-- dlls/dwrite/font.c | 36 +++--- dlls/dwrite/gdiinterop.c | 14 +- dlls/dwrite/layout.c | 18 +-- dlls/dwrite/main.c | 297 +++++++++++++++++++++++++++++-------------- dlls/dwrite/tests/font.c | 3 +- 7 files changed, 253 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d04a54857cc84f881393e…

1 0

Alexandre Julliard : makefiles: Add tool dependencies for winegcc and winebuild.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 444025d7fb2d8612e20eaec667066522ce9ea52a URL: http://source.winehq.org/git/wine.git/?a=commit;h=444025d7fb2d8612e20eaec66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 12:27:32 2016 +0900 makefiles: Add tool dependencies for winegcc and winebuild. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/makedep.c b/tools/makedep.c index 98645db..9ad6e39 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2683,6 +2683,8 @@ static struct strarray output_sources( const struct makefile *make ) output_filenames_obj_dir( make, object_files ); output_filenames_obj_dir( make, res_files ); output_filenames( dep_libs ); + output_filename( tools_path( make, "winebuild" )); + output_filename( tools_path( make, "winegcc" )); output( "\n" ); output( "\t%s -o $@", tools_path( make, "winegcc" )); output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); @@ -2907,6 +2909,8 @@ static struct strarray output_sources( const struct makefile *make ) output_filenames_obj_dir( make, object_files ); output_filenames_obj_dir( make, res_files ); output_filenames( dep_libs ); + output_filename( tools_path( make, "winebuild" )); + output_filename( tools_path( make, "winegcc" )); output( "\n" ); if (!make->disabled) @@ -2929,6 +2933,8 @@ static struct strarray output_sources( const struct makefile *make ) output_filenames_obj_dir( make, crossobj_files ); output_filenames_obj_dir( make, res_files ); output_filenames( dep_libs ); + output_filename( tools_path( make, "winebuild" )); + output_filename( tools_path( make, "winegcc" )); output( "\n" ); output( "\t%s -o $@ -b %s", tools_path( make, "winegcc" ), crosstarget ); output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" )));

1 0

Alexandre Julliard : winegcc: Use explicit library file name when loading cross libraries.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 33147c94750099f09674b12ba27398b3b16082f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33147c94750099f09674b12ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 12:18:59 2016 +0900 winegcc: Use explicit library file name when loading cross libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 1dffe74..8b69053 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -958,7 +958,7 @@ static void build(struct options* opts) strarray_add(link_args, name); break; case 'a': - if (strchr(name, '/')) + if (!opts->lib_suffix && strchr(name, '/')) { /* turn the path back into -Ldir -lfoo options * this makes sure that we use the specified libs even

1 0

Józef Kucia : d3dx9: Avoid '\n' in middle of TRACE() message.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: eb7fc363f8dec30dd40b4d7146310600571edc42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb7fc363f8dec30dd40b4d714… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 25 14:26:26 2016 +0100 d3dx9: Avoid '\n' in middle of TRACE() message. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/volume.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index 5a006ef..7dc61cf 100644 --- a/dlls/d3dx9_36/volume.c +++ b/dlls/d3dx9_36/volume.c @@ -240,14 +240,16 @@ HRESULT WINAPI D3DXLoadVolumeFromFileInMemory(IDirect3DVolume9 *dst_volume, D3DBOX box; D3DXIMAGE_INFO image_info; - TRACE("dst_volume %p, dst_palette %p, dst_box %p, src_data %p, src_data_size %u, src_box %p,\n", - dst_volume, dst_palette, dst_box, src_data, src_data_size, src_box); - TRACE("filter %#x, color_key %#x, src_info %p.\n", filter, color_key, src_info); + TRACE("dst_volume %p, dst_palette %p, dst_box %p, src_data %p, src_data_size %u, src_box %p, " + "filter %#x, color_key 0x%08x, src_info %p.\n", + dst_volume, dst_palette, dst_box, src_data, src_data_size, src_box, + filter, color_key, src_info); - if (!dst_volume || !src_data) return D3DERR_INVALIDCALL; + if (!dst_volume || !src_data) + return D3DERR_INVALIDCALL; - hr = D3DXGetImageInfoFromFileInMemory(src_data, src_data_size, &image_info); - if (FAILED(hr)) return hr; + if (FAILED(hr = D3DXGetImageInfoFromFileInMemory(src_data, src_data_size, &image_info))) + return hr; if (src_box) {

1 0

Józef Kucia : d3dcompiler: Avoid '\n' in middle of TRACE() messages.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: c9df3cd980058789c8fb7116f2121e0e9a292f5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9df3cd980058789c8fb7116f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 25 14:26:27 2016 +0100 d3dcompiler: Avoid '\n' in middle of TRACE() messages. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/compiler.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 33ef916..17e58fe 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -471,8 +471,8 @@ HRESULT WINAPI D3DAssemble(const void *data, SIZE_T datasize, const char *filena { HRESULT hr; - TRACE("data %p, datasize %lu, filename %s, defines %p, include %p, sflags %#x,\n" - "shader %p, error_messages %p\n", + TRACE("data %p, datasize %lu, filename %s, defines %p, include %p, sflags %#x, " + "shader %p, error_messages %p.\n", data, datasize, debugstr_a(filename), defines, include, flags, shader, error_messages); EnterCriticalSection(&wpp_mutex); @@ -700,9 +700,9 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen { HRESULT hr; - TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s,\n" - "target %s, sflags %#x, eflags %#x, secondary_flags %#x, secondary_data %p,\n" - "secondary_data_size %lu, shader %p, error_messages %p\n", + TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s, " + "target %s, sflags %#x, eflags %#x, secondary_flags %#x, secondary_data %p, " + "secondary_data_size %lu, shader %p, error_messages %p.\n", data, data_size, debugstr_a(filename), defines, include, debugstr_a(entrypoint), debugstr_a(target), sflags, eflags, secondary_flags, secondary_data, secondary_data_size, shader, error_messages); @@ -728,8 +728,8 @@ HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filena const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages) { - TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s,\n" - "target %s, sflags %#x, eflags %#x, shader %p, error_messages %p\n", + TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s, " + "target %s, sflags %#x, eflags %#x, shader %p, error_messages %p.\n", data, data_size, debugstr_a(filename), defines, include, debugstr_a(entrypoint), debugstr_a(target), sflags, eflags, shader, error_messages);

1 0

Józef Kucia : wined3d: Recognize SM 4.1 ld2dms opcode.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 463980431f4ddb9616261be94afd1b31bc4af8bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=463980431f4ddb9616261be94… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 25 19:53:35 2016 +0100 wined3d: Recognize SM 4.1 ld2dms opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 99c21db..23219db 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5285,6 +5285,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ITOF */ NULL, /* WINED3DSIH_LABEL */ shader_hw_label, /* WINED3DSIH_LD */ NULL, + /* WINED3DSIH_LD2DMS */ NULL, /* WINED3DSIH_LD_STRUCTURED */ NULL, /* WINED3DSIH_LIT */ shader_hw_map2gl, /* WINED3DSIH_LOG */ shader_hw_scalar_op, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e6ef82a..79eec10 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8171,6 +8171,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ITOF */ shader_glsl_to_float, /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ shader_glsl_ld, + /* WINED3DSIH_LD2DMS */ NULL, /* WINED3DSIH_LD_STRUCTURED */ NULL, /* WINED3DSIH_LIT */ shader_glsl_lit, /* WINED3DSIH_LOG */ shader_glsl_scalar_op, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index db30868..f45fbb8 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -113,6 +113,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ITOF */ "itof", /* WINED3DSIH_LABEL */ "label", /* WINED3DSIH_LD */ "ld", + /* WINED3DSIH_LD2DMS */ "ld2dms", /* WINED3DSIH_LD_STRUCTURED */ "ld_structured", /* WINED3DSIH_LIT */ "lit", /* WINED3DSIH_LOG */ "log", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 86c5b1b..6e1fe5d 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -135,6 +135,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_ISHL = 0x29, WINED3D_SM4_OP_ITOF = 0x2b, WINED3D_SM4_OP_LD = 0x2d, + WINED3D_SM4_OP_LD2DMS = 0x2e, WINED3D_SM4_OP_LOG = 0x2f, WINED3D_SM4_OP_LOOP = 0x30, WINED3D_SM4_OP_LT = 0x31, @@ -341,6 +342,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_ISHL, WINED3DSIH_ISHL, "I", "II"}, {WINED3D_SM4_OP_ITOF, WINED3DSIH_ITOF, "F", "I"}, {WINED3D_SM4_OP_LD, WINED3DSIH_LD, "U", "IR"}, + {WINED3D_SM4_OP_LD2DMS, WINED3DSIH_LD2DMS, "U", "IRI"}, {WINED3D_SM4_OP_LOG, WINED3DSIH_LOG, "F", "F"}, {WINED3D_SM4_OP_LOOP, WINED3DSIH_LOOP, "", ""}, {WINED3D_SM4_OP_LT, WINED3DSIH_LT, "U", "FF"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 242268d..bc301b7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -565,6 +565,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ITOF, WINED3DSIH_LABEL, WINED3DSIH_LD, + WINED3DSIH_LD2DMS, WINED3DSIH_LD_STRUCTURED, WINED3DSIH_LIT, WINED3DSIH_LOG,

1 0

Józef Kucia : wined3d: Recognize SM5 dcl_resource_structured opcode.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: f294f56a5ac808f02464db4b1a3a81a97dd1738b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f294f56a5ac808f02464db4b1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 25 19:53:36 2016 +0100 wined3d: Recognize SM5 dcl_resource_structured opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 7 + dlls/wined3d/shader_sm4.c | 367 +++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 8 + 5 files changed, 204 insertions(+), 180 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f294f56a5ac808f02464d…

1 0

Józef Kucia : wined3d: Use lower case letters for simple data types in SM4 "opcode_table".
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: d5192995226f9fc217dcb8d0f3990da724650d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5192995226f9fc217dcb8d0f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 25 19:53:37 2016 +0100 wined3d: Use lower case letters for simple data types in SM4 "opcode_table". 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/shader_sm4.c | 146 +++++++++++++++++++++++----------------------- 1 file changed, 73 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d5192995226f9fc217dcb…

1 0

Józef Kucia : wined3d: Recognize SM5 dcl_uav_typed opcode.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 1bc6a15183ccb4306f72ec07b46fbe51f808aff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bc6a15183ccb4306f72ec07b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 25 19:53:38 2016 +0100 wined3d: Recognize SM5 dcl_uav_typed opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 14 +++++++++++--- dlls/wined3d/shader_sm4.c | 13 +++++++++++-- dlls/wined3d/wined3d_private.h | 3 +++ 5 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e42f2b4..8ef944d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5242,6 +5242,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_RESOURCE_STRUCTURED */ NULL, /* WINED3DSIH_DCL_SAMPLER */ NULL, /* WINED3DSIH_DCL_TEMPS */ NULL, + /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_hw_nop, /* WINED3DSIH_DEF */ shader_hw_nop, /* WINED3DSIH_DEFB */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4b0f2a1..716650a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8128,6 +8128,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_RESOURCE_STRUCTURED */ NULL, /* WINED3DSIH_DCL_SAMPLER */ shader_glsl_nop, /* WINED3DSIH_DCL_TEMPS */ shader_glsl_nop, + /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, /* WINED3DSIH_DEF */ shader_glsl_nop, /* WINED3DSIH_DEFB */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a0e707c..5aded18 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -70,6 +70,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_RESOURCE_STRUCTURED */ "dcl_resource_structured", /* WINED3DSIH_DCL_SAMPLER */ "dcl_sampler", /* WINED3DSIH_DCL_TEMPS */ "dcl_temps", + /* WINED3DSIH_DCL_UAV_TYPED */ "dcl_uav_typed", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", /* WINED3DSIH_DEF */ "def", /* WINED3DSIH_DEFB */ "defb", @@ -1310,9 +1311,12 @@ static void shader_dump_decl_usage(struct wined3d_string_buffer *buffer, break; } } - else if (semantic->reg.reg.type == WINED3DSPR_RESOURCE) + else if (semantic->reg.reg.type == WINED3DSPR_RESOURCE || semantic->reg.reg.type == WINED3DSPR_UAV) { - shader_addline(buffer, "_resource_"); + if (semantic->reg.reg.type == WINED3DSPR_RESOURCE) + shader_addline(buffer, "_resource_"); + else + shader_addline(buffer, "_uav_"); switch (semantic->resource_type) { case WINED3D_SHADER_RESOURCE_BUFFER: @@ -1572,6 +1576,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "t"); break; + case WINED3DSPR_UAV: + shader_addline(buffer, "u"); + break; + default: shader_addline(buffer, "<unhandled_rtype(%#x)>", reg->type); break; @@ -1953,7 +1961,7 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe continue; } - if (ins.handler_idx == WINED3DSIH_DCL) + if (ins.handler_idx == WINED3DSIH_DCL || ins.handler_idx == WINED3DSIH_DCL_UAV_TYPED) { shader_dump_decl_usage(&buffer, &ins.declaration.semantic, &shader_version); shader_dump_ins_modifiers(&buffer, &ins.declaration.semantic.reg); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 0923b63..cb3f18e 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -188,6 +188,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTX_FINE = 0x7b, WINED3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, + WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, }; @@ -205,6 +206,7 @@ enum wined3d_sm4_register_type WINED3D_SM4_RT_PRIMID = 0xb, WINED3D_SM4_RT_DEPTHOUT = 0xc, WINED3D_SM4_RT_NULL = 0xd, + WINED3D_SM5_RT_UAV = 0xe, }; enum wined3d_sm4_output_primitive_type @@ -304,6 +306,7 @@ struct wined3d_sm4_opcode_info * u -> WINED3D_DATA_UINT * R -> WINED3D_DATA_RESOURCE * S -> WINED3D_DATA_SAMPLER + * U -> WINED3D_DATA_UAV */ static const struct wined3d_sm4_opcode_info opcode_table[] = { @@ -396,6 +399,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DERIV_RTX_FINE, WINED3DSIH_DSX_FINE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTY_COARSE, WINED3DSIH_DSY_COARSE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, + {WINED3D_SM5_OP_DCL_UAV_TYPED, WINED3DSIH_DCL_UAV_TYPED, "", ""}, {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_RESOURCE_STRUCTURED, "", ""}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "u", "uuR"}, }; @@ -416,6 +420,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM4_RT_PRIMID */ WINED3DSPR_PRIMID, /* WINED3D_SM4_RT_DEPTHOUT */ WINED3DSPR_DEPTHOUT, /* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL, + /* WINED3D_SM5_RT_UAV */ WINED3DSPR_UAV, }; static const enum wined3d_primitive_type output_primitive_type_table[] = @@ -518,6 +523,8 @@ static enum wined3d_data_type map_data_type(char t) return WINED3D_DATA_RESOURCE; case 'S': return WINED3D_DATA_SAMPLER; + case 'U': + return WINED3D_DATA_UAV; default: ERR("Invalid data type '%c'.\n", t); return WINED3D_DATA_FLOAT; @@ -937,10 +944,11 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi memcpy(priv->icb.data, p, sizeof(*p) * icb_size); ins->declaration.icb = &priv->icb; } - else if (opcode == WINED3D_SM4_OP_DCL_RESOURCE) + else if (opcode == WINED3D_SM4_OP_DCL_RESOURCE || opcode == WINED3D_SM5_OP_DCL_UAV_TYPED) { enum wined3d_sm4_resource_type resource_type; enum wined3d_sm4_data_type data_type; + enum wined3d_data_type reg_data_type; DWORD components; resource_type = (opcode_token & WINED3D_SM4_RESOURCE_TYPE_MASK) >> WINED3D_SM4_RESOURCE_TYPE_SHIFT; @@ -953,7 +961,8 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi { ins->declaration.semantic.resource_type = resource_type_table[resource_type]; } - shader_sm4_read_dst_param(priv, &p, WINED3D_DATA_RESOURCE, &ins->declaration.semantic.reg); + reg_data_type = opcode == WINED3D_SM4_OP_DCL_RESOURCE ? WINED3D_DATA_RESOURCE : WINED3D_DATA_UAV; + shader_sm4_read_dst_param(priv, &p, reg_data_type, &ins->declaration.semantic.reg); components = *p++; if ((components & 0xfff0) != (components & 0xf) * 0x1110) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 390c494..d2970c4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -365,6 +365,7 @@ enum wined3d_shader_register_type WINED3DSPR_PRIMID, WINED3DSPR_NULL, WINED3DSPR_RESOURCE, + WINED3DSPR_UAV, }; enum wined3d_data_type @@ -373,6 +374,7 @@ enum wined3d_data_type WINED3D_DATA_INT, WINED3D_DATA_RESOURCE, WINED3D_DATA_SAMPLER, + WINED3D_DATA_UAV, WINED3D_DATA_UINT, WINED3D_DATA_UNORM, WINED3D_DATA_SNORM, @@ -522,6 +524,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_SAMPLER, WINED3DSIH_DCL_TEMPS, + WINED3DSIH_DCL_UAV_TYPED, WINED3DSIH_DCL_VERTICES_OUT, WINED3DSIH_DEF, WINED3DSIH_DEFB,

1 0

Józef Kucia : wined3d: Recognize SM5 store_uav_typed opcode.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 3c5ca08a2f63131c7ca0b28ac643d8c37ed59add URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c5ca08a2f63131c7ca0b28ac… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 25 19:53:39 2016 +0100 wined3d: Recognize SM5 store_uav_typed opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8ef944d..298107a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5334,6 +5334,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_SINCOS */ shader_hw_sincos, /* WINED3DSIH_SLT */ shader_hw_map2gl, /* WINED3DSIH_SQRT */ NULL, + /* WINED3DSIH_STORE_UAV_TYPED */ NULL, /* WINED3DSIH_SUB */ shader_hw_map2gl, /* WINED3DSIH_TEX */ pshader_hw_tex, /* WINED3DSIH_TEXBEM */ pshader_hw_texbem, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 716650a..53a9191 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8220,6 +8220,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SINCOS */ shader_glsl_sincos, /* WINED3DSIH_SLT */ shader_glsl_compare, /* WINED3DSIH_SQRT */ shader_glsl_map2gl, + /* WINED3DSIH_STORE_UAV_TYPED */ NULL, /* WINED3DSIH_SUB */ shader_glsl_binop, /* WINED3DSIH_TEX */ shader_glsl_tex, /* WINED3DSIH_TEXBEM */ shader_glsl_texbem, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 5aded18..7120a7f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -162,6 +162,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_SINCOS */ "sincos", /* WINED3DSIH_SLT */ "slt", /* WINED3DSIH_SQRT */ "sqrt", + /* WINED3DSIH_STORE_UAV_TYPED */ "store_uav_typed", /* WINED3DSIH_SUB */ "sub", /* WINED3DSIH_TEX */ "texld", /* WINED3DSIH_TEXBEM */ "texbem", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index cb3f18e..51110f8 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -190,6 +190,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, + WINED3D_SM5_OP_STORE_UAV_TYPED = 0xa4, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, }; @@ -401,6 +402,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, {WINED3D_SM5_OP_DCL_UAV_TYPED, WINED3DSIH_DCL_UAV_TYPED, "", ""}, {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_RESOURCE_STRUCTURED, "", ""}, + {WINED3D_SM5_OP_STORE_UAV_TYPED, WINED3DSIH_STORE_UAV_TYPED, "", "Uif"}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "u", "uuR"}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d2970c4..229f6fd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -616,6 +616,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_SINCOS, WINED3DSIH_SLT, WINED3DSIH_SQRT, + WINED3DSIH_STORE_UAV_TYPED, WINED3DSIH_SUB, WINED3DSIH_TEX, WINED3DSIH_TEXBEM,

1 0