wine-commits May 2009

wine-commits@winehq.org

4 participants
793 discussions

Juan Lang : inetmib1: Return error codes from internal query functions.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: 1c547cdc4491cc301c4cbd82d7f8812a813b864d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c547cdc4491cc301c4cbd82d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu May 7 09:28:47 2009 -0700 inetmib1: Return error codes from internal query functions. --- dlls/inetmib1/main.c | 71 +++++++++++++++++++++++++++++++++----------------- 1 files changed, 47 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c547cdc4491cc301c4cb…

1 0

Juan Lang : inetmib1: Check return values from SnmpUtilOid functions in utility functions.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: a548d5a29fac36a556bc8d676a180bef8a2a942a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a548d5a29fac36a556bc8d676… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu May 7 09:28:24 2009 -0700 inetmib1: Check return values from SnmpUtilOid functions in utility functions. --- dlls/inetmib1/main.c | 52 ++++++++++++++++++++++++++++++++----------------- 1 files changed, 34 insertions(+), 18 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 3b39174..4fdd1df 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -431,45 +431,61 @@ static AsnInteger32 getItemAndInstanceFromTable(AsnObjectIdentifier *oid, return ret; } -static void setOidWithItem(AsnObjectIdentifier *dst, AsnObjectIdentifier *base, +static INT setOidWithItem(AsnObjectIdentifier *dst, AsnObjectIdentifier *base, UINT item) { UINT id; AsnObjectIdentifier oid; + INT ret; - SnmpUtilOidCpy(dst, base); - oid.idLength = 1; - oid.ids = &id; - id = item; - SnmpUtilOidAppend(dst, &oid); + ret = SnmpUtilOidCpy(dst, base); + if (ret) + { + oid.idLength = 1; + oid.ids = &id; + id = item; + ret = SnmpUtilOidAppend(dst, &oid); + } + return ret; } -static void setOidWithItemAndIpAddr(AsnObjectIdentifier *dst, +static INT setOidWithItemAndIpAddr(AsnObjectIdentifier *dst, AsnObjectIdentifier *base, UINT item, DWORD addr) { UINT id; BYTE *ptr; AsnObjectIdentifier oid; + INT ret; - setOidWithItem(dst, base, item); - oid.idLength = 1; - oid.ids = &id; - for (ptr = (BYTE *)&addr; ptr < (BYTE *)&addr + sizeof(DWORD); ptr++) + ret = setOidWithItem(dst, base, item); + if (ret) { - id = *ptr; - SnmpUtilOidAppend(dst, &oid); + oid.idLength = 1; + oid.ids = &id; + for (ptr = (BYTE *)&addr; ret && ptr < (BYTE *)&addr + sizeof(DWORD); + ptr++) + { + id = *ptr; + ret = SnmpUtilOidAppend(dst, &oid); + } } + return ret; } -static void setOidWithItemAndInteger(AsnObjectIdentifier *dst, +static INT setOidWithItemAndInteger(AsnObjectIdentifier *dst, AsnObjectIdentifier *base, UINT item, UINT instance) { AsnObjectIdentifier oid; + INT ret; - setOidWithItem(dst, base, item); - oid.idLength = 1; - oid.ids = &instance; - SnmpUtilOidAppend(dst, &oid); + ret = setOidWithItem(dst, base, item); + if (ret) + { + oid.idLength = 1; + oid.ids = &instance; + ret = SnmpUtilOidAppend(dst, &oid); + } + return ret; } static struct structToAsnValue mib2IfEntryMap[] = {

1 0

Stefan Dösinger : wined3d: Get rid of pshader_gen_output_modifier_line.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: 7a1f305d42b11189556656696e4c8fa084e4e4dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a1f305d42b11189556656696… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 18:09:05 2009 +0200 wined3d: Get rid of pshader_gen_output_modifier_line. Use shader_arb_add_instruction_modifiers instead. This avoids calling the fixup function from each single instruction handler to handle shifts. It does not yet get rid of the modifier handler in each instruction because we don't want a separate line if we can just append _SAT to the instruction name. --- dlls/wined3d/arb_program_shader.c | 61 +++++++++++++------------------------ 1 files changed, 21 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5e45fe2..2f8a989 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -798,31 +798,6 @@ static void pshader_gen_input_modifier_line(IWineD3DBaseShader *iface, SHADER_BU sprintf(outregstr, "T%c%s", 'A' + tmpreg, swzstr); } -static inline void pshader_gen_output_modifier_line(const struct wined3d_shader_instruction *ins) -{ - BOOL saturate; - DWORD shift; - char write_mask[20], regstr[50]; - SHADER_BUFFER *buffer = ins->ctx->buffer; - BOOL is_color = FALSE; - const struct wined3d_shader_dst_param *dst; - - if (!ins->dst_count) return; - - dst = &ins->dst[0]; - shift = dst->shift; - if(shift == 0) return; /* Saturate alone is handled by the instructions */ - saturate = dst->modifiers & WINED3DSPDM_SATURATE; - - shader_arb_get_write_mask(ins, dst, write_mask); - shader_arb_get_register_name(ins->ctx->shader, dst->reg.type, - dst->reg.idx, !!dst->reg.rel_addr, regstr, &is_color); - - /* Generate a line that does the output modifier computation */ - shader_addline(buffer, "MUL%s %s%s, %s, %s;\n", saturate ? "_SAT" : "", - regstr, write_mask, regstr, shift_tab[shift]); -} - static void pshader_hw_bem(const struct wined3d_shader_instruction *ins) { IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)ins->ctx->shader; @@ -899,8 +874,6 @@ static void pshader_hw_cnd(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "CMP%s %s%s, TMP, %s, %s;\n", sat ? "_SAT" : "", dst_name, dst_wmask, src_name[1], src_name[2]); } - - pshader_gen_output_modifier_line(ins); } static void pshader_hw_cmp(const struct wined3d_shader_instruction *ins) @@ -927,8 +900,6 @@ static void pshader_hw_cmp(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "CMP%s %s%s, %s, %s, %s;\n", sat ? "_SAT" : "", dst_name, dst_wmask, src_name[0], src_name[2], src_name[1]); - - pshader_gen_output_modifier_line(ins); } /** Process the WINED3DSIO_DP2ADD instruction in ARB. @@ -956,8 +927,6 @@ static void pshader_hw_dp2add(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "MOV TMP.z, 0.0;\n"); shader_addline(buffer, "DP3 TMP2, TMP, %s;\n", src_name[1]); shader_addline(buffer, "ADD%s %s%s, TMP2, %s;\n", sat ? "_SAT" : "", dst_name, dst_wmask, src_name[2]); - - pshader_gen_output_modifier_line(ins); } /* Map the opcode 1-to-1 to the GL code */ @@ -1058,9 +1027,6 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) strcat(arguments, operands[i + 1]); } shader_addline(buffer, "%s%s %s;\n", instruction, modifier, arguments); - - /* A shift requires another line. */ - pshader_gen_output_modifier_line(ins); } else { /* Note that shader_arb_add_*_param() adds spaces. */ @@ -1712,8 +1678,6 @@ static void shader_hw_nrm(const struct wined3d_shader_instruction *ins) /* 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, %s, TMP;\n", sat ? "_SAT" : "", dst_name, dst_wmask, src_name); - - pshader_gen_output_modifier_line(ins); } static void shader_hw_sincos(const struct wined3d_shader_instruction *ins) @@ -1737,9 +1701,6 @@ static void shader_hw_sincos(const struct wined3d_shader_instruction *ins) pshader_gen_input_modifier_line(ins->ctx->shader, buffer, &ins->src[0], 0, src_name); shader_addline(buffer, "SCS%s %s%s, %s;\n", sat ? "_SAT" : "", dst_name, dst_wmask, src_name); - - pshader_gen_output_modifier_line(ins); - } static GLuint create_arb_blt_vertex_program(const WineD3D_GL_Info *gl_info) @@ -2256,7 +2217,27 @@ static BOOL shader_arb_color_fixup_supported(struct color_fixup_desc fixup) } static void shader_arb_add_instruction_modifiers(const struct wined3d_shader_instruction *ins) { - /* Nothing to do for now */ + BOOL saturate; + DWORD shift; + char write_mask[20], regstr[50]; + SHADER_BUFFER *buffer = ins->ctx->buffer; + BOOL is_color = FALSE; + const struct wined3d_shader_dst_param *dst; + + if (!ins->dst_count) return; + + dst = &ins->dst[0]; + shift = dst->shift; + if(shift == 0) return; /* Saturate alone is handled by the instructions */ + saturate = dst->modifiers & WINED3DSPDM_SATURATE; + + shader_arb_get_write_mask(ins, dst, write_mask); + shader_arb_get_register_name(ins->ctx->shader, dst->reg.type, + dst->reg.idx, !!dst->reg.rel_addr, regstr, &is_color); + + /* Generate a line that does the output modifier computation */ + shader_addline(buffer, "MUL%s %s%s, %s, %s;\n", saturate ? "_SAT" : "", + regstr, write_mask, regstr, shift_tab[shift]); } static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABLE_SIZE] =

1 0

Stefan Dösinger : wined3d: Pass the instr to pshader_gen_output_modifier_line.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: f02582944934dc82b4649d4565319da46308aa80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f02582944934dc82b4649d456… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 17:53:54 2009 +0200 wined3d: Pass the instr to pshader_gen_output_modifier_line. --- dlls/wined3d/arb_program_shader.c | 44 +++++++++++++++++++++--------------- 1 files changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index fd9af76..5e45fe2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -798,9 +798,26 @@ static void pshader_gen_input_modifier_line(IWineD3DBaseShader *iface, SHADER_BU sprintf(outregstr, "T%c%s", 'A' + tmpreg, swzstr); } -static inline void pshader_gen_output_modifier_line(SHADER_BUFFER *buffer, int saturate, const char *write_mask, - int shift, const char *regstr) +static inline void pshader_gen_output_modifier_line(const struct wined3d_shader_instruction *ins) { + BOOL saturate; + DWORD shift; + char write_mask[20], regstr[50]; + SHADER_BUFFER *buffer = ins->ctx->buffer; + BOOL is_color = FALSE; + const struct wined3d_shader_dst_param *dst; + + if (!ins->dst_count) return; + + dst = &ins->dst[0]; + shift = dst->shift; + if(shift == 0) return; /* Saturate alone is handled by the instructions */ + saturate = dst->modifiers & WINED3DSPDM_SATURATE; + + shader_arb_get_write_mask(ins, dst, write_mask); + shader_arb_get_register_name(ins->ctx->shader, dst->reg.type, + dst->reg.idx, !!dst->reg.rel_addr, regstr, &is_color); + /* Generate a line that does the output modifier computation */ shader_addline(buffer, "MUL%s %s%s, %s, %s;\n", saturate ? "_SAT" : "", regstr, write_mask, regstr, shift_tab[shift]); @@ -857,7 +874,6 @@ static void pshader_hw_cnd(const struct wined3d_shader_instruction *ins) char dst_name[50]; char src_name[3][50]; BOOL sat = dst->modifiers & WINED3DSPDM_SATURATE; - DWORD shift = dst->shift; BOOL is_color; DWORD shader_version = WINED3D_SHADER_VERSION(ins->ctx->reg_maps->shader_version.major, ins->ctx->reg_maps->shader_version.minor); @@ -883,8 +899,8 @@ static void pshader_hw_cnd(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "CMP%s %s%s, TMP, %s, %s;\n", sat ? "_SAT" : "", dst_name, dst_wmask, src_name[1], src_name[2]); } - if (shift != 0) - pshader_gen_output_modifier_line(buffer, FALSE, dst_wmask, shift, dst_name); + + pshader_gen_output_modifier_line(ins); } static void pshader_hw_cmp(const struct wined3d_shader_instruction *ins) @@ -894,7 +910,6 @@ static void pshader_hw_cmp(const struct wined3d_shader_instruction *ins) char dst_wmask[20]; char dst_name[50]; char src_name[3][50]; - DWORD shift = dst->shift; BOOL sat = dst->modifiers & WINED3DSPDM_SATURATE; BOOL is_color; @@ -913,8 +928,7 @@ static void pshader_hw_cmp(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "CMP%s %s%s, %s, %s, %s;\n", sat ? "_SAT" : "", dst_name, dst_wmask, src_name[0], src_name[2], src_name[1]); - if (shift != 0) - pshader_gen_output_modifier_line(buffer, FALSE, dst_wmask, shift, dst_name); + pshader_gen_output_modifier_line(ins); } /** Process the WINED3DSIO_DP2ADD instruction in ARB. @@ -926,7 +940,6 @@ static void pshader_hw_dp2add(const struct wined3d_shader_instruction *ins) char dst_wmask[20]; char dst_name[50]; char src_name[3][50]; - DWORD shift = dst->shift; BOOL sat = dst->modifiers & WINED3DSPDM_SATURATE; BOOL is_color; @@ -944,8 +957,7 @@ static void pshader_hw_dp2add(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "DP3 TMP2, TMP, %s;\n", src_name[1]); shader_addline(buffer, "ADD%s %s%s, TMP2, %s;\n", sat ? "_SAT" : "", dst_name, dst_wmask, src_name[2]); - if (shift != 0) - pshader_gen_output_modifier_line(buffer, FALSE, dst_wmask, shift, dst_name); + pshader_gen_output_modifier_line(ins); } /* Map the opcode 1-to-1 to the GL code */ @@ -1048,7 +1060,7 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "%s%s %s;\n", instruction, modifier, arguments); /* A shift requires another line. */ - if (shift) pshader_gen_output_modifier_line(buffer, saturate, output_wmask, shift, output_rname); + pshader_gen_output_modifier_line(ins); } else { /* Note that shader_arb_add_*_param() adds spaces. */ @@ -1687,7 +1699,6 @@ static void shader_hw_nrm(const struct wined3d_shader_instruction *ins) char dst_name[50]; char src_name[50]; char dst_wmask[20]; - DWORD shift = dst->shift; BOOL sat = dst->modifiers & WINED3DSPDM_SATURATE; BOOL is_color; @@ -1702,8 +1713,7 @@ static void shader_hw_nrm(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "MUL%s %s%s, %s, TMP;\n", sat ? "_SAT" : "", dst_name, dst_wmask, src_name); - if (shift != 0) - pshader_gen_output_modifier_line(buffer, FALSE, dst_wmask, shift, dst_name); + pshader_gen_output_modifier_line(ins); } static void shader_hw_sincos(const struct wined3d_shader_instruction *ins) @@ -1717,7 +1727,6 @@ static void shader_hw_sincos(const struct wined3d_shader_instruction *ins) char dst_name[50]; char src_name[50]; char dst_wmask[20]; - DWORD shift = dst->shift; BOOL sat = dst->modifiers & WINED3DSPDM_SATURATE; BOOL is_color; @@ -1729,8 +1738,7 @@ static void shader_hw_sincos(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "SCS%s %s%s, %s;\n", sat ? "_SAT" : "", dst_name, dst_wmask, src_name); - if (shift != 0) - pshader_gen_output_modifier_line(buffer, FALSE, dst_wmask, shift, dst_name); + pshader_gen_output_modifier_line(ins); }

1 0

Stefan Dösinger : winedd: Move shader_*_add_instruction_modifiers into the shader backend.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: 2fd485ae311cd37fb75c7d12b694e93efe3e0b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fd485ae311cd37fb75c7d12b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 3 18:17:07 2009 +0200 winedd: Move shader_*_add_instruction_modifiers into the shader backend. --- dlls/wined3d/arb_program_shader.c | 5 +++++ dlls/wined3d/baseshader.c | 6 +++--- dlls/wined3d/glsl_shader.c | 3 ++- dlls/wined3d/pixelshader.c | 3 --- dlls/wined3d/vertexshader.c | 2 -- dlls/wined3d/wined3d_private.h | 7 +------ 6 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f3ec739..fd9af76 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2247,6 +2247,10 @@ static BOOL shader_arb_color_fixup_supported(struct color_fixup_desc fixup) return FALSE; } +static void shader_arb_add_instruction_modifiers(const struct wined3d_shader_instruction *ins) { + /* Nothing to do for now */ +} + static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABLE_SIZE] = { /* WINED3DSIH_ABS */ shader_hw_map2gl, @@ -2351,6 +2355,7 @@ const shader_backend_t arb_program_shader_backend = { shader_arb_generate_vshader, shader_arb_get_caps, shader_arb_color_fixup_supported, + shader_arb_add_instruction_modifiers, }; /* ARB_fragment_program fixed function pipeline replacement definitions */ diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 957ec61..303460f 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1028,9 +1028,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, hw_fct(&ins); /* Process instruction modifiers for GLSL apps ( _sat, etc. ) */ - /* FIXME: This should be internal to the shader backend. - * Also, right now this is the only reason "shader_mode" exists. */ - if (This->baseShader.shader_mode == SHADER_GLSL) shader_glsl_add_instruction_modifiers(&ins); + device->shader_backend->shader_add_instruction_modifiers(&ins); } } @@ -1252,6 +1250,7 @@ static GLuint shader_none_generate_vshader(IWineD3DVertexShader *iface, FIXME("NONE shader backend asked to generate a vertex shader\n"); return 0; } +static void shader_none_add_instruction_modifiers(const struct wined3d_shader_instruction *ins) {} #define GLINFO_LOCATION (*gl_info) static void shader_none_get_caps(WINED3DDEVTYPE devtype, const WineD3D_GL_Info *gl_info, struct shader_caps *pCaps) @@ -1298,4 +1297,5 @@ const shader_backend_t none_shader_backend = { shader_none_generate_vshader, shader_none_get_caps, shader_none_color_fixup_supported, + shader_none_add_instruction_modifiers, }; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0370fde..ca50305 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1363,7 +1363,7 @@ static DWORD shader_glsl_append_dst(SHADER_BUFFER *buffer, const struct wined3d_ } /** Process GLSL instruction modifiers */ -void shader_glsl_add_instruction_modifiers(const struct wined3d_shader_instruction *ins) +static void shader_glsl_add_instruction_modifiers(const struct wined3d_shader_instruction *ins) { glsl_dst_param_t dst_param; DWORD modifiers; @@ -4401,4 +4401,5 @@ const shader_backend_t glsl_shader_backend = { shader_glsl_generate_vshader, shader_glsl_get_caps, shader_glsl_color_fixup_supported, + shader_glsl_add_instruction_modifiers, }; diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index a2e182d..9b001db 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -207,7 +207,6 @@ static void pshader_set_limits(IWineD3DPixelShaderImpl *This) static HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *iface, CONST DWORD *pFunction) { IWineD3DPixelShaderImpl *This =(IWineD3DPixelShaderImpl *)iface; - IWineD3DDeviceImpl *deviceImpl = (IWineD3DDeviceImpl *) This->baseShader.device; unsigned int i, highest_reg_used = 0, num_regs_used = 0; shader_reg_maps *reg_maps = &This->baseShader.reg_maps; const struct wined3d_shader_frontend *fe; @@ -285,8 +284,6 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *i This->baseShader.load_local_constsF = FALSE; - This->baseShader.shader_mode = deviceImpl->ps_selected_mode; - TRACE("(%p) : Copying the function\n", This); This->baseShader.function = HeapAlloc(GetProcessHeap(), 0, This->baseShader.functionLength); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index e5fb20f..1491b0c 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -285,8 +285,6 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_SetFunction(IWineD3DVertexShader vshader_set_limits(This); - This->baseShader.shader_mode = deviceImpl->vs_selected_mode; - if(deviceImpl->vs_selected_mode == SHADER_ARB && (GLINFO_LOCATION).arb_vs_offset_limit && This->min_rel_offset <= This->max_rel_offset) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d40d0ab..641ca8c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -807,6 +807,7 @@ typedef struct { SHADER_BUFFER *buffer, const struct vs_compile_args *args); void (*shader_get_caps)(WINED3DDEVTYPE devtype, const WineD3D_GL_Info *gl_info, struct shader_caps *caps); BOOL (*shader_color_fixup_supported)(struct color_fixup_desc fixup); + void (*shader_add_instruction_modifiers)(const struct wined3d_shader_instruction *ins); } shader_backend_t; extern const shader_backend_t glsl_shader_backend; @@ -2525,9 +2526,6 @@ extern BOOL vshader_get_input( extern HRESULT allocate_shader_constants(IWineD3DStateBlockImpl* object); -/* GLSL helper functions */ -extern void shader_glsl_add_instruction_modifiers(const struct wined3d_shader_instruction *ins); - /***************************************************************************** * IDirect3DBaseShader implementation structure */ @@ -2543,9 +2541,6 @@ typedef struct IWineD3DBaseShaderClass const struct wined3d_shader_frontend *frontend; void *frontend_data; - /* Type of shader backend */ - int shader_mode; - /* Programs this shader is linked with */ struct list linked_programs;

1 0

Stefan Dösinger : wined3d: Add a point size test.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: 31f5b01f9a6bfcd90e3cb63317e6389662272b6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f5b01f9a6bfcd90e3cb6331… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 3 16:07:20 2009 +0200 wined3d: Add a point size test. It shows that our current behavior (enabling coord_replace on all units) is correct. --- dlls/d3d9/tests/visual.c | 88 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 87 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0663a91..b6f2147 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8371,6 +8371,12 @@ static void pointsize_test(IDirect3DDevice9 *device) D3DMATRIX identity; float ptsize, ptsize_orig, ptsizemax_orig, ptsizemin_orig; DWORD color; + IDirect3DTexture9 *tex1, *tex2; + D3DLOCKED_RECT lr; + const DWORD tex1_data[4] = {0x00ff0000, 0x00ff0000, + 0x00000000, 0x00000000}; + const DWORD tex2_data[4] = {0x00000000, 0x0000ff00, + 0x00000000, 0x0000ff00}; const float vertices[] = { 64, 64, 0.1, @@ -8455,7 +8461,7 @@ static void pointsize_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_GetRenderState(device, D3DRS_POINTSIZE_MAX, (DWORD *) (&ptsizemax_orig)); ok(hr == D3D_OK, "IDirect3DDevice9_GetRenderState failed, hr=%08x\n", hr); - hr = IDirect3DDevice9_GetRenderState(device, D3DRS_POINTSIZE_MAX, (DWORD *) (&ptsizemin_orig)); + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_POINTSIZE_MIN, (DWORD *) (&ptsizemin_orig)); ok(hr == D3D_OK, "IDirect3DDevice9_GetRenderState failed, hr=%08x\n", hr); /* What happens if point scaling is disabled, and POINTSIZE_MAX < POINTSIZE? */ @@ -8596,6 +8602,86 @@ static void pointsize_test(IDirect3DDevice9 *device) color = getPixelColor(device, 576+4, 64+4); ok(color == 0x00ffffff, "pSize: Pixel (576+4),(64+4) has color 0x%08x, expected 0x00ffffff\n", color); + /* The following code tests point sprites with two textures, to see if each texture coordinate unit + * generates texture coordinates for the point(result: Yes, it does) + * + * However, not all GL implementations support point sprites(they need GL_ARB_point_sprite), but there + * is no point sprite cap bit in d3d because native d3d software emulates point sprites. Until the + * SW emulation is implemented in wined3d, this test will fail on GL drivers that does not support them. + */ + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed, hr=%08x\n", hr); + + hr = IDirect3DDevice9_CreateTexture(device, 2, 2, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &tex1, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed hr=%08x\n", hr); + hr = IDirect3DDevice9_CreateTexture(device, 2, 2, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &tex2, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed hr=%08x\n", hr); + memset(&lr, 0, sizeof(lr)); + hr = IDirect3DTexture9_LockRect(tex1, 0, &lr, NULL, 0); + ok(hr == D3D_OK, "IDirect3DTexture9_LockRect failed hr=%08x\n", hr); + memcpy(lr.pBits, tex1_data, sizeof(tex1_data)); + hr = IDirect3DTexture9_UnlockRect(tex1, 0); + ok(hr == D3D_OK, "IDirect3DTexture9_UnlockRect failed hr=%08x\n", hr); + memset(&lr, 0, sizeof(lr)); + hr = IDirect3DTexture9_LockRect(tex2, 0, &lr, NULL, 0); + ok(hr == D3D_OK, "IDirect3DTexture9_LockRect failed hr=%08x\n", hr); + memcpy(lr.pBits, tex2_data, sizeof(tex2_data)); + hr = IDirect3DTexture9_UnlockRect(tex2, 0); + ok(hr == D3D_OK, "IDirect3DTexture9_UnlockRect failed hr=%08x\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *) tex1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed hr=%08x\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 1, (IDirect3DBaseTexture9 *) tex2); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed hr=%08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed hr=%08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed hr=%08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_ADD); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed hr=%08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed hr=%08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLORARG2, D3DTA_CURRENT); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed hr=%08x\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSPRITEENABLE, TRUE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed hr=%08x\n", hr); + ptsize = 32.0; + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSIZE, *((DWORD *) (&ptsize))); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed, hr=%08x\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed, hr=%08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_POINTLIST, 1, &vertices[0], sizeof(float) * 3); + ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed, hr=%08x\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed, hr=%08x\n", hr); + } + + IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + color = getPixelColor(device, 64-4, 64-4); + ok(color == 0x00ff0000, "pSprite: Pixel (64-4),(64-4) has color 0x%08x, expected 0x00ff0000\n", color); + color = getPixelColor(device, 64-4, 64+4); + ok(color == 0x00000000, "pSprite: Pixel (64-4),(64+4) has color 0x%08x, expected 0x00000000\n", color); + color = getPixelColor(device, 64+4, 64+4); + ok(color == 0x0000ff00, "pSprite: Pixel (64+4),(64+4) has color 0x%08x, expected 0x0000ff00\n", color); + color = getPixelColor(device, 64+4, 64-4); + ok(color == 0x00ffff00, "pSprite: Pixel (64+4),(64-4) has color 0x%08x, expected 0x00ffff00\n", color); + + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed hr=%08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed hr=%08x\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed hr=%08x\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 1, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed hr=%08x\n", hr); + IDirect3DTexture9_Release(tex1); + IDirect3DTexture9_Release(tex2); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSPRITEENABLE, FALSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed hr=%08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSIZE, *((DWORD *) (&ptsize_orig))); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed hr=%08x\n", hr); hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &identity);

1 0

Stefan Dösinger : wined3d: Work around a bad crash in fglrx.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: 668328a697aaed3a7863c8c7e099e99471774bce URL: http://source.winehq.org/git/wine.git/?a=commit;h=668328a697aaed3a7863c8c7e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 6 19:36:08 2009 +0200 wined3d: Work around a bad crash in fglrx. --- dlls/wined3d/context.c | 10 ++++------ dlls/wined3d/directx.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/wined3d/state.c | 15 +++++++++++++-- dlls/wined3d/wined3d_gl.h | 1 + 4 files changed, 55 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a510d2e..2c6703f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -895,12 +895,10 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar } } - if(GL_SUPPORT(ARB_POINT_SPRITE)) { - for(s = 0; s < GL_LIMITS(textures); s++) { - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + s)); - glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE); - checkGLcall("glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)\n"); - } + for(s = 0; s < GL_LIMITS(point_sprite_units); s++) { + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + s)); + glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE); + checkGLcall("glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)\n"); } LEAVE_GL(); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 61927fc..d1f851a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1014,7 +1014,11 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { /* GL_ARB_half_float_vertex is a subset of GL_NV_half_float */ gl_info->supported[ARB_HALF_FLOAT_VERTEX] = TRUE; } - + if(gl_info->supported[ARB_POINT_SPRITE]) { + gl_info->max_point_sprite_units = gl_info->max_textures; + } else { + gl_info->max_point_sprite_units = 0; + } } checkGLcall("extension detection\n"); @@ -4031,6 +4035,13 @@ static BOOL match_apple_nonr500ati(const WineD3D_GL_Info *gl_info) { return TRUE; } +static BOOL match_fglrx(const WineD3D_GL_Info *gl_info) { + if(gl_info->gl_vendor != VENDOR_ATI) return FALSE; + if(match_apple(gl_info)) return FALSE; + if(strstr(gl_info->gl_renderer, "DRI")) return FALSE; /* Filter out Mesa DRI drivers */ + return TRUE; +} + static void quirk_arb_constants(WineD3D_GL_Info *gl_info) { TRACE_(d3d_caps)("Using ARB vs constant limit(=%u) for GLSL\n", gl_info->vs_arb_constantsF); gl_info->vs_glsl_constantsF = gl_info->vs_arb_constantsF; @@ -4048,6 +4059,26 @@ static void quirk_apple_glsl_constants(WineD3D_GL_Info *gl_info) { gl_info->reserved_glsl_constants = max(gl_info->reserved_glsl_constants, 12); } +/* fglrx crashes with a very bad kernel panic if GL_POINT_SPRITE_ARB is set to GL_COORD_REPLACE_ARB + * on more than one texture unit. This means that the d3d9 visual point size test will cause a + * kernel panic on any machine running fglrx 9.3(latest that supports r300 to r500 cards). This + * quirk only enables point sprites on the first texture unit. This keeps point sprites working in + * most games, but avoids the crash + * + * A more sophisticated way would be to find all units that need texture coordinates and enable + * point sprites for one if only one is found, and software emulate point sprites in drawStridedSlow + * if more than one unit needs texture coordinates(This requires software ffp and vertex shaders though) + * + * Note that disabling the extension entirely does not gain predictability because there is no point + * sprite capability flag in d3d, so the potential rendering bugs are the same if we disable the extension. + */ +static void quirk_one_point_sprite(WineD3D_GL_Info *gl_info) { + if(gl_info->supported[ARB_POINT_SPRITE]) { + TRACE("Limiting point sprites to one texture unit\n"); + gl_info->max_point_sprite_units = 1; + } +} + static void quirk_ati_dx9(WineD3D_GL_Info *gl_info) { quirk_arb_constants(gl_info); @@ -4146,6 +4177,11 @@ struct driver_quirk quirk_table[] = { match_apple_nonr500ati, quirk_texcoord_w, "Init texcoord .w for Apple ATI >= r600 GPU driver" + }, + { + match_fglrx, + quirk_one_point_sprite, + "Fglrx point sprite crash workaround" } }; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b1fbadf..ad1593c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1503,14 +1503,25 @@ static void state_lastpixel(DWORD state, IWineD3DStateBlockImpl *stateblock, Win } static void state_pointsprite_w(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + BOOL warned = FALSE; /* TODO: NV_POINT_SPRITE */ - if (stateblock->renderState[WINED3DRS_POINTSPRITEENABLE]) { - TRACE("Point sprites not supported\n"); + if (!warned && stateblock->renderState[WINED3DRS_POINTSPRITEENABLE]) { + /* A FIXME, not a WARN because point sprites should be software emulated if not supported by HW */ + FIXME("Point sprites not supported\n"); + warned = TRUE; } } static void state_pointsprite(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { if (stateblock->renderState[WINED3DRS_POINTSPRITEENABLE]) { + BOOL warned = FALSE; + if(GL_LIMITS(point_sprite_units) < GL_LIMITS(textures) && !warned) { + if(use_ps(stateblock) || stateblock->lowest_disabled_stage > GL_LIMITS(point_sprite_units)) { + FIXME("The app uses point sprite texture coordinates on more units than supported by the driver\n"); + warned = TRUE; + } + } + glEnable(GL_POINT_SPRITE_ARB); checkGLcall("glEnable(GL_POINT_SPRITE_ARB)"); } else { diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 2072391..1a9c925 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3933,6 +3933,7 @@ typedef struct _WineD3D_GL_Info { UINT max_texture_size; UINT max_texture3d_size; float max_pointsize, max_pointsizemin; + UINT max_point_sprite_units; UINT max_blends; UINT max_anisotropy; UINT max_glsl_varyings;

1 0

Stefan Dösinger : wined3d: Always declare single constants in ARB if rel addr is not used.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: 4daa3e532007a18640efd721181d2800114499ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=4daa3e532007a18640efd7211… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 17:32:59 2009 +0200 wined3d: Always declare single constants in ARB if rel addr is not used. This is needed to raise the number of advertised constants to the GL limit. The ARB assembler ususally does not optimize away unused constants, so we have to do this. --- dlls/wined3d/arb_program_shader.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e64c1b0..f3ec739 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -385,13 +385,16 @@ static void shader_generate_arb_declarations(IWineD3DBaseShader *iface, const sh * local constants do not declare the loaded constants as an array because ARB compilers usually * do not optimize unused constants away */ - if(!lconst_map || list_empty(&This->baseShader.constantsF)) { + if(This->baseShader.reg_maps.usesrelconstF) { /* Need to PARAM the environment parameters (constants) so we can use relative addressing */ shader_addline(buffer, "PARAM C[%d] = { program.env[0..%d] };\n", max_constantsF, max_constantsF - 1); } else { for(i = 0; i < max_constantsF; i++) { - if(!shader_constant_is_local(This, i)) { + DWORD idx, mask; + idx = i >> 5; + mask = 1 << (i & 0x1f); + if(!shader_constant_is_local(This, i) && (This->baseShader.reg_maps.constf[idx] & mask)) { shader_addline(buffer, "PARAM C%d = program.env[%d];\n",i, i); } } @@ -513,7 +516,7 @@ static void shader_arb_get_register_name(IWineD3DBaseShader *iface, WINED3DSHADE } else { - if (This->baseShader.load_local_constsF || list_empty(&This->baseShader.constantsF)) + if (This->baseShader.reg_maps.usesrelconstF) sprintf(register_name, "C[%u]", register_idx); else sprintf(register_name, "C%u", register_idx); @@ -1442,13 +1445,14 @@ static void pshader_hw_texm3x3spec(const struct wined3d_shader_instruction *ins) IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; DWORD flags; DWORD reg = ins->dst[0].reg.idx; - DWORD reg3 = ins->src[1].reg.idx; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; SHADER_BUFFER *buffer = ins->ctx->buffer; char dst_str[8]; char src0_name[50]; + char src1_name[50]; pshader_gen_input_modifier_line(ins->ctx->shader, buffer, &ins->src[0], 0, src0_name); + pshader_gen_input_modifier_line(ins->ctx->shader, buffer, &ins->src[1], 1, src1_name); shader_addline(buffer, "DP3 TMP.z, T%u, %s;\n", reg, src0_name); /* Calculate reflection vector. @@ -1459,12 +1463,12 @@ static void pshader_hw_texm3x3spec(const struct wined3d_shader_instruction *ins) * * Which normalizes the normal vector */ - shader_addline(buffer, "DP3 TMP.w, TMP, C[%u];\n", reg3); + shader_addline(buffer, "DP3 TMP.w, TMP, %s;\n", src1_name); shader_addline(buffer, "DP3 TMP2.w, TMP, TMP;\n"); shader_addline(buffer, "RCP TMP2.w, TMP2.w;\n"); shader_addline(buffer, "MUL TMP.w, TMP.w, TMP2.w;\n"); shader_addline(buffer, "MUL TMP, TMP.w, TMP;\n"); - shader_addline(buffer, "MAD TMP, coefmul.x, TMP, -C[%u];\n", reg3); + shader_addline(buffer, "MAD TMP, coefmul.x, TMP, -%s;\n", src1_name); /* Sample the texture using the calculated coordinates */ sprintf(dst_str, "T%u", reg);

1 0

Stefan Dösinger : wined3d: Keep track of used float constants.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: f9276a64295e5fdff6e8b68958ed9ef0e9a29c31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9276a64295e5fdff6e8b6895… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 17:31:20 2009 +0200 wined3d: Keep track of used float constants. --- dlls/wined3d/baseshader.c | 60 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/pixelshader.c | 3 +- dlls/wined3d/vertexshader.c | 3 +- dlls/wined3d/wined3d_private.h | 3 +- 4 files changed, 65 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 105128d..957ec61 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -237,6 +237,14 @@ static void shader_delete_constant_list(struct list* clist) { list_init(clist); } +static inline void set_bitmap_bit(DWORD *bitmap, DWORD bit) +{ + DWORD idx, shift; + idx = bit >> 5; + shift = bit & 0x1f; + bitmap[idx] |= (1 << shift); +} + static void shader_record_register_usage(IWineD3DBaseShaderImpl *This, struct shader_reg_maps *reg_maps, DWORD register_type, UINT register_idx, BOOL has_rel_addr, BOOL pshader) { @@ -293,6 +301,10 @@ static void shader_record_register_usage(IWineD3DBaseShaderImpl *This, struct sh } reg_maps->usesrelconstF = TRUE; } + else + { + set_bitmap_bit(reg_maps->constf, register_idx); + } break; case WINED3DSPR_CONSTINT: @@ -309,12 +321,32 @@ static void shader_record_register_usage(IWineD3DBaseShaderImpl *This, struct sh } } +static unsigned char get_instr_regcount(enum WINED3D_SHADER_INSTRUCTION_HANDLER instr, int param) +{ + switch(instr) + { + case WINED3DSIH_M4x4: + case WINED3DSIH_M3x4: + return param == 1 ? 4 : 1; + + case WINED3DSIH_M4x3: + case WINED3DSIH_M3x3: + return param == 1 ? 3 : 1; + + case WINED3DSIH_M3x2: + return param == 1 ? 2 : 1; + + default: + return 1; + } +} + /* Note that this does not count the loop register * as an address register. */ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3d_shader_frontend *fe, struct shader_reg_maps *reg_maps, struct wined3d_shader_semantic *semantics_in, - struct wined3d_shader_semantic *semantics_out, const DWORD *byte_code) + struct wined3d_shader_semantic *semantics_out, const DWORD *byte_code, DWORD constf_size) { IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; void *fe_data = This->baseShader.frontend_data; @@ -338,6 +370,13 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 reg_maps->shader_version = shader_version; pshader = shader_is_pshader_version(shader_version.type); + reg_maps->constf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(*reg_maps->constf) * ((constf_size + 31) / 32)); + if(!reg_maps->constf) { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + while (!fe->shader_is_end(fe_data, &pToken)) { struct wined3d_shader_instruction ins; @@ -582,6 +621,24 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 fe->shader_read_src_param(fe_data, &pToken, &src_param, &src_rel_addr); shader_record_register_usage(This, reg_maps, src_param.reg.type, src_param.reg.idx, !!src_param.reg.rel_addr, pshader); + switch(get_instr_regcount(ins.handler_idx, i)) + { + case 4: + shader_record_register_usage(This, reg_maps, src_param.reg.type, + src_param.reg.idx + 3, !!src_param.reg.rel_addr, pshader); + /* drop through */ + case 3: + shader_record_register_usage(This, reg_maps, src_param.reg.type, + src_param.reg.idx + 2, !!src_param.reg.rel_addr, pshader); + /* drop through */ + case 2: + shader_record_register_usage(This, reg_maps, src_param.reg.type, + src_param.reg.idx + 1, !!src_param.reg.rel_addr, pshader); + /* drop through */ + case 1: + shader_record_register_usage(This, reg_maps, src_param.reg.type, + src_param.reg.idx, !!src_param.reg.rel_addr, pshader); + } } } } @@ -1158,6 +1215,7 @@ void shader_cleanup(IWineD3DBaseShader *iface) IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)iface; ((IWineD3DDeviceImpl *)This->baseShader.device)->shader_backend->shader_destroy(iface); + HeapFree(GetProcessHeap(), 0, This->baseShader.reg_maps.constf); HeapFree(GetProcessHeap(), 0, This->baseShader.function); shader_delete_constant_list(&This->baseShader.constantsF); shader_delete_constant_list(&This->baseShader.constantsB); diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 485857c..a2e182d 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -238,7 +238,8 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *i list_init(&This->baseShader.constantsI); /* Second pass: figure out which registers are used, what the semantics are, etc.. */ - hr = shader_get_registers_used((IWineD3DBaseShader *)This, fe, reg_maps, This->semantics_in, NULL, pFunction); + hr = shader_get_registers_used((IWineD3DBaseShader *)This, fe, reg_maps, This->semantics_in, NULL, pFunction, + GL_LIMITS(pshader_constantsF)); if (FAILED(hr)) return hr; pshader_set_limits(This); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index e8171ba..e5fb20f 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -279,7 +279,8 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_SetFunction(IWineD3DVertexShader This->min_rel_offset = GL_LIMITS(vshader_constantsF); This->max_rel_offset = 0; hr = shader_get_registers_used((IWineD3DBaseShader*) This, fe, - reg_maps, This->semantics_in, This->semantics_out, pFunction); + reg_maps, This->semantics_in, This->semantics_out, pFunction, + GL_LIMITS(vshader_constantsF)); if (hr != WINED3D_OK) return hr; vshader_set_limits(This); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c5f74fb..d40d0ab 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -625,6 +625,7 @@ typedef struct shader_reg_maps char packed_output[MAX_REG_OUTPUT]; /* vertex >= 3.0 */ char attributes[MAX_ATTRIBS]; /* vertex */ char labels[MAX_LABELS]; /* pixel, vertex */ + DWORD *constf; /* pixel, vertex */ DWORD texcoord_mask[MAX_REG_TEXCRD]; /* vertex < 3.0 */ WORD integer_constants; /* MAX_CONST_I, 16 */ WORD boolean_constants; /* MAX_CONST_B, 16 */ @@ -2579,7 +2580,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, const shader_reg_maps *reg_maps, const DWORD *pFunction); HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3d_shader_frontend *fe, struct shader_reg_maps *reg_maps, struct wined3d_shader_semantic *semantics_in, - struct wined3d_shader_semantic *semantics_out, const DWORD *byte_code); + struct wined3d_shader_semantic *semantics_out, const DWORD *byte_code, DWORD constf_size); void shader_init(struct IWineD3DBaseShaderClass *shader, IWineD3DDevice *device); const struct wined3d_shader_frontend *shader_select_frontend(DWORD version_token); void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe_data, const DWORD *pFunction);

1 0

Hwang YunSong : notepad: Updated Korean resource.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: bcf1361af11d3a6ea4726a98aa95c2c9abd03fd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcf1361af11d3a6ea4726a98a… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon May 4 10:29:05 2009 +0900 notepad: Updated Korean resource. --- programs/notepad/Ko.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Ko.rc b/programs/notepad/Ko.rc index 045a13c..3b4e5d4 100644 --- a/programs/notepad/Ko.rc +++ b/programs/notepad/Ko.rc @@ -5,6 +5,7 @@ * Proofread 1998 by David Lee Lambert <lamber45(a)egr.msu.edu> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2007 Bang Jun-Young <junyoung(a)mogua.com> + * Copyright 2009 YunSong Hwang <hys545(a)dreamwiz.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -54,6 +55,7 @@ POPUP " POPUP "ã��(&S)" { MENUITEM "ã��(&S)...\tCtrl+F", CMD_SEARCH MENUITEM "�� ã��(&N)\tF3", CMD_SEARCH_NEXT + MENUITEM "�ٲٱ�(&R)...\tCtrl+H", CMD_REPLACE } POPUP "��(&H)" { MENUITEM "�׸�(&C)", CMD_HELP_CONTENTS

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
80
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 2009