wine-commits April 2008

wine-commits@winehq.org

4 participants
1278 discussions

Stefan Dösinger : wined3d: Deactivate GL_FRAGMENT_SHADER_ATI before deactivating a context.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: ddf52dda15e83eae639ef2ce0ec4071b321ce34f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddf52dda15e83eae639ef2ce0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 30 14:52:18 2008 +0200 wined3d: Deactivate GL_FRAGMENT_SHADER_ATI before deactivating a context. Mesa has a bug that causes a crash due to a NULL pointer dereference with the R200 driver when making a context current that has GL_FRAGMENT_SHADER_ATI enabled. This patch works around this bug by making sure that GL_FRAGMENT_SHADER_ATI is disabled before deactivating a context, and reactivates it afterwards. The context manager keeps GL_ATI_FRAGMENT_SHADER generally enabled, except if the context is in 2D blit mode. --- dlls/wined3d/context.c | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0934180..d20f5f2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -351,6 +351,11 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar /* Set up the context defaults */ oldCtx = pwglGetCurrentContext(); oldDrawable = pwglGetCurrentDC(); + if(oldCtx && oldDrawable && GL_SUPPORT(ATI_FRAGMENT_SHADER)) { + /* See comment in ActivateContext context switching */ + glDisable(GL_FRAGMENT_SHADER_ATI); + checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); + } if(pwglMakeCurrent(hdc, ctx) == FALSE) { ERR("Cannot activate context to set up defaults\n"); goto out; @@ -414,9 +419,6 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar glTexEnvi(GL_TEXTURE_SHADER_NV, GL_PREVIOUS_TEXTURE_INPUT_NV, GL_TEXTURE0_ARB + s - 1); checkGLcall("glTexEnvi(GL_TEXTURE_SHADER_NV, GL_PREVIOUS_TEXTURE_INPUT_NV, ...\n"); } - } else if(GL_SUPPORT(ATI_FRAGMENT_SHADER)) { - glEnable(GL_FRAGMENT_SHADER_ATI); - checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); } if(GL_SUPPORT(ARB_POINT_SPRITE)) { @@ -428,9 +430,16 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar } LEAVE_GL(); + /* Never keep GL_FRAGMENT_SHADER_ATI enabled on a context that we switch away from, + * but enable it for the first context we create, and reenable it on the old context + */ if(oldDrawable && oldCtx) { pwglMakeCurrent(oldDrawable, oldCtx); } + if(GL_SUPPORT(ATI_FRAGMENT_SHADER)) { + glEnable(GL_FRAGMENT_SHADER_ATI); + checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); + } out: return ret; @@ -928,9 +937,23 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU } else { TRACE("Switching gl ctx to %p, hdc=%p ctx=%p\n", context, context->hdc, context->glCtx); + + if(GL_SUPPORT(ATI_FRAGMENT_SHADER)) { + /* Mesa crashes when enabling a context with GL_FRAGMENT_SHADER_ATI enabled. + * Thus we disable it before deactivating any context, and re-enable it afterwards. + * + * This bug is filed as bug #15269 on bugs.freedesktop.org + */ + glDisable(GL_FRAGMENT_SHADER_ATI); + checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); + } + ret = pwglMakeCurrent(context->hdc, context->glCtx); if(ret == FALSE) { ERR("Failed to activate the new context\n"); + } else if(GL_SUPPORT(ATI_FRAGMENT_SHADER) && !context->last_was_blit) { + glEnable(GL_FRAGMENT_SHADER_ATI); + checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); } } if(This->activeContext->vshader_const_dirty) {

1 0

Stefan Dösinger : d3d9: Improve an ok line.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: de5a8db58b51be2f65baf3b9b67d79bc9c49a17e URL: http://source.winehq.org/git/wine.git/?a=commit;h=de5a8db58b51be2f65baf3b9b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 29 23:06:38 2008 +0100 d3d9: Improve an ok line. --- 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 a22b168..d4e840a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6741,7 +6741,7 @@ static void alpha_test(IDirect3DDevice9 *device) green = (color & 0x0000ff00) >> 8; blue = (color & 0x000000ff); ok(red >= 0x7e && red <= 0x81 && green == 0x00 && blue >= 0x7e && blue <= 0x81, - "DSTALPHA on texture returned color %08x, expected foo\n", color); + "DSTALPHA on texture returned color %08x, expected 0x00800080\n", color); out: /* restore things */

1 0

Stefan Dösinger : wined3d: Initialize some ARB shader output parameters.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 20e63160df1be7f43af17c251247c8412d741b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=20e63160df1be7f43af17c251… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 3 11:41:02 2008 +0200 wined3d: Initialize some ARB shader output parameters. --- dlls/wined3d/arb_program_shader.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7a841cd..a8d2c70 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1987,12 +1987,27 @@ static void shader_arb_generate_vshader(IWineD3DVertexShader *iface, SHADER_BUFF /* We need a constant to fixup the final position */ shader_addline(buffer, "PARAM posFixup = program.env[%d];\n", ARB_SHADER_PRIVCONST_POS); - if((GLINFO_LOCATION).set_texcoord_w) { - int i; - for(i = 0; i < min(8, MAX_REG_TEXCRD); i++) { - if(This->baseShader.reg_maps.texcoord_mask[i] != 0 && - This->baseShader.reg_maps.texcoord_mask[i] != WINED3DSP_WRITEMASK_ALL) { - shader_addline(buffer, "MOV result.texcoord[%u].w, -helper_const.y;\n", i); + /* Initialize output parameters. GL_ARB_vertex_program does not require special initialization values + * for output parameters. D3D in theory does not do that either, but some applications depend on a + * proper initialization of the secondary color, and programs using the fixed function pipeline without + * a replacement shader depend on the texcoord.w beeing set properly. + * + * GL_NV_vertex_program defines that all output values are initialized to {0.0, 0.0, 0.0, 1.0}. This + * assetion is in effect even when using GL_ARB_vertex_program without any NV specific additions. So + * skip this if NV_vertex_program is supported. Otherwise, initialize the secondary color. For the tex- + * coords, we have a flag in the opengl caps. Many cards do not require the texcoord beeing set, and + * this can eat a number of instructions, so skip it unless this cap is set as well + */ + if(!GL_SUPPORT(NV_VERTEX_PROGRAM)) { + shader_addline(buffer, "MOV result.color.secondary, -helper_const.wwwy;\n"); + + if((GLINFO_LOCATION).set_texcoord_w) { + int i; + for(i = 0; i < min(8, MAX_REG_TEXCRD); i++) { + if(This->baseShader.reg_maps.texcoord_mask[i] != 0 && + This->baseShader.reg_maps.texcoord_mask[i] != WINED3DSP_WRITEMASK_ALL) { + shader_addline(buffer, "MOV result.texcoord[%u].w, -helper_const.y;\n", i); + } } } }

1 0

Maarten Lankhorst : user32: Implement BroadcastSystemMessage.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 70a6495a31cc01d6ea4284d4a6dadf037d9b60df URL: http://source.winehq.org/git/wine.git/?a=commit;h=70a6495a31cc01d6ea4284d4a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 1 12:15:55 2008 -0700 user32: Implement BroadcastSystemMessage. --- dlls/user32/message.c | 174 ++++++++++++++++++--- dlls/user32/tests/Makefile.in | 1 + dlls/user32/tests/broadcast.c | 348 ++++++++++++++++++++++++++++++++++++++++ dlls/user32/user32.spec | 4 +- dlls/user32/win.h | 1 + dlls/user32/winstation.c | 15 ++- include/wine/server_protocol.h | 3 +- server/protocol.def | 1 + server/trace.c | 1 + server/winstation.c | 9 +- 10 files changed, 530 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70a6495a31cc01d6ea428…

1 0

Jason Edmeades : comctl32: Add basic custom draw support for tooltips.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: f54570fdbd2b3d06586bd3824f5473c66b70fd00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f54570fdbd2b3d06586bd3824… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Thu Apr 3 00:25:38 2008 +0100 comctl32: Add basic custom draw support for tooltips. --- dlls/comctl32/tests/tooltips.c | 173 ++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tooltips.c | 59 +++++++++++++- 2 files changed, 229 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f54570fdbd2b3d06586bd…

1 0

Austin English : ddraw: Spelling fixes.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 825baa23a2d77476b06299f853685216ef651ea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=825baa23a2d77476b06299f85… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Apr 2 14:26:42 2008 -0500 ddraw: Spelling fixes. --- dlls/ddraw/ddraw.c | 8 ++++---- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/direct3d.c | 4 ++-- dlls/ddraw/light.c | 2 +- dlls/ddraw/main.c | 6 +++--- dlls/ddraw/palette.c | 2 +- dlls/ddraw/surface.c | 6 +++--- dlls/ddraw/tests/d3d.c | 4 ++-- dlls/ddraw/tests/dsurface.c | 4 ++-- dlls/ddraw/tests/visual.c | 2 +- dlls/ddraw/viewport.c | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=825baa23a2d77476b0629…

1 0

Alexander Dorofeyev : wined3d: Improve detection of device palette change.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: d6ba069d9e07590d2086dcd9489812b2cd598ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6ba069d9e07590d2086dcd94… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:12:16 2008 +0300 wined3d: Improve detection of device palette change. --- dlls/d3d8/tests/visual.c | 56 ++++++++++++++++++---------------------- dlls/wined3d/cubetexture.c | 13 +++++++++ dlls/wined3d/device.c | 18 ++++++++++++- dlls/wined3d/surface.c | 18 +++++++----- dlls/wined3d/texture.c | 11 ++++++++ dlls/wined3d/wined3d_private.h | 2 + 6 files changed, 78 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6ba069d9e07590d2086d…

1 0

Alexander Dorofeyev : wined3d: Support index in alpha in BltOverride colorfill codepath.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 1c89795438894c3ee00606929fb7d091dfbaff59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c89795438894c3ee00606929… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:12:13 2008 +0300 wined3d: Support index in alpha in BltOverride colorfill codepath. Fixes a failure in ddraw p8_primary_test when running with opengl ddraw renderer. --- dlls/wined3d/surface.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e7f7391..91bc419 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3395,13 +3395,18 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * * 'clear' expect it in ARGB format => we need to do some conversion :-) */ if (This->resource.format == WINED3DFMT_P8) { + DWORD alpha; + + if (primary_render_target_is_p8(myDevice)) alpha = DDBltFx->u5.dwFillColor << 24; + else alpha = 0xFF000000; + if (This->palette) { - color = ((0xFF000000) | + color = (alpha | (This->palette->palents[DDBltFx->u5.dwFillColor].peRed << 16) | (This->palette->palents[DDBltFx->u5.dwFillColor].peGreen << 8) | (This->palette->palents[DDBltFx->u5.dwFillColor].peBlue)); } else { - color = 0xFF000000; + color = alpha; } } else if (This->resource.format == WINED3DFMT_R5G6B5) {

1 0

Alexander Dorofeyev : ddraw/tests: Additional colorfill test in p8_primary_test.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 003f679cbe105e95b30c40c6b88df02e3722876e URL: http://source.winehq.org/git/wine.git/?a=commit;h=003f679cbe105e95b30c40c6b… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:12:11 2008 +0300 ddraw/tests: Additional colorfill test in p8_primary_test. --- dlls/ddraw/tests/visual.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index dc4ff47..8eb39cd 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -1860,6 +1860,17 @@ static void p8_primary_test() "got R %02X G %02X B %02X, expected R FF G 00 B 00\n", GetRValue(color), GetGValue(color), GetBValue(color)); + memset(&ddbltfx, 0, sizeof(ddbltfx)); + ddbltfx.dwSize = sizeof(ddbltfx); + U5(ddbltfx).dwFillColor = 1; + hr = IDirectDrawSurface_Blt(Surface1, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); + ok(hr == DD_OK, "IDirectDrawSurface_Blt failed with %08x\n", hr); + + color = getPixelColor_GDI(Surface1, 10, 10); + ok(GetRValue(color) == 0 && GetGValue(color) == 0xFF && GetBValue(color) == 0, + "got R %02X G %02X B %02X, expected R 00 G FF B 00\n", + GetRValue(color), GetGValue(color), GetBValue(color)); + memset (&ddsd, 0, sizeof (ddsd)); ddsd.dwSize = sizeof (ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT;

1 0

Alexander Dorofeyev : wined3d: Remove ENTER_GL/ LEAVE_GL in IWineD3DCubeTextureImpl_PreLoad.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 8ec63a9cf78b73a0c733fc824b0c396ccb16cb31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec63a9cf78b73a0c733fc824… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:12:08 2008 +0300 wined3d: Remove ENTER_GL/LEAVE_GL in IWineD3DCubeTextureImpl_PreLoad. --- dlls/wined3d/cubetexture.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 9426448..c44b3f9 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -125,7 +125,6 @@ static void WINAPI IWineD3DCubeTextureImpl_PreLoad(IWineD3DCubeTexture *iface) { } IWineD3DCubeTexture_BindTexture(iface); - ENTER_GL(); /* If the texture is marked dirty or the srgb sampler setting has changed since the last load then reload the surfaces */ if (This->baseTexture.dirty) { for (i = 0; i < This->baseTexture.levels; i++) { @@ -152,7 +151,6 @@ static void WINAPI IWineD3DCubeTextureImpl_PreLoad(IWineD3DCubeTexture *iface) { } else { TRACE("(%p) Texture not dirty, nothing to do\n" , iface); } - LEAVE_GL(); /* No longer dirty */ This->baseTexture.dirty = FALSE;

1 0

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 April 2008