August 2008 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Make sure the pixel shader is compiled.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: f0f32912a6863246827be997fdb848077a3ca7c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0f32912a6863246827be997f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 13 14:32:48 2008 -0500 wined3d: Make sure the pixel shader is compiled. If we're heading out of the pixelshader handler early, and a pixel shader is in use, the pixel shader may not be compiled. The vertex shader handler then checks if the pixel shader is dirty, and calls the shader backend to apply the shader if it isn't. Thus, in the case of GLSL, the shader code could attempt to link an uncompiled shader into the program. This isn't much of a problem because when the fog is applied, the pixel shader is compiled and the program re-linked. --- dlls/wined3d/arb_program_shader.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e553828..bc8d3b3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2776,7 +2776,12 @@ static void fragment_prog_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, struct arbfp_ffp_desc *desc; unsigned int i; - if(isStateDirty(context, STATE_RENDER(WINED3DRS_FOGENABLE))) return; + if(isStateDirty(context, STATE_RENDER(WINED3DRS_FOGENABLE))) { + if(use_pshader) { + IWineD3DPixelShader_CompileShader(stateblock->pixelShader); + } + return; + } if(use_pshader) { IWineD3DPixelShader_CompileShader(stateblock->pixelShader);

1 0

Stefan Dösinger : wined3d: Override the default filter of conditional np2 textures.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: 5b77a2f90b3710f8ad5e03938d698bef43c94629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b77a2f90b3710f8ad5e03938… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 13 12:55:53 2008 -0500 wined3d: Override the default filter of conditional np2 textures. --- dlls/wined3d/texture.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 35dfcae..bd83541 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -229,17 +229,25 @@ static HRESULT WINAPI IWineD3DTextureImpl_BindTexture(IWineD3DTexture *iface) { } /* Conditinal non power of two textures use a different clamping default. If we're using the GL_WINE_normalized_texrect * partial driver emulation, we're dealing with a GL_TEXTURE_2D texture which has the address mode set to repeat - something - * that prevents us from hitting the accelerated codepath. Thus manually set the GL state + * that prevents us from hitting the accelerated codepath. Thus manually set the GL state. The same applies to filtering. + * Even if the texture has only one mip level, the default LINEAR_MIPMAP_LINEAR filter causes a SW fallback on macos. */ if(IWineD3DBaseTexture_IsCondNP2(iface)) { ENTER_GL(); glTexParameteri(IWineD3DTexture_GetTextureDimensions(iface), GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); checkGLcall("glTexParameteri(dimension, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE)"); glTexParameteri(IWineD3DTexture_GetTextureDimensions(iface), GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - checkGLcall("glTexParameteri(dimension, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE)"); + checkGLcall("glTexParameteri(dimension, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE)"); + glTexParameteri(IWineD3DTexture_GetTextureDimensions(iface), GL_TEXTURE_MIN_FILTER, GL_NEAREST); + checkGLcall("glTexParameteri(dimension, GL_TEXTURE_MIN_FILTER, GL_NEAREST)"); + glTexParameteri(IWineD3DTexture_GetTextureDimensions(iface), GL_TEXTURE_MAG_FILTER, GL_NEAREST); + checkGLcall("glTexParameteri(dimension, GL_TEXTURE_MAG_FILTER, GL_NEAREST)"); LEAVE_GL(); This->baseTexture.states[WINED3DTEXSTA_ADDRESSU] = WINED3DTADDRESS_CLAMP; This->baseTexture.states[WINED3DTEXSTA_ADDRESSV] = WINED3DTADDRESS_CLAMP; + This->baseTexture.states[WINED3DTEXSTA_MAGFILTER] = WINED3DTEXF_POINT; + This->baseTexture.states[WINED3DTEXSTA_MINFILTER] = WINED3DTEXF_POINT; + This->baseTexture.states[WINED3DTEXSTA_MIPFILTER] = WINED3DTEXF_NONE; } }

1 0

Markus Hitter : user32: Better reflect the current state of DrawIconEx.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: cadb8854739b5ddafe4dcf273b13b5d8ac59a031 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cadb8854739b5ddafe4dcf273… Author: Markus Hitter <mah(a)jump-ing.de> Date: Sun Aug 24 23:14:14 2008 +0200 user32: Better reflect the current state of DrawIconEx. --- dlls/user32/cursoricon.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index a1ba570..066203b 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1978,8 +1978,8 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, hMemDC = CreateCompatibleDC (hdc); if (istep) FIXME_(icon)("Ignoring istep=%d\n", istep); - if (flags & DI_COMPAT) - FIXME_(icon)("Ignoring flag DI_COMPAT\n"); + if (flags & DI_NOMIRROR) + FIXME_(icon)("Ignoring flag DI_NOMIRROR\n"); if (!flags) { FIXME_(icon)("no flags set? setting to DI_NORMAL\n");

1 0

Chris Robinson : wined3d: Use the proper internal type for some formats.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: 9f823689081265b5119bf6ab775593b33420914c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f823689081265b5119bf6ab7… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sat Aug 23 14:53:33 2008 -0700 wined3d: Use the proper internal type for some formats. --- dlls/wined3d/utils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8b3be3f..91c8c37 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -205,7 +205,7 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { ,0 }, {WINED3DFMT_X4R4G4B4 ,GL_RGB4 ,GL_RGB4 , 0, GL_BGRA ,GL_UNSIGNED_SHORT_4_4_4_4_REV ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, - {WINED3DFMT_A2B10G10R10 ,GL_RGBA ,GL_RGBA , 0, GL_RGBA ,GL_UNSIGNED_INT_2_10_10_10_REV + {WINED3DFMT_A2B10G10R10 ,GL_RGB10_A2 ,GL_RGB10_A2 , 0, GL_RGBA ,GL_UNSIGNED_INT_2_10_10_10_REV ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_A8B8G8R8 ,GL_RGBA8 ,GL_RGBA8 , 0, GL_RGBA ,GL_UNSIGNED_INT_8_8_8_8_REV ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, @@ -213,7 +213,7 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_G16R16 ,GL_RGB16_EXT ,GL_RGB16_EXT , 0, GL_RGB ,GL_UNSIGNED_SHORT ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING }, - {WINED3DFMT_A2R10G10B10 ,GL_RGBA ,GL_RGBA , 0, GL_BGRA ,GL_UNSIGNED_INT_2_10_10_10_REV + {WINED3DFMT_A2R10G10B10 ,GL_RGB10_A2 ,GL_RGB10_A2 , 0, GL_BGRA ,GL_UNSIGNED_INT_2_10_10_10_REV ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING }, {WINED3DFMT_A16B16G16R16 ,GL_RGBA16_EXT ,GL_RGBA16_EXT , 0, GL_RGBA ,GL_UNSIGNED_SHORT ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET },

1 0

David Adam : d3dx8: Remove useless variables.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: 86d392cce80f12fe87d8640f86dda820b8081432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86d392cce80f12fe87d8640f8… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sat Aug 23 04:10:48 2008 +0200 d3dx8: Remove useless variables. --- dlls/d3dx8/math.c | 50 ++++++++++++++++++++++++-------------------------- 1 files changed, 24 insertions(+), 26 deletions(-) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 93a0b49..958cb96 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -61,7 +61,7 @@ D3DXCOLOR* WINAPI D3DXColorAdjustSaturation(D3DXCOLOR *pout, CONST D3DXCOLOR *pc D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *pout, FLOAT scaling, CONST D3DXVECTOR3 *rotationcenter, CONST D3DXQUATERNION *rotation, CONST D3DXVECTOR3 *translation) { - D3DXMATRIX m1, m2, m3, m4, m5, p1, p2, p3; + D3DXMATRIX m1, m2, m3, m4, m5; D3DXMatrixScaling(&m1, scaling, scaling, scaling); if ( !rotationcenter ) @@ -90,10 +90,10 @@ D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *pout, FLOAT scalin { D3DXMatrixTranslation(&m5, translation->x, translation->y, translation->z); } - D3DXMatrixMultiply(&p1, &m1, &m2); - D3DXMatrixMultiply(&p2, &p1, &m3); - D3DXMatrixMultiply(&p3, &p2, &m4); - D3DXMatrixMultiply(pout, &p3, &m5); + D3DXMatrixMultiply(&m1, &m1, &m2); + D3DXMatrixMultiply(&m1, &m1, &m3); + D3DXMatrixMultiply(&m1, &m1, &m4); + D3DXMatrixMultiply(pout, &m1, &m5); return pout; } @@ -105,7 +105,7 @@ FLOAT WINAPI D3DXMatrixfDeterminant(CONST D3DXMATRIX *pm) v1.x = pm->u.m[0][0]; v1.y = pm->u.m[1][0]; v1.z = pm->u.m[2][0]; v1.w = pm->u.m[3][0]; v2.x = pm->u.m[0][1]; v2.y = pm->u.m[1][1]; v2.z = pm->u.m[2][1]; v2.w = pm->u.m[3][1]; v3.x = pm->u.m[0][2]; v3.y = pm->u.m[1][2]; v3.z = pm->u.m[2][2]; v3.w = pm->u.m[3][2]; - D3DXVec4Cross(&minor,&v1,&v2,&v3); + D3DXVec4Cross(&minor, &v1, &v2, &v3); det = - (pm->u.m[0][3] * minor.x + pm->u.m[1][3] * minor.y + pm->u.m[2][3] * minor.z + pm->u.m[3][3] * minor.w); return det; } @@ -218,10 +218,8 @@ D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, CONST D3DXMATRIX *pm1, C D3DXMATRIX* WINAPI D3DXMatrixMultiplyTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm1, CONST D3DXMATRIX *pm2) { - D3DXMATRIX temp; - - D3DXMatrixMultiply(&temp, pm1, pm2); - D3DXMatrixTranspose(pout, &temp); + D3DXMatrixMultiply(pout, pm1, pm2); + D3DXMatrixTranspose(pout, pout); return pout; } @@ -421,15 +419,15 @@ D3DXMATRIX* WINAPI D3DXMatrixRotationY(D3DXMATRIX *pout, FLOAT angle) D3DXMATRIX* WINAPI D3DXMatrixRotationYawPitchRoll(D3DXMATRIX *pout, FLOAT yaw, FLOAT pitch, FLOAT roll) { - D3DXMATRIX m, pout1, pout2, pout3; + D3DXMATRIX m; - D3DXMatrixIdentity(&pout3); - D3DXMatrixRotationZ(&m,roll); - D3DXMatrixMultiply(&pout2,&pout3,&m); - D3DXMatrixRotationX(&m,pitch); - D3DXMatrixMultiply(&pout1,&pout2,&m); - D3DXMatrixRotationY(&m,yaw); - D3DXMatrixMultiply(pout,&pout1,&m); + D3DXMatrixIdentity(pout); + D3DXMatrixRotationZ(&m, roll); + D3DXMatrixMultiply(pout, pout, &m); + D3DXMatrixRotationX(&m, pitch); + D3DXMatrixMultiply(pout, pout, &m); + D3DXMatrixRotationY(&m, yaw); + D3DXMatrixMultiply(pout, pout, &m); return pout; } D3DXMATRIX* WINAPI D3DXMatrixRotationZ(D3DXMATRIX *pout, FLOAT angle) @@ -479,7 +477,7 @@ D3DXMATRIX* WINAPI D3DXMatrixShadow(D3DXMATRIX *pout, CONST D3DXVECTOR4 *plight, D3DXMATRIX* WINAPI D3DXMatrixTransformation(D3DXMATRIX *pout, CONST D3DXVECTOR3 *pscalingcenter, CONST D3DXQUATERNION *pscalingrotation, CONST D3DXVECTOR3 *pscaling, CONST D3DXVECTOR3 *protationcenter, CONST D3DXQUATERNION *protation, CONST D3DXVECTOR3 *ptranslation) { - D3DXMATRIX m1, m2, m3, m4, m5, m6, m7, p1, p2, p3, p4, p5; + D3DXMATRIX m1, m2, m3, m4, m5, m6, m7; D3DXQUATERNION prc; D3DXVECTOR3 psc, pt; @@ -548,12 +546,12 @@ D3DXMATRIX* WINAPI D3DXMatrixTransformation(D3DXMATRIX *pout, CONST D3DXVECTOR3 } D3DXMatrixTranslation(&m5, psc.x - prc.x, psc.y - prc.y, psc.z - prc.z); D3DXMatrixTranslation(&m7, prc.x + pt.x, prc.y + pt.y, prc.z + pt.z); - D3DXMatrixMultiply(&p1, &m1, &m2); - D3DXMatrixMultiply(&p2, &p1, &m3); - D3DXMatrixMultiply(&p3, &p2, &m4); - D3DXMatrixMultiply(&p4, &p3, &m5); - D3DXMatrixMultiply(&p5, &p4, &m6); - D3DXMatrixMultiply(pout, &p5, &m7); + D3DXMatrixMultiply(&m1, &m1, &m2); + D3DXMatrixMultiply(&m1, &m1, &m3); + D3DXMatrixMultiply(&m1, &m1, &m4); + D3DXMatrixMultiply(&m1, &m1, &m5); + D3DXMatrixMultiply(&m1, &m1, &m6); + D3DXMatrixMultiply(pout, &m1, &m7); return pout; }

1 0

Alexandre Julliard : configure: Allow multiple variables in makefile output , and generate the programs directory lists.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: 4051eaf7c908ba1d7d7c2b1d44d9fec94a76a878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4051eaf7c908ba1d7d7c2b1d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 25 12:14:54 2008 +0200 configure: Allow multiple variables in makefile output, and generate the programs directory lists. --- aclocal.m4 | 4 +- configure | 205 ++++++++++++++++++++++++++++++++++++++----------- configure.ac | 93 ++++++++++++----------- programs/Makefile.in | 113 +--------------------------- tools/make_makefiles | 48 +++--------- 5 files changed, 224 insertions(+), 239 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4051eaf7c908ba1d7d7c2…

1 0

Alexandre Julliard : configure: Use the generic directory enabling mechanism to turn off dlls that depend on external libraries .
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: dbb535e4e92263cb4716322d152381c370048ddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbb535e4e92263cb4716322d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 25 12:12:28 2008 +0200 configure: Use the generic directory enabling mechanism to turn off dlls that depend on external libraries. --- configure | 33 ++---- configure.ac | 20 ++-- dlls/Makefile.in | 287 ++------------------------------------------------ tools/make_makefiles | 43 +------- 4 files changed, 30 insertions(+), 353 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dbb535e4e92263cb47163…

1 0

Alexandre Julliard : configure: Add possibility to exclude some directories from the generated lists.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: 485cc59c14ba9de6a0b17d3dc4298bc7a1524e11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=485cc59c14ba9de6a0b17d3dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 25 12:03:35 2008 +0200 configure: Add possibility to exclude some directories from the generated lists. --- aclocal.m4 | 6 +- configure | 712 ++++++++++++++++++++++++++++++------------------------------ 2 files changed, 360 insertions(+), 358 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=485cc59c14ba9de6a0b17…

1 0

Alexandre Julliard : configure: Generate the dlls directory lists in configure instead of make_makefiles.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: 49163da1d16b8612a7e7dd70d069cadd0b98bd7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=49163da1d16b8612a7e7dd70d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 25 12:02:27 2008 +0200 configure: Generate the dlls directory lists in configure instead of make_makefiles. --- aclocal.m4 | 6 +- configure | 791 +++++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 716 +++++++++++++++++++++++----------------------- dlls/Makefile.in | 110 +------- tools/make_makefiles | 25 +-- 5 files changed, 1166 insertions(+), 482 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49163da1d16b8612a7e7d…

1 0

James Hawkins : msi: Store the _Columns and _Tables tables in the database structure.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: 4b9fd1d5e2d5b7d2bcc220de1cf245b146ef8bca URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9fd1d5e2d5b7d2bcc220de1… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 25 00:09:34 2008 -0500 msi: Store the _Columns and _Tables tables in the database structure. --- dlls/msi/database.c | 1 - dlls/msi/msipriv.h | 2 - dlls/msi/table.c | 111 ++++++++++++++++++++------------------------------- 3 files changed, 44 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b9fd1d5e2d5b7d2bcc22…

1 0