November 2007 - Wine-Commits

Alexandre Julliard : include: Add WINGDIAPI to the exported gdi32 functions .
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: caf56765d5b8294dc5fd1e51e7492c0fcc2559e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caf56765d5b8294dc5fd1e51e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 12:26:49 2007 +0100 include: Add WINGDIAPI to the exported gdi32 functions. --- include/wingdi.h | 824 +++++++++++++++++++++++++++--------------------------- 1 files changed, 409 insertions(+), 415 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=caf56765d5b8294dc5fd1…

1 0

Alexandre Julliard : include: Add WINUSERAPI to the exported user32 functions.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: 919e32c034b6a9634b9d8101164c44d0548200e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=919e32c034b6a9634b9d81011… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 12:26:29 2007 +0100 include: Add WINUSERAPI to the exported user32 functions. --- include/dde.h | 25 +- include/ddeml.h | 76 ++-- include/winuser.h | 1576 ++++++++++++++++++++++++++--------------------------- 3 files changed, 825 insertions(+), 852 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=919e32c034b6a9634b9d8…

1 0

Laurent Vromman : gdi32: Correct a test where the tested function was not called.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: 52f769e88d0ee2c22e55ea6bb1b327e48ce823da URL: http://source.winehq.org/git/wine.git/?a=commit;h=52f769e88d0ee2c22e55ea6bb… Author: Laurent Vromman <laurent(a)vromman.org> Date: Tue Nov 6 01:37:15 2007 +0100 gdi32: Correct a test where the tested function was not called. --- dlls/gdi32/path.c | 5 ----- dlls/gdi32/tests/path.c | 5 +++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 553f475..a8977eb 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1901,11 +1901,6 @@ static BOOL PATH_WidenPath(DC *dc) return FALSE; } - /* pen width must be strictly higher than 1 */ - if(penWidth == 1) { - return TRUE; - } - penWidthIn = penWidth / 2; penWidthOut = penWidth / 2; if(penWidthIn + penWidthOut < penWidth) diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 6753298..cbbd53c 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -83,14 +83,15 @@ static void test_widenpath(void) AbortPath(hdc); - /* Test when the pen width is equal to 1. The path should not change */ + /* Test when the pen width is equal to 1. The path should change too */ narrowPen = CreatePen(PS_SOLID, 1, RGB(0,0,0)); oldPen = SelectObject(hdc, narrowPen); BeginPath(hdc); Polyline(hdc, pnt, 6); EndPath(hdc); + ret = WidenPath(hdc); nSize = GetPath(hdc, NULL, NULL, 0); - ok(nSize == 6, "WidenPath fails detecting 1px wide pen. Path length is %d, should be 6\n", nSize); + ok(nSize > 6, "WidenPath should compute a widdened path with a 1px wide pen. Path length is %d, should be more than 6\n", nSize); ReleaseDC(0, hdc); return;

1 0

Stefan Dösinger : wined3d: Free the backbuffer array.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: a34c1f948b0b9266862004b31388e334ffa89a55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a34c1f948b0b9266862004b31… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 6 19:50:18 2007 +0100 wined3d: Free the backbuffer array. --- dlls/wined3d/swapchain.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 501c7cd..81f17c3 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -103,6 +103,7 @@ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface, D3DCB FIXME("(%p) Something's still holding the back buffer\n",This); } } + HeapFree(GetProcessHeap(), 0, This->backBuffer); } /* Restore the screen resolution if we rendered in fullscreen

1 0

Stefan Dösinger : ddraw: Fix a test for Vista.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: 714991bf3fb974ec1dcb390a712fabb9f058f01e URL: http://source.winehq.org/git/wine.git/?a=commit;h=714991bf3fb974ec1dcb390a7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 26 18:43:08 2007 +0200 ddraw: Fix a test for Vista. --- dlls/ddraw/tests/dsurface.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 1b4ec4e..0f522db 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -287,8 +287,18 @@ static void SrcColorKey32BlitTest(void) ok(rc==DD_OK,"Lock returned: %x\n",rc); ok((ddsd2.dwFlags & DDSD_LPSURFACE) == 0, "Surface desc has LPSURFACE Flags set\n"); lpData = (LPDWORD)ddsd2.lpSurface; - ok((lpData[0]==0x77010203)&&(lpData[1]==0x00010203)&&(lpData[2]==0xCCCCCCCC)&&(lpData[3]==0xCCCCCCCC), - "Destination data after blitting is not correct\n"); + /* Different behavior on some drivers / windows versions. Some versions ignore the X channel when + * color keying, but copy it to the destination surface. Others apply it for color keying, but + * do not copy it into the destination surface. + */ + if(lpData[0]==0x00010203) { + trace("X channel was not copied into the destination surface\n"); + ok((lpData[0]==0x00010203)&&(lpData[1]==0x00010203)&&(lpData[2]==0x00FF00FF)&&(lpData[3]==0xCCCCCCCC), + "Destination data after blitting is not correct\n"); + } else { + ok((lpData[0]==0x77010203)&&(lpData[1]==0x00010203)&&(lpData[2]==0xCCCCCCCC)&&(lpData[3]==0xCCCCCCCC), + "Destination data after blitting is not correct\n"); + } rc = IDirectDrawSurface_Unlock(lpDst, NULL); ok(rc==DD_OK,"Unlock returned: %x\n",rc);

1 0

Stefan Dösinger : d3d9: Remove some spamy debug traces from the texture test.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: c390b6044b383313e6ebf8d1b08bd941cbf9f1f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c390b6044b383313e6ebf8d1b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 26 18:45:20 2007 +0200 d3d9: Remove some spamy debug traces from the texture test. --- dlls/d3d9/tests/texture.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/texture.c b/dlls/d3d9/tests/texture.c index d0d00ee..617ad77 100644 --- a/dlls/d3d9/tests/texture.c +++ b/dlls/d3d9/tests/texture.c @@ -106,7 +106,6 @@ static void test_cube_texture_from_pool(IDirect3DDevice9 *device_ptr, DWORD caps HRESULT hr; hr = IDirect3DDevice9_CreateCubeTexture(device_ptr, 512, 1, 0, D3DFMT_X8R8G8B8, pool, &texture_ptr, NULL); - trace("pool=%d hr=0x%.8x\n", pool, hr); if((caps & D3DPTEXTURECAPS_CUBEMAP) || !need_cap) ok(SUCCEEDED(hr), "hr=0x%.8x\n", hr); @@ -118,8 +117,6 @@ static void test_cube_texture_from_pool(IDirect3DDevice9 *device_ptr, DWORD caps static void test_cube_textures(IDirect3DDevice9 *device_ptr, DWORD caps) { - trace("texture caps: 0x%.8x\n", caps); - test_cube_texture_from_pool(device_ptr, caps, D3DPOOL_DEFAULT, TRUE); test_cube_texture_from_pool(device_ptr, caps, D3DPOOL_MANAGED, TRUE); test_cube_texture_from_pool(device_ptr, caps, D3DPOOL_SYSTEMMEM, TRUE);

1 0

Stefan Dösinger : ddraw: Be less picky about float precision.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: f9dba294772bff1297702ea9069be879b62e4ded URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9dba294772bff1297702ea90… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 26 18:40:58 2007 +0200 ddraw: Be less picky about float precision. --- dlls/ddraw/tests/d3d.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index b82b67f..c1d5099 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -898,7 +898,7 @@ static void Direct3D1Test(void) }; static struct v_in cliptest[] = { {25.59, 25.59, 1.0}, {-25.59, -25.59, 0.0}, - {25.61, 25.61, 1.01}, {-25.60, -25.60, -0.01}, + {25.61, 25.61, 1.01}, {-25.61, -25.61, -0.01}, }; static struct v_in offscreentest[] = { {128.1, 0.0, 0.0},

1 0

Stefan Dösinger : d3d9: Initialize the test rectangle correctly.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: d2c166bbb7ef13f62ba08d466dfb7a3d59145d49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2c166bbb7ef13f62ba08d466… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 6 19:45:17 2007 +0100 d3d9: Initialize the test rectangle correctly. --- dlls/d3d9/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index cccfbe6..0673e99 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -299,7 +299,7 @@ static void clear_test(IDirect3DDevice9 *device) /* negative x, negative y */ rect_negneg.x1 = 640; - rect_negneg.x1 = 240; + rect_negneg.y1 = 240; rect_negneg.x2 = 320; rect_negneg.y2 = 0; hr = IDirect3DDevice9_Clear(device, 1, &rect_negneg, D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0);

1 0

Stefan Dösinger : wined3d: Implement the varying map.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: 1b23dd1ba1e4bc557e842d77ce21432e5eda5dae URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b23dd1ba1e4bc557e842d77c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 6 12:34:22 2007 +0100 wined3d: Implement the varying map. --- dlls/wined3d/baseshader.c | 20 ++++++++++++++++++-- dlls/wined3d/glsl_shader.c | 3 +++ dlls/wined3d/pixelshader.c | 35 +++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 55 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 2d1c5d9..df0ac0c 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -422,8 +422,24 @@ HRESULT shader_get_registers_used( else if (WINED3DSPR_TEMP == regtype) reg_maps->temporary[reg] = 1; - else if (WINED3DSPR_INPUT == regtype && !pshader) - reg_maps->attributes[reg] = 1; + else if (WINED3DSPR_INPUT == regtype) { + if( !pshader) + reg_maps->attributes[reg] = 1; + else { + if(param & WINED3DSHADER_ADDRMODE_RELATIVE) { + /* If relative addressing is used, we must assume that all registers + * are used. Even if it is a construct like v3[aL], we can't assume + * that v0, v1 and v2 aren't read because aL can be negative + */ + unsigned int i; + for(i = 0; i < MAX_REG_INPUT; i++) { + ((IWineD3DPixelShaderImpl *) This)->input_reg_used[i] = TRUE; + } + } else { + ((IWineD3DPixelShaderImpl *) This)->input_reg_used[reg] = TRUE; + } + } + } else if (WINED3DSPR_RASTOUT == regtype && reg == 1) reg_maps->fog = 1; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3dfca51..4083d56 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2670,6 +2670,9 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, semantic *semantics_in, sema if(map[i] >= (GL_LIMITS(glsl_varyings) / 4)) { FIXME("More input varyings declared than supported, expect issues\n"); continue; + } else if(map[i] == -1) { + /* Declared, but not read register */ + continue; } register_token = semantics_in[i].reg; diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index daeae42..138e419 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -543,7 +543,7 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *i if (WINED3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) > 1) { shader_reg_maps *reg_maps = &This->baseShader.reg_maps; HRESULT hr; - unsigned int i; + unsigned int i, j, highest_reg_used = 0, num_regs_used = 0; /* Second pass: figure out which registers are used, what the semantics are, etc.. */ memset(reg_maps, 0, sizeof(shader_reg_maps)); @@ -553,7 +553,38 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *i /* FIXME: validate reg_maps against OpenGL */ for(i = 0; i < MAX_REG_INPUT; i++) { - This->input_reg_map[i] = i; + if(This->input_reg_used[i]) { + num_regs_used++; + highest_reg_used = i; + } + } + + /* Don't do any register mapping magic if it is not needed, or if we can't + * achive anything anyway + */ + if(highest_reg_used < (GL_LIMITS(glsl_varyings) / 4) || + num_regs_used >= (GL_LIMITS(glsl_varyings) / 4) ) { + if(num_regs_used >= (GL_LIMITS(glsl_varyings) / 4)) { + /* This happens with relative addressing. The input mapper function + * warns about this if the higher registers are declared too, so + * don't write a FIXME here + */ + WARN("More varying registers used than supported\n"); + } + + for(i = 0; i < MAX_REG_INPUT; i++) { + This->input_reg_map[i] = i; + } + } else { + j = 0; + for(i = 0; i < MAX_REG_INPUT; i++) { + if(This->input_reg_used[i]) { + This->input_reg_map[i] = j; + j++; + } else { + This->input_reg_map[i] = -1; + } + } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1fab9aa..56ba569 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2084,6 +2084,7 @@ typedef struct IWineD3DPixelShaderImpl { /* Pixel shader input semantics */ semantic semantics_in [MAX_REG_INPUT]; DWORD input_reg_map[MAX_REG_INPUT]; + BOOL input_reg_used[MAX_REG_INPUT]; /* run time data */ PSHADERDATA *data;

1 0

Stefan Dösinger : wined3d: Install a varying map.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: 409103f8017404bd3a8603ba7fff80c131b09cdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=409103f8017404bd3a8603ba7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Oct 28 00:12:37 2007 +0200 wined3d: Install a varying map. --- dlls/wined3d/glsl_shader.c | 58 ++++++++++++++++++++++++--------------- dlls/wined3d/pixelshader.c | 5 +++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 42 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 37b8df8..3dfca51 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -802,9 +802,11 @@ static void shader_glsl_get_register_name( glsl_src_param_t rel_param; shader_glsl_add_src_param(arg, addr_token, 0, WINED3DSP_WRITEMASK_0, &rel_param); - sprintf(tmpStr, "IN[%s + %u]", rel_param.param_str, reg); + sprintf(tmpStr, "IN[%s + %u]", rel_param.param_str, + ((IWineD3DPixelShaderImpl *) This)->input_reg_map[reg]); } else { - sprintf(tmpStr, "IN[%u]", reg); + sprintf(tmpStr, "IN[%u]", + ((IWineD3DPixelShaderImpl *) This)->input_reg_map[reg]); } } else { if (reg==0) @@ -2584,28 +2586,28 @@ void pshader_glsl_input_pack( case WINED3DDECLUSAGE_TEXCOORD: if(usage_idx < 8 && This->vertexprocessing == pretransformed) { shader_addline(buffer, "IN[%u]%s = gl_TexCoord[%u]%s;\n", - i, reg_mask, usage_idx, reg_mask); + This->input_reg_map[i], reg_mask, usage_idx, reg_mask); } else { shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n", - i, reg_mask, reg_mask); + This->input_reg_map[i], reg_mask, reg_mask); } break; case WINED3DDECLUSAGE_COLOR: if (usage_idx == 0) shader_addline(buffer, "IN[%u]%s = vec4(gl_Color)%s;\n", - i, reg_mask, reg_mask); + This->input_reg_map[i], reg_mask, reg_mask); else if (usage_idx == 1) shader_addline(buffer, "IN[%u]%s = vec4(gl_SecondaryColor)%s;\n", - i, reg_mask, reg_mask); + This->input_reg_map[i], reg_mask, reg_mask); else shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n", - i, reg_mask, reg_mask); + This->input_reg_map[i], reg_mask, reg_mask); break; default: shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n", - i, reg_mask, reg_mask); + This->input_reg_map[i], reg_mask, reg_mask); } } } @@ -2652,7 +2654,7 @@ void delete_glsl_program_entry(IWineD3DDevice *iface, struct glsl_shader_prog_li HeapFree(GetProcessHeap(), 0, entry); } -static void handle_ps3_input(SHADER_BUFFER *buffer, semantic *semantics_in, semantic *semantics_out, WineD3D_GL_Info *gl_info) { +static void handle_ps3_input(SHADER_BUFFER *buffer, semantic *semantics_in, semantic *semantics_out, WineD3D_GL_Info *gl_info, DWORD *map) { unsigned int i, j; DWORD usage_token, usage_token_out; DWORD register_token, register_token_out; @@ -2662,41 +2664,51 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, semantic *semantics_in, sema set = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*set) * (GL_LIMITS(glsl_varyings) / 4)); - for(i = 0; i < min(MAX_REG_INPUT, GL_LIMITS(glsl_varyings) / 4); i++) { + for(i = 0; i < MAX_REG_INPUT; i++) { usage_token = semantics_in[i].usage; if (!usage_token) continue; + if(map[i] >= (GL_LIMITS(glsl_varyings) / 4)) { + FIXME("More input varyings declared than supported, expect issues\n"); + continue; + } register_token = semantics_in[i].reg; usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; - set[i] = shader_glsl_get_write_mask(register_token, reg_mask); + set[map[i]] = shader_glsl_get_write_mask(register_token, reg_mask); if(!semantics_out) { switch(usage) { case WINED3DDECLUSAGE_COLOR: if (usage_idx == 0) - shader_addline(buffer, "IN[%u]%s = gl_FrontColor%s;\n", i, reg_mask, reg_mask); + shader_addline(buffer, "IN[%u]%s = gl_FrontColor%s;\n", + map[i], reg_mask, reg_mask); else if (usage_idx == 1) - shader_addline(buffer, "IN[%u]%s = gl_FrontSecondaryColor%s;\n", i, reg_mask, reg_mask); + shader_addline(buffer, "IN[%u]%s = gl_FrontSecondaryColor%s;\n", + map[i], reg_mask, reg_mask); else - shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n", i, reg_mask, reg_mask); + shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n", + map[i], reg_mask, reg_mask); break; case WINED3DDECLUSAGE_TEXCOORD: if (usage_idx < 8) { shader_addline(buffer, "IN[%u]%s = gl_TexCoord[%u]%s;\n", - i, reg_mask, usage_idx, reg_mask); + map[i], reg_mask, usage_idx, reg_mask); } else { - shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n", i, reg_mask, reg_mask); + shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n", + map[i], reg_mask, reg_mask); } break; case WINED3DDECLUSAGE_FOG: - shader_addline(buffer, "IN[%u] = vec4(gl_FogFragCoord, 0.0, 0.0, 0.0)%s;\n", i, reg_mask, reg_mask); + shader_addline(buffer, "IN[%u]%s = vec4(gl_FogFragCoord, 0.0, 0.0, 0.0)%s;\n", + map[i], reg_mask, reg_mask); break; default: - shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n", i, reg_mask, reg_mask); + shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n", + map[i], reg_mask, reg_mask); } } else { BOOL found = FALSE; @@ -2711,12 +2723,14 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, semantic *semantics_in, sema if(usage == usage_out && usage_idx == usage_idx_out) { - shader_addline(buffer, "IN[%u]%s = OUT[%u]%s;\n", i, reg_mask, j, reg_mask); + shader_addline(buffer, "IN[%u]%s = OUT[%u]%s;\n", + map[i], reg_mask, j, reg_mask); found = TRUE; } } if(!found) { - shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n", i, reg_mask, reg_mask); + shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n", + map[i], reg_mask, reg_mask); } } } @@ -2869,7 +2883,7 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs } /* Then, fix the pixel shader input */ - handle_ps3_input(&buffer, semantics_in, semantics_out, gl_info); + handle_ps3_input(&buffer, semantics_in, semantics_out, gl_info, ps->input_reg_map); shader_addline(&buffer, "}\n"); } else if(ps_major >= 3 && vs_major < 3) { @@ -2881,7 +2895,7 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs * point size, but we depend on the optimizers kindness to find out that the pixel shader doesn't * read gl_TexCoord and gl_ColorX, otherwise we'll run out of varyings */ - handle_ps3_input(&buffer, semantics_in, NULL, gl_info); + handle_ps3_input(&buffer, semantics_in, NULL, gl_info, ps->input_reg_map); shader_addline(&buffer, "}\n"); } else { ERR("Unexpected vertex and pixel shader version condition: vs: %d, ps: %d\n", vs_major, ps_major); diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index f46084e..daeae42 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -543,6 +543,7 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *i if (WINED3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) > 1) { shader_reg_maps *reg_maps = &This->baseShader.reg_maps; HRESULT hr; + unsigned int i; /* Second pass: figure out which registers are used, what the semantics are, etc.. */ memset(reg_maps, 0, sizeof(shader_reg_maps)); @@ -550,6 +551,10 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *i This->semantics_in, NULL, pFunction, NULL); if (FAILED(hr)) return hr; /* FIXME: validate reg_maps against OpenGL */ + + for(i = 0; i < MAX_REG_INPUT; i++) { + This->input_reg_map[i] = i; + } } This->baseShader.shader_mode = deviceImpl->ps_selected_mode; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 89688fc..1fab9aa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2083,6 +2083,7 @@ typedef struct IWineD3DPixelShaderImpl { /* Pixel shader input semantics */ semantic semantics_in [MAX_REG_INPUT]; + DWORD input_reg_map[MAX_REG_INPUT]; /* run time data */ PSHADERDATA *data;

1 0