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

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

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: 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: 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: 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

Jacek Caban : mshtml.idl: Added HTMLScriptElement coclass declaration.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: eb9b998c15f4da429712e6fb112f34ce48622fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb9b998c15f4da429712e6fb1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 20 16:09:29 2017 +0200 mshtml.idl: Added HTMLScriptElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlscript.h | 4 ++-- include/mshtml.idl | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlscript.h b/dlls/mshtml/htmlscript.h index 3d41a6c..af9192f 100644 --- a/dlls/mshtml/htmlscript.h +++ b/dlls/mshtml/htmlscript.h @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -typedef struct { +struct HTMLScriptElement { HTMLElement element; IHTMLScriptElement IHTMLScriptElement_iface; @@ -28,7 +28,7 @@ typedef struct { READYSTATE readystate; WCHAR *src_text; /* sctipt text downloaded from src */ BSCallback *binding; /* weak reference to current binding */ -} HTMLScriptElement; +}; typedef struct { struct list entry; diff --git a/include/mshtml.idl b/include/mshtml.idl index 4e5503e..f734356 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -18635,6 +18635,25 @@ methods: } /***************************************************************************** + * HTMLScriptElement coclass + */ +[ + noncreatable, + uuid(3050f28c-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLScriptElement +{ + [default] dispinterface DispHTMLScriptElement; + /* [source, default] dispinterface HTMLScriptEvents; */ + /* [source] dispinterface HTMLScriptEvents2; */ + WINE_HTMLELEMENT_INTERFACES; + interface IHTMLScriptElement; + interface IHTMLScriptElement2; + /* interface IHTMLScriptElement3; */ + /* interface IHTMLScriptElement4; */ +} + +/***************************************************************************** * IHTMLObjectElement interface */ [

1 0

Jacek Caban : mshtml.idl: Added HTMLObjectElement coclass declaration.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 887641070a157dac4272f25034c81945d2bf4409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=887641070a157dac4272f2503… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 20 16:23:27 2017 +0200 mshtml.idl: Added HTMLObjectElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlobject.c | 4 ++-- include/mshtml.idl | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 89913cb..47c1e8b 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -34,14 +34,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLObjectElement { HTMLPluginContainer plugin_container; IHTMLObjectElement IHTMLObjectElement_iface; IHTMLObjectElement2 IHTMLObjectElement2_iface; nsIDOMHTMLObjectElement *nsobject; -} HTMLObjectElement; +}; static inline HTMLObjectElement *impl_from_IHTMLObjectElement(IHTMLObjectElement *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index f734356..0bdd473 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -19089,6 +19089,28 @@ methods: } /***************************************************************************** + * HTMLObjectElement coclass + */ +[ + noncreatable, + uuid(3050f24e-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLObjectElement +{ + [default] dispinterface DispHTMLObjectElement; + /* [source, default] dispinterface HTMLObjectElementEvents; */ + /* [source] dispinterface HTMLObjectElementEvents2; */ + WINE_HTMLDATAELEMENT_INTERFACES; + interface IHTMLControlElement; + interface IHTMLObjectElement; + interface IHTMLObjectElement2; + /* interface IHTMLObjectElement3; */ + /* interface IHTMLObjectElement4; */ + /* interface IGetSVGDocument; */ + /* interface IHTMLObjectElement5; */ +} + +/***************************************************************************** * DispHTMLParamElement dispinterface */ [

1 0

Jacek Caban : mshtml.idl: Added HTMLFrameElement coclass declaration.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 39460707e27e84e976f4f5acfdc5f8db02b2aa89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39460707e27e84e976f4f5acf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 20 16:23:33 2017 +0200 mshtml.idl: Added HTMLFrameElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlframe.c | 4 ++-- include/mshtml.idl | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index fd76fa2..1a2772b 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -31,10 +31,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLFrameElement { HTMLFrameBase framebase; IHTMLFrameElement3 IHTMLFrameElement3_iface; -} HTMLFrameElement; +}; static inline HTMLFrameElement *impl_from_IHTMLFrameElement3(IHTMLFrameElement3 *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index 0bdd473..ff67650 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -19428,6 +19428,29 @@ methods: } /***************************************************************************** + * HTMLFrameElement coclass + */ +[ + noncreatable, + uuid(3050f314-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLFrameElement +{ + [default] dispinterface DispHTMLFrameElement; + /* [source, default] dispinterface HTMLControlElementEvents; */ + /* [source] dispinterface HTMLControlElementEvents2; */ + WINE_HTMLDATAELEMENT_INTERFACES; + interface IHTMLControlElement; + interface IHTMLFrameBase; + interface IHTMLFrameBase2; + /* interface IHTMLFrameBase3; */ + /* interface IHTMLFrameElement; */ + /* interface IHTMLFrameElement2; */ + interface IHTMLFrameElement3; + /* interface IGetSVGDocument; */ +} + +/***************************************************************************** * IHTMLIFrameElement interface */ [

1 0

Jacek Caban : mshtml.idl: Added HTMLIFrame coclass declaration.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 8d467a4bd0e391562f62df45d8be20c3d74e4a92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d467a4bd0e391562f62df45d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 20 16:23:40 2017 +0200 mshtml.idl: Added HTMLIFrame coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmliframe.c | 4 ++-- include/mshtml.idl | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index 14f545d..83ce952 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -31,12 +31,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLIFrame { HTMLFrameBase framebase; IHTMLIFrameElement IHTMLIFrameElement_iface; IHTMLIFrameElement2 IHTMLIFrameElement2_iface; IHTMLIFrameElement3 IHTMLIFrameElement3_iface; -} HTMLIFrame; +}; static inline HTMLIFrame *impl_from_IHTMLIFrameElement(IHTMLIFrameElement *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index ff67650..1b4ba2a 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -19603,6 +19603,29 @@ methods: } /***************************************************************************** + * HTMLIFrame coclass + */ +[ + noncreatable, + uuid(3050f316-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLIFrame +{ + [default] dispinterface DispHTMLIFrame; + /* [source, default] dispinterface HTMLControlElementEvents; */ + /* [source] dispinterface HTMLControlElementEvents2; */ + WINE_HTMLDATAELEMENT_INTERFACES; + interface IHTMLControlElement; + interface IHTMLFrameBase; + interface IHTMLFrameBase2; + /* interface IHTMLFrameBase3; */ + interface IHTMLIFrameElement; + interface IHTMLIFrameElement2; + interface IHTMLIFrameElement3; + /* interface IGetSVGDocument; */ +} + +/***************************************************************************** * IHTMLStyleElement interface */ [

1 0

Jacek Caban : mshtml.idl: Added HTMLStyleElement coclass declaration.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 91c568bc6dbdde09e4137ca5e6eee558bda9969e URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c568bc6dbdde09e4137ca5e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 20 16:23:45 2017 +0200 mshtml.idl: Added HTMLStyleElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyleelem.c | 4 ++-- include/mshtml.idl | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index 96c394c..f516273 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -33,14 +33,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLStyleElement { HTMLElement element; IHTMLStyleElement IHTMLStyleElement_iface; nsIDOMHTMLStyleElement *nsstyle; IHTMLStyleSheet *style_sheet; -} HTMLStyleElement; +}; static inline HTMLStyleElement *impl_from_IHTMLStyleElement(IHTMLStyleElement *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index 1b4ba2a..a9d6502 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -19721,6 +19721,23 @@ methods: } /***************************************************************************** + * HTMLStyleElement coclass + */ +[ + noncreatable, + uuid(3050f37d-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLStyleElement +{ + [default] dispinterface DispHTMLStyleElement; + /* [source, default] dispinterface HTMLStyleElementEvents; */ + /* [source] dispinterface HTMLStyleElementEvents2; */ + WINE_HTMLELEMENT_INTERFACES; + interface IHTMLStyleElement; + /* interface IHTMLStyleElement2; */ +} + +/***************************************************************************** * IHTMLStorage interface */ [

1 0