wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Alexandre Julliard : winex11: Avoid passing a window data structure to functions that can send messages.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: c8ea1e50dc8142bbfb88652b76f2a4c5b8a06511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8ea1e50dc8142bbfb88652b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 20:08:01 2012 +0200 winex11: Avoid passing a window data structure to functions that can send messages. --- dlls/winex11.drv/event.c | 25 +++++----- dlls/winex11.drv/mouse.c | 16 ++++--- dlls/winex11.drv/systray.c | 15 +++--- dlls/winex11.drv/window.c | 105 +++++++++++++++++++++++++------------------ dlls/winex11.drv/x11drv.h | 6 +- 5 files changed, 93 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8ea1e50dc8142bbfb886…

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_CUT in the GLSL shader backend.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: c982e5f64b6951a5247314dab208337531ea1e14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c982e5f64b6951a5247314dab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 17 12:22:26 2012 +0200 wined3d: Implement WINED3DSIH_CUT in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fbd9f38..97a6109 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2202,6 +2202,11 @@ static void shader_glsl_cross(const struct wined3d_shader_instruction *ins) shader_addline(ins->ctx->buffer, "cross(%s, %s)%s);\n", src0_param.param_str, src1_param.param_str, dst_mask); } +static void shader_glsl_cut(const struct wined3d_shader_instruction *ins) +{ + shader_addline(ins->ctx->buffer, "EndPrimitive();\n"); +} + /* Process the WINED3DSIO_POW instruction in GLSL (dst = |src0|^src1) * Src0 and src1 are scalars. Note that D3D uses the absolute of src0, while * GLSL uses the value as-is. */ @@ -5029,7 +5034,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_CMP */ shader_glsl_cmp, /* WINED3DSIH_CND */ shader_glsl_cnd, /* WINED3DSIH_CRS */ shader_glsl_cross, - /* WINED3DSIH_CUT */ NULL, + /* WINED3DSIH_CUT */ shader_glsl_cut, /* WINED3DSIH_DCL */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_glsl_nop, /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_glsl_nop,

1 0

Henri Verbeet : wined3d: Recognize the SM4 dcl_outputTopology opcode.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: a67ee02a4881694fd95ad5ff19b06b0f6005510e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a67ee02a4881694fd95ad5ff1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 17 12:22:25 2012 +0200 wined3d: Recognize the SM4 dcl_outputTopology opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 4 +++- dlls/wined3d/shader_sm4.c | 36 +++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e5b2968..1195563 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5100,6 +5100,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_CUT */ NULL, /* WINED3DSIH_DCL */ shader_hw_nop, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_hw_nop, + /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_hw_nop, /* 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 d83371e..fbd9f38 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5032,6 +5032,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_CUT */ NULL, /* WINED3DSIH_DCL */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_glsl_nop, + /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_glsl_nop, /* 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 6941434..aaf3446 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -51,6 +51,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_CUT */ "cut", /* WINED3DSIH_DCL */ "dcl", /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ "dcl_inputPrimitive", + /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ "dcl_outputTopology", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", /* WINED3DSIH_DEF */ "def", /* WINED3DSIH_DEFB */ "defb", @@ -1366,7 +1367,8 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe TRACE(" "); shader_dump_dst_param(&ins.declaration.semantic.reg, &shader_version); } - else if (ins.handler_idx == WINED3DSIH_DCL_INPUT_PRIMITIVE) + else if (ins.handler_idx == WINED3DSIH_DCL_INPUT_PRIMITIVE + || ins.handler_idx == WINED3DSIH_DCL_OUTPUT_TOPOLOGY) { TRACE("%s ", shader_opcode_names[ins.handler_idx]); shader_dump_primitive_type(ins.declaration.primitive_type); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 2f9094b..007b9b1 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -101,6 +101,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_USHR = 0x55, WINED3D_SM4_OP_UTOF = 0x56, WINED3D_SM4_OP_XOR = 0x57, + WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY = 0x5c, WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE = 0x5d, WINED3D_SM4_OP_DCL_VERTICES_OUT = 0x5e, }; @@ -116,6 +117,13 @@ enum wined3d_sm4_register_type WINED3D_SM4_RT_NULL = 0xd, }; +enum wined3d_sm4_output_primitive_type +{ + WINED3D_SM4_OUTPUT_PT_POINTLIST = 0x1, + WINED3D_SM4_OUTPUT_PT_LINELIST = 0x3, + WINED3D_SM4_OUTPUT_PT_TRIANGLESTRIP = 0x5, +}; + enum wined3d_sm4_input_primitive_type { WINED3D_SM4_INPUT_PT_POINT = 0x1, @@ -213,6 +221,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_USHR, WINED3DSIH_USHR, "U", "UU"}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, "F", "U"}, {WINED3D_SM4_OP_XOR, WINED3DSIH_XOR, "U", "UU"}, + {WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY, WINED3DSIH_DCL_OUTPUT_TOPOLOGY, "", ""}, {WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE, WINED3DSIH_DCL_INPUT_PRIMITIVE, "", ""}, {WINED3D_SM4_OP_DCL_VERTICES_OUT, WINED3DSIH_DCL_VERTICES_OUT, "", ""}, }; @@ -235,6 +244,16 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL, }; +static const enum wined3d_primitive_type output_primitive_type_table[] = +{ + /* UNKNOWN */ WINED3D_PT_UNDEFINED, + /* WINED3D_SM4_OUTPUT_PT_POINTLIST */ WINED3D_PT_POINTLIST, + /* UNKNOWN */ WINED3D_PT_UNDEFINED, + /* WINED3D_SM4_OUTPUT_PT_LINELIST */ WINED3D_PT_LINELIST, + /* UNKNOWN */ WINED3D_PT_UNDEFINED, + /* WINED3D_SM4_OUTPUT_PT_TRIANGLESTRIP */ WINED3D_PT_TRIANGLESTRIP, +}; + static const enum wined3d_primitive_type input_primitive_type_table[] = { /* UNKNOWN */ WINED3D_PT_UNDEFINED, @@ -562,7 +581,22 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi FIXME("Skipping modifier 0x%08x.\n", modifier); } - if (opcode == WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE) + if (opcode == WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY) + { + enum wined3d_sm4_output_primitive_type primitive_type; + + primitive_type = (opcode_token & WINED3D_SM4_PRIMITIVE_TYPE_MASK) >> WINED3D_SM4_PRIMITIVE_TYPE_SHIFT; + if (primitive_type >= sizeof(output_primitive_type_table) / sizeof(*output_primitive_type_table)) + { + FIXME("Unhandled output primitive type %#x.\n", primitive_type); + ins->declaration.primitive_type = WINED3D_PT_UNDEFINED; + } + else + { + ins->declaration.primitive_type = output_primitive_type_table[primitive_type]; + } + } + else if (opcode == WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE) { enum wined3d_sm4_input_primitive_type primitive_type; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1900d43..8ce9db9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -440,6 +440,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_CUT, WINED3DSIH_DCL, WINED3DSIH_DCL_INPUT_PRIMITIVE, + WINED3DSIH_DCL_OUTPUT_TOPOLOGY, WINED3DSIH_DCL_VERTICES_OUT, WINED3DSIH_DEF, WINED3DSIH_DEFB,

1 0

Henri Verbeet : wined3d: Recognize the SM4 dcl_inputPrimitive opcode.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 0fbb98424c1e2c6571ce92187457ab5a8f88df3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fbb98424c1e2c6571ce92187… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 17 12:22:24 2012 +0200 wined3d: Recognize the SM4 dcl_inputPrimitive opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 49 +++++++++++++++++++++++++++++++++++++ dlls/wined3d/shader_sm4.c | 43 +++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 2 + 5 files changed, 95 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 41b8242..e5b2968 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5099,6 +5099,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_CRS */ shader_hw_map2gl, /* WINED3DSIH_CUT */ NULL, /* WINED3DSIH_DCL */ shader_hw_nop, + /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_hw_nop, /* 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 58fc9ac..d83371e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5031,6 +5031,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_CRS */ shader_glsl_cross, /* WINED3DSIH_CUT */ NULL, /* WINED3DSIH_DCL */ shader_glsl_nop, + /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_glsl_nop, /* 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 5e3abc6..6941434 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -50,6 +50,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_CRS */ "crs", /* WINED3DSIH_CUT */ "cut", /* WINED3DSIH_DCL */ "dcl", + /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ "dcl_inputPrimitive", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", /* WINED3DSIH_DEF */ "def", /* WINED3DSIH_DEFB */ "defb", @@ -1241,6 +1242,49 @@ static void shader_dump_ins_modifiers(const struct wined3d_shader_dst_param *dst if (mmask) FIXME("_unrecognized_modifier(%#x)", mmask); } +static void shader_dump_primitive_type(enum wined3d_primitive_type primitive_type) +{ + switch (primitive_type) + { + case WINED3D_PT_UNDEFINED: + TRACE("undefined"); + break; + case WINED3D_PT_POINTLIST: + TRACE("pointlist"); + break; + case WINED3D_PT_LINELIST: + TRACE("linelist"); + break; + case WINED3D_PT_LINESTRIP: + TRACE("linestrip"); + break; + case WINED3D_PT_TRIANGLELIST: + TRACE("trianglelist"); + break; + case WINED3D_PT_TRIANGLESTRIP: + TRACE("trianglestrip"); + break; + case WINED3D_PT_TRIANGLEFAN: + TRACE("trianglefan"); + break; + case WINED3D_PT_LINELIST_ADJ: + TRACE("linelist_adj"); + break; + case WINED3D_PT_LINESTRIP_ADJ: + TRACE("linestrip_adj"); + break; + case WINED3D_PT_TRIANGLELIST_ADJ: + TRACE("trianglelist_adj"); + break; + case WINED3D_PT_TRIANGLESTRIP_ADJ: + TRACE("trianglestrip_adj"); + break; + default: + TRACE("<unrecognized_primitive_type %#x>", primitive_type); + break; + } +} + static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe_data, const DWORD *byte_code) { struct wined3d_shader_version shader_version; @@ -1322,6 +1366,11 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe TRACE(" "); shader_dump_dst_param(&ins.declaration.semantic.reg, &shader_version); } + else if (ins.handler_idx == WINED3DSIH_DCL_INPUT_PRIMITIVE) + { + TRACE("%s ", shader_opcode_names[ins.handler_idx]); + shader_dump_primitive_type(ins.declaration.primitive_type); + } else if (ins.handler_idx == WINED3DSIH_DCL_VERTICES_OUT) { TRACE("%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 5087849..2f9094b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -28,6 +28,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT 24 #define WINED3D_SM4_INSTRUCTION_LENGTH_MASK (0xf << WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) +#define WINED3D_SM4_PRIMITIVE_TYPE_SHIFT 11 +#define WINED3D_SM4_PRIMITIVE_TYPE_MASK (0x7 << WINED3D_SM4_PRIMITIVE_TYPE_SHIFT) + #define WINED3D_SM4_OPCODE_MASK 0xff #define WINED3D_SM4_REGISTER_MODIFIER (1 << 31) @@ -98,6 +101,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_USHR = 0x55, WINED3D_SM4_OP_UTOF = 0x56, WINED3D_SM4_OP_XOR = 0x57, + WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE = 0x5d, WINED3D_SM4_OP_DCL_VERTICES_OUT = 0x5e, }; @@ -112,6 +116,15 @@ enum wined3d_sm4_register_type WINED3D_SM4_RT_NULL = 0xd, }; +enum wined3d_sm4_input_primitive_type +{ + WINED3D_SM4_INPUT_PT_POINT = 0x1, + WINED3D_SM4_INPUT_PT_LINE = 0x2, + WINED3D_SM4_INPUT_PT_TRIANGLE = 0x3, + WINED3D_SM4_INPUT_PT_LINEADJ = 0x6, + WINED3D_SM4_INPUT_PT_TRIANGLEADJ = 0x7, +}; + enum wined3d_sm4_immconst_type { WINED3D_SM4_IMMCONST_SCALAR = 0x1, @@ -200,6 +213,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_USHR, WINED3DSIH_USHR, "U", "UU"}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, "F", "U"}, {WINED3D_SM4_OP_XOR, WINED3DSIH_XOR, "U", "UU"}, + {WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE, WINED3DSIH_DCL_INPUT_PRIMITIVE, "", ""}, {WINED3D_SM4_OP_DCL_VERTICES_OUT, WINED3DSIH_DCL_VERTICES_OUT, "", ""}, }; @@ -221,6 +235,18 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL, }; +static const enum wined3d_primitive_type input_primitive_type_table[] = +{ + /* UNKNOWN */ WINED3D_PT_UNDEFINED, + /* WINED3D_SM4_INPUT_PT_POINT */ WINED3D_PT_POINTLIST, + /* WINED3D_SM4_INPUT_PT_LINE */ WINED3D_PT_LINELIST, + /* WINED3D_SM4_INPUT_PT_TRIANGLE */ WINED3D_PT_TRIANGLELIST, + /* UNKNOWN */ WINED3D_PT_UNDEFINED, + /* UNKNOWN */ WINED3D_PT_UNDEFINED, + /* WINED3D_SM4_INPUT_PT_LINEADJ */ WINED3D_PT_LINELIST_ADJ, + /* WINED3D_SM4_INPUT_PT_TRIANGLEADJ */ WINED3D_PT_TRIANGLELIST_ADJ, +}; + static const struct sysval_map sysval_map[] = { {WINED3D_SV_DEPTH, WINED3DSPR_DEPTHOUT, 0}, @@ -536,7 +562,22 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi FIXME("Skipping modifier 0x%08x.\n", modifier); } - if (opcode == WINED3D_SM4_OP_DCL_VERTICES_OUT) + if (opcode == WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE) + { + enum wined3d_sm4_input_primitive_type primitive_type; + + primitive_type = (opcode_token & WINED3D_SM4_PRIMITIVE_TYPE_MASK) >> WINED3D_SM4_PRIMITIVE_TYPE_SHIFT; + if (primitive_type >= sizeof(input_primitive_type_table) / sizeof(*input_primitive_type_table)) + { + FIXME("Unhandled input primitive type %#x.\n", primitive_type); + ins->declaration.primitive_type = WINED3D_PT_UNDEFINED; + } + else + { + ins->declaration.primitive_type = input_primitive_type_table[primitive_type]; + } + } + else if (opcode == WINED3D_SM4_OP_DCL_VERTICES_OUT) { ins->declaration.count = *p++; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 31e16cd..1900d43 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -439,6 +439,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_CRS, WINED3DSIH_CUT, WINED3DSIH_DCL, + WINED3DSIH_DCL_INPUT_PRIMITIVE, WINED3DSIH_DCL_VERTICES_OUT, WINED3DSIH_DEF, WINED3DSIH_DEFB, @@ -667,6 +668,7 @@ struct wined3d_shader_instruction union { struct wined3d_shader_semantic semantic; + enum wined3d_primitive_type primitive_type; UINT count; } declaration; };

1 0

Henri Verbeet : wined3d: Recognize the SM4 dcl_maxOutputVertexCount opcode.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: d574d639a42e9b57a0a51a77bad4a277d0dc5080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d574d639a42e9b57a0a51a77b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 17 12:22:23 2012 +0200 wined3d: Recognize the SM4 dcl_maxOutputVertexCount opcode. --- dlls/wined3d/arb_program_shader.c | 215 ++++++++++++++++++------------------ dlls/wined3d/glsl_shader.c | 215 ++++++++++++++++++------------------ dlls/wined3d/shader.c | 219 +++++++++++++++++++------------------ dlls/wined3d/shader_sm4.c | 207 ++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 + 5 files changed, 438 insertions(+), 420 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d574d639a42e9b57a0a51…

1 0

Henri Verbeet : wined3d: Introduce a union for declaration shader instruction arguments.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 0a17173bc247381cb63bfdda1a5f1311f44556a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a17173bc247381cb63bfdda1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 17 12:22:22 2012 +0200 wined3d: Introduce a union for declaration shader instruction arguments. --- dlls/wined3d/shader.c | 24 +++++++++++++----------- dlls/wined3d/shader_sm1.c | 2 +- dlls/wined3d/wined3d_private.h | 5 ++++- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6bb3b5b..3799e04 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -501,29 +501,31 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st /* Handle declarations. */ if (ins.handler_idx == WINED3DSIH_DCL) { - switch (ins.semantic.reg.reg.type) + struct wined3d_shader_semantic *semantic = &ins.declaration.semantic; + + switch (semantic->reg.reg.type) { /* Mark input registers used. */ case WINED3DSPR_INPUT: - reg_maps->input_registers |= 1 << ins.semantic.reg.reg.idx; - shader_signature_from_semantic(&input_signature[ins.semantic.reg.reg.idx], &ins.semantic); + reg_maps->input_registers |= 1 << semantic->reg.reg.idx; + shader_signature_from_semantic(&input_signature[semantic->reg.reg.idx], semantic); break; /* Vertex shader: mark 3.0 output registers used, save token. */ case WINED3DSPR_OUTPUT: - reg_maps->output_registers |= 1 << ins.semantic.reg.reg.idx; - shader_signature_from_semantic(&output_signature[ins.semantic.reg.reg.idx], &ins.semantic); - if (ins.semantic.usage == WINED3D_DECL_USAGE_FOG) + reg_maps->output_registers |= 1 << semantic->reg.reg.idx; + shader_signature_from_semantic(&output_signature[semantic->reg.reg.idx], semantic); + if (semantic->usage == WINED3D_DECL_USAGE_FOG) reg_maps->fog = 1; break; /* Save sampler usage token. */ case WINED3DSPR_SAMPLER: - reg_maps->sampler_type[ins.semantic.reg.reg.idx] = ins.semantic.sampler_type; + reg_maps->sampler_type[semantic->reg.reg.idx] = semantic->sampler_type; break; default: - TRACE("Not recording DCL register type %#x.\n", ins.semantic.reg.reg.type); + TRACE("Not recording DCL register type %#x.\n", semantic->reg.reg.type); break; } } @@ -1314,10 +1316,10 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe if (ins.handler_idx == WINED3DSIH_DCL) { - shader_dump_decl_usage(&ins.semantic, &shader_version); - shader_dump_ins_modifiers(&ins.semantic.reg); + shader_dump_decl_usage(&ins.declaration.semantic, &shader_version); + shader_dump_ins_modifiers(&ins.declaration.semantic.reg); TRACE(" "); - shader_dump_dst_param(&ins.semantic.reg, &shader_version); + shader_dump_dst_param(&ins.declaration.semantic.reg, &shader_version); } else if (ins.handler_idx == WINED3DSIH_DEF) { diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index 8721d7e..b8b96dd 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -670,7 +670,7 @@ static void shader_sm1_read_instruction(void *data, const DWORD **ptr, struct wi if (ins->handler_idx == WINED3DSIH_DCL) { - shader_sm1_read_semantic(&p, &ins->semantic); + shader_sm1_read_semantic(&p, &ins->declaration.semantic); } else if (ins->handler_idx == WINED3DSIH_DEF) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bd5c5e2..8f1b168 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -663,7 +663,10 @@ struct wined3d_shader_instruction const struct wined3d_shader_dst_param *dst; UINT src_count; const struct wined3d_shader_src_param *src; - struct wined3d_shader_semantic semantic; + union + { + struct wined3d_shader_semantic semantic; + } declaration; }; struct wined3d_shader_attribute

1 0

Hans Leidekker : wbemprox: Implement Win32_VideoController.Description.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 2760a70aeecb79551931b49ba5512f068fbd8919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2760a70aeecb79551931b49ba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 17 12:19:30 2012 +0200 wbemprox: Implement Win32_VideoController.Description. --- dlls/wbemprox/builtin.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 41a31f3..5434fc5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -287,6 +287,7 @@ static const struct column col_videocontroller[] = { prop_currentbitsperpixelW, CIM_UINT32 }, { prop_currenthorizontalresW, CIM_UINT32 }, { prop_currentverticalresW, CIM_UINT32 }, + { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC } }; @@ -428,6 +429,7 @@ struct record_videocontroller UINT32 current_bitsperpixel; UINT32 current_horizontalres; UINT32 current_verticalres; + const WCHAR *description; const WCHAR *device_id; const WCHAR *name; }; @@ -1050,6 +1052,7 @@ done: rec->current_bitsperpixel = get_bits_per_pixel( &hres, &vres ); rec->current_horizontalres = hres; rec->current_verticalres = vres; + rec->description = heap_strdupW( name ); rec->device_id = videocontroller_deviceidW; rec->name = heap_strdupW( name );

1 0

Hans Leidekker : wbemprox: Win32_Processor. MaxClockSpeed is expressed in Mhz.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: c60fe4751874905ce5b763916a93de7588073c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c60fe4751874905ce5b763916… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 17 12:19:13 2012 +0200 wbemprox: Win32_Processor.MaxClockSpeed is expressed in Mhz. --- dlls/wbemprox/builtin.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 7e416a5..41a31f3 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -783,7 +783,7 @@ static void get_processor_name( WCHAR *name ) static UINT get_processor_maxclockspeed( void ) { PROCESSOR_POWER_INFORMATION *info; - UINT ret = 1000000, size = get_processor_count() * sizeof(PROCESSOR_POWER_INFORMATION); + UINT ret = 1000, size = get_processor_count() * sizeof(PROCESSOR_POWER_INFORMATION); NTSTATUS status; if ((info = heap_alloc( size )))

1 0

Hans Leidekker : wbemprox: Override variant conversion for Win32_Processor. MaxClockSpeed.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 8e5350041863300a4fc70d718dea253b1fe4be4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e5350041863300a4fc70d718… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 17 12:18:58 2012 +0200 wbemprox: Override variant conversion for Win32_Processor.MaxClockSpeed. --- dlls/wbemprox/builtin.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 30dfd4c..7e416a5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -259,7 +259,7 @@ static const struct column col_processor[] = { prop_cpustatusW, CIM_UINT16 }, { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_maxclockspeedW, CIM_UINT32 }, + { prop_maxclockspeedW, CIM_UINT32, VT_I4 }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_numlogicalprocessorsW, CIM_UINT32, VT_I4 }, { prop_processoridW, CIM_STRING|COL_FLAG_DYNAMIC }

1 0

Hans Leidekker : wbemprox: Adapt to the new behavior of NtPowerInformation.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 66d39fba285128702fbe59b26063b4d9f69f5eaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=66d39fba285128702fbe59b26… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 17 12:18:46 2012 +0200 wbemprox: Adapt to the new behavior of NtPowerInformation. --- dlls/wbemprox/builtin.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index c2271c0..30dfd4c 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -782,9 +782,17 @@ static void get_processor_name( WCHAR *name ) } static UINT get_processor_maxclockspeed( void ) { - PROCESSOR_POWER_INFORMATION info; - if (!NtPowerInformation( ProcessorInformation, NULL, 0, &info, sizeof(info) )) return info.MaxMhz; - return 1000000; + PROCESSOR_POWER_INFORMATION *info; + UINT ret = 1000000, size = get_processor_count() * sizeof(PROCESSOR_POWER_INFORMATION); + NTSTATUS status; + + if ((info = heap_alloc( size ))) + { + status = NtPowerInformation( ProcessorInformation, NULL, 0, info, size ); + if (!status) ret = info[0].MaxMhz; + heap_free( info ); + } + return ret; } static void fill_processor( struct table *table )

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
83
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 September 2012