June 2009 - Wine-Commits - list.winehq.org

Francois Gouget : notepad: Ellipses should be preceded by a space in Slovenian.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: 344ddc6b890bff033f8c11efa36ac3168f8b0e9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=344ddc6b890bff033f8c11efa… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jun 28 18:53:07 2009 +0200 notepad: Ellipses should be preceded by a space in Slovenian. --- programs/notepad/Si.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/notepad/Si.rc b/programs/notepad/Si.rc index 6ef38ee..a1ffc73 100644 --- a/programs/notepad/Si.rc +++ b/programs/notepad/Si.rc @@ -53,7 +53,7 @@ POPUP "&Urejanje" { POPUP "&Iskanje" { MENUITEM "&Najdi ...\tCtrl+F", CMD_SEARCH MENUITEM "Najdi na&slednje\tF3", CMD_SEARCH_NEXT - MENUITEM "&Zamenjaj...\tCtrl+H", CMD_REPLACE + MENUITEM "&Zamenjaj ...\tCtrl+H", CMD_REPLACE } POPUP "&Pomoč" { MENUITEM "&Teme pomoči", CMD_HELP_CONTENTS

1 0

Stefan Dösinger : wined3d: Add the vertex shader footer in the main function.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: d4312ebb16578d7d8ae193edd3d293d3748c7df4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4312ebb16578d7d8ae193edd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 25 19:52:17 2009 +0200 wined3d: Add the vertex shader footer in the main function. --- dlls/wined3d/arb_program_shader.c | 182 ++++++++++++++++++++----------------- 1 files changed, 98 insertions(+), 84 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a9862ad..e438366 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -201,6 +201,8 @@ struct shader_arb_ctx_priv int aL; unsigned int vs_clipplanes; + BOOL footer_written; + BOOL in_main_func; /* For 3.0 vertex shaders */ const char *vs_output[MAX_REG_OUTPUT]; @@ -2804,6 +2806,7 @@ static void shader_hw_label(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; + priv->in_main_func = FALSE; /* Call instructions activate the NV extensions, not labels and rets. If there is an uncalled * subroutine, don't generate a label that will make GL complain */ @@ -2812,13 +2815,105 @@ static void shader_hw_label(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "l%u:\n", ins->src[0].reg.idx); } +static void vshader_add_footer(IWineD3DVertexShaderImpl *This, SHADER_BUFFER *buffer, const struct arb_vs_compile_args *args, + struct shader_arb_ctx_priv *priv_ctx) +{ + const shader_reg_maps *reg_maps = &This->baseShader.reg_maps; + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)This->baseShader.device; + const WineD3D_GL_Info *gl_info = &device->adapter->gl_info; + unsigned int i; + + /* The D3DRS_FOGTABLEMODE render state defines if the shader-generated fog coord is used + * or if the fragment depth is used. If the fragment depth is used(FOGTABLEMODE != NONE), + * the fog frag coord is thrown away. If the fog frag coord is used, but not written by + * the shader, it is set to 0.0(fully fogged, since start = 1.0, end = 0.0) + */ + if(args->super.fog_src == VS_FOG_Z) { + shader_addline(buffer, "MOV result.fogcoord, TMP_OUT.z;\n"); + } else if (!reg_maps->fog) { + /* posFixup.x is always 1.0, so we can savely use it */ + shader_addline(buffer, "ADD result.fogcoord, posFixup.x, -posFixup.x;\n"); + } + + /* Write the final position. + * + * OpenGL coordinates specify the center of the pixel while d3d coords specify + * the corner. The offsets are stored in z and w in posFixup. posFixup.y contains + * 1.0 or -1.0 to turn the rendering upside down for offscreen rendering. PosFixup.x + * contains 1.0 to allow a mad, but arb vs swizzles are too restricted for that. + */ + shader_addline(buffer, "MUL TA, posFixup, TMP_OUT.w;\n"); + shader_addline(buffer, "ADD TMP_OUT.x, TMP_OUT.x, TA.z;\n"); + shader_addline(buffer, "MAD TMP_OUT.y, TMP_OUT.y, posFixup.y, TA.w;\n"); + + if(use_nv_clip(gl_info) && priv_ctx->target_version >= NV2) + { + for(i = 0; i < priv_ctx->vs_clipplanes; i++) + { + shader_addline(buffer, "DP4 result.clip[%u].x, TMP_OUT, state.clip[%u].plane;\n", i, i); + } + } + else if(args->boolclip.clip_control[0]) + { + unsigned int cur_clip = 0; + char component[4] = {'x', 'y', 'z', 'w'}; + + for(i = 0; i < GL_LIMITS(clipplanes); i++) + { + if(args->boolclip.clip_control[1] & (1 << i)) + { + shader_addline(buffer, "DP4 TA.%c, TMP_OUT, state.clip[%u].plane;\n", + component[cur_clip++], i); + } + } + switch(cur_clip) + { + case 0: + shader_addline(buffer, "MOV TA, -helper_const.w;\n"); + break; + case 1: + shader_addline(buffer, "MOV TA.yzw, -helper_const.w;\n"); + break; + case 2: + shader_addline(buffer, "MOV TA.zw, -helper_const.w;\n"); + break; + case 3: + shader_addline(buffer, "MOV TA.w, -helper_const.w;\n"); + break; + } + shader_addline(buffer, "MOV result.texcoord[%u], TA;\n", + args->boolclip.clip_control[0] - 1); + } + + /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c + * and the glsl equivalent + */ + if(need_helper_const(gl_info)) { + shader_addline(buffer, "MAD TMP_OUT.z, TMP_OUT.z, helper_const.x, -TMP_OUT.w;\n"); + } else { + shader_addline(buffer, "ADD TMP_OUT.z, TMP_OUT.z, TMP_OUT.z;\n"); + shader_addline(buffer, "ADD TMP_OUT.z, TMP_OUT.z, -TMP_OUT.w;\n"); + } + + shader_addline(buffer, "MOV result.position, TMP_OUT;\n"); + + priv_ctx->footer_written = TRUE; +} + static void shader_hw_ret(const struct wined3d_shader_instruction *ins) { SHADER_BUFFER *buffer = ins->ctx->buffer; struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; + IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *) ins->ctx->shader; + BOOL vshader = shader_is_vshader_version(ins->ctx->reg_maps->shader_version.type); if(priv->target_version == ARB) return; + if(vshader) + { + if(priv->in_main_func) vshader_add_footer((IWineD3DVertexShaderImpl *) shader, buffer, priv->cur_vs_args, priv); + } + shader_addline(buffer, "RET;\n"); } @@ -3565,89 +3660,6 @@ static void init_output_registers(IWineD3DVertexShaderImpl *shader, DWORD sig_nu } } -static void vshader_add_footer(IWineD3DVertexShaderImpl *This, SHADER_BUFFER *buffer, const struct arb_vs_compile_args *args, - struct shader_arb_ctx_priv *priv_ctx) -{ - const shader_reg_maps *reg_maps = &This->baseShader.reg_maps; - IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)This->baseShader.device; - const WineD3D_GL_Info *gl_info = &device->adapter->gl_info; - unsigned int i; - - /* The D3DRS_FOGTABLEMODE render state defines if the shader-generated fog coord is used - * or if the fragment depth is used. If the fragment depth is used(FOGTABLEMODE != NONE), - * the fog frag coord is thrown away. If the fog frag coord is used, but not written by - * the shader, it is set to 0.0(fully fogged, since start = 1.0, end = 0.0) - */ - if(args->super.fog_src == VS_FOG_Z) { - shader_addline(buffer, "MOV result.fogcoord, TMP_OUT.z;\n"); - } else if (!reg_maps->fog) { - /* posFixup.x is always 1.0, so we can savely use it */ - shader_addline(buffer, "ADD result.fogcoord, posFixup.x, -posFixup.x;\n"); - } - - /* Write the final position. - * - * OpenGL coordinates specify the center of the pixel while d3d coords specify - * the corner. The offsets are stored in z and w in posFixup. posFixup.y contains - * 1.0 or -1.0 to turn the rendering upside down for offscreen rendering. PosFixup.x - * contains 1.0 to allow a mad, but arb vs swizzles are too restricted for that. - */ - shader_addline(buffer, "MUL TA, posFixup, TMP_OUT.w;\n"); - shader_addline(buffer, "ADD TMP_OUT.x, TMP_OUT.x, TA.z;\n"); - shader_addline(buffer, "MAD TMP_OUT.y, TMP_OUT.y, posFixup.y, TA.w;\n"); - - if(use_nv_clip(gl_info) && priv_ctx->target_version >= NV2) - { - for(i = 0; i < priv_ctx->vs_clipplanes; i++) - { - shader_addline(buffer, "DP4 result.clip[%u].x, TMP_OUT, state.clip[%u].plane;\n", i, i); - } - } - else if(args->boolclip.clip_control[0]) - { - unsigned int cur_clip = 0; - char component[4] = {'x', 'y', 'z', 'w'}; - - for(i = 0; i < GL_LIMITS(clipplanes); i++) - { - if(args->boolclip.clip_control[1] & (1 << i)) - { - shader_addline(buffer, "DP4 TA.%c, TMP_OUT, state.clip[%u].plane;\n", - component[cur_clip++], i); - } - } - switch(cur_clip) - { - case 0: - shader_addline(buffer, "MOV TA, -helper_const.w;\n"); - break; - case 1: - shader_addline(buffer, "MOV TA.yzw, -helper_const.w;\n"); - break; - case 2: - shader_addline(buffer, "MOV TA.zw, -helper_const.w;\n"); - break; - case 3: - shader_addline(buffer, "MOV TA.w, -helper_const.w;\n"); - break; - } - shader_addline(buffer, "MOV result.texcoord[%u], TA;\n", - args->boolclip.clip_control[0] - 1); - } - - /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c - * and the glsl equivalent - */ - if(need_helper_const(gl_info)) { - shader_addline(buffer, "MAD TMP_OUT.z, TMP_OUT.z, helper_const.x, -TMP_OUT.w;\n"); - } else { - shader_addline(buffer, "ADD TMP_OUT.z, TMP_OUT.z, TMP_OUT.z;\n"); - shader_addline(buffer, "ADD TMP_OUT.z, TMP_OUT.z, -TMP_OUT.w;\n"); - } - - shader_addline(buffer, "MOV result.position, TMP_OUT;\n"); -} - /* GL locking is done by the caller */ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, SHADER_BUFFER *buffer, const struct arb_vs_compile_args *args, struct arb_vs_compiled_shader *compiled) @@ -3750,10 +3762,12 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, } } + /* The shader starts with the main function */ + priv_ctx.in_main_func = TRUE; /* Base Shader Body */ shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, &priv_ctx); - vshader_add_footer(This, buffer, args, &priv_ctx); + if(!priv_ctx.footer_written) vshader_add_footer(This, buffer, args, &priv_ctx); shader_addline(buffer, "END\n");

1 0

Stefan Dösinger : wined3d: Write the vshader footer in a separate function.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: 5befed21f62a3d5e7d123ff3b8d4f533faa38c81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5befed21f62a3d5e7d123ff3b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 25 19:43:11 2009 +0200 wined3d: Write the vshader footer in a separate function. --- dlls/wined3d/arb_program_shader.c | 162 ++++++++++++++++++++----------------- 1 files changed, 87 insertions(+), 75 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 729ff44..a9862ad 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -200,6 +200,8 @@ struct shader_arb_ctx_priv unsigned int num_loops, loop_depth, num_ifcs; int aL; + unsigned int vs_clipplanes; + /* For 3.0 vertex shaders */ const char *vs_output[MAX_REG_OUTPUT]; /* For 2.x and earlier vertex shaders */ @@ -3563,6 +3565,89 @@ static void init_output_registers(IWineD3DVertexShaderImpl *shader, DWORD sig_nu } } +static void vshader_add_footer(IWineD3DVertexShaderImpl *This, SHADER_BUFFER *buffer, const struct arb_vs_compile_args *args, + struct shader_arb_ctx_priv *priv_ctx) +{ + const shader_reg_maps *reg_maps = &This->baseShader.reg_maps; + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)This->baseShader.device; + const WineD3D_GL_Info *gl_info = &device->adapter->gl_info; + unsigned int i; + + /* The D3DRS_FOGTABLEMODE render state defines if the shader-generated fog coord is used + * or if the fragment depth is used. If the fragment depth is used(FOGTABLEMODE != NONE), + * the fog frag coord is thrown away. If the fog frag coord is used, but not written by + * the shader, it is set to 0.0(fully fogged, since start = 1.0, end = 0.0) + */ + if(args->super.fog_src == VS_FOG_Z) { + shader_addline(buffer, "MOV result.fogcoord, TMP_OUT.z;\n"); + } else if (!reg_maps->fog) { + /* posFixup.x is always 1.0, so we can savely use it */ + shader_addline(buffer, "ADD result.fogcoord, posFixup.x, -posFixup.x;\n"); + } + + /* Write the final position. + * + * OpenGL coordinates specify the center of the pixel while d3d coords specify + * the corner. The offsets are stored in z and w in posFixup. posFixup.y contains + * 1.0 or -1.0 to turn the rendering upside down for offscreen rendering. PosFixup.x + * contains 1.0 to allow a mad, but arb vs swizzles are too restricted for that. + */ + shader_addline(buffer, "MUL TA, posFixup, TMP_OUT.w;\n"); + shader_addline(buffer, "ADD TMP_OUT.x, TMP_OUT.x, TA.z;\n"); + shader_addline(buffer, "MAD TMP_OUT.y, TMP_OUT.y, posFixup.y, TA.w;\n"); + + if(use_nv_clip(gl_info) && priv_ctx->target_version >= NV2) + { + for(i = 0; i < priv_ctx->vs_clipplanes; i++) + { + shader_addline(buffer, "DP4 result.clip[%u].x, TMP_OUT, state.clip[%u].plane;\n", i, i); + } + } + else if(args->boolclip.clip_control[0]) + { + unsigned int cur_clip = 0; + char component[4] = {'x', 'y', 'z', 'w'}; + + for(i = 0; i < GL_LIMITS(clipplanes); i++) + { + if(args->boolclip.clip_control[1] & (1 << i)) + { + shader_addline(buffer, "DP4 TA.%c, TMP_OUT, state.clip[%u].plane;\n", + component[cur_clip++], i); + } + } + switch(cur_clip) + { + case 0: + shader_addline(buffer, "MOV TA, -helper_const.w;\n"); + break; + case 1: + shader_addline(buffer, "MOV TA.yzw, -helper_const.w;\n"); + break; + case 2: + shader_addline(buffer, "MOV TA.zw, -helper_const.w;\n"); + break; + case 3: + shader_addline(buffer, "MOV TA.w, -helper_const.w;\n"); + break; + } + shader_addline(buffer, "MOV result.texcoord[%u], TA;\n", + args->boolclip.clip_control[0] - 1); + } + + /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c + * and the glsl equivalent + */ + if(need_helper_const(gl_info)) { + shader_addline(buffer, "MAD TMP_OUT.z, TMP_OUT.z, helper_const.x, -TMP_OUT.w;\n"); + } else { + shader_addline(buffer, "ADD TMP_OUT.z, TMP_OUT.z, TMP_OUT.z;\n"); + shader_addline(buffer, "ADD TMP_OUT.z, TMP_OUT.z, -TMP_OUT.w;\n"); + } + + shader_addline(buffer, "MOV result.position, TMP_OUT;\n"); +} + /* GL locking is done by the caller */ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, SHADER_BUFFER *buffer, const struct arb_vs_compile_args *args, struct arb_vs_compiled_shader *compiled) @@ -3576,7 +3661,6 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, DWORD next_local, *lconst_map = local_const_mapping((IWineD3DBaseShaderImpl *) This); struct shader_arb_ctx_priv priv_ctx; unsigned int i; - DWORD num_clipplanes = 0; memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.cur_vs_args = args; @@ -3614,7 +3698,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, /* Base Declarations */ next_local = shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, - lconst_map, &num_clipplanes, &priv_ctx); + lconst_map, &priv_ctx.vs_clipplanes, &priv_ctx); for(i = 0; i < MAX_CONST_I; i++) { @@ -3669,79 +3753,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, /* Base Shader Body */ shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, &priv_ctx); - /* The D3DRS_FOGTABLEMODE render state defines if the shader-generated fog coord is used - * or if the fragment depth is used. If the fragment depth is used(FOGTABLEMODE != NONE), - * the fog frag coord is thrown away. If the fog frag coord is used, but not written by - * the shader, it is set to 0.0(fully fogged, since start = 1.0, end = 0.0) - */ - if(args->super.fog_src == VS_FOG_Z) { - shader_addline(buffer, "MOV result.fogcoord, TMP_OUT.z;\n"); - } else if (!reg_maps->fog) { - /* posFixup.x is always 1.0, so we can savely use it */ - shader_addline(buffer, "ADD result.fogcoord, posFixup.x, -posFixup.x;\n"); - } - - /* Write the final position. - * - * OpenGL coordinates specify the center of the pixel while d3d coords specify - * the corner. The offsets are stored in z and w in posFixup. posFixup.y contains - * 1.0 or -1.0 to turn the rendering upside down for offscreen rendering. PosFixup.x - * contains 1.0 to allow a mad, but arb vs swizzles are too restricted for that. - */ - shader_addline(buffer, "MUL TA, posFixup, TMP_OUT.w;\n"); - shader_addline(buffer, "ADD TMP_OUT.x, TMP_OUT.x, TA.z;\n"); - shader_addline(buffer, "MAD TMP_OUT.y, TMP_OUT.y, posFixup.y, TA.w;\n"); - - if(use_nv_clip(gl_info) && priv_ctx.target_version >= NV2) - { - for(i = 0; i < num_clipplanes; i++) - { - shader_addline(buffer, "DP4 result.clip[%u].x, TMP_OUT, state.clip[%u].plane;\n", i, i); - } - } - else if(args->boolclip.clip_control[0]) - { - unsigned int cur_clip = 0; - char component[4] = {'x', 'y', 'z', 'w'}; - - for(i = 0; i < GL_LIMITS(clipplanes); i++) - { - if(args->boolclip.clip_control[1] & (1 << i)) - { - shader_addline(buffer, "DP4 TA.%c, TMP_OUT, state.clip[%u].plane;\n", - component[cur_clip++], i); - } - } - switch(cur_clip) - { - case 0: - shader_addline(buffer, "MOV TA, -helper_const.w;\n"); - break; - case 1: - shader_addline(buffer, "MOV TA.yzw, -helper_const.w;\n"); - break; - case 2: - shader_addline(buffer, "MOV TA.zw, -helper_const.w;\n"); - break; - case 3: - shader_addline(buffer, "MOV TA.w, -helper_const.w;\n"); - break; - } - shader_addline(buffer, "MOV result.texcoord[%u], TA;\n", - args->boolclip.clip_control[0] - 1); - } - - /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c - * and the glsl equivalent - */ - if(need_helper_const(gl_info)) { - shader_addline(buffer, "MAD TMP_OUT.z, TMP_OUT.z, helper_const.x, -TMP_OUT.w;\n"); - } else { - shader_addline(buffer, "ADD TMP_OUT.z, TMP_OUT.z, TMP_OUT.z;\n"); - shader_addline(buffer, "ADD TMP_OUT.z, TMP_OUT.z, -TMP_OUT.w;\n"); - } - - shader_addline(buffer, "MOV result.position, TMP_OUT;\n"); + vshader_add_footer(This, buffer, args, &priv_ctx); shader_addline(buffer, "END\n");

1 0

Stefan Dösinger : wined3d: Implement function calls with NV exts.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: 5859d877544747fdedd18c32918696fa3442131d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5859d877544747fdedd18c329… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 25 18:54:28 2009 +0200 wined3d: Implement function calls with NV exts. --- dlls/wined3d/arb_program_shader.c | 37 +++++++++++++++++++++++++++++++++---- dlls/wined3d/baseshader.c | 7 +++++-- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 06bcc62..729ff44 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2797,6 +2797,35 @@ static void shader_hw_texldl(const struct wined3d_shader_instruction *ins) shader_hw_sample(ins, sampler_idx, reg_dest, reg_coord, flags, NULL, NULL); } +static void shader_hw_label(const struct wined3d_shader_instruction *ins) +{ + SHADER_BUFFER *buffer = ins->ctx->buffer; + struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; + + /* Call instructions activate the NV extensions, not labels and rets. If there is an uncalled + * subroutine, don't generate a label that will make GL complain + */ + if(priv->target_version == ARB) return; + + shader_addline(buffer, "l%u:\n", ins->src[0].reg.idx); +} + +static void shader_hw_ret(const struct wined3d_shader_instruction *ins) +{ + SHADER_BUFFER *buffer = ins->ctx->buffer; + struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; + + if(priv->target_version == ARB) return; + + shader_addline(buffer, "RET;\n"); +} + +static void shader_hw_call(const struct wined3d_shader_instruction *ins) +{ + SHADER_BUFFER *buffer = ins->ctx->buffer; + shader_addline(buffer, "CAL l%u;\n", ins->src[0].reg.idx); +} + /* GL locking is done by the caller */ static GLuint create_arb_blt_vertex_program(const WineD3D_GL_Info *gl_info) { @@ -3079,7 +3108,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, * So enable the best we can get. */ if(reg_maps->usesdsx || reg_maps->usesdsy || reg_maps->loop_depth > 0 || reg_maps->usestexldd || - reg_maps->usestexldl || reg_maps->usesfacing || reg_maps->usesifc) + reg_maps->usestexldl || reg_maps->usesfacing || reg_maps->usesifc || reg_maps->usescall) { want_nv_prog = TRUE; } @@ -4388,7 +4417,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_BREAK */ shader_hw_break, /* WINED3DSIH_BREAKC */ shader_hw_breakc, /* WINED3DSIH_BREAKP */ NULL, - /* WINED3DSIH_CALL */ NULL, + /* WINED3DSIH_CALL */ shader_hw_call, /* WINED3DSIH_CALLNZ */ NULL, /* WINED3DSIH_CMP */ pshader_hw_cmp, /* WINED3DSIH_CND */ pshader_hw_cnd, @@ -4412,7 +4441,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_FRC */ shader_hw_map2gl, /* WINED3DSIH_IF */ NULL /* Hardcoded into the shader */, /* WINED3DSIH_IFC */ shader_hw_ifc, - /* WINED3DSIH_LABEL */ NULL, + /* WINED3DSIH_LABEL */ shader_hw_label, /* WINED3DSIH_LIT */ shader_hw_map2gl, /* WINED3DSIH_LOG */ shader_hw_log_pow, /* WINED3DSIH_LOGP */ shader_hw_log_pow, @@ -4435,7 +4464,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_POW */ shader_hw_log_pow, /* WINED3DSIH_RCP */ shader_hw_rsq_rcp, /* WINED3DSIH_REP */ shader_hw_rep, - /* WINED3DSIH_RET */ NULL, + /* WINED3DSIH_RET */ shader_hw_ret, /* WINED3DSIH_RSQ */ shader_hw_rsq_rcp, /* WINED3DSIH_SETP */ NULL, /* WINED3DSIH_SGE */ shader_hw_map2gl, diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index d23d037..c5aafbf 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -709,6 +709,10 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 { reg_maps->usesifc = 1; } + else if(ins.handler_idx == WINED3DSIH_CALL) + { + reg_maps->usescall = 1; + } limit = ins.src_count + (ins.predicate ? 1 : 0); for (i = 0; i < limit; ++i) @@ -1089,8 +1093,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, || ins.handler_idx == WINED3DSIH_DEF || ins.handler_idx == WINED3DSIH_DEFI || ins.handler_idx == WINED3DSIH_DEFB - || ins.handler_idx == WINED3DSIH_PHASE - || ins.handler_idx == WINED3DSIH_RET) + || ins.handler_idx == WINED3DSIH_PHASE) { pToken += param_size; continue; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e9b64bf..ffee326 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -641,7 +641,8 @@ typedef struct shader_reg_maps unsigned fog : 1; unsigned usestexldl : 1; unsigned usesifc : 1; - unsigned padding : 5; + unsigned usescall : 1; + unsigned padding : 4; /* Whether or not loops are used in this shader, and nesting depth */ unsigned loop_depth;

1 0

Stefan Dösinger : wined3d: ARB*p is already on after a depth blit.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: 031401a07053d9b6e53d4fef068bcabda07778f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=031401a07053d9b6e53d4fef0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jun 27 13:15:32 2009 +0200 wined3d: ARB*p is already on after a depth blit. --- dlls/wined3d/arb_program_shader.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 026fac1..06bcc62 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4163,9 +4163,6 @@ static void shader_arb_deselect_depth_blt(IWineD3DDevice *iface) { GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, priv->current_vprogram_id)); checkGLcall("glBindProgramARB(GL_VERTEX_PROGRAM_ARB, vertexShader->prgId);"); - glEnable(GL_VERTEX_PROGRAM_ARB); - checkGLcall("glEnable(GL_VERTEX_PROGRAM_ARB);"); - TRACE("(%p) : Bound vertex program %u and enabled GL_VERTEX_PROGRAM_ARB\n", This, priv->current_vprogram_id); } else { glDisable(GL_VERTEX_PROGRAM_ARB); @@ -4176,9 +4173,6 @@ static void shader_arb_deselect_depth_blt(IWineD3DDevice *iface) { GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, priv->current_fprogram_id)); checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, pixelShader->prgId);"); - glEnable(GL_FRAGMENT_PROGRAM_ARB); - checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);"); - TRACE("(%p) : Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB\n", This, priv->current_fprogram_id); } else if(!priv->use_arbfp_fixed_func) { glDisable(GL_FRAGMENT_PROGRAM_ARB);

1 0

Stefan Dösinger : wined3d: Add a NOP ret handler to GLSL.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: d5e2c142252b7771b0310f457521392d168f89f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5e2c142252b7771b0310f457… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jun 28 00:16:53 2009 +0200 wined3d: Add a NOP ret handler to GLSL. --- dlls/wined3d/glsl_shader.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b700763..501023d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2602,6 +2602,13 @@ static void shader_glsl_callnz(const struct wined3d_shader_instruction *ins) shader_addline(ins->ctx->buffer, "if (%s) subroutine%u();\n", src1_param.param_str, ins->src[0].reg.idx); } +static void shader_glsl_ret(const struct wined3d_shader_instruction *ins) +{ + /* No-op. The closing } is written when a new function is started, and at the end of the shader. This + * function only suppresses the unhandled instruction warning + */ +} + /********************************************* * Pixel Shader Specific Code begins here ********************************************/ @@ -4649,7 +4656,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_POW */ shader_glsl_pow, /* WINED3DSIH_RCP */ shader_glsl_rcp, /* WINED3DSIH_REP */ shader_glsl_rep, - /* WINED3DSIH_RET */ NULL, + /* WINED3DSIH_RET */ shader_glsl_ret, /* WINED3DSIH_RSQ */ shader_glsl_rsq, /* WINED3DSIH_SETP */ NULL, /* WINED3DSIH_SGE */ shader_glsl_compare,

1 0

Davide Pizzetti : cmdlgtst: Update Italian translation.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: 7b5bdfed7b9a7f8b24292c77b12746d17fef72e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b5bdfed7b9a7f8b24292c77b… Author: Davide Pizzetti <erpizzo(a)alice.it> Date: Sun Jun 28 16:06:45 2009 +0200 cmdlgtst: Update Italian translation. --- programs/cmdlgtst/It.rc | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/cmdlgtst/It.rc b/programs/cmdlgtst/It.rc index 069045e..c5c860c 100644 --- a/programs/cmdlgtst/It.rc +++ b/programs/cmdlgtst/It.rc @@ -40,26 +40,26 @@ CmdlgtstMenu MENU MENUITEM "&Salva", CM_U_SAVE MENUITEM SEPARATOR MENUITEM "&Colori", CM_U_COLOR - MENUITEM "&Font", CM_U_FONT + MENUITEM "&Carattere", CM_U_FONT MENUITEM SEPARATOR MENUITEM "Trova &Testo", CM_U_FIND MENUITEM "&Sostituisci Testo", CM_U_REPLACE MENUITEM SEPARATOR MENUITEM "&Stampa", CM_U_PRINT - MENUITEM "Pa&ge Setup", CM_U_PAGESETUP + MENUITEM "Installazione Pa&gina", CM_U_PAGESETUP } - POPUP "F&lags" + POPUP "B&andiere" { MENUITEM "Fil&e", CM_F_FILE MENUITEM SEPARATOR MENUITEM "&Colori", CM_F_COLOR - MENUITEM "&Font", CM_F_FONT + MENUITEM "&Carattere", CM_F_FONT MENUITEM SEPARATOR MENUITEM "Trova/&Sostituisci", CM_F_FINDREPLACE MENUITEM SEPARATOR MENUITEM "&Stampa", CM_F_PRINT - MENUITEM "Pa&ge Setup", CM_F_PAGESETUP + MENUITEM "Installazione Pa&gina", CM_F_PAGESETUP } POPUP "&Aiuto" @@ -72,11 +72,11 @@ CmdlgtstMenu MENU Color_Flags_Dialog DIALOG 11, 20, 207, 107 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Font Dialog Flags" +CAPTION "Bandiere Dialogo Carattere" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 148, 6, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancella", IDCANCEL, 148, 24, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annulla", IDCANCEL, 148, 24, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Aiuto", CM_R_HELP, 148, 42, 50, 14, WS_GROUP | WS_TABSTOP CHECKBOX "CC_ENABLEHOOK", I_CC_ENABLEHOOK, 12, 12, 122, 10, BS_AUTOCHECKBOX | WS_TABSTOP CHECKBOX "CC_ENABLETEMPLATE", I_CC_ENABLETEMPLATE, 12, 24, 122, 10, BS_AUTOCHECKBOX | WS_TABSTOP @@ -93,7 +93,7 @@ CAPTION "Font Dialog Flags" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 148, 6, 50, 14 - PUSHBUTTON "Cancella", IDCANCEL, 148, 24, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, 148, 24, 50, 14 PUSHBUTTON "Aiuto", CM_R_HELP, 148, 42, 50, 14 CHECKBOX "CF_APPLY", I_CF_APPLY, 12, 12, 120, 10, BS_AUTOCHECKBOX | WS_TABSTOP CHECKBOX "CF_ANSIONLY", I_CF_ANSIONLY, 12, 24, 120, 10, BS_AUTOCHECKBOX | WS_TABSTOP @@ -127,7 +127,7 @@ CAPTION "Trova/Sostituisci Dialog Flags" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 148, 6, 50, 14 - PUSHBUTTON "Cancella", IDCANCEL, 148, 24, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, 148, 24, 50, 14 PUSHBUTTON "Aiuto", IDHELP, 148, 42, 50, 14 CHECKBOX "FR_DIALOGTERM", I_FR_DIALOGTERM, 24, 12, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP CHECKBOX "FR_DOWN", I_FR_DOWN, 24, 24, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP @@ -226,15 +226,15 @@ FONT 8, "MS Shell Dlg" UsageDialog DIALOG 183, 22, 190, 300 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Ustilizzo" +CAPTION "Utilizzo" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 70, 276, 50, 14 LTEXT "Common Dialog Test Jig Exerciser, versione 1.20", -1, 13, 48, 168, 12 LTEXT "Questo programma testa COMMDLG per Wine.", -1, 12, 72, 168, 12 - LTEXT "I Flags sono specificati nel menu flags.", -1, 12, 96, 168, 12 + LTEXT "Le Bandiere sono specificate nel menÃ¹ bandiere.", -1, 12, 96, 168, 12 LTEXT "La finestra di dialogo dei colori modifica il colore dello sfondo.", -1, 12, 120, 168, 12 - LTEXT "La finestra di dialogo dei Font modifica tutti i Font, e il loro colore se CF_EFFECTS e selezionato.", -1, 12, 144, 168, 24 + LTEXT "La finestra di dialogo dei Caratteri modifica tutti i Caratteri, e il loro colore se CF_EFFECTS e selezionato.", -1, 12, 144, 168, 24 LTEXT "L'angolo in alto a sinistra indica il percorso completo e il titolo dell'ultima operazione di apertura o salvataggio conclusa con successo.", -1, 12, 180, 168, 24 LTEXT "(c) 1999-2000, Eric Williams. I diritti sono concessi sotto la licenza di WINE. Non nascondere i sorgenti... condividili!", -1, 12, 228, 168, 36 ICON "AboutIcon", -1, 86, 12, 18, 20

1 0

Stefan Dösinger : wined3d: Don' t disable ARBfp if the replacement pipeline is used.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: 9d63585352897f615eb5b1a0be11bbdd8cacd082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d63585352897f615eb5b1a0b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jun 27 13:14:28 2009 +0200 wined3d: Don't disable ARBfp if the replacement pipeline is used. If the replacement pipeline is used, ARBfp is always on. Disabling it can break shaders or the replacement pipeline, because the shader and ffp code assumes the extension is on. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5fb0f63..026fac1 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4180,7 +4180,7 @@ static void shader_arb_deselect_depth_blt(IWineD3DDevice *iface) { checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);"); TRACE("(%p) : Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB\n", This, priv->current_fprogram_id); - } else { + } else if(!priv->use_arbfp_fixed_func) { glDisable(GL_FRAGMENT_PROGRAM_ARB); checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); }

1 0

Nicolas Le Cam : cabinet/tests: Avoid use of lstrlenA when not needed.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: 027bc8100c60d257f86e83bb77cf56820f1ae8f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=027bc8100c60d257f86e83bb7… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sat Jun 27 11:34:36 2009 +0200 cabinet/tests: Avoid use of lstrlenA when not needed. --- dlls/cabinet/tests/fdi.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index 1fa3851..011d94f 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -287,10 +287,9 @@ static void createTestFile(const CHAR *name) static void create_test_files(void) { - int len; + DWORD len; - GetCurrentDirectoryA(MAX_PATH, CURR_DIR); - len = lstrlenA(CURR_DIR); + len = GetCurrentDirectoryA(MAX_PATH, CURR_DIR); if(len && (CURR_DIR[len-1] == '\\')) CURR_DIR[len-1] = 0;

1 0

Stefan Dösinger : wined3d: Only update the screen when the frontbuffer was changed.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: 1f8761219b99cec6369f9267c3611587100e2fa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f8761219b99cec6369f9267c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jun 27 21:35:24 2009 +0200 wined3d: Only update the screen when the frontbuffer was changed. There is no need to copy the frontbuffer to the screen when the backbuffer was modified... --- dlls/wined3d/surface_gdi.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 96054d9..9e1a5de 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -199,7 +199,10 @@ IWineGDISurfaceImpl_UnlockRect(IWineD3DSurface *iface) /* Tell the swapchain to update the screen */ if (SUCCEEDED(IWineD3DSurface_GetContainer(iface, &IID_IWineD3DSwapChain, (void **)&swapchain))) { - x11_copy_to_screen(swapchain, &This->lockedRect); + if(iface == swapchain->frontBuffer) + { + x11_copy_to_screen(swapchain, &This->lockedRect); + } IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); } @@ -490,7 +493,10 @@ static HRESULT WINAPI IWineGDISurfaceImpl_RealizePalette(IWineD3DSurface *iface) /* Tell the swapchain to update the screen */ if (SUCCEEDED(IWineD3DSurface_GetContainer(iface, &IID_IWineD3DSwapChain, (void **)&swapchain))) { - x11_copy_to_screen(swapchain, NULL); + if(iface == swapchain->frontBuffer) + { + x11_copy_to_screen(swapchain, NULL); + } IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); }

1 0