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

Alexander Dorofeyev : ddraw/tests: Skip cubemap tests when cubemap isn' t supported.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: e718eae9e291bb45e7a1172e3a56c9175d5ca44b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e718eae9e291bb45e7a1172e3… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Wed Aug 20 21:50:42 2008 +0300 ddraw/tests: Skip cubemap tests when cubemap isn't supported. --- dlls/ddraw/tests/d3d.c | 436 ++++++++++++++++++++++--------------------- dlls/ddraw/tests/dsurface.c | 12 +- 2 files changed, 233 insertions(+), 215 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e718eae9e291bb45e7a11…

1 0

Stefan Dösinger : wined3d: Filter out more spam.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: c38b2fe09e3d089951b7b7d4f07f0098005e65b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c38b2fe09e3d089951b7b7d4f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 12 17:52:35 2008 -0500 wined3d: Filter out more spam. --- dlls/wined3d/glsl_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 63d95fd..ee38ffc 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -70,7 +70,8 @@ void print_glsl_info_log(WineD3D_GL_Info *gl_info, GLhandleARB obj) { "Vertex shader(s) linked, no fragment shader(s) defined.", /* fglrx, no \n */ "Fragment shader was successfully compiled to run on hardware.\nWARNING: 0:1: extension 'GL_ARB_draw_buffers' is not supported", "Fragment shader(s) linked, no vertex shader(s) defined.", /* fglrx, no \n */ - "Fragment shader(s) linked, no vertex shader(s) defined. \n " /* fglrx, with \n */ + "Fragment shader(s) linked, no vertex shader(s) defined. \n ", /* fglrx, with \n */ + "WARNING: 0:2: extension 'GL_ARB_draw_buffers' is not supported\n" /* MacOS ati */ }; GL_EXTCALL(glGetObjectParameterivARB(obj,

1 0

Stefan Dösinger : wined3d: De-pickify the texbem test.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: b692e861044760483c88b5e50ff88fe440dcca94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b692e861044760483c88b5e50… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 12 17:46:34 2008 -0500 wined3d: De-pickify the texbem test. --- dlls/d3d9/tests/visual.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 7793a6c..8818eab 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1663,13 +1663,13 @@ static void texbem_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); color = getPixelColor(device, 320-32, 240); - ok(color == 0x00ffffff, "texbem failed: Got color 0x%08x, expected 0x00ffffff.\n", color); + ok(color_match(color, 0x00ffffff, 4), "texbem failed: Got color 0x%08x, expected 0x00ffffff.\n", color); color = getPixelColor(device, 320+32, 240); - ok(color == 0x00ffffff, "texbem failed: Got color 0x%08x, expected 0x00ffffff.\n", color); + ok(color_match(color, 0x00ffffff, 4), "texbem failed: Got color 0x%08x, expected 0x00ffffff.\n", color); color = getPixelColor(device, 320, 240-32); - ok(color == 0x00ffffff, "texbem failed: Got color 0x%08x, expected 0x00ffffff.\n", color); + ok(color_match(color, 0x00ffffff, 4), "texbem failed: Got color 0x%08x, expected 0x00ffffff.\n", color); color = getPixelColor(device, 320, 240+32); - ok(color == 0x00ffffff, "texbem failed: Got color 0x%08x, expected 0x00ffffff.\n", color); + ok(color_match(color, 0x00ffffff, 4), "texbem failed: Got color 0x%08x, expected 0x00ffffff.\n", color); hr = IDirect3DDevice9_SetPixelShader(device, NULL); ok(SUCCEEDED(hr), "SetPixelShader failed (%08x)\n", hr);

1 0

Stefan Dösinger : d3d9: Make the bumpmap test less picky.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: a901f0966d1808c3925e24bfdb3665dba61f4a57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a901f0966d1808c3925e24bfd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 12 17:33:45 2008 -0500 d3d9: Make the bumpmap test less picky. --- dlls/d3d9/tests/visual.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6f184cb..7793a6c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7758,24 +7758,28 @@ static void fixed_function_bumpmap_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); + /* on MacOS(10.5.4, radeon X1600), the white dots are have color 0x00fbfbfb rather than 0x00ffffff. This is + * kinda strange since no calculations are done on the sampled colors, only on the texture coordinates. + * But since testing the color match is not the purpose of the test don't be too picky + */ color = getPixelColor(device, 320-32, 240); - ok(color == 0x00ffffff, "bumpmap failed: Got color 0x%08x, expected 0x00ffffff.\n", color); + ok(color_match(color, 0x00ffffff, 4), "bumpmap failed: Got color 0x%08x, expected 0x00ffffff.\n", color); color = getPixelColor(device, 320+32, 240); - ok(color == 0x00ffffff, "bumpmap failed: Got color 0x%08x, expected 0x00ffffff.\n", color); + ok(color_match(color, 0x00ffffff, 4), "bumpmap failed: Got color 0x%08x, expected 0x00ffffff.\n", color); color = getPixelColor(device, 320, 240-32); - ok(color == 0x00ffffff, "bumpmap failed: Got color 0x%08x, expected 0x00ffffff.\n", color); + ok(color_match(color, 0x00ffffff, 4), "bumpmap failed: Got color 0x%08x, expected 0x00ffffff.\n", color); color = getPixelColor(device, 320, 240+32); - ok(color == 0x00ffffff, "bumpmap failed: Got color 0x%08x, expected 0x00ffffff.\n", color); + ok(color_match(color, 0x00ffffff, 4), "bumpmap failed: Got color 0x%08x, expected 0x00ffffff.\n", color); color = getPixelColor(device, 320, 240); - ok(color == 0x00000000, "bumpmap failed: Got color 0x%08x, expected 0x00000000.\n", color); + ok(color_match(color, 0x00000000, 4), "bumpmap failed: Got color 0x%08x, expected 0x00000000.\n", color); color = getPixelColor(device, 320+32, 240+32); - ok(color == 0x00000000, "bumpmap failed: Got color 0x%08x, expected 0x00000000.\n", color); + ok(color_match(color, 0x00000000, 4), "bumpmap failed: Got color 0x%08x, expected 0x00000000.\n", color); color = getPixelColor(device, 320-32, 240+32); - ok(color == 0x00000000, "bumpmap failed: Got color 0x%08x, expected 0x00000000.\n", color); + ok(color_match(color, 0x00000000, 4), "bumpmap failed: Got color 0x%08x, expected 0x00000000.\n", color); color = getPixelColor(device, 320+32, 240-32); - ok(color == 0x00000000, "bumpmap failed: Got color 0x%08x, expected 0x00000000.\n", color); + ok(color_match(color, 0x00000000, 4), "bumpmap failed: Got color 0x%08x, expected 0x00000000.\n", color); color = getPixelColor(device, 320-32, 240-32); - ok(color == 0x00000000, "bumpmap failed: Got color 0x%08x, expected 0x00000000.\n", color); + ok(color_match(color, 0x00000000, 4), "bumpmap failed: Got color 0x%08x, expected 0x00000000.\n", color); hr = IDirect3DDevice9_SetVertexDeclaration(device, NULL); ok(SUCCEEDED(hr), "SetVertexDeclaration failed (%08x)\n", hr);

1 0

Stefan Dösinger : wined3d: Set the texture wrap default with the NP2 emulation properly.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: c425bbccab4e9cacd7e35b9b862186c290e9e851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c425bbccab4e9cacd7e35b9b8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 12 17:18:25 2008 -0500 wined3d: Set the texture wrap default with the NP2 emulation properly. --- dlls/wined3d/texture.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5dc9821..35dfcae 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -227,6 +227,20 @@ static HRESULT WINAPI IWineD3DTextureImpl_BindTexture(IWineD3DTexture *iface) { for (i = 0; i < This->baseTexture.levels; ++i) { IWineD3DSurface_SetGlTextureDesc(This->surfaces[i], This->baseTexture.textureName, IWineD3DTexture_GetTextureDimensions(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 + */ + 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)"); + LEAVE_GL(); + This->baseTexture.states[WINED3DTEXSTA_ADDRESSU] = WINED3DTADDRESS_CLAMP; + This->baseTexture.states[WINED3DTEXSTA_ADDRESSV] = WINED3DTADDRESS_CLAMP; + } } return hr;

1 0

Stefan Dösinger : wined3d: Don' t skip applying texdims with shaders.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 46109da87d8ca5d078ce287aba53fa38fbaa6e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46109da87d8ca5d078ce287ab… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 12 13:06:25 2008 -0500 wined3d: Don't skip applying texdims with shaders. There's no need to do that with the nvts and opengl ffp fixed function fragment pipeline, it's perfectly well defined in GL which one takes effect. This removes a few more troubles when switching between shaders and arbfp. --- dlls/wined3d/nvidia_texture_shader.c | 1 - dlls/wined3d/utils.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index d11c6af..5f36668 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -558,7 +558,6 @@ void nvts_texdim(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext */ if(mapped_stage == -1 || mapped_stage >= GL_LIMITS(textures)) return; if(sampler >= stateblock->lowest_disabled_stage) return; - if(use_ps(stateblock->wineD3DDevice)) return; if(isStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3DTSS_COLOROP))) return; nvts_activate_dimensions(sampler, stateblock, context); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e56b4b9..df291ea 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2081,7 +2081,6 @@ void sampler_texdim(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont */ if(mapped_stage == -1 || mapped_stage >= GL_LIMITS(textures)) return; if(sampler >= stateblock->lowest_disabled_stage) return; - if(use_ps(stateblock->wineD3DDevice)) return; if(isStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3DTSS_COLOROP))) return; texture_activate_dimensions(sampler, stateblock, context);

1 0

Stefan Dösinger : d3d9: Test for fixed function value clamping.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: bbf313e76aaa92ddfba37b8db9b40a80a707e3df URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbf313e76aaa92ddfba37b8db… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 14 16:29:47 2008 -0500 d3d9: Test for fixed function value clamping. --- dlls/d3d9/tests/visual.c | 111 ++++++++++++++++++++++++++++++++++ dlls/wined3d/arb_program_shader.c | 4 +- dlls/wined3d/ati_fragment_shader.c | 42 +++++++------ dlls/wined3d/nvidia_texture_shader.c | 6 +- 4 files changed, 140 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bbf313e76aaa92ddfba37…

1 0

Stefan Dösinger : winex11: Do not cap the cursor size.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 08f4b87f96af7257d64a59488c0809679a439f80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08f4b87f96af7257d64a59488… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Aug 8 16:01:51 2008 -0500 winex11: Do not cap the cursor size. --- dlls/winex11.drv/mouse.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index d939bb0..5df71a7 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -408,8 +408,8 @@ void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y, */ static XcursorImage *create_cursor_image( CURSORICONINFO *ptr ) { - int x, xmax; - int y, ymax; + int x; + int y; int and_size; unsigned char *and_bits, *and_ptr, *xor_bits, *xor_ptr; int and_width_bytes, xor_width_bytes; @@ -417,10 +417,7 @@ static XcursorImage *create_cursor_image( CURSORICONINFO *ptr ) XcursorImage *image; BOOL alpha_zero = TRUE; - ymax = (ptr->nHeight > 32) ? 32 : ptr->nHeight; - xmax = (ptr->nWidth > 32) ? 32 : ptr->nWidth; - - and_width_bytes = xmax / 8; + and_width_bytes = ptr->nWidth / 8; xor_width_bytes = and_width_bytes * ptr->bBitsPerPixel; and_size = ptr->nWidth * ptr->nHeight / 8; @@ -428,7 +425,7 @@ static XcursorImage *create_cursor_image( CURSORICONINFO *ptr ) xor_ptr = xor_bits = and_ptr + and_size; - image = pXcursorImageCreate( xmax, ymax ); + image = pXcursorImageCreate( ptr->nWidth, ptr->nHeight ); pixel_ptr = image->pixels; /* Generally 32 bit bitmaps have an alpha channel which is used in favor @@ -447,10 +444,10 @@ static XcursorImage *create_cursor_image( CURSORICONINFO *ptr ) */ if(ptr->bBitsPerPixel == 32) { - for (y = 0; alpha_zero && y < ymax; ++y) + for (y = 0; alpha_zero && y < ptr->nHeight; ++y) { xor_ptr = xor_bits + (y * xor_width_bytes); - for (x = 0; x < xmax; ++x) + for (x = 0; x < ptr->nWidth; ++x) { if (xor_ptr[3] != 0x00) { @@ -476,12 +473,12 @@ static XcursorImage *create_cursor_image( CURSORICONINFO *ptr ) * the "xor" data to the alpha channel, and xor the color with either * black or white. */ - for (y = 0; y < ymax; ++y) + for (y = 0; y < ptr->nHeight; ++y) { and_ptr = and_bits + (y * and_width_bytes); xor_ptr = xor_bits + (y * xor_width_bytes); - for (x = 0; x < xmax; ++x) + for (x = 0; x < ptr->nWidth; ++x) { /* Xcursor pixel data is in ARGB format, with A in the high byte */ switch (ptr->bBitsPerPixel)

1 0

Stefan Dösinger : wined3d: Prefer aux buffer matches over alpha matches.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 77204574d19b1969ca0810c7522e6bee5a0c4026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77204574d19b1969ca0810c75… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 14 16:47:19 2008 -0500 wined3d: Prefer aux buffer matches over alpha matches. Half Life 2 uses D3DFMT_X8R8G8B8 for the back buffer, but macos supports aux buffers only on D3DFMT_A8R8G8B8. I think having aux buffers is more important right now than having a precise alpha match. --- dlls/wined3d/context.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 68ec2a7..739ddb2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -129,17 +129,19 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DF BOOL exact_alpha; BOOL exact_color; } matches[] = { - /* First, try without aux buffers - this is the most common cause - * for not finding a pixel format. Also some drivers(the open source ones) + /* First, try without alpha match buffers. MacOS supports aux buffers only + * on A8R8G8B8, and we prefer better offscreen rendering over an alpha match. + * Then try without aux buffers - this is the most common cause for not + * finding a pixel format. Also some drivers(the open source ones) * only offer 32 bit ARB pixel formats. First try without an exact alpha * match, then try without an exact alpha and color match. */ - { TRUE, TRUE, TRUE }, { FALSE, TRUE, TRUE }, - { TRUE, FALSE, TRUE }, - { TRUE, FALSE, FALSE }, + { TRUE, TRUE, TRUE }, { FALSE, FALSE, TRUE }, { FALSE, FALSE, FALSE }, + { TRUE, FALSE, TRUE }, + { TRUE, FALSE, FALSE }, }; int i = 0;

1 0

Stefan Dösinger : wined3d: Don' t enable texture dimensions with shaders.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: ec94c2ea99763d5dc4805d2da981828120ad8ba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec94c2ea99763d5dc4805d2da… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 12 12:46:54 2008 -0500 wined3d: Don't enable texture dimensions with shaders. ARB and GLSL don't need that. If a shader backend like atifs or nvts need it in the future, the shader backend should deal with that rather than the ffp pipeline. --- dlls/wined3d/state.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 84be28b..5b92420 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3528,18 +3528,7 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont checkGLcall("glTexEnvi(GL_TEXTURE_LOD_BIAS_EXT, ...)"); } - if (stateblock->wineD3DDevice->ps_selected_mode != SHADER_NONE && stateblock->pixelShader && - ((IWineD3DPixelShaderImpl *)stateblock->pixelShader)->baseShader.function) { - /* Using a pixel shader? Verify the sampler types */ - - /* Make sure that the texture dimensions are enabled. I don't have to disable the other - * dimensions because the shader knows from which texture type to sample from. For the sake of - * debugging all dimensions could be enabled and a texture with some ugly pink bound to the unused - * dimensions. This should make wrong sampling sources visible :-) - */ - glEnable(stateblock->textureDimensions[sampler]); - checkGLcall("glEnable(stateblock->textureDimensions[sampler])"); - } else if(sampler < stateblock->lowest_disabled_stage) { + if(!use_ps(stateblock->wineD3DDevice) && sampler < stateblock->lowest_disabled_stage) { if(stateblock->renderState[WINED3DRS_COLORKEYENABLE] && sampler == 0) { /* If color keying is enabled update the alpha test, it depends on the existence * of a color key in stage 0

1 0