wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Józef Kucia : d3d10core/tests: Add test for layered rendering.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: f64b0431e75b626c908858d13e07840fc56f2389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f64b0431e75b626c908858d13… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 21 10:59:57 2017 +0200 d3d10core/tests: Add test for layered rendering. 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 | 209 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 209 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f64b0431e75b626c90885…

1 0

Józef Kucia : d3d11/tests: Add test for layered rendering.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 78c7204d5b2e8a85c0064bcc9166693ff4180aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=78c7204d5b2e8a85c0064bcc9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 21 10:59:56 2017 +0200 d3d11/tests: Add test for layered rendering. 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 | 276 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 276 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=78c7204d5b2e8a85c0064…

1 0

Józef Kucia : wined3d: Drop support for ARB_geometry_shader4.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 0352291bda5b2ffba36f9d7ccde0b7497c708e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0352291bda5b2ffba36f9d7cc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 21 10:59:55 2017 +0200 wined3d: Drop support for ARB_geometry_shader4. 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 | 69 ++++++++++++---------------------------------- 1 file changed, 18 insertions(+), 51 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6c41f3a..0f4e66c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2033,11 +2033,6 @@ static BOOL shader_glsl_use_explicit_attrib_location(const struct wined3d_gl_inf && shader_glsl_use_layout_qualifier(gl_info) && !needs_legacy_glsl_syntax(gl_info); } -static BOOL shader_glsl_has_core_gs(const struct wined3d_gl_info *gl_info) -{ - return shader_glsl_get_version(gl_info) >= 150; -} - static const char *get_attribute_keyword(const struct wined3d_gl_info *gl_info) { return needs_legacy_glsl_syntax(gl_info) ? "attribute" : "in"; @@ -2694,24 +2689,23 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (version->type == WINED3D_SHADER_TYPE_GEOMETRY) { - const char *suffix = shader_glsl_has_core_gs(gl_info) ? ".gs_in" : ""; if (reg->idx[0].rel_addr) { if (reg->idx[1].rel_addr) - sprintf(register_name, "gs_in[%s + %u]%s[%s + %u]", - rel_param0.param_str, reg->idx[0].offset, suffix, + sprintf(register_name, "gs_in[%s + %u].gs_in[%s + %u]", + rel_param0.param_str, reg->idx[0].offset, rel_param1.param_str, reg->idx[1].offset); else - sprintf(register_name, "gs_in[%s + %u]%s[%u]", - rel_param0.param_str, reg->idx[0].offset, suffix, + sprintf(register_name, "gs_in[%s + %u].gs_in[%u]", + rel_param0.param_str, reg->idx[0].offset, reg->idx[1].offset); } else if (reg->idx[1].rel_addr) - sprintf(register_name, "gs_in[%u]%s[%s + %u]", reg->idx[0].offset, - suffix, rel_param1.param_str, reg->idx[1].offset); + sprintf(register_name, "gs_in[%u].gs_in[%s + %u]", reg->idx[0].offset, + rel_param1.param_str, reg->idx[1].offset); else - sprintf(register_name, "gs_in[%u]%s[%u]", - reg->idx[0].offset, suffix, reg->idx[1].offset); + sprintf(register_name, "gs_in[%u].gs_in[%u]", + reg->idx[0].offset, reg->idx[1].offset); break; } @@ -6600,16 +6594,12 @@ static void shader_glsl_generate_vs_gs_setup(struct shader_glsl_priv *priv, const struct wined3d_gl_info *gl_info) { struct wined3d_string_buffer *buffer = &priv->shader_buffer; - const BOOL core_gs = shader_glsl_has_core_gs(gl_info); - if (core_gs) - shader_addline(buffer, "out vs_gs_iface { vec4 gs_in[%u]; } gs_in;\n", input_count); - else - shader_addline(buffer, "varying out vec4 gs_in[%u];\n", input_count); + shader_addline(buffer, "out vs_gs_iface { vec4 gs_in[%u]; } gs_in;\n", input_count); shader_addline(buffer, "void setup_vs_output(in vec4 shader_out[%u])\n{\n", vs->limits->packed_output); shader_glsl_setup_sm4_shader_output(priv, input_count, &vs->output_signature, &vs->reg_maps, - core_gs ? "gs_in.gs_in" : "gs_in"); + "gs_in.gs_in"); shader_addline(buffer, "}\n"); } @@ -7362,25 +7352,17 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context shader_glsl_add_version_declaration(buffer, gl_info); shader_glsl_enable_extensions(buffer, gl_info); - if (gl_info->supported[ARB_GEOMETRY_SHADER4]) - shader_addline(buffer, "#extension GL_ARB_geometry_shader4 : enable\n"); shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); - if (shader_glsl_has_core_gs(gl_info)) - { - shader_addline(buffer, "layout(%s", glsl_primitive_type_from_d3d(shader->u.gs.input_type)); - if (shader->u.gs.instance_count > 1) - shader_addline(buffer, ", invocations = %u", shader->u.gs.instance_count); - shader_addline(buffer, ") in;\n"); - shader_addline(buffer, "layout(%s, max_vertices = %u) out;\n", - glsl_primitive_type_from_d3d(shader->u.gs.output_type), shader->u.gs.vertices_out); - shader_addline(buffer, "in vs_gs_iface { vec4 gs_in[%u]; } gs_in[];\n", shader->limits->packed_input); - } - else - { - shader_addline(buffer, "varying in vec4 gs_in[][%u];\n", shader->limits->packed_input); - } + shader_addline(buffer, "layout(%s", glsl_primitive_type_from_d3d(shader->u.gs.input_type)); + if (shader->u.gs.instance_count > 1) + shader_addline(buffer, ", invocations = %u", shader->u.gs.instance_count); + shader_addline(buffer, ") in;\n"); + shader_addline(buffer, "layout(%s, max_vertices = %u) out;\n", + glsl_primitive_type_from_d3d(shader->u.gs.output_type), shader->u.gs.vertices_out); + shader_addline(buffer, "in vs_gs_iface { vec4 gs_in[%u]; } gs_in[];\n", shader->limits->packed_input); + if (!gl_info->supported[ARB_CLIP_CONTROL]) shader_addline(buffer, "uniform vec4 pos_fixup;\n"); @@ -9329,21 +9311,6 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const GL_EXTCALL(glAttachShader(program_id, gs_id)); checkGLcall("glAttachShader"); - if (!shader_glsl_has_core_gs(gl_info)) - { - TRACE("input type %s, output type %s, vertices out %u.\n", - debug_d3dprimitivetype(gshader->u.gs.input_type), - debug_d3dprimitivetype(gshader->u.gs.output_type), - gshader->u.gs.vertices_out); - GL_EXTCALL(glProgramParameteriARB(program_id, GL_GEOMETRY_INPUT_TYPE_ARB, - gl_primitive_type_from_d3d(gshader->u.gs.input_type))); - GL_EXTCALL(glProgramParameteriARB(program_id, GL_GEOMETRY_OUTPUT_TYPE_ARB, - gl_primitive_type_from_d3d(gshader->u.gs.output_type))); - GL_EXTCALL(glProgramParameteriARB(program_id, GL_GEOMETRY_VERTICES_OUT_ARB, - gshader->u.gs.vertices_out)); - checkGLcall("glProgramParameteriARB"); - } - shader_glsl_init_transform_feedback(context, priv, program_id, gshader); list_add_head(&gshader->linked_programs, &entry->gs.shader_entry);

1 0

Józef Kucia : wined3d: Prefer core geometry shaders.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 9d8adb202f1559ba393d9621d4b6f54abf17aa59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d8adb202f1559ba393d9621d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 21 10:59:54 2017 +0200 wined3d: Prefer core geometry shaders. 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 | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c950138..6c41f3a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2033,6 +2033,11 @@ static BOOL shader_glsl_use_explicit_attrib_location(const struct wined3d_gl_inf && shader_glsl_use_layout_qualifier(gl_info) && !needs_legacy_glsl_syntax(gl_info); } +static BOOL shader_glsl_has_core_gs(const struct wined3d_gl_info *gl_info) +{ + return shader_glsl_get_version(gl_info) >= 150; +} + static const char *get_attribute_keyword(const struct wined3d_gl_info *gl_info) { return needs_legacy_glsl_syntax(gl_info) ? "attribute" : "in"; @@ -2689,27 +2694,24 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (version->type == WINED3D_SHADER_TYPE_GEOMETRY) { + const char *suffix = shader_glsl_has_core_gs(gl_info) ? ".gs_in" : ""; if (reg->idx[0].rel_addr) { if (reg->idx[1].rel_addr) sprintf(register_name, "gs_in[%s + %u]%s[%s + %u]", - rel_param0.param_str, reg->idx[0].offset, - gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] ? "" : ".gs_in", + rel_param0.param_str, reg->idx[0].offset, suffix, rel_param1.param_str, reg->idx[1].offset); else sprintf(register_name, "gs_in[%s + %u]%s[%u]", - rel_param0.param_str, reg->idx[0].offset, - gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] ? "" : ".gs_in", + rel_param0.param_str, reg->idx[0].offset, suffix, reg->idx[1].offset); } else if (reg->idx[1].rel_addr) sprintf(register_name, "gs_in[%u]%s[%s + %u]", reg->idx[0].offset, - gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] ? "" : ".gs_in", - rel_param1.param_str, reg->idx[1].offset); + suffix, rel_param1.param_str, reg->idx[1].offset); else - sprintf(register_name, "gs_in[%u]%s[%u]", reg->idx[0].offset, - gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] ? "" : ".gs_in", - reg->idx[1].offset); + sprintf(register_name, "gs_in[%u]%s[%u]", + reg->idx[0].offset, suffix, reg->idx[1].offset); break; } @@ -6597,17 +6599,17 @@ static void shader_glsl_generate_vs_gs_setup(struct shader_glsl_priv *priv, const struct wined3d_shader *vs, unsigned int input_count, const struct wined3d_gl_info *gl_info) { - BOOL legacy_context = gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]; struct wined3d_string_buffer *buffer = &priv->shader_buffer; + const BOOL core_gs = shader_glsl_has_core_gs(gl_info); - if (legacy_context) - shader_addline(buffer, "varying out vec4 gs_in[%u];\n", input_count); - else + if (core_gs) shader_addline(buffer, "out vs_gs_iface { vec4 gs_in[%u]; } gs_in;\n", input_count); + else + shader_addline(buffer, "varying out vec4 gs_in[%u];\n", input_count); shader_addline(buffer, "void setup_vs_output(in vec4 shader_out[%u])\n{\n", vs->limits->packed_output); shader_glsl_setup_sm4_shader_output(priv, input_count, &vs->output_signature, &vs->reg_maps, - legacy_context ? "gs_in" : "gs_in.gs_in"); + core_gs ? "gs_in.gs_in" : "gs_in"); shader_addline(buffer, "}\n"); } @@ -7365,11 +7367,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); - if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) - { - shader_addline(buffer, "varying in vec4 gs_in[][%u];\n", shader->limits->packed_input); - } - else + if (shader_glsl_has_core_gs(gl_info)) { shader_addline(buffer, "layout(%s", glsl_primitive_type_from_d3d(shader->u.gs.input_type)); if (shader->u.gs.instance_count > 1) @@ -7379,6 +7377,10 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context glsl_primitive_type_from_d3d(shader->u.gs.output_type), shader->u.gs.vertices_out); shader_addline(buffer, "in vs_gs_iface { vec4 gs_in[%u]; } gs_in[];\n", shader->limits->packed_input); } + else + { + shader_addline(buffer, "varying in vec4 gs_in[][%u];\n", shader->limits->packed_input); + } if (!gl_info->supported[ARB_CLIP_CONTROL]) shader_addline(buffer, "uniform vec4 pos_fixup;\n"); @@ -9327,7 +9329,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const GL_EXTCALL(glAttachShader(program_id, gs_id)); checkGLcall("glAttachShader"); - if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + if (!shader_glsl_has_core_gs(gl_info)) { TRACE("input type %s, output type %s, vertices out %u.\n", debug_d3dprimitivetype(gshader->u.gs.input_type),

1 0

Józef Kucia : wined3d: Implement geometry shader instancing.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 0d624fdb6ca6f0dcff0196da15a4fecaf854771b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d624fdb6ca6f0dcff0196da1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 21 10:59:53 2017 +0200 wined3d: Implement geometry shader instancing. 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 | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 26554d8..c950138 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2970,6 +2970,13 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * sprintf(register_name, "ivec2(gl_LocalInvocationIndex, 0)"); break; + case WINED3DSPR_GSINSTID: + if (gl_info->supported[ARB_SHADING_LANGUAGE_420PACK]) + sprintf(register_name, "gl_InvocationID"); + else + sprintf(register_name, "ivec2(gl_InvocationID, 0)"); + break; + case WINED3DSPR_THREADID: sprintf(register_name, "ivec3(gl_GlobalInvocationID)"); break; @@ -3132,10 +3139,11 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_instructio case WINED3DSPR_PRIMID: param_data_type = WINED3D_DATA_UINT; break; + case WINED3DSPR_GSINSTID: + case WINED3DSPR_LOCALTHREADID: case WINED3DSPR_LOCALTHREADINDEX: - case WINED3DSPR_THREADID: case WINED3DSPR_THREADGROUPID: - case WINED3DSPR_LOCALTHREADID: + case WINED3DSPR_THREADID: param_data_type = WINED3D_DATA_INT; break; default: @@ -7363,7 +7371,10 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context } else { - shader_addline(buffer, "layout(%s) in;\n", glsl_primitive_type_from_d3d(shader->u.gs.input_type)); + shader_addline(buffer, "layout(%s", glsl_primitive_type_from_d3d(shader->u.gs.input_type)); + if (shader->u.gs.instance_count > 1) + shader_addline(buffer, ", invocations = %u", shader->u.gs.instance_count); + shader_addline(buffer, ") in;\n"); shader_addline(buffer, "layout(%s, max_vertices = %u) out;\n", glsl_primitive_type_from_d3d(shader->u.gs.output_type), shader->u.gs.vertices_out); shader_addline(buffer, "in vs_gs_iface { vec4 gs_in[%u]; } gs_in[];\n", shader->limits->packed_input); @@ -10049,7 +10060,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_FUNCTION_BODY */ NULL, /* WINED3DSIH_DCL_FUNCTION_TABLE */ NULL, /* WINED3DSIH_DCL_GLOBAL_FLAGS */ shader_glsl_nop, - /* WINED3DSIH_DCL_GS_INSTANCES */ NULL, + /* WINED3DSIH_DCL_GS_INSTANCES */ shader_glsl_nop, /* WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT */ NULL, /* WINED3DSIH_DCL_HS_JOIN_PHASE_INSTANCE_COUNT */ NULL, /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ NULL,

1 0

Józef Kucia : wined3d: Recognize SM5 dcl_gsinstances opcode.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 1491151a37f1cf19a66621bc04562d34c6425eac URL: http://source.winehq.org/git/wine.git/?a=commit;h=1491151a37f1cf19a66621bc0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 21 10:59:52 2017 +0200 wined3d: Recognize SM5 dcl_gsinstances 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 | 3 +++ dlls/wined3d/wined3d_private.h | 4 +++- 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3b1eff9..b1cf639 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5054,6 +5054,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_FUNCTION_BODY */ NULL, /* WINED3DSIH_DCL_FUNCTION_TABLE */ NULL, /* WINED3DSIH_DCL_GLOBAL_FLAGS */ NULL, + /* WINED3DSIH_DCL_GS_INSTANCES */ NULL, /* WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT */ NULL, /* WINED3DSIH_DCL_HS_JOIN_PHASE_INSTANCE_COUNT */ NULL, /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f875d06..26554d8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10049,6 +10049,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_FUNCTION_BODY */ NULL, /* WINED3DSIH_DCL_FUNCTION_TABLE */ NULL, /* WINED3DSIH_DCL_GLOBAL_FLAGS */ shader_glsl_nop, + /* WINED3DSIH_DCL_GS_INSTANCES */ NULL, /* WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT */ NULL, /* WINED3DSIH_DCL_HS_JOIN_PHASE_INSTANCE_COUNT */ NULL, /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a29c1f3..c83ef1f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -74,6 +74,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_FUNCTION_BODY */ "dcl_function_body", /* WINED3DSIH_DCL_FUNCTION_TABLE */ "dcl_function_table", /* WINED3DSIH_DCL_GLOBAL_FLAGS */ "dcl_globalFlags", + /* WINED3DSIH_DCL_GS_INSTANCES */ "dcl_gs_instances", /* WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT */ "dcl_hs_fork_phase_instance_count", /* WINED3DSIH_DCL_HS_JOIN_PHASE_INSTANCE_COUNT */ "dcl_hs_join_phase_instance_count", /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ "dcl_hs_max_tessfactor", @@ -1019,6 +1020,14 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st else reg_maps->cb_sizes[reg->idx[0].offset] = reg->idx[1].offset; } + else if (ins.handler_idx == WINED3DSIH_DCL_GS_INSTANCES) + { + if (shader_version.type == WINED3D_SHADER_TYPE_GEOMETRY) + shader->u.gs.instance_count = ins.declaration.count; + else + FIXME("Invalid instruction %#x for shader type %#x.\n", + ins.handler_idx, shader_version.type); + } else if (ins.handler_idx == WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER) { if (reg_maps->icb) @@ -2648,11 +2657,12 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe shader_addline(&buffer, ", comparisonMode"); } else if (ins.handler_idx == WINED3DSIH_DCL_TEMPS - || ins.handler_idx == WINED3DSIH_DCL_VERTICES_OUT + || ins.handler_idx == WINED3DSIH_DCL_GS_INSTANCES || ins.handler_idx == WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT || ins.handler_idx == WINED3DSIH_DCL_HS_JOIN_PHASE_INSTANCE_COUNT || ins.handler_idx == WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT - || ins.handler_idx == WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT) + || ins.handler_idx == WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT + || ins.handler_idx == WINED3DSIH_DCL_VERTICES_OUT) { shader_addline(&buffer, "%s %u", shader_opcode_names[ins.handler_idx], ins.declaration.count); } diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index c670996..4e0fb83 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -294,6 +294,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_IMM_ATOMIC_UMAX = 0xbc, WINED3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, WINED3D_SM5_OP_SYNC = 0xbe, + WINED3D_SM5_OP_DCL_GS_INSTANCES = 0xce, }; enum wined3d_sm4_register_type @@ -1053,6 +1054,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_IMM_ATOMIC_UMIN, WINED3DSIH_IMM_ATOMIC_UMIN, "uU", "iu"}, {WINED3D_SM5_OP_SYNC, WINED3DSIH_SYNC, "", "", shader_sm5_read_sync}, + {WINED3D_SM5_OP_DCL_GS_INSTANCES, WINED3DSIH_DCL_GS_INSTANCES, "", "", + shader_sm4_read_declaration_count}, }; static const enum wined3d_shader_register_type register_type_table[] = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index eef7cc8..bab0fea 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -700,6 +700,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_FUNCTION_BODY, WINED3DSIH_DCL_FUNCTION_TABLE, WINED3DSIH_DCL_GLOBAL_FLAGS, + WINED3DSIH_DCL_GS_INSTANCES, WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT, WINED3DSIH_DCL_HS_JOIN_PHASE_INSTANCE_COUNT, WINED3DSIH_DCL_HS_MAX_TESSFACTOR, @@ -3681,7 +3682,8 @@ struct wined3d_geometry_shader { enum wined3d_primitive_type input_type; enum wined3d_primitive_type output_type; - UINT vertices_out; + unsigned int vertices_out; + unsigned int instance_count; struct wined3d_stream_output_desc so_desc; };

1 0

Józef Kucia : wined3d: Recognize SM5 vGSInstanceID register.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 86f9eab8e2a5d151517685cb1e5d80077961054d URL: http://source.winehq.org/git/wine.git/?a=commit;h=86f9eab8e2a5d151517685cb1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 21 10:59:51 2017 +0200 wined3d: Recognize SM5 vGSInstanceID register. 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.c | 4 ++++ dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 7dc276f..a29c1f3 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2122,6 +2122,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "oMask"); break; + case WINED3DSPR_GSINSTID: + shader_addline(buffer, "vGSInstanceID"); + break; + default: shader_addline(buffer, "<unhandled_rtype(%#x)>", reg->type); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 614b545..c670996 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -328,6 +328,7 @@ enum wined3d_sm4_register_type WINED3D_SM5_RT_LOCAL_THREAD_ID = 0x22, WINED3D_SM5_RT_COVERAGE = 0x23, WINED3D_SM5_RT_LOCAL_THREAD_INDEX = 0x24, + WINED3D_SM5_RT_GS_INSTANCE_ID = 0x25, }; enum wined3d_sm4_output_primitive_type @@ -1093,6 +1094,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM5_RT_LOCAL_THREAD_ID */ WINED3DSPR_LOCALTHREADID, /* WINED3D_SM5_RT_COVERAGE */ WINED3DSPR_COVERAGE, /* WINED3D_SM5_RT_LOCAL_THREAD_INDEX */ WINED3DSPR_LOCALTHREADINDEX, + /* WINED3D_SM5_RT_GS_INSTANCE_ID */ WINED3DSPR_GSINSTID, }; static const struct wined3d_sm4_opcode_info *get_opcode_info(enum wined3d_sm4_opcode opcode) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b8ee413..eef7cc8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -490,6 +490,7 @@ enum wined3d_shader_register_type WINED3DSPR_FUNCTIONPOINTER, WINED3DSPR_COVERAGE, WINED3DSPR_SAMPLEMASK, + WINED3DSPR_GSINSTID, }; enum wined3d_data_type

1 0

Alexandre Julliard : glu32: Import tessellation functions from Mesa.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 2386e37bd24f26ebb0757827eb4b81916d8284da URL: http://source.winehq.org/git/wine.git/?a=commit;h=2386e37bd24f26ebb0757827e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 21 13:34:53 2017 +0200 glu32: Import tessellation functions from Mesa. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/Makefile.in | 8 +- dlls/glu32/geom.c | 244 ++++++++ dlls/glu32/glu.c | 293 ---------- dlls/glu32/glu32.spec | 28 +- dlls/glu32/mesh.c | 951 +++++++++++++++++++++++++++++++ dlls/glu32/mesh.h | 271 +++++++++ dlls/glu32/priorityq.c | 467 ++++++++++++++++ dlls/glu32/render.c | 497 ++++++++++++++++ dlls/glu32/sweep.c | 1460 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/glu32/tess.c | 812 +++++++++++++++++++++++++++ dlls/glu32/tess.h | 240 ++++++++ 11 files changed, 4963 insertions(+), 308 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2386e37bd24f26ebb0757…

1 0

Henri Verbeet : wined3d: Use context_map_bo_address() in wined3d_buffer_copy().
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 3311ea98595a71b7de4edec498b31fec68526e84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3311ea98595a71b7de4edec49… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 21 00:57:11 2017 +0200 wined3d: Use context_map_bo_address() in wined3d_buffer_copy(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 6e1ecb0..3cf153b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1202,7 +1202,6 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ struct wined3d_device *device; BYTE *dst_ptr, *src_ptr; DWORD dst_location; - HRESULT hr; buffer_mark_used(dst_buffer); buffer_mark_used(src_buffer); @@ -1213,7 +1212,10 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ gl_info = context->gl_info; dst_location = wined3d_buffer_get_memory(dst_buffer, &dst, dst_buffer->locations); + dst.addr += dst_offset; + wined3d_buffer_get_memory(src_buffer, &src, src_buffer->locations); + src.addr += src_offset; if (dst.buffer_object && src.buffer_object) { @@ -1227,41 +1229,30 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ } else { - if (FAILED(hr = wined3d_buffer_map(dst_buffer, dst_offset, size, &dst_ptr, 0))) - { - WARN("Failed to map dst_buffer, hr %#x.\n", hr); - context_release(context); - return WINED3DERR_INVALIDCALL; - } - if (FAILED(hr = wined3d_buffer_map(src_buffer, src_offset, size, &src_ptr, WINED3D_MAP_READONLY))) - { - WARN("Failed to map src_buffer, hr %#x.\n", hr); - wined3d_buffer_unmap(dst_buffer); - context_release(context); - return WINED3DERR_INVALIDCALL; - } + src_ptr = context_map_bo_address(context, &src, size, src_buffer->buffer_type_hint, WINED3D_MAP_READONLY); + dst_ptr = context_map_bo_address(context, &dst, size, dst_buffer->buffer_type_hint, 0); memcpy(dst_ptr, src_ptr, size); - wined3d_buffer_unmap(src_buffer); - wined3d_buffer_unmap(dst_buffer); + context_unmap_bo_address(context, &dst, dst_buffer->buffer_type_hint); + context_unmap_bo_address(context, &src, src_buffer->buffer_type_hint); } } else if (!dst.buffer_object && src.buffer_object) { buffer_bind(src_buffer, context); - GL_EXTCALL(glGetBufferSubData(src_buffer->buffer_type_hint, src_offset, size, dst.addr + dst_offset)); + GL_EXTCALL(glGetBufferSubData(src_buffer->buffer_type_hint, src_offset, size, dst.addr)); checkGLcall("buffer download"); } else if (dst.buffer_object && !src.buffer_object) { buffer_bind(dst_buffer, context); - GL_EXTCALL(glBufferSubData(dst_buffer->buffer_type_hint, dst_offset, size, src.addr + src_offset)); + GL_EXTCALL(glBufferSubData(dst_buffer->buffer_type_hint, dst_offset, size, src.addr)); checkGLcall("buffer upload"); } else { - memcpy(dst.addr + dst_offset, src.addr + src_offset, size); + memcpy(dst.addr, src.addr, size); } wined3d_buffer_invalidate_range(dst_buffer, ~dst_location, dst_offset, size);

1 0

Henri Verbeet : wined3d: Introduce context functions to map/ unmap a wined3d_bo_address.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 62ca4f38269139ef2a8b9842ec538d9e7f7a0e76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62ca4f38269139ef2a8b9842e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 21 00:57:10 2017 +0200 wined3d: Introduce context functions to map/unmap a wined3d_bo_address. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 42 ++++++++++++++++++++++++++ dlls/wined3d/surface.c | 54 ++++++++++++++------------------- dlls/wined3d/texture.c | 68 ++++-------------------------------------- dlls/wined3d/wined3d_private.h | 8 ++--- 4 files changed, 74 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=62ca4f38269139ef2a8b9…

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
76
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 April 2017