wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Stefan Dösinger : wined3d: Catch RCP 0.0 in ARB.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: b5da1185311a3d772e75b6a8056d7d45bf20e42b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5da1185311a3d772e75b6a80… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 21 14:05:46 2010 +0200 wined3d: Catch RCP 0.0 in ARB. --- dlls/wined3d/arb_program_shader.c | 51 ++++++++++++++++++++++++++++++++++--- dlls/wined3d/shader.c | 1 + dlls/wined3d/wined3d_private.h | 3 +- 3 files changed, 50 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2920b43..3045f4a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -104,8 +104,9 @@ static BOOL need_helper_const(IWineD3DBaseShaderImpl *shader, const struct wined if (!gl_info->supported[NV_VERTEX_PROGRAM]) return TRUE; /* Need to init colors. */ if (gl_info->quirks & WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT) return TRUE; /* Load the immval offset. */ if (gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W) return TRUE; /* Have to init texcoords. */ - if (shader->baseShader.reg_maps.usesnrm) return TRUE; /* 0.0 */ if (!use_nv_clip(gl_info)) return TRUE; /* Init the clip texcoord */ + if (shader->baseShader.reg_maps.usesnrm) return TRUE; /* 0.0 */ + if (shader->baseShader.reg_maps.usesrcp) return TRUE; /* EPS */ return FALSE; } @@ -126,6 +127,7 @@ enum arb_helper_value ARB_ONE, ARB_TWO, ARB_0001, + ARB_EPS, ARB_VS_REL_OFFSET }; @@ -146,6 +148,7 @@ static const char *arb_get_helper_value(enum wined3d_shader_type shader, enum ar case ARB_ONE: return "ps_helper_const.y"; case ARB_TWO: return "coefmul.x"; case ARB_0001: return "helper_const.xxxy"; + case ARB_EPS: return "ps_helper_const.z"; default: break; } } @@ -156,6 +159,7 @@ static const char *arb_get_helper_value(enum wined3d_shader_type shader, enum ar case ARB_ZERO: return "helper_const.x"; case ARB_ONE: return "helper_const.y"; case ARB_TWO: return "helper_const.z"; + case ARB_EPS: return "helper_const.w"; case ARB_0001: return "helper_const.xxxy"; case ARB_VS_REL_OFFSET: return "rel_addr_const.y"; } @@ -168,6 +172,7 @@ static const char *arb_get_helper_value(enum wined3d_shader_type shader, enum ar case ARB_ONE: return "1.0"; case ARB_TWO: return "2.0"; case ARB_0001: return "{0.0, 0.0, 0.0, 1.0}"; + case ARB_EPS: return "1e-8"; default: return "bad"; } } @@ -2403,6 +2408,44 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) } } +static void shader_hw_rcp(const struct wined3d_shader_instruction *ins) +{ + struct wined3d_shader_buffer *buffer = ins->ctx->buffer; + struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; + const char *flt_eps = arb_get_helper_value(ins->ctx->reg_maps->shader_version.type, ARB_EPS); + + char dst[50]; + char src[50]; + + shader_arb_get_dst_param(ins, &ins->dst[0], dst); /* Destination */ + shader_arb_get_src_param(ins, &ins->src[0], 0, src); + if (ins->src[0].swizzle == WINED3DSP_NOSWIZZLE) + { + /* Dx sdk says .x is used if no swizzle is given, but our test shows that + * .w is used + */ + strcat(src, ".w"); + } + + /* TODO: If the destination is readable, and not the same as the source, the destination + * can be used instead of TA + */ + if (priv->target_version >= NV2) + { + shader_addline(buffer, "MOVC TA.x, %s;\n", src); + shader_addline(buffer, "MOV TA.x (EQ.x), %s;\n", flt_eps); + shader_addline(buffer, "RCP%s %s, TA.x;\n", shader_arb_get_modifier(ins), dst); + } + else + { + const char *zero = arb_get_helper_value(ins->ctx->reg_maps->shader_version.type, ARB_ZERO); + shader_addline(buffer, "ABS TA.x, %s;\n", src); + shader_addline(buffer, "SGE TA.y, -TA.x, %s;\n", zero); + shader_addline(buffer, "MAD TA.x, TA.y, %s, %s;\n", flt_eps, src); + shader_addline(buffer, "RCP%s %s, TA.x;\n", shader_arb_get_modifier(ins), dst); + } +} + static void shader_hw_scalar_op(const struct wined3d_shader_instruction *ins) { struct wined3d_shader_buffer *buffer = ins->ctx->buffer; @@ -3578,7 +3621,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, struct if(dcl_td) shader_addline(buffer, "TEMP TD;\n"); /* Used for sRGB writing */ shader_addline(buffer, "PARAM coefdiv = { 0.5, 0.25, 0.125, 0.0625 };\n"); shader_addline(buffer, "PARAM coefmul = { 2, 4, 8, 16 };\n"); - shader_addline(buffer, "PARAM ps_helper_const = { 0.0, 1.0, 0.0, 0.0 };\n"); + shader_addline(buffer, "PARAM ps_helper_const = { 0.0, 1.0, %1.10f, 0.0 };\n", eps); if (reg_maps->shader_version.major < 2) { @@ -4074,7 +4117,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct shader_addline(buffer, "TEMP TMP_OUT;\n"); if(need_helper_const((IWineD3DBaseShaderImpl *) This, gl_info)) { - shader_addline(buffer, "PARAM helper_const = { 0.0, 1.0, 2.0, 0.0 };\n"); + shader_addline(buffer, "PARAM helper_const = { 0.0, 1.0, 2.0, %1.10f};\n", eps); } if(need_rel_addr_const((IWineD3DBaseShaderImpl *) This, gl_info)) { shader_addline(buffer, "PARAM rel_addr_const = { 0.5, %d.0, 0.0, 0.0 };\n", This->rel_offset); @@ -4949,7 +4992,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_NRM */ shader_hw_nrm, /* WINED3DSIH_PHASE */ NULL, /* WINED3DSIH_POW */ shader_hw_log_pow, - /* WINED3DSIH_RCP */ shader_hw_scalar_op, + /* WINED3DSIH_RCP */ shader_hw_rcp, /* WINED3DSIH_REP */ shader_hw_rep, /* WINED3DSIH_RET */ shader_hw_ret, /* WINED3DSIH_RSQ */ shader_hw_scalar_op, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a8340d3..f26122a 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -721,6 +721,7 @@ static HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct else if (ins.handler_idx == WINED3DSIH_MOVA) reg_maps->usesmova = 1; else if (ins.handler_idx == WINED3DSIH_IFC) reg_maps->usesifc = 1; else if (ins.handler_idx == WINED3DSIH_CALL) reg_maps->usescall = 1; + else if (ins.handler_idx == WINED3DSIH_RCP) reg_maps->usesrcp = 1; limit = ins.src_count + (ins.predicate ? 1 : 0); for (i = 0; i < limit; ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 001312d..045d068 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -541,7 +541,8 @@ typedef struct shader_reg_maps WORD usestexldl : 1; WORD usesifc : 1; WORD usescall : 1; - WORD padding : 4; + WORD usesrcp : 1; + WORD padding : 3; /* Whether or not loops are used in this shader, and nesting depth */ unsigned loop_depth;

1 0

Stefan Dösinger : wined3d: Handle length zero vectors in ARB's NRM.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: c80b5d6afc016c55ae51a3fcd0ce425c970a116a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c80b5d6afc016c55ae51a3fcd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 19 12:30:03 2010 +0200 wined3d: Handle length zero vectors in ARB's NRM. --- dlls/wined3d/arb_program_shader.c | 30 +++++++++++++++++++++++++++--- 1 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ed74eaf..2920b43 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -104,6 +104,7 @@ static BOOL need_helper_const(IWineD3DBaseShaderImpl *shader, const struct wined if (!gl_info->supported[NV_VERTEX_PROGRAM]) return TRUE; /* Need to init colors. */ if (gl_info->quirks & WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT) return TRUE; /* Load the immval offset. */ if (gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W) return TRUE; /* Have to init texcoords. */ + if (shader->baseShader.reg_maps.usesnrm) return TRUE; /* 0.0 */ if (!use_nv_clip(gl_info)) return TRUE; /* Init the clip texcoord */ return FALSE; } @@ -2446,16 +2447,39 @@ static void shader_hw_nrm(const struct wined3d_shader_instruction *ins) shader_arb_get_dst_param(ins, &ins->dst[0], dst_name); shader_arb_get_src_param(ins, &ins->src[0], 1 /* Use TB */, src_name); + /* In D3D, NRM of a vector with length zero returns zero. Catch this situation, as + * otherwise NRM or RSQ would return NaN */ if(pshader && priv->target_version >= NV3) { + /* GL_NV_fragment_program2's NRM needs protection against length zero vectors too + * + * TODO: Find out if DP3+NRM+MOV is really faster than DP3+RSQ+MUL + */ + shader_addline(buffer, "DP3C TA, %s, %s;\n", src_name, src_name); shader_addline(buffer, "NRM%s %s, %s;\n", shader_arb_get_modifier(ins), dst_name, src_name); + shader_addline(buffer, "MOV %s (EQ), %s;\n", dst_name, zero); + } + else if(priv->target_version >= NV2) + { + shader_addline(buffer, "DP3C TA.x, %s, %s;\n", src_name, src_name); + shader_addline(buffer, "RSQ TA.x (NE), TA.x;\n"); + shader_addline(buffer, "MUL%s %s, %s, TA.x;\n", shader_arb_get_modifier(ins), dst_name, + src_name); } else { - shader_addline(buffer, "DP3 TA, %s, %s;\n", src_name, src_name); - shader_addline(buffer, "RSQ TA, TA.x;\n"); + const char *one = arb_get_helper_value(ins->ctx->reg_maps->shader_version.type, ARB_ONE); + + shader_addline(buffer, "DP3 TA.x, %s, %s;\n", src_name, src_name); + /* Pass any non-zero value to RSQ if the input vector has a length of zero. The + * RSQ result doesn't matter, as long as multiplying it by 0 returns 0. + */ + shader_addline(buffer, "SGE TA.y, -TA.x, %s;\n", zero); + shader_addline(buffer, "MAD TA.x, %s, TA.y, TA.x;\n", one); + + shader_addline(buffer, "RSQ TA.x, TA.x;\n"); /* dst.w = src[0].w * 1 / (src.x^2 + src.y^2 + src.z^2)^(1/2) according to msdn*/ - shader_addline(buffer, "MUL%s %s, %s, TA;\n", shader_arb_get_modifier(ins), dst_name, + shader_addline(buffer, "MUL%s %s, %s, TA.x;\n", shader_arb_get_modifier(ins), dst_name, src_name); } }

1 0

Stefan Dösinger : wined3d: Make the mova constant more generic for relative addressing.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: ed74fcefc891ac92851b8936ed0a053c09499bdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed74fcefc891ac92851b8936e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 12 22:51:24 2010 +0200 wined3d: Make the mova constant more generic for relative addressing. --- dlls/wined3d/arb_program_shader.c | 52 ++++++++++++++++++++----------------- 1 files changed, 28 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 54b361b..ed74eaf 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -81,10 +81,13 @@ static void shader_arb_dump_program_source(const char *source) } /* GL locking for state handlers is done by the caller. */ -static BOOL need_mova_const(IWineD3DBaseShader *shader, const struct wined3d_gl_info *gl_info) +static BOOL need_rel_addr_const(IWineD3DBaseShaderImpl *shader, const struct wined3d_gl_info *gl_info) { - IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *) shader; - if(!This->baseShader.reg_maps.usesmova) return FALSE; + if (shader->baseShader.reg_maps.shader_version.type == WINED3D_SHADER_TYPE_VERTEX) + { + if (((IWineD3DVertexShaderImpl *)shader)->rel_offset) return TRUE; + } + if (!shader->baseShader.reg_maps.usesmova) return FALSE; return !gl_info->supported[NV_VERTEX_PROGRAM2_OPTION]; } @@ -95,26 +98,24 @@ static inline BOOL use_nv_clip(const struct wined3d_gl_info *gl_info) && !(gl_info->quirks & WINED3D_QUIRK_NV_CLIP_BROKEN); } -static BOOL need_helper_const(const struct wined3d_gl_info *gl_info) +static BOOL need_helper_const(IWineD3DBaseShaderImpl *shader, const struct wined3d_gl_info *gl_info) { - if (!gl_info->supported[NV_VERTEX_PROGRAM] /* Need to init colors. */ - || gl_info->quirks & WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT /* Load the immval offset. */ - || gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W /* Have to init texcoords. */ - || (!use_nv_clip(gl_info)) /* Init the clip texcoord */) - { - return TRUE; - } + if (need_rel_addr_const(shader, gl_info)) return TRUE; + if (!gl_info->supported[NV_VERTEX_PROGRAM]) return TRUE; /* Need to init colors. */ + if (gl_info->quirks & WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT) return TRUE; /* Load the immval offset. */ + if (gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W) return TRUE; /* Have to init texcoords. */ + if (!use_nv_clip(gl_info)) return TRUE; /* Init the clip texcoord */ return FALSE; } -static unsigned int reserved_vs_const(IWineD3DBaseShader *shader, const struct wined3d_gl_info *gl_info) +static unsigned int reserved_vs_const(IWineD3DBaseShaderImpl *shader, const struct wined3d_gl_info *gl_info) { unsigned int ret = 1; /* We use one PARAM for the pos fixup, and in some cases one to load * some immediate values into the shader */ - if(need_helper_const(gl_info)) ret++; - if(need_mova_const(shader, gl_info)) ret++; + if(need_helper_const(shader, gl_info)) ret++; + if(need_rel_addr_const(shader, gl_info)) ret++; return ret; } @@ -155,7 +156,7 @@ static const char *arb_get_helper_value(enum wined3d_shader_type shader, enum ar case ARB_ONE: return "helper_const.y"; case ARB_TWO: return "helper_const.z"; case ARB_0001: return "helper_const.xxxy"; - case ARB_VS_REL_OFFSET: return "helper_const.w"; + case ARB_VS_REL_OFFSET: return "rel_addr_const.y"; } } FIXME("Unmanaged %s shader helper constant requested: %u\n", @@ -739,7 +740,7 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s if(This->baseShader.reg_maps.usesrelconstF) { DWORD highest_constf = 0, clip_limit; - max_constantsF -= reserved_vs_const(iface, gl_info); + max_constantsF -= reserved_vs_const(This, gl_info); max_constantsF -= count_bits(This->baseShader.reg_maps.integer_constants); for(i = 0; i < This->baseShader.limits.constant_float; i++) @@ -1738,6 +1739,9 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->ctx->shader; BOOL pshader = shader_is_pshader_version(shader->baseShader.reg_maps.shader_version.type); struct shader_arb_ctx_priv *ctx = ins->ctx->backend_data; + const char *zero = arb_get_helper_value(shader->baseShader.reg_maps.shader_version.type, ARB_ZERO); + const char *one = arb_get_helper_value(shader->baseShader.reg_maps.shader_version.type, ARB_ONE); + const char *two = arb_get_helper_value(shader->baseShader.reg_maps.shader_version.type, ARB_TWO); struct wined3d_shader_buffer *buffer = ins->ctx->buffer; char src0_param[256]; @@ -1763,11 +1767,11 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) * The ARL is performed when A0 is used - the requested component is read from A0_SHADOW into * A0.x. We can use the overwritten component of A0_shadow as temporary storage for the sign. */ - shader_addline(buffer, "SGE A0_SHADOW%s, %s, mova_const.y;\n", write_mask, src0_param); - shader_addline(buffer, "MAD A0_SHADOW%s, A0_SHADOW, mova_const.z, -mova_const.w;\n", write_mask); + shader_addline(buffer, "SGE A0_SHADOW%s, %s, %s;\n", write_mask, src0_param, zero); + shader_addline(buffer, "MAD A0_SHADOW%s, A0_SHADOW, %s, -%s;\n", write_mask, two, one); shader_addline(buffer, "ABS TA%s, %s;\n", write_mask, src0_param); - shader_addline(buffer, "ADD TA%s, TA, mova_const.x;\n", write_mask); + shader_addline(buffer, "ADD TA%s, TA, rel_addr_const.x;\n", write_mask); shader_addline(buffer, "FLR TA%s, TA;\n", write_mask); if (((IWineD3DVertexShaderImpl *)shader)->rel_offset) { @@ -3103,7 +3107,7 @@ static void vshader_add_footer(IWineD3DVertexShaderImpl *This, struct wined3d_sh /* 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)) { + if(need_helper_const((IWineD3DBaseShaderImpl *) This, gl_info)) { const char *two = arb_get_helper_value(WINED3D_SHADER_TYPE_VERTEX, ARB_TWO); shader_addline(buffer, "MAD TMP_OUT.z, TMP_OUT.z, %s, -TMP_OUT.w;\n", two); } else { @@ -4045,11 +4049,11 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct } shader_addline(buffer, "TEMP TMP_OUT;\n"); - if(need_helper_const(gl_info)) { - shader_addline(buffer, "PARAM helper_const = { 0.0, 1.0, 2.0, %d.0 };\n", This->rel_offset); + if(need_helper_const((IWineD3DBaseShaderImpl *) This, gl_info)) { + shader_addline(buffer, "PARAM helper_const = { 0.0, 1.0, 2.0, 0.0 };\n"); } - if(need_mova_const((IWineD3DBaseShader *) This, gl_info)) { - shader_addline(buffer, "PARAM mova_const = { 0.5, 0.0, 2.0, 1.0 };\n"); + if(need_rel_addr_const((IWineD3DBaseShaderImpl *) This, gl_info)) { + shader_addline(buffer, "PARAM rel_addr_const = { 0.5, %d.0, 0.0, 0.0 };\n", This->rel_offset); shader_addline(buffer, "TEMP A0_SHADOW;\n"); }

1 0

Stefan Dösinger : wined3d: Order the helper constants a bit better.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: a0143e142badc610582250023e7cd7c6296cbf1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0143e142badc610582250023… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 12 22:35:23 2010 +0200 wined3d: Order the helper constants a bit better. --- dlls/wined3d/arb_program_shader.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0235652..54b361b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -140,10 +140,10 @@ static const char *arb_get_helper_value(enum wined3d_shader_type shader, enum ar { switch (value) { - case ARB_ZERO: return "ps_helper_const.y"; - case ARB_ONE: return "ps_helper_const.x"; + case ARB_ZERO: return "ps_helper_const.x"; + case ARB_ONE: return "ps_helper_const.y"; case ARB_TWO: return "coefmul.x"; - case ARB_0001: return "helper_const.yyyx"; + case ARB_0001: return "helper_const.xxxy"; default: break; } } @@ -151,11 +151,11 @@ static const char *arb_get_helper_value(enum wined3d_shader_type shader, enum ar { switch (value) { - case ARB_ZERO: return "helper_const.w"; + case ARB_ZERO: return "helper_const.x"; case ARB_ONE: return "helper_const.y"; - case ARB_TWO: return "helper_const.x"; - case ARB_0001: return "helper_const.wwwy"; - case ARB_VS_REL_OFFSET: return "helper_const.z"; + case ARB_TWO: return "helper_const.z"; + case ARB_0001: return "helper_const.xxxy"; + case ARB_VS_REL_OFFSET: return "helper_const.w"; } } FIXME("Unmanaged %s shader helper constant requested: %u\n", @@ -3550,7 +3550,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, struct if(dcl_td) shader_addline(buffer, "TEMP TD;\n"); /* Used for sRGB writing */ shader_addline(buffer, "PARAM coefdiv = { 0.5, 0.25, 0.125, 0.0625 };\n"); shader_addline(buffer, "PARAM coefmul = { 2, 4, 8, 16 };\n"); - shader_addline(buffer, "PARAM ps_helper_const = { 1.0, 0.0, 0.0, 0.0 };\n"); + shader_addline(buffer, "PARAM ps_helper_const = { 0.0, 1.0, 0.0, 0.0 };\n"); if (reg_maps->shader_version.major < 2) { @@ -4046,7 +4046,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct shader_addline(buffer, "TEMP TMP_OUT;\n"); if(need_helper_const(gl_info)) { - shader_addline(buffer, "PARAM helper_const = { 2.0, 1.0, %d.0, 0.0 };\n", This->rel_offset); + shader_addline(buffer, "PARAM helper_const = { 0.0, 1.0, 2.0, %d.0 };\n", This->rel_offset); } if(need_mova_const((IWineD3DBaseShader *) This, gl_info)) { shader_addline(buffer, "PARAM mova_const = { 0.5, 0.0, 2.0, 1.0 };\n");

1 0

Stefan Dösinger : wined3d: Add a function for reading (ps_)helper_const.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: a1710a32f3dcba2fb3ec6d45d45cb76d16e6e6fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1710a32f3dcba2fb3ec6d45d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat May 15 21:04:06 2010 +0200 wined3d: Add a function for reading (ps_)helper_const. --- dlls/wined3d/arb_program_shader.c | 108 ++++++++++++++++++++++++++++++------- 1 files changed, 88 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1710a32f3dcba2fb3ec6…

1 0

Stefan Dösinger : wined3d: Store a positive 1. 0 in the ARB's vertex shader helper constant.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: 6946de81253d860097dfc29576a86a226f87c730 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6946de81253d860097dfc2957… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat May 15 20:56:29 2010 +0200 wined3d: Store a positive 1.0 in the ARB's vertex shader helper constant. --- dlls/wined3d/arb_program_shader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 57c5964..a6cafe7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3981,7 +3981,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct shader_addline(buffer, "TEMP TMP_OUT;\n"); if(need_helper_const(gl_info)) { - shader_addline(buffer, "PARAM helper_const = { 2.0, -1.0, %d.0, 0.0 };\n", This->rel_offset); + shader_addline(buffer, "PARAM helper_const = { 2.0, 1.0, %d.0, 0.0 };\n", This->rel_offset); } if(need_mova_const((IWineD3DBaseShader *) This, gl_info)) { shader_addline(buffer, "PARAM mova_const = { 0.5, 0.0, 2.0, 1.0 };\n"); @@ -4032,7 +4032,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct */ if (!gl_info->supported[NV_VERTEX_PROGRAM]) { - shader_addline(buffer, "MOV result.color.secondary, -helper_const.wwwy;\n"); + shader_addline(buffer, "MOV result.color.secondary, helper_const.wwwy;\n"); if (gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W && !device->frag_pipe->ffp_proj_control) { @@ -4040,7 +4040,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct for(i = 0; i < min(8, MAX_REG_TEXCRD); i++) { if(This->baseShader.reg_maps.texcoord_mask[i] != 0 && This->baseShader.reg_maps.texcoord_mask[i] != WINED3DSP_WRITEMASK_ALL) { - shader_addline(buffer, "MOV result.texcoord[%u].w, -helper_const.y;\n", i); + shader_addline(buffer, "MOV result.texcoord[%u].w, helper_const.y;\n", i); } } }

1 0

Stefan Dösinger : wined3d: Split up the "one" pixel shader helper constant.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: 09d74b748e54955065cf5ea8adf63a0f6f1dd181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09d74b748e54955065cf5ea8a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat May 15 20:51:19 2010 +0200 wined3d: Split up the "one" pixel shader helper constant. --- dlls/wined3d/arb_program_shader.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b6285b2..57c5964 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1366,7 +1366,7 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD if (pshader) { gen_color_correction(buffer, dst_str, ins->dst[0].write_mask, - "one", "coefmul.x", priv->cur_ps_args->super.color_fixup[sampler_idx]); + "ps_helper_const.x", "coefmul.x", priv->cur_ps_args->super.color_fixup[sampler_idx]); } } @@ -1405,13 +1405,13 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in shader_addline(buffer, "ADD T%c, -%s, coefdiv.x;\n", 'A' + tmpreg, regstr); break; case WINED3DSPSM_SIGN: - shader_addline(buffer, "MAD T%c, %s, coefmul.x, -one.x;\n", 'A' + tmpreg, regstr); + shader_addline(buffer, "MAD T%c, %s, coefmul.x, -ps_helper_const.x;\n", 'A' + tmpreg, regstr); break; case WINED3DSPSM_SIGNNEG: - shader_addline(buffer, "MAD T%c, %s, -coefmul.x, one.x;\n", 'A' + tmpreg, regstr); + shader_addline(buffer, "MAD T%c, %s, -coefmul.x, ps_helper_const.x;\n", 'A' + tmpreg, regstr); break; case WINED3DSPSM_COMP: - shader_addline(buffer, "SUB T%c, one.x, %s;\n", 'A' + tmpreg, regstr); + shader_addline(buffer, "SUB T%c, ps_helper_const.x, %s;\n", 'A' + tmpreg, regstr); break; case WINED3DSPSM_X2: shader_addline(buffer, "ADD T%c, %s, %s;\n", 'A' + tmpreg, regstr, regstr); @@ -2192,7 +2192,7 @@ static void pshader_hw_texdepth(const struct wined3d_shader_instruction *ins) /* According to the msdn, the source register(must be r5) is unusable after * the texdepth instruction, so we're free to modify it */ - shader_addline(buffer, "MIN %s.y, %s.y, one.y;\n", dst_name, dst_name); + shader_addline(buffer, "MIN %s.y, %s.y, ps_helper_const.x;\n", dst_name, dst_name); /* How to deal with the special case dst_name.g == 0? if r != 0, then * the r * (1 / 0) will give infinity, which is clamped to 1.0, the correct @@ -2200,7 +2200,7 @@ static void pshader_hw_texdepth(const struct wined3d_shader_instruction *ins) */ shader_addline(buffer, "RCP %s.y, %s.y;\n", dst_name, dst_name); shader_addline(buffer, "MUL TA.x, %s.x, %s.y;\n", dst_name, dst_name); - shader_addline(buffer, "MIN TA.x, TA.x, one.x;\n"); + shader_addline(buffer, "MIN TA.x, TA.x, ps_helper_const.x;\n"); shader_addline(buffer, "MAX result.depth, TA.x, 0.0;\n"); } @@ -2276,7 +2276,7 @@ static void pshader_hw_texm3x2depth(const struct wined3d_shader_instruction *ins */ shader_addline(buffer, "RCP %s.y, %s.y;\n", dst_name, dst_name); shader_addline(buffer, "MUL %s.x, %s.x, %s.y;\n", dst_name, dst_name, dst_name); - shader_addline(buffer, "MIN %s.x, %s.x, one.x;\n", dst_name, dst_name); + shader_addline(buffer, "MIN %s.x, %s.x, ps_helper_const.x;\n", dst_name, dst_name); shader_addline(buffer, "MAX result.depth, %s.x, 0.0;\n", dst_name); } @@ -3485,7 +3485,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, struct if(dcl_td) shader_addline(buffer, "TEMP TD;\n"); /* Used for sRGB writing */ shader_addline(buffer, "PARAM coefdiv = { 0.5, 0.25, 0.125, 0.0625 };\n"); shader_addline(buffer, "PARAM coefmul = { 2, 4, 8, 16 };\n"); - shader_addline(buffer, "PARAM one = { 1.0, 1.0, 1.0, 1.0 };\n"); + shader_addline(buffer, "PARAM ps_helper_const = { 1.0, 0.0, 0.0, 0.0 };\n"); if (reg_maps->shader_version.major < 2) {

1 0

Damjan Jovanovic : winemenubuilder: Generate .png even for paletted icons.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: a83a9c1da143ceec7a4189501431b35f178ec78a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a83a9c1da143ceec7a4189501… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri May 21 07:44:22 2010 +0200 winemenubuilder: Generate .png even for paletted icons. --- programs/winemenubuilder/winemenubuilder.c | 146 +++++++++++++++++++++++++++- 1 files changed, 145 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 9f10fdb..eba21ef 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -242,7 +242,7 @@ static void user_warning_fn(png_structp png_ptr, png_const_charp warning_message WINE_WARN("PNG warning: %s\n", wine_dbgstr_an(warning_message, -1)); } -static BOOL SaveIconResAsPNG(const BITMAPINFO *pIcon, const char *png_filename, LPCWSTR commentW) +static BOOL SaveTrueColorIconResAsPNG(const BITMAPINFO *pIcon, const char *png_filename, LPCWSTR commentW) { static const char comment_key[] = "Created from"; FILE *fp; @@ -373,6 +373,150 @@ static BOOL SaveIconResAsPNG(const BITMAPINFO *pIcon, const char *png_filename, HeapFree(GetProcessHeap(), 0, comment.text); return FALSE; } + +static BOOL SavePalettedIconResAsPNG(const BITMAPINFO *pIcon, const char *png_filename, LPCWSTR commentW) +{ + static const char comment_key[] = "Created from"; + FILE *pngFile = NULL; + int i, j; + int nHeight; + int nXORWidthBytes; + int nANDWidthBytes; + BOOL b8BitColors; + int nColors; + const BYTE *pXOR; + const BYTE *pAND; + png_structp png_ptr; + png_infop info_ptr; + png_text comment; + jmp_buf jmpbuf; + unsigned char *row = NULL; + BOOL ret = FALSE; + + comment.text = NULL; + + if (!((pIcon->bmiHeader.biBitCount == 4) || (pIcon->bmiHeader.biBitCount == 8))) + { + WINE_FIXME("Unsupported color depth %d-bit\n", pIcon->bmiHeader.biBitCount); + goto done; + } + + if (!(pngFile = fopen(png_filename, "w"))) + { + WINE_TRACE("Unable to open '%s' for writing: %s\n", png_filename, strerror(errno)); + goto done; + } + + nHeight = pIcon->bmiHeader.biHeight / 2; + nXORWidthBytes = 4 * ((pIcon->bmiHeader.biWidth * pIcon->bmiHeader.biBitCount / 32) + + ((pIcon->bmiHeader.biWidth * pIcon->bmiHeader.biBitCount % 32) > 0)); + nANDWidthBytes = 4 * ((pIcon->bmiHeader.biWidth / 32) + + ((pIcon->bmiHeader.biWidth % 32) > 0)); + b8BitColors = pIcon->bmiHeader.biBitCount == 8; + nColors = pIcon->bmiHeader.biClrUsed ? pIcon->bmiHeader.biClrUsed + : 1 << pIcon->bmiHeader.biBitCount; + pXOR = (const BYTE*) pIcon + sizeof (BITMAPINFOHEADER) + (nColors * sizeof (RGBQUAD)); + pAND = pXOR + nHeight * nXORWidthBytes; + + row = HeapAlloc(GetProcessHeap(), 0, 4 * pIcon->bmiHeader.biWidth); + if (row == NULL) + { + WINE_ERR("out of memory\n"); + goto done; + } + + if (!libpng_handle && !load_libpng()) + { + WINE_WARN("Unable to load libpng\n"); + goto done; + } + + if (!(png_ptr = ppng_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL)) || + !(info_ptr = ppng_create_info_struct(png_ptr))) + goto done; + + if (setjmp(jmpbuf)) + { + /* All future errors jump here */ + goto done; + } + ppng_set_error_fn(png_ptr, &jmpbuf, user_error_fn, user_warning_fn); + + ppng_init_io(png_ptr, pngFile); + ppng_set_IHDR(png_ptr, info_ptr, pIcon->bmiHeader.biWidth, nHeight, 8, + PNG_COLOR_TYPE_RGB_ALPHA, + PNG_INTERLACE_NONE, + PNG_COMPRESSION_TYPE_DEFAULT, + PNG_FILTER_TYPE_DEFAULT); + + /* Set comment */ + comment.compression = PNG_TEXT_COMPRESSION_NONE; + comment.key = (png_charp)comment_key; + i = WideCharToMultiByte(CP_UNIXCP, 0, commentW, -1, NULL, 0, NULL, NULL); + comment.text = HeapAlloc(GetProcessHeap(), 0, i); + if (comment.text == NULL) + { + WINE_ERR("out of memory\n"); + goto done; + } + WideCharToMultiByte(CP_UNIXCP, 0, commentW, -1, comment.text, i, NULL, NULL); + comment.text_length = i - 1; + ppng_set_text(png_ptr, info_ptr, &comment, 1); + + ppng_write_info(png_ptr, info_ptr); + for (i = 0; i < nHeight; i++) + { + unsigned char *p = row; + for (j = 0; j < pIcon->bmiHeader.biWidth; j++) + { + if MASK(j,i) + { + *p++ = 0; + *p++ = 0; + *p++ = 0; + *p++ = 0; + } + else + { +#define COLOR(x,y) (b8BitColors ? pXOR[(x) + (nHeight - (y) - 1) * nXORWidthBytes] : (x) % 2 ? pXOR[(x) / 2 + (nHeight - (y) - 1) * nXORWidthBytes] & 0xF : (pXOR[(x) / 2 + (nHeight - (y) - 1) * nXORWidthBytes] & 0xF0) >> 4) + *p++ = pIcon->bmiColors[COLOR(j,i)].rgbRed; + *p++ = pIcon->bmiColors[COLOR(j,i)].rgbGreen; + *p++ = pIcon->bmiColors[COLOR(j,i)].rgbBlue; + *p++ = 0xFF; +#undef COLOR + } + } + ppng_write_row(png_ptr, (png_bytep)row); + } + ppng_write_end(png_ptr, info_ptr); + ret = TRUE; + +done: + ppng_destroy_write_struct(&png_ptr, &info_ptr); + if (pngFile != NULL) + fclose(pngFile); + HeapFree(GetProcessHeap(), 0, comment.text); + HeapFree(GetProcessHeap(), 0, row); + return ret; +} + +static BOOL SaveIconResAsPNG(const BITMAPINFO *pIcon, const char *png_filename, LPCWSTR commentW) +{ + switch (pIcon->bmiHeader.biBitCount) + { + case 4: + return SavePalettedIconResAsPNG(pIcon, png_filename, commentW); + case 8: + return SavePalettedIconResAsPNG(pIcon, png_filename, commentW); + case 24: + return SaveTrueColorIconResAsPNG(pIcon, png_filename, commentW); + case 32: + return SaveTrueColorIconResAsPNG(pIcon, png_filename, commentW); + default: + WINE_FIXME("unsupported bpp %d, please report", pIcon->bmiHeader.biBitCount); + return FALSE; + } +} #endif /* SONAME_LIBPNG */ static BOOL SaveIconResAsXPM(const BITMAPINFO *pIcon, const char *szXPMFileName, LPCWSTR commentW)

1 0

André Hentschel : msvidc32: Be less picky with formats .
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: f31e30d1be997b5716f318166a2a1d18b38fddfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f31e30d1be997b5716f318166… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 20 19:55:06 2010 +0200 msvidc32: Be less picky with formats. --- dlls/msvidc32/msvideo1.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 71ed2d7..d01f07a 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -375,8 +375,8 @@ static LRESULT CRAM_DecompressBegin( Msvideo1Context *info, LPBITMAPINFO in, LPB info->mode_8bit = 0; else { - ERR("Bad output format\n"); - return ICERR_BADPARAM; + info->mode_8bit = 0; + FIXME("Unsupported output format %i\n", in->bmiHeader.biBitCount); } return ICERR_OK;

1 0

Michael Stefaniuc : wined3d: Avoid using the long type.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: 6d89364ad1c7b1ab87d24413561447f0ff971889 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d89364ad1c7b1ab87d244135… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 21 12:45:40 2010 +0200 wined3d: Avoid using the long type. --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/drawprim.c | 18 +++++++++--------- dlls/wined3d/state.c | 2 +- dlls/wined3d/swapchain_gdi.c | 2 +- dlls/wined3d/utils.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 4 ++-- 8 files changed, 22 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d89364ad1c7b1ab87d24…

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
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 May 2010