wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Henri Verbeet : wined3d: Implement WINED3DSIH_EQ in the GLSL shader backend .
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 09f5f592292c7dbd4149eeab653eb9124ed3ba75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09f5f592292c7dbd4149eeab6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 10 22:22:17 2012 +0200 wined3d: Implement WINED3DSIH_EQ in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 46 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 45 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 52298fa..47ace5d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2218,6 +2218,50 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "%s %c %s);\n", src0_param.param_str, op, src1_param.param_str); } +static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) +{ + struct wined3d_shader_buffer *buffer = ins->ctx->buffer; + struct glsl_src_param src0_param; + struct glsl_src_param src1_param; + unsigned int mask_size; + DWORD write_mask; + const char *op; + + write_mask = shader_glsl_append_dst(buffer, ins); + mask_size = shader_glsl_get_write_mask_size(write_mask); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); + shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); + + if (mask_size > 1) + { + switch (ins->handler_idx) + { + case WINED3DSIH_EQ: op = "equal"; break; + default: + op = "<unhandled operator>"; + ERR("Unhandled opcode %#x.\n", ins->handler_idx); + break; + } + + shader_addline(buffer, "uvec%u(%s(%s, %s)) * 0xffffffffu);\n", + mask_size, op, src0_param.param_str, src1_param.param_str); + } + else + { + switch (ins->handler_idx) + { + case WINED3DSIH_EQ: op = "=="; break; + default: + op = "<unhandled operator>"; + ERR("Unhandled opcode %#x.\n", ins->handler_idx); + break; + } + + shader_addline(buffer, "%s %s %s ? 0xffffffffu : 0u);\n", + src0_param.param_str, op, src1_param.param_str); + } +} + /* Process the WINED3DSIO_MOV opcode using GLSL (dst = src) */ static void shader_glsl_mov(const struct wined3d_shader_instruction *ins) { @@ -5223,7 +5267,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ENDIF */ shader_glsl_end, /* WINED3DSIH_ENDLOOP */ shader_glsl_end, /* WINED3DSIH_ENDREP */ shader_glsl_end, - /* WINED3DSIH_EQ */ NULL, + /* WINED3DSIH_EQ */ shader_glsl_relop, /* WINED3DSIH_EXP */ shader_glsl_map2gl, /* WINED3DSIH_EXPP */ shader_glsl_expp, /* WINED3DSIH_FRC */ shader_glsl_map2gl,

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_XOR in the GLSL shader backend.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 4c4b224330ecb45c4f32a6f53e40de66f01778f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c4b224330ecb45c4f32a6f53… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 10 22:22:16 2012 +0200 wined3d: Implement WINED3DSIH_XOR in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0c5ceb6..52298fa 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2205,6 +2205,7 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_IADD: op = '+'; break; case WINED3DSIH_MUL: op = '*'; break; case WINED3DSIH_SUB: op = '-'; break; + case WINED3DSIH_XOR: op = '^'; break; default: op = ' '; FIXME("Opcode %#x not yet handled in GLSL\n", ins->handler_idx); @@ -5299,7 +5300,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_UDIV */ NULL, /* WINED3DSIH_USHR */ NULL, /* WINED3DSIH_UTOF */ NULL, - /* WINED3DSIH_XOR */ NULL, + /* WINED3DSIH_XOR */ shader_glsl_binop, }; static void shader_glsl_handle_instruction(const struct wined3d_shader_instruction *ins) {

1 0

Lucas Zawacki : Portuguese translation for release 1.5.14
by Jeremy Newman 11 Oct '12

11 Oct '12

Module: website Branch: master Commit: 0a0ee01f9c633eeacb86af50ed2e428823814665 URL: http://source.winehq.org/git/website.git/?a=commit;h=0a0ee01f9c633eeacb86af… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Thu Oct 11 14:53:37 2012 -0300 Portuguese translation for release 1.5.14 --- news/pt/2012092801.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/pt/2012092801.xml b/news/pt/2012092801.xml new file mode 100644 index 0000000..64b6cd3 --- /dev/null +++ b/news/pt/2012092801.xml @@ -0,0 +1,16 @@ +<news> +<date>28 de Setembro de 2012</date> +<title>Wine 1.5.14 lançado</title> +<body> + A versão de desenvolvimento 1.5.14 já está disponível. + <a href="{$root}/announce/1.5.14">Novidades</a> nesta versão: +<ul> + <li>Grandes melhorias no comportamento da cache de URL.</li> + <li>Melhorias no suporte a imagens GIF.</li> + <li>Melhorias no analisador do compilador de shaders.</li> + <li>Otimizações do JavaScript.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.14.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Lucas Zawacki : Portuguese translation for release 1.5.13
by Jeremy Newman 11 Oct '12

11 Oct '12

Module: website Branch: master Commit: 5ecc071831e9600303fe93409926331ca8ac530f URL: http://source.winehq.org/git/website.git/?a=commit;h=5ecc071831e9600303fe93… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Thu Oct 11 14:53:36 2012 -0300 Portuguese translation for release 1.5.13 --- news/pt/2012091401.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/pt/2012091401.xml b/news/pt/2012091401.xml new file mode 100644 index 0000000..6b82387 --- /dev/null +++ b/news/pt/2012091401.xml @@ -0,0 +1,18 @@ +<news> +<date>14 de Setembro de 2012</date> +<title>Wine 1.5.13 lançado</title> +<body> + A versão de desenvolvimento 1.5.13 já está disponível. + <a href="{$root}/announce/1.5.13">Novidades</a> nesta versão: +<ul> + <li>Desenho de janelas em Client-side usando a DIB engine.</li> + <li>Suporte para Raw input do teclado e mouse.</li> + <li>Suporte a janelas com áreas transparentes usando color keying.</li> + <li>Suporte a C++ RTTI em processadores 64-bit.</li> + <li>Implementação de informações lógicas de processador.</li> + <li>Suporte a fontes com nomes localizados.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.13.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Lucas Zawacki : Portuguese translation for release 1.5.12
by Jeremy Newman 11 Oct '12

11 Oct '12

Module: website Branch: master Commit: ed35cf50b54f77dce9dd6ba35895abfb6d2c8cd8 URL: http://source.winehq.org/git/website.git/?a=commit;h=ed35cf50b54f77dce9dd6b… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Thu Oct 11 14:53:35 2012 -0300 Portuguese translation for release 1.5.12 --- news/pt/2012083101.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/pt/2012083101.xml b/news/pt/2012083101.xml new file mode 100644 index 0000000..7b4575e --- /dev/null +++ b/news/pt/2012083101.xml @@ -0,0 +1,15 @@ +<news> +<date>31 de Agosto de 2012</date> +<title>Wine 1.5.12 lançado</title> +<body> + A versão de desenvolvimento 1.5.12 já está disponível. + <a href="{$root}/announce/1.5.12">Novidades</a> nesta versão: +<ul> + <li>Possibilidade de desativar joysticks individualmente.</li> + <li>Melhor suporte às tabelas de constantes do D3DX9.</li> + <li>Algumas melhoras no XRandR.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.12.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Lucas Zawacki : Portuguese translation for 08/21 news
by Jeremy Newman 11 Oct '12

11 Oct '12

Module: website Branch: master Commit: a77bcc56ff8015b73640965515f50aca8031ad11 URL: http://source.winehq.org/git/website.git/?a=commit;h=a77bcc56ff8015b7364096… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Thu Oct 11 14:53:34 2012 -0300 Portuguese translation for 08/21 news --- news/pt/2012082101.xml | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/news/pt/2012082101.xml b/news/pt/2012082101.xml new file mode 100644 index 0000000..4b99189 --- /dev/null +++ b/news/pt/2012082101.xml @@ -0,0 +1,5 @@ +<news> +<date>21 de Agosto de 2012</date> +<title>Doações do JIB</title> +<body> +O projeto <a href="http://jib.magicermine.com">Jinn in the Bottle</a> recentemente anunciou que estará doando 15% de suas vendas para o Wine.</body></news>

1 0

Matteo Bruni : d3dcompiler: Don' t raise a warning for an uninitialized uniform.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 1f876a670e60464b4a39de2382c533782179172f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f876a670e60464b4a39de238… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 10 18:26:00 2012 +0200 d3dcompiler: Don't raise a warning for an uninitialized uniform. --- dlls/d3dcompiler_43/hlsl.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index afb12ec..a7d4c68 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -605,7 +605,7 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, local = FALSE; } - if (var->modifiers & HLSL_MODIFIER_CONST && !v->initializer) + if (var->modifiers & HLSL_MODIFIER_CONST && !(var->modifiers & HLSL_STORAGE_UNIFORM) && !v->initializer) { hlsl_report_message(v->loc.file, v->loc.line, v->loc.col, HLSL_LEVEL_ERROR, "const variable without initializer");

1 0

Matteo Bruni : d3dcompiler/tests: Fix access to the test output for y > 0.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 71da1bac5d78d9d07ea6da1ea6379caa1d89a856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71da1bac5d78d9d07ea6da1ea… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 10 18:25:59 2012 +0200 d3dcompiler/tests: Fix access to the test output for y > 0. --- dlls/d3dcompiler_43/tests/hlsl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index a528e80..1bc3641 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -269,7 +269,7 @@ static void compute_shader_probe9(IDirect3DDevice9 *device, IDirect3DVertexShade /* Now go through the probes and check each one */ for (i = 0; i < count; i++, probes++) { - int index = probes->x + (probes->y * lr.Pitch); + int index = probes->x + (probes->y * lr.Pitch / sizeof(D3DXCOLOR)); ok(colors_match(probes->c, pbits_data[index], probes->epsilon), "Line %d: At (%d, %d): %s: Expected (%.04f,%.04f,%.04f, %.04f), got " "(%.04f,%.04f,%.04f,%.04f)\n", line_number, probes->x, probes->y, probes->message,

1 0

Matteo Bruni : d3dcompiler: Fix "for" syntax.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: f4eccde66d7942165d48375f9f9adce679f7169b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4eccde66d7942165d48375f9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 10 18:25:58 2012 +0200 d3dcompiler: Fix "for" syntax. --- dlls/d3dcompiler_43/hlsl.y | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 8627e54..afb12ec 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -320,7 +320,7 @@ enum loop_type }; static struct list *create_loop(enum loop_type type, struct list *init, struct list *cond, - struct list *iter, struct list *body, struct source_location *loc) + struct hlsl_ir_node *iter, struct list *body, struct source_location *loc) { struct list *list = NULL; struct hlsl_ir_loop *loop = NULL; @@ -355,14 +355,13 @@ static struct list *create_loop(enum loop_type type, struct list *init, struct l list_move_tail(loop->body, body); if (iter) - list_move_tail(loop->body, iter); + list_add_tail(loop->body, &iter->entry); if (type == LOOP_DO_WHILE) list_add_tail(loop->body, &cond_jump->node.entry); d3dcompiler_free(init); d3dcompiler_free(cond); - d3dcompiler_free(iter); d3dcompiler_free(body); return list; @@ -375,7 +374,7 @@ oom: d3dcompiler_free(list); free_instr_list(init); free_instr_list(cond); - free_instr_list(iter); + free_instr(iter); free_instr_list(body); return NULL; } @@ -1651,7 +1650,7 @@ loop_statement: KW_WHILE '(' expr ')' statement set_location(&loc, &@1); $$ = create_loop(LOOP_DO_WHILE, NULL, cond, NULL, $2, &loc); } - | KW_FOR '(' scope_start expr_statement expr_statement expr_statement ')' statement + | KW_FOR '(' scope_start expr_statement expr_statement expr ')' statement { struct source_location loc; @@ -1659,7 +1658,7 @@ loop_statement: KW_WHILE '(' expr ')' statement $$ = create_loop(LOOP_FOR, $4, $5, $6, $8, &loc); pop_scope(&hlsl_ctx); } - | KW_FOR '(' scope_start declaration expr_statement expr_statement ')' statement + | KW_FOR '(' scope_start declaration expr_statement expr ')' statement { struct source_location loc;

1 0

Matteo Bruni : d3d8: Use proper helper.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: f90f895759bf541ca1a245814beba67ed257cd33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f90f895759bf541ca1a245814… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 10 18:25:57 2012 +0200 d3d8: Use proper helper. --- dlls/d3d8/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b16d5bf..8cd150f 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -168,7 +168,7 @@ static void check_mipmap_levels(IDirect3DDevice8 *device, UINT width, UINT heigh } else trace("CreateTexture failed: %#08x\n", hr); - if (texture) IDirect3DDevice8_Release( texture ); + if (texture) IDirect3DBaseTexture8_Release( texture ); } static void test_mipmap_levels(void)

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
96
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 October 2012