wine-commits May 2009

wine-commits@winehq.org

4 participants
793 discussions

Alexandre Julliard : ntdll: Add support for some function epilogs in RtlVirtualUnwind.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: 1d4747c35fe5627375c98ab0cb55ec1e4e0eab4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d4747c35fe5627375c98ab0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 20 12:31:28 2009 +0200 ntdll: Add support for some function epilogs in RtlVirtualUnwind. --- dlls/ntdll/signal_x86_64.c | 132 +++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/tests/exception.c | 10 +++ 2 files changed, 141 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index c1210e9..bf78685 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1060,6 +1060,131 @@ static int get_opcode_size( struct opcode op ) } } +static BOOL is_inside_epilog( BYTE *pc ) +{ + /* add or lea must be the first instruction, and it must have a rex.W prefix */ + if ((pc[0] & 0xf8) == 0x48) + { + switch (pc[1]) + { + case 0x81: /* add $nnnn,%rsp */ + if (pc[0] == 0x48 && pc[2] == 0xc4) + { + pc += 7; + break; + } + return FALSE; + case 0x83: /* add $n,%rsp */ + if (pc[0] == 0x48 && pc[2] == 0xc4) + { + pc += 4; + break; + } + return FALSE; + case 0x8d: /* lea n(reg),%rsp */ + if (pc[0] & 0x06) return FALSE; /* rex.RX must be cleared */ + if (((pc[2] >> 3) & 7) != 4) return FALSE; /* dest reg mus be %rsp */ + if ((pc[2] & 7) == 4) return FALSE; /* no SIB byte allowed */ + if ((pc[2] >> 6) == 1) /* 8-bit offset */ + { + pc += 4; + break; + } + if ((pc[2] >> 6) == 2) /* 32-bit offset */ + { + pc += 7; + break; + } + return FALSE; + } + } + + /* now check for various pop instructions */ + + for (;;) + { + BYTE rex = 0; + + if ((*pc & 0xf0) == 0x40) rex = *pc++ & 0x0f; /* rex prefix */ + + switch (*pc) + { + case 0x58: /* pop %rax/%r8 */ + case 0x59: /* pop %rcx/%r9 */ + case 0x5a: /* pop %rdx/%r10 */ + case 0x5b: /* pop %rbx/%r11 */ + case 0x5c: /* pop %rsp/%r12 */ + case 0x5d: /* pop %rbp/%r13 */ + case 0x5e: /* pop %rsi/%r14 */ + case 0x5f: /* pop %rdi/%r15 */ + pc++; + continue; + case 0xc2: /* ret $nn */ + case 0xc3: /* ret */ + return TRUE; + /* FIXME: add various jump instructions */ + } + return FALSE; + } +} + +/* execute a function epilog, which must have been validated with is_inside_epilog() */ +static void interpret_epilog( BYTE *pc, CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_ptr ) +{ + for (;;) + { + BYTE rex = 0; + + if ((*pc & 0xf0) == 0x40) rex = *pc++ & 0x0f; /* rex prefix */ + + switch (*pc) + { + case 0x58: /* pop %rax/r8 */ + case 0x59: /* pop %rcx/r9 */ + case 0x5a: /* pop %rdx/r10 */ + case 0x5b: /* pop %rbx/r11 */ + case 0x5c: /* pop %rsp/r12 */ + case 0x5d: /* pop %rbp/r13 */ + case 0x5e: /* pop %rsi/r14 */ + case 0x5f: /* pop %rdi/r15 */ + set_int_reg( context, ctx_ptr, *pc - 0x58 + (rex & 1) * 8, *(ULONG64 *)context->Rsp ); + context->Rsp += sizeof(ULONG64); + pc++; + continue; + case 0x81: /* add $nnnn,%rsp */ + context->Rsp += *(LONG *)(pc + 2); + pc += 2 + sizeof(LONG); + continue; + case 0x83: /* add $n,%rsp */ + context->Rsp += (signed char)pc[2]; + pc += 3; + continue; + case 0x8d: + if ((pc[1] >> 6) == 1) /* lea n(reg),%rsp */ + { + context->Rsp = get_int_reg( context, (pc[1] & 7) + (rex & 1) * 8 ) + (signed char)pc[2]; + pc += 3; + } + else /* lea nnnn(reg),%rsp */ + { + context->Rsp = get_int_reg( context, (pc[1] & 7) + (rex & 1) * 8 ) + *(LONG *)(pc + 2); + pc += 2 + sizeof(LONG); + } + continue; + case 0xc2: /* ret $nn */ + context->Rip = *(ULONG64 *)context->Rsp; + context->Rsp += sizeof(ULONG64) + *(WORD *)(pc + 1); + return; + case 0xc3: /* ret */ + context->Rip = *(ULONG64 *)context->Rsp; + context->Rsp += sizeof(ULONG64); + return; + /* FIXME: add various jump instructions */ + } + return; + } +} + /********************************************************************** * RtlVirtualUnwind (NTDLL.@) */ @@ -1100,7 +1225,12 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, else { prolog_offset = ~0; - /* FIXME: check for function epilog */ + if (is_inside_epilog( (BYTE *)pc )) + { + interpret_epilog( (BYTE *)pc, context, ctx_ptr ); + *frame_ret = frame; + return NULL; + } } for (i = 0; i < info->count; i += get_opcode_size(info->opcodes[i])) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index c3cc797..ff4125f 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1116,6 +1116,9 @@ static void test_virtual_unwind(void) { 0x1c, 0x40, TRUE, 0x128, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {rsi,0x138}, {-1,-1}}}, { 0x1d, 0x40, TRUE, 0x128, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {rsi,0x138}, {-1,-1}}}, { 0x24, 0x40, TRUE, 0x128, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {rsi,0x138}, {-1,-1}}}, + { 0x2b, 0x40, FALSE, 0x128, { {rsp,0x130}, {rbp,0x120}, {-1,-1}}}, + { 0x32, 0x40, FALSE, 0x008, { {rsp,0x010}, {rbp,0x000}, {-1,-1}}}, + { 0x33, 0x40, FALSE, 0x000, { {rsp,0x008}, {-1,-1}}}, }; @@ -1165,6 +1168,13 @@ static void test_virtual_unwind(void) { 0x04, 0x50, FALSE, 0x020, { {rsp,0x028}, {rbx,0x018}, {rbp,0x010}, {rsi,0x008}, {rdi,0x000}, {-1,-1} }}, { 0x06, 0x50, FALSE, 0x028, { {rsp,0x030}, {rbx,0x020}, {rbp,0x018}, {rsi,0x010}, {rdi,0x008}, {r12,0x000}, {-1,-1} }}, { 0x0a, 0x50, TRUE, 0x058, { {rsp,0x060}, {rbx,0x050}, {rbp,0x048}, {rsi,0x040}, {rdi,0x038}, {r12,0x030}, {-1,-1} }}, + { 0x0c, 0x50, FALSE, 0x058, { {rsp,0x060}, {rbx,0x050}, {rbp,0x048}, {rsi,0x040}, {rdi,0x038}, {r12,0x030}, {-1,-1} }}, + { 0x10, 0x50, FALSE, 0x028, { {rsp,0x030}, {rbx,0x020}, {rbp,0x018}, {rsi,0x010}, {rdi,0x008}, {r12,0x000}, {-1,-1} }}, + { 0x12, 0x50, FALSE, 0x020, { {rsp,0x028}, {rbx,0x018}, {rbp,0x010}, {rsi,0x008}, {rdi,0x000}, {-1,-1} }}, + { 0x13, 0x50, FALSE, 0x018, { {rsp,0x020}, {rbx,0x010}, {rbp,0x008}, {rsi,0x000}, {-1,-1} }}, + { 0x14, 0x50, FALSE, 0x010, { {rsp,0x018}, {rbx,0x008}, {rbp,0x000}, {-1,-1} }}, + { 0x15, 0x50, FALSE, 0x008, { {rsp,0x010}, {rbx,0x000}, {-1,-1} }}, + { 0x16, 0x50, FALSE, 0x000, { {rsp,0x008}, {-1,-1} }}, }; static const struct unwind_test tests[] =

1 0

Alexandre Julliard : ntdll/tests: Add more tests for RtlVirtualUnwind.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: fb819d6491d046fed99ec879df9de08e8ccd49da URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb819d6491d046fed99ec879d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 20 12:21:07 2009 +0200 ntdll/tests: Add more tests for RtlVirtualUnwind. --- dlls/ntdll/tests/exception.c | 241 ++++++++++++++++++++++++++++------------- 1 files changed, 164 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb819d6491d046fed99ec…

1 0

Luke Benstead : ddraw: Add tests for DirectDrawSurface reference counting.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: 73abda63d782abf53eaae2428237e024a3881d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=73abda63d782abf53eaae2428… Author: Luke Benstead <kazade(a)gmail.com> Date: Tue May 19 21:27:08 2009 +0100 ddraw: Add tests for DirectDrawSurface reference counting. --- dlls/ddraw/tests/dsurface.c | 114 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 114 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index a0f69b1..c3280fb 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -26,6 +26,7 @@ #include <assert.h> #include "wine/test.h" #include "ddraw.h" +#include "d3d.h" #include "unknwn.h" static LPDIRECTDRAW lpDD = NULL; @@ -966,6 +967,118 @@ static void GetDDInterface_7(void) IDirectDrawSurface7_Release(dsurface7); } +static ULONG getRefcount(IUnknown *iface) +{ + IUnknown_AddRef(iface); + return IUnknown_Release(iface); +} + +static void IFaceRefCount(void) +{ + LPDIRECTDRAWSURFACE surf; + DDSURFACEDESC surface; + HRESULT ret; + IDirectDrawSurface2 *surf2; + IDirectDrawSurface2 *surf2a; + IDirectDrawSurface4 *surf4; + IDirectDrawSurface7 *surf7a; + IDirectDrawSurface7 *surf7b; + IDirect3DTexture* tex; + IDirect3DTexture2* tex2; + IDirectDrawGammaControl* gamma; + ULONG ref; + + /* Create a surface */ + ZeroMemory(&surface, sizeof(surface)); + surface.dwSize = sizeof(surface); + surface.dwFlags = DDSD_CAPS; + surface.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + ret = IDirectDraw_CreateSurface(lpDD, &surface, &surf, NULL); + + if (ret != DD_OK) + { + ok(FALSE, "Could not create surface, skipping test\n"); + return; + } + + ref = getRefcount((IUnknown *) surf); + ok(ref == 1, "Refcount is %u, expected 1\n", ref); /* Check the ref count is one */ + + IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawSurface2, (void **) &surf2); + ref = getRefcount((IUnknown *) surf); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); /* Check the ref count is one */ + ref = getRefcount((IUnknown *) surf2); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); /* This should also be one */ + + IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawSurface2, (void **) &surf2a); + ref = getRefcount((IUnknown *) surf2); + todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); /* Surf2's refcount should be 2 now, but surf should be 1 */ + ref = getRefcount((IUnknown *) surf); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + + IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawSurface4, (void **) &surf4); + ref = getRefcount((IUnknown *) surf4); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + + IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawSurface7, (void **) &surf7a); + ref = getRefcount((IUnknown *) surf7a); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + + IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawSurface7, (void **) &surf7b); + ref = getRefcount((IUnknown *) surf7b); + todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); + + /* IDirect3DTexture interface (unlike the others) alters the original IDirectDrawSurface ref count */ + IDirectDrawSurface_QueryInterface(surf, &IID_IDirect3DTexture, (void **) &tex); + ref = getRefcount((IUnknown *) tex); + todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); + ref = getRefcount((IUnknown *) surf); + todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); + + IDirectDrawSurface_QueryInterface(surf, &IID_IDirect3DTexture2, (void **) &tex2); + ref = getRefcount((IUnknown *) tex); + todo_wine ok(ref == 3, "Refcount is %u, expected 3\n", ref); + ref = getRefcount((IUnknown *) tex2); + todo_wine ok(ref == 3, "Refcount is %u, expected 3\n", ref); + ref = getRefcount((IUnknown *) surf); + todo_wine ok(ref == 3, "Refcount is %u, expected 3\n", ref); + + IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawGammaControl, (void **) &gamma); + ref = getRefcount((IUnknown *) gamma); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + + ref = IDirect3DTexture2_Release(tex2); /* Release the texture */ + todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); + ref = getRefcount((IUnknown *) surf); + todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); + + ref = IDirect3DTexture_Release(tex); /* Release the texture */ + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + ref = getRefcount((IUnknown *) surf); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + + ref = IDirectDrawGammaControl_Release(gamma); /* Release the gamma control */ + todo_wine ok(ref == 0, "Refcount is %u, expected 0\n", ref); + + ref = IDirectDrawSurface2_Release(surf2); /* Release one of the 2 surf2 interfaces */ + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + + ref = IDirectDrawSurface2_Release(surf2a); /* Release the other */ + todo_wine ok(ref == 0, "Refcount is %u, expected 0\n", ref); + + ref = IDirectDrawSurface4_Release(surf4); + todo_wine ok(ref == 0, "Refcount is %u, expected 0\n", ref); + + ref = IDirectDrawSurface7_Release(surf7a); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + + ref = IDirectDrawSurface7_Release(surf7b); + todo_wine ok(ref == 0, "Refcount is %u, expected 0\n", ref); + + ref = IDirectDrawSurface_Release(surf); + ok(ref == 0, "Refcount is %u, expected 0\n", ref); +} + #define MAXEXPECTED 8 /* Can match up to 8 expected surfaces */ struct enumstruct { @@ -2908,6 +3021,7 @@ START_TEST(dsurface) GetDDInterface_2(); GetDDInterface_4(); GetDDInterface_7(); + IFaceRefCount(); EnumTest(); AttachmentTest(); AttachmentTest7();

1 0

André Hentschel : winemaker: Read the includes of a dsp project file.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: abc68c1ca75a5fd4a3b275fc8be94f2f71e4beb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abc68c1ca75a5fd4a3b275fc8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 19 21:01:55 2009 +0200 winemaker: Read the includes of a dsp project file. --- tools/winemaker | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 8170720..3d45247 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -663,9 +663,11 @@ sub source_scan_project_file($$$) } elsif (/^D\s*\"(.*)\"/) { # Preprocessor Definitions $prj_target_cflags.="-D".$1." "; - } elsif (/^I/) { + } elsif (/^I\s*\"(.*)\"/) { # Additional Include Directories - #$prj_target_cflags.="-I" fixpath(option) + $sfilet=$1; + $sfilet=~s/\\/\//g; + push @{@$project_settings[$T_INCLUDE_PATH]},"-I".$sfilet." "; } elsif (/^U\s*\"(.*)\"/) { # Undefines a previously defined symbol $prj_target_cflags.="-U".$1." "; @@ -1847,6 +1849,7 @@ sub get_real_include_name($$$$$) foreach my $include (@{@$target[$T_INCLUDE_PATH]}, @{@$project_settings[$T_INCLUDE_PATH]}) { my $dirname=$include; $dirname=~ s+^-I++; + $dirname=~ s+\s$++; if (!is_absolute($dirname)) { $dirname="@$project[$P_PATH]$dirname"; } else {

1 0

Stefan Dösinger : wined3d: Emulate the 4 component address register in ARB.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: 7b1d48721df2bc3199812bdc5cbbc73cd0969d9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b1d48721df2bc3199812bdc5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 15 13:56:40 2009 +0200 wined3d: Emulate the 4 component address register in ARB. --- dlls/wined3d/arb_program_shader.c | 58 ++++++++++++++++++++++++++++++------- dlls/wined3d/baseshader.c | 3 +- dlls/wined3d/glsl_shader.c | 4 +- dlls/wined3d/wined3d_private.h | 3 +- 4 files changed, 53 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 87a1d4c..d871fc9 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -84,6 +84,10 @@ struct shader_arb_priv { struct hash_table_t *fragment_shaders; }; +struct shader_arb_ctx_priv { + char addr_reg[20]; +}; + /******************************************************** * ARB_[vertex/fragment]_program helper functions follow ********************************************************/ @@ -503,6 +507,17 @@ static void shader_arb_get_swizzle(const struct wined3d_shader_src_param *param, *ptr = '\0'; } +static void shader_arb_request_a0(const struct wined3d_shader_instruction *ins, const char *src) +{ + struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; + SHADER_BUFFER *buffer = ins->ctx->buffer; + + if(strcmp(priv->addr_reg, src) == 0) return; + + strcpy(priv->addr_reg, src); + shader_addline(buffer, "ARL A0.x, %s;\n", src); +} + static void shader_arb_get_src_param(const struct wined3d_shader_instruction *ins, const struct wined3d_shader_src_param *src, unsigned int tmpreg, char *outregstr); @@ -543,7 +558,9 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction if(This->baseShader.reg_maps.shader_version.major < 2) { sprintf(rel_reg, "A0.x"); } else { + shader_arb_get_src_param(ins, reg->rel_addr, 0, rel_reg); /* FIXME: GL_NV_vertex_progam2_option */ + shader_arb_request_a0(ins, rel_reg); sprintf(rel_reg, "A0.x"); } if (reg->idx >= rel_offset) @@ -574,7 +591,17 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction sprintf(register_name, "fragment.texcoord[%u]", reg->idx); } } - else sprintf(register_name, "A%u", reg->idx); + else + { + if(This->baseShader.reg_maps.shader_version.major == 1) + { + sprintf(register_name, "A%u", reg->idx); + } + else + { + sprintf(register_name, "A%u_SHADOW", reg->idx); + } + } break; case WINED3DSPR_COLOROUT: @@ -1016,9 +1043,11 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) if(ins->handler_idx == WINED3DSIH_MOVA) { struct wined3d_shader_src_param tmp_src = ins->src[0]; + char write_mask[6]; tmp_src.swizzle = (tmp_src.swizzle & 0x3) * 0x55; shader_arb_get_src_param(ins, &tmp_src, 0, src0_param); + shader_arb_get_write_mask(ins, &ins->dst[0], write_mask); /* This implements the mova formula used in GLSL. The first two instructions * prepare the sign() part. Note that it is fine to have my_sign(0.0) = 1.0 @@ -1027,16 +1056,20 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) * * A0.x = arl(floor(abs(0.0) + 0.5) * 1.0) = floor(0.5) = 0.0 since arl does a floor * + * 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. + * * TODO: ARR from GL_NV_vertex_program2_option */ - shader_addline(buffer, "SGE TA.y, %s, mova_const.y;\n", src0_param); - shader_addline(buffer, "MAD TA.y, TA.y, mova_const.z, -mova_const.w;\n"); - - shader_addline(buffer, "ABS TA.x, %s;\n", src0_param); - shader_addline(buffer, "ADD TA.x, TA.x, mova_const.x;\n"); - shader_addline(buffer, "FLR TA.x, TA.x;\n"); - shader_addline(buffer, "MUL TA.x, TA.x, TA.y;\n"); - shader_addline(buffer, "ARL A0.x, TA.x;\n"); + 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, "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, "FLR TA%s, TA;\n", write_mask); + shader_addline(buffer, "MUL A0_SHADOW%s, TA, A0_SHADOW;\n", write_mask); + + ((struct shader_arb_ctx_priv *)ins->ctx->backend_data)->addr_reg[0] = '\0'; } else if (ins->ctx->reg_maps->shader_version.major == 1 && !shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type) && ins->dst[0].reg.type == WINED3DSPR_ADDR) @@ -1982,7 +2015,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, lconst_map); /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function); + shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, NULL); if(args->srgb_correction) { arbfp_add_sRGB_correction(buffer, fragcolor, "TA", "TB", "TC"); @@ -2036,7 +2069,9 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, const local_constant *lconst; GLuint ret; DWORD *lconst_map = local_const_mapping((IWineD3DBaseShaderImpl *) This); + struct shader_arb_ctx_priv priv_ctx; + memset(&priv_ctx, 0, sizeof(priv_ctx)); /* Create the hw ARB shader */ shader_addline(buffer, "!!ARBvp1.0\n"); @@ -2045,6 +2080,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, } if(need_mova_const((IWineD3DBaseShader *) iface, gl_info)) { shader_addline(buffer, "PARAM mova_const = { 0.5, 0.0, 2.0, 1.0 };\n"); + shader_addline(buffer, "TEMP A0_SHADOW;\n"); } /* Mesa supports only 95 constants */ @@ -2086,7 +2122,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, } /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function); + 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), diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index cf8171b..2fd79ff 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -929,7 +929,7 @@ void shader_dump_src_param(const struct wined3d_shader_src_param *param, /* Shared code in order to generate the bulk of the shader string. * NOTE: A description of how to parse tokens can be found on msdn */ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, - const shader_reg_maps *reg_maps, const DWORD *pFunction) + const shader_reg_maps *reg_maps, const DWORD *pFunction, void *backend_ctx) { IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; /* To access shader backend callbacks */ @@ -951,6 +951,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, ctx.shader = iface; ctx.reg_maps = reg_maps; ctx.buffer = buffer; + ctx.backend_data = backend_ctx; ins.ctx = &ctx; ins.dst = &dst_param; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 13d82ba..c978e5b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4142,7 +4142,7 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShader *iface, } /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function); + shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, NULL); /* Pixel shaders < 2.0 place the resulting color in R0 implicitly */ if (reg_maps->shader_version.major < 2) @@ -4229,7 +4229,7 @@ static GLuint shader_glsl_generate_vshader(IWineD3DVertexShader *iface, shader_generate_glsl_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, NULL); /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader*)This, buffer, reg_maps, function); + shader_generate_main((IWineD3DBaseShader*)This, buffer, reg_maps, function, NULL); /* Unpack 3.0 outputs */ if (reg_maps->shader_version.major >= 3) shader_addline(buffer, "order_ps_input(OUT);\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 526ba24..79ac60b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -648,6 +648,7 @@ struct wined3d_shader_context IWineD3DBaseShader *shader; const struct shader_reg_maps *reg_maps; SHADER_BUFFER *buffer; + void *backend_data; }; struct wined3d_shader_register @@ -2575,7 +2576,7 @@ void shader_dump_src_param(const struct wined3d_shader_src_param *param, void shader_dump_dst_param(const struct wined3d_shader_dst_param *param, const struct wined3d_shader_version *shader_version); void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, - const shader_reg_maps *reg_maps, const DWORD *pFunction); + const shader_reg_maps *reg_maps, const DWORD *pFunction, void *backend_ctx); 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, DWORD constf_size);

1 0

Stefan Dösinger : wined3d: Prepare for vec4 address registers in ARB.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: 72e9e80f6e79f7daf6a60cdddd133aa46344c76e URL: http://source.winehq.org/git/wine.git/?a=commit;h=72e9e80f6e79f7daf6a60cddd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 15 13:55:00 2009 +0200 wined3d: Prepare for vec4 address registers in ARB. --- dlls/wined3d/arb_program_shader.c | 34 ++++++++++++++++++++-------------- 1 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ecb6f0b..87a1d4c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -457,14 +457,8 @@ static void shader_arb_get_write_mask(const struct wined3d_shader_instruction *i const struct wined3d_shader_dst_param *dst, char *write_mask) { char *ptr = write_mask; - char vshader = shader_is_vshader_version(ins->ctx->reg_maps->shader_version.type); - if (vshader && dst->reg.type == WINED3DSPR_ADDR) - { - *ptr++ = '.'; - *ptr++ = 'x'; - } - else if (dst->write_mask != WINED3DSP_WRITEMASK_ALL) + if (dst->write_mask != WINED3DSP_WRITEMASK_ALL) { *ptr++ = '.'; if (dst->write_mask & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; @@ -509,12 +503,15 @@ static void shader_arb_get_swizzle(const struct wined3d_shader_src_param *param, *ptr = '\0'; } -static void shader_arb_get_register_name(IWineD3DBaseShader *iface, +static void shader_arb_get_src_param(const struct wined3d_shader_instruction *ins, + const struct wined3d_shader_src_param *src, unsigned int tmpreg, char *outregstr); + +static void shader_arb_get_register_name(const struct wined3d_shader_instruction *ins, const struct wined3d_shader_register *reg, char *register_name, BOOL *is_color) { /* oPos, oFog and oPts in D3D */ static const char * const rastout_reg_names[] = {"TMP_OUT", "result.fogcoord", "result.pointsize"}; - IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)iface; + IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)ins->ctx->shader; BOOL pshader = shader_is_pshader_version(This->baseShader.reg_maps.shader_version.type); *is_color = FALSE; @@ -541,11 +538,18 @@ static void shader_arb_get_register_name(IWineD3DBaseShader *iface, case WINED3DSPR_CONST: if (!pshader && reg->rel_addr) { + char rel_reg[50]; UINT rel_offset = ((IWineD3DVertexShaderImpl *)This)->rel_offset; + if(This->baseShader.reg_maps.shader_version.major < 2) { + sprintf(rel_reg, "A0.x"); + } else { + /* FIXME: GL_NV_vertex_progam2_option */ + sprintf(rel_reg, "A0.x"); + } if (reg->idx >= rel_offset) - sprintf(register_name, "C[A0.x + %u]", reg->idx - rel_offset); + sprintf(register_name, "C[%s + %u]", rel_reg, reg->idx - rel_offset); else - sprintf(register_name, "C[A0.x - %u]", -reg->idx + rel_offset); + sprintf(register_name, "C[%s - %u]", rel_reg, -reg->idx + rel_offset); } else { @@ -626,7 +630,7 @@ static void shader_arb_get_dst_param(const struct wined3d_shader_instruction *in char write_mask[6]; BOOL is_color; - shader_arb_get_register_name(ins->ctx->shader, &wined3d_dst->reg, register_name, &is_color); + shader_arb_get_register_name(ins, &wined3d_dst->reg, register_name, &is_color); strcpy(str, register_name); shader_arb_get_write_mask(ins, wined3d_dst, write_mask); @@ -777,7 +781,7 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in insert_line = 1; /* Get register name */ - shader_arb_get_register_name(ins->ctx->shader, &src->reg, regstr, &is_color); + shader_arb_get_register_name(ins, &src->reg, regstr, &is_color); shader_arb_get_swizzle(src, is_color, swzstr); switch (src->modifiers) @@ -1012,6 +1016,7 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) if(ins->handler_idx == WINED3DSIH_MOVA) { struct wined3d_shader_src_param tmp_src = ins->src[0]; + tmp_src.swizzle = (tmp_src.swizzle & 0x3) * 0x55; shader_arb_get_src_param(ins, &tmp_src, 0, src0_param); @@ -2034,6 +2039,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, /* Create the hw ARB shader */ shader_addline(buffer, "!!ARBvp1.0\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); } @@ -2206,7 +2212,7 @@ static void shader_arb_add_instruction_modifiers(const struct wined3d_shader_ins if(shift == 0) return; /* Saturate alone is handled by the instructions */ shader_arb_get_write_mask(ins, dst, write_mask); - shader_arb_get_register_name(ins->ctx->shader, &dst->reg, regstr, &is_color); + shader_arb_get_register_name(ins, &dst->reg, regstr, &is_color); /* Generate a line that does the output modifier computation * FIXME: _SAT vs shift? _SAT alone is already handled in the instructions, if this

1 0

Stefan Dösinger : wined3d: Implement mova rounding in arb.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: c7ca3793cc7750588fc8232c332e99759b541a40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7ca3793cc7750588fc8232c3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 19:12:07 2009 +0200 wined3d: Implement mova rounding in arb. --- dlls/wined3d/arb_program_shader.c | 56 ++++++++++++++++++++++++++++-------- dlls/wined3d/baseshader.c | 4 ++ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 48 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d5136bb..ecb6f0b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -42,6 +42,13 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d); #define GLINFO_LOCATION (*gl_info) /* GL locking for state handlers is done by the caller. */ +static BOOL need_mova_const(IWineD3DBaseShader *shader, const WineD3D_GL_Info *gl_info) { + IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *) shader; + if(!This->baseShader.reg_maps.usesmova) return FALSE; + /* TODO: ARR from GL_NV_vertex_program2_option */ + return TRUE; +} + static BOOL need_helper_const(const WineD3D_GL_Info *gl_info) { if(!GL_SUPPORT(NV_VERTEX_PROGRAM) || /* Need to init colors */ gl_info->arb_vs_offset_limit || /* Have to init texcoords */ @@ -51,12 +58,14 @@ static BOOL need_helper_const(const WineD3D_GL_Info *gl_info) { return FALSE; } -static unsigned int reserved_vs_const(const WineD3D_GL_Info *gl_info) { +static unsigned int reserved_vs_const(IWineD3DBaseShader *shader, const 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)) return 2; - else return 1; + if(need_helper_const(gl_info)) ret++; + if(need_mova_const(shader, gl_info)) ret++; + return ret; } /* Internally used shader constants. Applications can use constants 0 to GL_LIMITS(vshader_constantsF) - 1, @@ -328,7 +337,7 @@ static void shader_generate_arb_declarations(IWineD3DBaseShader *iface, const sh max_constantsF = GL_LIMITS(pshader_constantsF); } else { if(This->baseShader.reg_maps.usesrelconstF) { - max_constantsF = GL_LIMITS(vshader_constantsF) - reserved_vs_const(gl_info); + max_constantsF = GL_LIMITS(vshader_constantsF) - reserved_vs_const(iface, gl_info); } else { max_constantsF = GL_LIMITS(vshader_constantsF) - 1; } @@ -998,17 +1007,35 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) { IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->ctx->shader; - if ((ins->ctx->reg_maps->shader_version.major == 1 - && !shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type) - && ins->dst[0].reg.type == WINED3DSPR_ADDR) - || ins->handler_idx == WINED3DSIH_MOVA) - { - SHADER_BUFFER *buffer = ins->ctx->buffer; - char src0_param[256]; + SHADER_BUFFER *buffer = ins->ctx->buffer; + char src0_param[256]; - if (ins->handler_idx == WINED3DSIH_MOVA) - FIXME("mova should round\n"); + if(ins->handler_idx == WINED3DSIH_MOVA) { + struct wined3d_shader_src_param tmp_src = ins->src[0]; + tmp_src.swizzle = (tmp_src.swizzle & 0x3) * 0x55; + shader_arb_get_src_param(ins, &tmp_src, 0, src0_param); + /* This implements the mova formula used in GLSL. The first two instructions + * prepare the sign() part. Note that it is fine to have my_sign(0.0) = 1.0 + * in this case: + * mova A0.x, 0.0 + * + * A0.x = arl(floor(abs(0.0) + 0.5) * 1.0) = floor(0.5) = 0.0 since arl does a floor + * + * TODO: ARR from GL_NV_vertex_program2_option + */ + shader_addline(buffer, "SGE TA.y, %s, mova_const.y;\n", src0_param); + shader_addline(buffer, "MAD TA.y, TA.y, mova_const.z, -mova_const.w;\n"); + + shader_addline(buffer, "ABS TA.x, %s;\n", src0_param); + shader_addline(buffer, "ADD TA.x, TA.x, mova_const.x;\n"); + shader_addline(buffer, "FLR TA.x, TA.x;\n"); + shader_addline(buffer, "MUL TA.x, TA.x, TA.y;\n"); + shader_addline(buffer, "ARL A0.x, TA.x;\n"); + } else if (ins->ctx->reg_maps->shader_version.major == 1 + && !shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type) + && ins->dst[0].reg.type == WINED3DSPR_ADDR) + { src0_param[0] = '\0'; if (((IWineD3DVertexShaderImpl *)shader)->rel_offset) { @@ -2010,6 +2037,9 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, if(need_helper_const(gl_info)) { shader_addline(buffer, "PARAM helper_const = { 2.0, -1.0, %d.0, 0.0 };\n", This->rel_offset); } + if(need_mova_const((IWineD3DBaseShader *) iface, gl_info)) { + shader_addline(buffer, "PARAM mova_const = { 0.5, 0.0, 2.0, 1.0 };\n"); + } /* Mesa supports only 95 constants */ if (GL_VEND(MESA) || GL_VEND(WINE)) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 1746917..cf8171b 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -611,6 +611,10 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 { reg_maps->usestexldd = 1; } + else if(ins.handler_idx == WINED3DSIH_MOVA) + { + reg_maps->usesmova = 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 a0dcddb..526ba24 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -632,7 +632,7 @@ typedef struct shader_reg_maps WINED3DSAMPLER_TEXTURE_TYPE sampler_type[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; BOOL bumpmat[MAX_TEXTURES], luminanceparams[MAX_TEXTURES]; - char usesnrm, vpos, usesdsy, usestexldd; + char usesnrm, vpos, usesdsy, usestexldd, usesmova; char usesrelconstF; /* Whether or not loops are used in this shader, and nesting depth */

1 0

Stefan Dösinger : wined3d: Fix srgb correction.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: bffb89101fb6c758ff05e5fc2de4485b7a9cf794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bffb89101fb6c758ff05e5fc2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 19:09:52 2009 +0200 wined3d: Fix srgb correction. --- 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 769d31b..d5136bb 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1954,7 +1954,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, if(args->srgb_correction) { arbfp_add_sRGB_correction(buffer, fragcolor, "TA", "TB", "TC"); - shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); + shader_addline(buffer, "MOV result.color.a, %s;\n", fragcolor); } else if(reg_maps->shader_version.major < 2) { shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); }

1 0

Stefan Dösinger : wined3d: Get rid of the TMP register in fragment shaders.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: e6cc81d287f5118a8133d5e2197568112414cd73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6cc81d287f5118a8133d5e21… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 19:09:07 2009 +0200 wined3d: Get rid of the TMP register in fragment shaders. To be able keep the temporary register in the type independent NRM instruction, the vertex temporary register is renamed to TA to match the name of a pixel shader register. --- dlls/wined3d/arb_program_shader.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b52f173..769d31b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1013,8 +1013,8 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) if (((IWineD3DVertexShaderImpl *)shader)->rel_offset) { shader_arb_get_src_param(ins, &ins->src[0], 0, src0_param); - shader_addline(buffer, "ADD TMP.x, %s, helper_const.z;\n", src0_param); - shader_addline(buffer, "ARL A0.x, TMP.x;\n"); + shader_addline(buffer, "ADD TA.x, %s, helper_const.z;\n", src0_param); + shader_addline(buffer, "ARL A0.x, TA.x;\n"); } else { @@ -1605,11 +1605,11 @@ static void shader_hw_nrm(const struct wined3d_shader_instruction *ins) char src_name[50]; shader_arb_get_dst_param(ins, &ins->dst[0], dst_name); - shader_arb_get_src_param(ins, &ins->src[0], 0, src_name); - shader_addline(buffer, "DP3 TMP, %s, %s;\n", src_name, src_name); - shader_addline(buffer, "RSQ TMP, TMP.x;\n"); + shader_arb_get_src_param(ins, &ins->src[0], 1 /* Use TB */, src_name); + shader_addline(buffer, "DP3 TA, %s, %s;\n", src_name, src_name); + shader_addline(buffer, "RSQ TA, 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, TMP;\n", shader_arb_get_modifier(ins), dst_name, + shader_addline(buffer, "MUL%s %s, %s, TA;\n", shader_arb_get_modifier(ins), dst_name, src_name); } @@ -1927,7 +1927,6 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, } } - shader_addline(buffer, "TEMP TMP;\n"); /* Used in matrix ops */ shader_addline(buffer, "TEMP TA;\n"); /* Used for modifiers */ shader_addline(buffer, "TEMP TB;\n"); /* Used for modifiers */ shader_addline(buffer, "TEMP TC;\n"); /* Used for modifiers */ @@ -1954,7 +1953,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function); if(args->srgb_correction) { - arbfp_add_sRGB_correction(buffer, fragcolor, "TMP", "TA", "TB"); + arbfp_add_sRGB_correction(buffer, fragcolor, "TA", "TB", "TC"); shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); } else if(reg_maps->shader_version.major < 2) { shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); @@ -2017,7 +2016,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, This->baseShader.limits.constant_float = min(95, This->baseShader.limits.constant_float); - shader_addline(buffer, "TEMP TMP;\n"); + shader_addline(buffer, "TEMP TA;\n"); /* Base Declarations */ shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, lconst_map); @@ -2072,9 +2071,9 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, * 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 TMP, posFixup, TMP_OUT.w;\n"); - shader_addline(buffer, "ADD TMP_OUT.x, TMP_OUT.x, TMP.z;\n"); - shader_addline(buffer, "MAD TMP_OUT.y, TMP_OUT.y, posFixup.y, TMP.w;\n"); + 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"); /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c * and the glsl equivalent

1 0

Michael Stefaniuc : msctf: Use FAILED instead of !SUCCEDED.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: 2a11f2df4786a544b51fab700384d77778150bbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a11f2df4786a544b51fab700… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 19 23:46:30 2009 +0200 msctf: Use FAILED instead of !SUCCEDED. --- dlls/msctf/context.c | 2 +- dlls/msctf/inputprocessor.c | 2 +- dlls/msctf/tests/inputprocessor.c | 4 ++-- dlls/msctf/threadmgr.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 1f255c8..6a2bed6 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -430,7 +430,7 @@ static WINAPI HRESULT ContextSource_AdviseSink(ITfSource *iface, es = HeapAlloc(GetProcessHeap(),0,sizeof(ContextSink)); if (!es) return E_OUTOFMEMORY; - if (!SUCCEEDED(IUnknown_QueryInterface(punk, riid, (LPVOID*)&es->interfaces.pITfTextEditSink))) + if (FAILED(IUnknown_QueryInterface(punk, riid, (LPVOID *)&es->interfaces.pITfTextEditSink))) { HeapFree(GetProcessHeap(),0,es); return CONNECT_E_CANNOTCONNECT; diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 90daa2f..a904a68 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -615,7 +615,7 @@ static WINAPI HRESULT IPPSource_AdviseSink(ITfSource *iface, ipps = HeapAlloc(GetProcessHeap(),0,sizeof(InputProcessorProfilesSink)); if (!ipps) return E_OUTOFMEMORY; - if (!SUCCEEDED(IUnknown_QueryInterface(punk, riid, (LPVOID*)&ipps->interfaces.pITfLanguageProfileNotifySink))) + if (FAILED(IUnknown_QueryInterface(punk, riid, (LPVOID *)&ipps->interfaces.pITfLanguageProfileNotifySink))) { HeapFree(GetProcessHeap(),0,ipps); return CONNECT_E_CANNOTCONNECT; diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 318149b..11e7233 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1186,7 +1186,7 @@ static void test_startSession(void) cnt = check_context_refcount(cxt3); hr = ITfDocumentMgr_Push(g_dm, cxt3); - ok(!SUCCEEDED(hr),"Push Succeeded\n"); + ok(FAILED(hr),"Push Succeeded\n"); ok(check_context_refcount(cxt3) == cnt, "Ref changed\n"); cnt = check_context_refcount(cxt2); @@ -1221,7 +1221,7 @@ static void test_startSession(void) ITfContext_Release(cxtTest); hr = ITfDocumentMgr_Pop(g_dm, 0); - ok(!SUCCEEDED(hr),"Pop Succeeded\n"); + ok(FAILED(hr),"Pop Succeeded\n"); hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); ok(SUCCEEDED(hr),"GetTop Failed\n"); diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index c91e536..9b887f0 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -442,7 +442,7 @@ static WINAPI HRESULT ThreadMgrSource_AdviseSink(ITfSource *iface, tms = HeapAlloc(GetProcessHeap(),0,sizeof(ThreadMgrSink)); if (!tms) return E_OUTOFMEMORY; - if (!SUCCEEDED(IUnknown_QueryInterface(punk, riid, (LPVOID*)&tms->interfaces.pITfThreadMgrEventSink))) + if (FAILED(IUnknown_QueryInterface(punk, riid, (LPVOID *)&tms->interfaces.pITfThreadMgrEventSink))) { HeapFree(GetProcessHeap(),0,tms); return CONNECT_E_CANNOTCONNECT;

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
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