April 2008 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Disable blending when clearing.
by Alexandre Julliard April 9, 2008

April 9, 2008

Module: wine Branch: master Commit: fb8fde81d1cfaad2ee488aa5216ee853e000301e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb8fde81d1cfaad2ee488aa52… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 6 00:49:00 2008 +0200 wined3d: Disable blending when clearing. --- dlls/wined3d/context.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index fb96584..f8fda6e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -997,6 +997,12 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU } } + /* Blending and clearing should be orthogonal, but tests on the nvidia driver show that disabling + * blending when clearing improves the clearing performance increadibly + */ + glDisable(GL_BLEND); + Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), StateTable); + glEnable(GL_SCISSOR_TEST); checkGLcall("glEnable GL_SCISSOR_TEST"); context->last_was_blit = FALSE;

1 0

Stefan Dösinger : d3d9: Make the srgb reading test less strict.
by Alexandre Julliard April 9, 2008

April 9, 2008

Module: wine Branch: master Commit: 9cd1d505bd39fcc81b94a57c8d1c0ca2b686d8c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cd1d505bd39fcc81b94a57c8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 7 13:56:27 2008 +0200 d3d9: Make the srgb reading test less strict. --- 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 fc78f7a..879e2c4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6336,7 +6336,7 @@ static void srgbtexture_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %s\n", DXGetErrorString9(hr)); color = getPixelColor(device, 320, 240); - ok(color == 0x00363636, "srgb quad has color %08x, expected 0x00363636\n", color); + ok(color == 0x00363636 || color == 0x00373737, "srgb quad has color %08x, expected 0x00363636\n", color); out: if(texture) IDirect3DTexture9_Release(texture);

1 0

Stefan Dösinger : d3d9: Accept erros in the fvp->3. 0 pixel shader varying test.
by Alexandre Julliard April 9, 2008

April 9, 2008

Module: wine Branch: master Commit: 1c3e725d6363c34837f76d03e40d3cabd69110ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c3e725d6363c34837f76d03e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 7 14:07:22 2008 +0200 d3d9: Accept erros in the fvp->3.0 pixel shader varying test. Some cards/drivers like ATI and the Geforce 8 driver return an error in this case, make the test accept that. This lifts some constraints we have to care for in WineD3D and removes one of the requirement for the packing shader. We still need the packing shader for vs_1_1 -> ps_3_0 mapping and for indirect pixel shader varying addressing though. --- dlls/d3d9/tests/visual.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 879e2c4..969f79b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5181,6 +5181,7 @@ static void fixed_function_varying_test(IDirect3DDevice9 *device) { HRESULT hr; unsigned int i; DWORD color, r, g, b, r_e, g_e, b_e; + BOOL drawok; memcpy(data2, data, sizeof(data2)); data2[0].pos_x = 0; data2[0].pos_y = 0; @@ -5212,16 +5213,25 @@ static void fixed_function_varying_test(IDirect3DDevice9 *device) { hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned %s\n", DXGetErrorString9(hr)); + drawok = FALSE; if(SUCCEEDED(hr)) { hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, data, sizeof(data[0])); - ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "DrawPrimitiveUP failed (%08x)\n", hr); + drawok = SUCCEEDED(hr); hr = IDirect3DDevice9_EndScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %s\n", DXGetErrorString9(hr)); } hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %s\n", DXGetErrorString9(hr)); + /* Some drivers reject the combination of ps_3_0 and fixed function vertex processing. Accept + * the failure and do not check the color if it failed + */ + if(!drawok) { + continue; + } + color = getPixelColor(device, 360, 240); r = color & 0x00ff0000 >> 16; g = color & 0x0000ff00 >> 8;

1 0

Stefan Dösinger : wined3d: Make the mag filter lookup a separate array.
by Alexandre Julliard April 9, 2008

April 9, 2008

Module: wine Branch: master Commit: a22203adeb22024106980b8721c3cba24baa3522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a22203adeb22024106980b872… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 6 00:31:39 2008 +0200 wined3d: Make the mag filter lookup a separate array. This makes it easier to make this a per texture / per adapter property. Somewhen we should rename the remaining lookup type in the general lookup table to wraplookup. --- dlls/wined3d/basetexture.c | 4 ++-- dlls/wined3d/directx.c | 14 ++++++-------- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/wined3d_private.h | 6 ++++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 7609099..ab7fd55 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -431,10 +431,10 @@ void WINAPI IWineD3DBaseTextureImpl_ApplyStateChanges(IWineD3DBaseTexture *iface if(samplerStates[WINED3DSAMP_MAGFILTER] != This->baseTexture.states[WINED3DTEXSTA_MAGFILTER]) { GLint glValue; state = samplerStates[WINED3DSAMP_MAGFILTER]; - if (state < minLookup[WINELOOKUP_MAGFILTER] || state > maxLookup[WINELOOKUP_MAGFILTER]) { + if (state < WINED3DTEXF_NONE || state > WINED3DTEXF_ANISOTROPIC) { FIXME("Unrecognized or unsupported MAGFILTER* value %d\n", state); } - glValue = stateLookup[WINELOOKUP_MAGFILTER][state - minLookup[WINELOOKUP_MAGFILTER]]; + glValue = magLookup[state - WINED3DTEXF_NONE]; TRACE("ValueMAG=%d setting MAGFILTER to %x\n", state, glValue); glTexParameteri(textureDimensions, GL_TEXTURE_MAG_FILTER, glValue); /* We need to reset the Anisotropic filtering state when we change the mag filter to WINED3DTEXF_ANISOTROPIC (this seems a bit weird, check the documentation to see how it should be switched off. */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c29fbf1..d39118c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -162,6 +162,8 @@ DWORD minMipLookup_noFilter[WINED3DTEXF_ANISOTROPIC + 1][WINED3DTEXF_LINEAR + 1] {GL_NEAREST, GL_NEAREST, GL_NEAREST}, }; +DWORD magLookup[WINED3DTEXF_ANISOTROPIC + 1]; + /* drawStridedSlow attributes */ glAttribFunc position_funcs[WINED3DDECLTYPE_UNUSED]; glAttribFunc diffuse_funcs[WINED3DDECLTYPE_UNUSED]; @@ -1302,10 +1304,6 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { minLookup[WINELOOKUP_WARPPARAM] = WINED3DTADDRESS_WRAP; maxLookup[WINELOOKUP_WARPPARAM] = WINED3DTADDRESS_MIRRORONCE; - minLookup[WINELOOKUP_MAGFILTER] = WINED3DTEXF_NONE; - maxLookup[WINELOOKUP_MAGFILTER] = WINED3DTEXF_ANISOTROPIC; - - for (i = 0; i < MAX_LOOKUPS; i++) { stateLookup[i] = HeapAlloc(GetProcessHeap(), 0, sizeof(*stateLookup[i]) * (1 + maxLookup[i] - minLookup[i]) ); } @@ -1321,10 +1319,10 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { stateLookup[WINELOOKUP_WARPPARAM][WINED3DTADDRESS_MIRRORONCE - minLookup[WINELOOKUP_WARPPARAM]] = gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] ? GL_MIRROR_CLAMP_TO_EDGE_ATI : GL_REPEAT; - stateLookup[WINELOOKUP_MAGFILTER][WINED3DTEXF_NONE - minLookup[WINELOOKUP_MAGFILTER]] = GL_NEAREST; - stateLookup[WINELOOKUP_MAGFILTER][WINED3DTEXF_POINT - minLookup[WINELOOKUP_MAGFILTER]] = GL_NEAREST; - stateLookup[WINELOOKUP_MAGFILTER][WINED3DTEXF_LINEAR - minLookup[WINELOOKUP_MAGFILTER]] = GL_LINEAR; - stateLookup[WINELOOKUP_MAGFILTER][WINED3DTEXF_ANISOTROPIC - minLookup[WINELOOKUP_MAGFILTER]] = + magLookup[WINED3DTEXF_NONE - WINED3DTEXF_NONE] = GL_NEAREST; + magLookup[WINED3DTEXF_POINT - WINED3DTEXF_NONE] = GL_NEAREST; + magLookup[WINED3DTEXF_LINEAR - WINED3DTEXF_NONE] = GL_LINEAR; + magLookup[WINED3DTEXF_ANISOTROPIC - WINED3DTEXF_NONE] = gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC] ? GL_LINEAR : GL_NEAREST; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 90a05d1..31c8e4f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2799,7 +2799,7 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine /* No issue with overriding these - the sampler is dirty due to blit usage */ glTexParameteri(texture_target, GL_TEXTURE_MAG_FILTER, - stateLookup[WINELOOKUP_MAGFILTER][Filter - minLookup[WINELOOKUP_MAGFILTER]]); + magLookup[Filter - WINED3DTEXF_NONE]); checkGLcall("glTexParameteri"); glTexParameteri(texture_target, GL_TEXTURE_MIN_FILTER, minMipLookup[Filter][WINED3DTEXF_NONE]); @@ -3321,7 +3321,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * /* Filtering for StretchRect */ glTexParameteri(Src->glDescription.target, GL_TEXTURE_MAG_FILTER, - stateLookup[WINELOOKUP_MAGFILTER][Filter - minLookup[WINELOOKUP_MAGFILTER]]); + magLookup[Filter - WINED3DTEXF_NONE]); checkGLcall("glTexParameteri"); glTexParameteri(Src->glDescription.target, GL_TEXTURE_MIN_FILTER, minMipLookup[Filter][WINED3DTEXF_NONE]); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 077e456..4aeda0c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -104,14 +104,16 @@ extern const DWORD SavedVertexStates_S[NUM_SAVEDVERTEXSTATES_S]; typedef enum _WINELOOKUP { WINELOOKUP_WARPPARAM = 0, - WINELOOKUP_MAGFILTER = 1, - MAX_LOOKUPS = 2 + MAX_LOOKUPS = 1 } WINELOOKUP; extern int minLookup[MAX_LOOKUPS]; extern int maxLookup[MAX_LOOKUPS]; extern DWORD *stateLookup[MAX_LOOKUPS]; +typedef DWORD magLookup_t[WINED3DTEXF_ANISOTROPIC + 1]; +extern magLookup_t magLookup; + typedef DWORD minMipLookup_t[WINED3DTEXF_ANISOTROPIC + 1][WINED3DTEXF_LINEAR + 1]; extern minMipLookup_t minMipLookup; extern minMipLookup_t minMipLookup_noFilter;

1 0

Stefan Dösinger : wined3d: Disable texture filtering on textures that do not support it.
by Alexandre Julliard April 9, 2008

April 9, 2008

Module: wine Branch: master Commit: 0cbd08b2b909a33fe45c6e482fa81cb6149a8278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cbd08b2b909a33fe45c6e482… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 6 00:22:08 2008 +0200 wined3d: Disable texture filtering on textures that do not support it. OpenGL always offers filtering on all formats, and if the hardware doesn't support it the driver falls back to software. Direct3D on the other hand silently disables filtering, so that's what we should do too. --- dlls/wined3d/device.c | 19 ++++++++++++++++--- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 82bdf2f..489b36e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -789,7 +789,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, U D3DINITIALIZEBASETEXTURE(object->baseTexture); object->width = Width; object->height = Height; - object->baseTexture.minMipLookup = &minMipLookup; + + if(glDesc->Flags & WINED3DFMT_FLAG_FILTERING) { + object->baseTexture.minMipLookup = &minMipLookup; + } else { + object->baseTexture.minMipLookup = &minMipLookup_noFilter; + } /** Non-power2 support **/ if (GL_SUPPORT(ARB_TEXTURE_NON_POWER_OF_TWO)) { @@ -935,7 +940,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa object->baseTexture.pow2Matrix[10] = 1.0; object->baseTexture.pow2Matrix[15] = 1.0; - object->baseTexture.minMipLookup = &minMipLookup; + if(glDesc->Flags & WINED3DFMT_FLAG_FILTERING) { + object->baseTexture.minMipLookup = &minMipLookup; + } else { + object->baseTexture.minMipLookup = &minMipLookup_noFilter; + } /* Calculate levels for mip mapping */ if (Usage & WINED3DUSAGE_AUTOGENMIPMAP) { @@ -1084,7 +1093,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface object->baseTexture.pow2Matrix[10] = ((float)EdgeLength) / ((float)pow2EdgeLength); object->baseTexture.pow2Matrix[15] = 1.0; - object->baseTexture.minMipLookup = &minMipLookup; + if(glDesc->Flags & WINED3DFMT_FLAG_FILTERING) { + object->baseTexture.minMipLookup = &minMipLookup; + } else { + object->baseTexture.minMipLookup = &minMipLookup_noFilter; + } /* Calculate levels for mip mapping */ if (Usage & WINED3DUSAGE_AUTOGENMIPMAP) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d0fbf3a..c29fbf1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -155,6 +155,12 @@ int maxLookup[MAX_LOOKUPS]; DWORD *stateLookup[MAX_LOOKUPS]; DWORD minMipLookup[WINED3DTEXF_ANISOTROPIC + 1][WINED3DTEXF_LINEAR + 1]; +DWORD minMipLookup_noFilter[WINED3DTEXF_ANISOTROPIC + 1][WINED3DTEXF_LINEAR + 1] = { + {GL_NEAREST, GL_NEAREST, GL_NEAREST}, + {GL_NEAREST, GL_NEAREST, GL_NEAREST}, + {GL_NEAREST, GL_NEAREST, GL_NEAREST}, + {GL_NEAREST, GL_NEAREST, GL_NEAREST}, +}; /* drawStridedSlow attributes */ glAttribFunc position_funcs[WINED3DDECLTYPE_UNUSED]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 46075fa..077e456 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -114,6 +114,7 @@ extern DWORD *stateLookup[MAX_LOOKUPS]; typedef DWORD minMipLookup_t[WINED3DTEXF_ANISOTROPIC + 1][WINED3DTEXF_LINEAR + 1]; extern minMipLookup_t minMipLookup; +extern minMipLookup_t minMipLookup_noFilter; void init_type_lookup(WineD3D_GL_Info *gl_info); #define WINED3D_ATR_TYPE(type) GLINFO_LOCATION.glTypeLookup[type].d3dType

1 0

Stefan Dösinger : wined3d: Make the min mip lookup type a texture property.
by Alexandre Julliard April 9, 2008

April 9, 2008

Module: wine Branch: master Commit: 4bb54a1ab70b10e130b9037af6598beeec8e5891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb54a1ab70b10e130b9037af… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 6 00:18:53 2008 +0200 wined3d: Make the min mip lookup type a texture property. --- dlls/wined3d/basetexture.c | 3 ++- dlls/wined3d/device.c | 5 +++++ dlls/wined3d/wined3d_private.h | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 0ad0433..7609099 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -463,7 +463,8 @@ void WINAPI IWineD3DBaseTextureImpl_ApplyStateChanges(IWineD3DBaseTexture *iface This->baseTexture.states[WINED3DTEXSTA_MINFILTER], This->baseTexture.states[WINED3DTEXSTA_MIPFILTER]); } - glValue = minMipLookup[min(max(samplerStates[WINED3DSAMP_MINFILTER],WINED3DTEXF_NONE), WINED3DTEXF_ANISOTROPIC)] + glValue = (*This->baseTexture.minMipLookup) + [min(max(samplerStates[WINED3DSAMP_MINFILTER],WINED3DTEXF_NONE), WINED3DTEXF_ANISOTROPIC)] [min(max(samplerStates[WINED3DSAMP_MIPFILTER],WINED3DTEXF_NONE), WINED3DTEXF_LINEAR)]; TRACE("ValueMIN=%d, ValueMIP=%d, setting MINFILTER to %x\n", diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8e1e24a..82bdf2f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -789,6 +789,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, U D3DINITIALIZEBASETEXTURE(object->baseTexture); object->width = Width; object->height = Height; + object->baseTexture.minMipLookup = &minMipLookup; /** Non-power2 support **/ if (GL_SUPPORT(ARB_TEXTURE_NON_POWER_OF_TWO)) { @@ -934,6 +935,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa object->baseTexture.pow2Matrix[10] = 1.0; object->baseTexture.pow2Matrix[15] = 1.0; + object->baseTexture.minMipLookup = &minMipLookup; + /* Calculate levels for mip mapping */ if (Usage & WINED3DUSAGE_AUTOGENMIPMAP) { if(!GL_SUPPORT(SGIS_GENERATE_MIPMAP)) { @@ -1081,6 +1084,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface object->baseTexture.pow2Matrix[10] = ((float)EdgeLength) / ((float)pow2EdgeLength); object->baseTexture.pow2Matrix[15] = 1.0; + object->baseTexture.minMipLookup = &minMipLookup; + /* Calculate levels for mip mapping */ if (Usage & WINED3DUSAGE_AUTOGENMIPMAP) { if(!GL_SUPPORT(SGIS_GENERATE_MIPMAP)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 19ad58d..46075fa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -112,7 +112,8 @@ extern int minLookup[MAX_LOOKUPS]; extern int maxLookup[MAX_LOOKUPS]; extern DWORD *stateLookup[MAX_LOOKUPS]; -extern DWORD minMipLookup[WINED3DTEXF_ANISOTROPIC + 1][WINED3DTEXF_LINEAR + 1]; +typedef DWORD minMipLookup_t[WINED3DTEXF_ANISOTROPIC + 1][WINED3DTEXF_LINEAR + 1]; +extern minMipLookup_t minMipLookup; void init_type_lookup(WineD3D_GL_Info *gl_info); #define WINED3D_ATR_TYPE(type) GLINFO_LOCATION.glTypeLookup[type].d3dType @@ -1090,6 +1091,7 @@ typedef struct IWineD3DBaseTextureClass UINT srgb_mode_change_count; WINED3DFORMAT shader_conversion_group; float pow2Matrix[16]; + minMipLookup_t *minMipLookup; } IWineD3DBaseTextureClass; typedef struct IWineD3DBaseTextureImpl

1 0

Stefan Dösinger : wined3d: Store the number of aux buffers in the context.
by Alexandre Julliard April 9, 2008

April 9, 2008

Module: wine Branch: master Commit: 67e0943ba30a47c7f63ae44e8a267563d018df38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67e0943ba30a47c7f63ae44e8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 8 14:20:27 2008 +0200 wined3d: Store the number of aux buffers in the context. --- dlls/wined3d/context.c | 3 +++ dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 4 ---- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d_gl.h | 1 - 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d20f5f2..fb96584 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -362,6 +362,9 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar } ENTER_GL(); + + glGetIntegerv(GL_AUX_BUFFERS, &ret->aux_buffers); + TRACE("Setting up the screen\n"); /* Clear the screen */ glClearColor(1.0, 0.0, 0.0, 0.0); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c594460..8e1e24a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2157,7 +2157,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR case ORM_BACKBUFFER: { - if(GL_LIMITS(aux_buffers) > 0) { + if(This->activeContext->aux_buffers > 0) { TRACE("Using auxilliary buffer for offscreen rendering\n"); This->offscreenBuffer = GL_AUX0; } else { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4a9bbed..320456c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -724,10 +724,6 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_info->max_pointsize = gl_floatv[1]; TRACE_(d3d_caps)("Maximum point size support - max point size=%f\n", gl_floatv[1]); - glGetIntegerv(GL_AUX_BUFFERS, &gl_max); - gl_info->max_aux_buffers = gl_max; - TRACE_(d3d_caps)("Offscreen rendering support - number of aux buffers=%d\n", gl_max); - /* Parse the gl supported features, in theory enabling parts of our code appropriately */ GL_Extensions = (const char *) glGetString(GL_EXTENSIONS); TRACE_(d3d_caps)("GL_Extensions reported:\n"); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3eeaaa3..90a05d1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2757,10 +2757,10 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine /* Try to use an aux buffer for drawing the rectangle. This way it doesn't need restoring. * This way we don't have to wait for the 2nd readback to finish to leave this function. */ - if(GL_LIMITS(aux_buffers) >= 2) { + if(myDevice->activeContext->aux_buffers >= 2) { /* Got more than one aux buffer? Use the 2nd aux buffer */ drawBuffer = GL_AUX1; - } else if((swapchain || myDevice->offscreenBuffer == GL_BACK) && GL_LIMITS(aux_buffers) >= 1) { + } else if((swapchain || myDevice->offscreenBuffer == GL_BACK) && myDevice->activeContext->aux_buffers >= 1) { /* Only one aux buffer, but it isn't used (Onscreen rendering, or non-aux orm)? Use it! */ drawBuffer = GL_AUX0; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 652d86d..19ad58d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -620,6 +620,7 @@ struct WineD3DContext { HDC hdc; HPBUFFERARB pbuffer; BOOL isPBuffer; + GLint aux_buffers; }; typedef enum ContextUsage { diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 43d82e0..02432db 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -3824,7 +3824,6 @@ typedef struct _WineD3D_GL_Info { float max_pointsize, max_pointsizemin; UINT max_blends; UINT max_anisotropy; - UINT max_aux_buffers; UINT max_glsl_varyings; float max_shininess;

1 0

Michael Stefaniuc : quartz: Add missing lock releases on some code paths ( Smatch).
by Alexandre Julliard April 9, 2008

April 9, 2008

Module: wine Branch: master Commit: 71e9455b7345a02439dfc6ea76ae0c2e707224db URL: http://source.winehq.org/git/wine.git/?a=commit;h=71e9455b7345a02439dfc6ea7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 8 23:13:19 2008 +0200 quartz: Add missing lock releases on some code paths (Smatch). --- dlls/quartz/parser.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 670a0c3..a369de2 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -223,6 +223,7 @@ static HRESULT WINAPI Parser_Stop(IBaseFilter * iface) if (This->state == State_Stopped) { LeaveCriticalSection(&This->csFilter); + LeaveCriticalSection(&pin->thread_lock); return S_OK; } This->state = State_Stopped; @@ -248,6 +249,7 @@ static HRESULT WINAPI Parser_Pause(IBaseFilter * iface) if (This->state == State_Paused) { LeaveCriticalSection(&This->csFilter); + LeaveCriticalSection(&pin->thread_lock); return S_OK; } @@ -284,6 +286,7 @@ static HRESULT WINAPI Parser_Run(IBaseFilter * iface, REFERENCE_TIME tStart) if (This->state == State_Running) { LeaveCriticalSection(&This->csFilter); + LeaveCriticalSection(&pin->thread_lock); return S_OK; }

1 0

Stefan Dösinger : wined3d: Report D3DUSAGE_QUERY_WRAPANDMIP support.
by Alexandre Julliard April 9, 2008

April 9, 2008

Module: wine Branch: master Commit: 98b56c3ff013fc26d774bd0b4f3d34f1ae04422f URL: http://source.winehq.org/git/wine.git/?a=commit;h=98b56c3ff013fc26d774bd0b4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Apr 5 23:35:21 2008 +0200 wined3d: Report D3DUSAGE_QUERY_WRAPANDMIP support. --- dlls/wined3d/directx.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 320456c..d0fbf3a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2053,6 +2053,19 @@ static BOOL CheckPostPixelShaderBlendingCapability(UINT Adapter, WINED3DFORMAT C return FALSE; } +static BOOL CheckWrapAndMipCapability(UINT Adapter, WINED3DFORMAT CheckFormat) { + /* OpenGL supports mipmapping on all formats basically. Wrapping is unsupported, + * but we have to report mipmapping so we cannot reject this flag. Tests show that + * windows reports WRAPANDMIP on unfilterable surfaces as well, apparently to show + * that wrapping is supported. The lack of filtering will sort out the mipmapping + * capability anyway. + * + * For now lets report this on all formats, but in the future we may want to + * restrict it to some should games need that + */ + return TRUE; +} + /* Check if a texture format is supported on the given adapter */ static BOOL CheckTextureCapability(UINT Adapter, WINED3DFORMAT CheckFormat) { @@ -2312,6 +2325,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt * - D3DUSAGE_NONSECURE (d3d9ex) * - D3DUSAGE_RENDERTARGET * - D3DUSAGE_SOFTWAREPROCESSING + * - D3DUSAGE_QUERY_WRAPANDMIP */ if(GL_SUPPORT(ARB_TEXTURE_CUBE_MAP)) { /* Check if the texture format is around */ @@ -2392,6 +2406,16 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; } } + + /* Check QUERY_WRAPANDMIP support */ + if(Usage & WINED3DUSAGE_QUERY_WRAPANDMIP) { + if(CheckWrapAndMipCapability(Adapter, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_QUERY_WRAPANDMIP; + } else { + TRACE_(d3d_caps)("[FAILED] - No wrapping and mipmapping support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } } else { TRACE_(d3d_caps)("[FAILED] - Cube texture format not supported\n"); return WINED3DERR_NOTAVAILABLE; @@ -2444,6 +2468,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt * - D3DUSAGE_RENDERTARGET * - D3DUSAGE_SOFTWAREPROCESSING * - D3DUSAGE_TEXTAPI (d3d9ex) + * - D3DUSAGE_QUERY_WRAPANDMIP */ /* Check if the texture format is around */ @@ -2534,6 +2559,16 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; } } + + /* Check QUERY_WRAPANDMIP support */ + if(Usage & WINED3DUSAGE_QUERY_WRAPANDMIP) { + if(CheckWrapAndMipCapability(Adapter, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_QUERY_WRAPANDMIP; + } else { + TRACE_(d3d_caps)("[FAILED] - No wrapping and mipmapping support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } } else if(CheckDepthStencilCapability(Adapter, AdapterFormat, CheckFormat)) { if(Usage & WINED3DUSAGE_DEPTHSTENCIL) UsageCaps |= WINED3DUSAGE_DEPTHSTENCIL; @@ -2549,6 +2584,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt * - D3DUSAGE_DYNAMIC * - D3DUSAGE_NONSECURE (d3d9ex) * - D3DUSAGE_SOFTWAREPROCESSING + * - D3DUSAGE_QUERY_WRAPANDMIP */ /* Check volume texture and volume usage caps */ @@ -2615,6 +2651,16 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; } } + + /* Check QUERY_WRAPANDMIP support */ + if(Usage & WINED3DUSAGE_QUERY_WRAPANDMIP) { + if(CheckWrapAndMipCapability(Adapter, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_QUERY_WRAPANDMIP; + } else { + TRACE_(d3d_caps)("[FAILED] - No wrapping and mipmapping support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } } else { TRACE_(d3d_caps)("[FAILED] - No volume texture support\n"); return WINED3DERR_NOTAVAILABLE;

1 0

Dan Hipschman : qedit: Implement IMediaDet_(put|get)_CurrentStream.
by Alexandre Julliard April 9, 2008

April 9, 2008

Module: wine Branch: master Commit: 33f270afc07541293c0f7a142473a66201547ba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33f270afc07541293c0f7a142… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Apr 8 16:55:37 2008 -0700 qedit: Implement IMediaDet_(put|get)_CurrentStream. --- dlls/qedit/mediadet.c | 41 +++++++++++++++++++++++-- dlls/qedit/tests/mediadet.c | 69 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 101 insertions(+), 9 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 3a7cc1b..abccca9 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -37,6 +37,8 @@ typedef struct MediaDetImpl { IGraphBuilder *graph; IBaseFilter *source; IBaseFilter *splitter; + long num_streams; + long cur_stream; } MediaDetImpl; static void MD_cleanup(MediaDetImpl *This) @@ -47,6 +49,8 @@ static void MD_cleanup(MediaDetImpl *This) This->splitter = NULL; if (This->graph) IGraphBuilder_Release(This->graph); This->graph = NULL; + This->num_streams = -1; + This->cur_stream = 0; } static ULONG WINAPI MediaDet_AddRef(IMediaDet* iface) @@ -116,6 +120,12 @@ static HRESULT WINAPI MediaDet_get_OutputStreams(IMediaDet* iface, long *pVal) if (!This->splitter) return E_INVALIDARG; + if (This->num_streams != -1) + { + *pVal = This->num_streams; + return S_OK; + } + *pVal = 0; hr = IBaseFilter_EnumPins(This->splitter, &pins); @@ -138,21 +148,42 @@ static HRESULT WINAPI MediaDet_get_OutputStreams(IMediaDet* iface, long *pVal) } IEnumPins_Release(pins); + This->num_streams = *pVal; return S_OK; } static HRESULT WINAPI MediaDet_get_CurrentStream(IMediaDet* iface, long *pVal) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%p): not implemented!\n", This, pVal); - return E_NOTIMPL; + TRACE("(%p)\n", This); + + if (!pVal) + return E_POINTER; + + *pVal = This->cur_stream; + return S_OK; } static HRESULT WINAPI MediaDet_put_CurrentStream(IMediaDet* iface, long newVal) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%ld): not implemented!\n", This, newVal); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p)->(%ld)\n", This, newVal); + + if (This->num_streams == -1) + { + long n; + hr = MediaDet_get_OutputStreams(iface, &n); + if (FAILED(hr)) + return hr; + } + + if (newVal < 0 || This->num_streams <= newVal) + return E_INVALIDARG; + + This->cur_stream = newVal; + return S_OK; } static HRESULT WINAPI MediaDet_get_StreamType(IMediaDet* iface, GUID *pVal) @@ -469,6 +500,8 @@ HRESULT MediaDet_create(IUnknown * pUnkOuter, LPVOID * ppv) { obj->graph = NULL; obj->source = NULL; obj->splitter = NULL; + obj->num_streams = -1; + obj->cur_stream = 0; *ppv = obj; return S_OK; diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 237dfb9..422554d 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -120,11 +120,37 @@ static void test_mediadet(void) ok(hr == E_INVALIDARG, "IMediaDet_get_OutputStreams\n"); ok(nstrms == -1, "IMediaDet_get_OutputStreams\n"); + strm = -1; + /* The stream defaults to 0, even without a file! */ + hr = IMediaDet_get_CurrentStream(pM, &strm); + ok(hr == S_OK, "IMediaDet_get_CurrentStream\n"); + ok(strm == 0, "IMediaDet_get_CurrentStream\n"); + + hr = IMediaDet_get_CurrentStream(pM, NULL); + ok(hr == E_POINTER, "IMediaDet_get_CurrentStream\n"); + + /* But put_CurrentStream doesn't. */ + hr = IMediaDet_put_CurrentStream(pM, 0); + ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream\n"); + + hr = IMediaDet_put_CurrentStream(pM, -1); + ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream\n"); + filename = SysAllocString(test_avi_filename); hr = IMediaDet_put_Filename(pM, filename); ok(hr == S_OK, "IMediaDet_put_Filename -> %x\n", hr); SysFreeString(filename); + strm = -1; + /* The stream defaults to 0. */ + hr = IMediaDet_get_CurrentStream(pM, &strm); + ok(hr == S_OK, "IMediaDet_get_CurrentStream\n"); + ok(strm == 0, "IMediaDet_get_CurrentStream\n"); + + /* Even before get_OutputStreams. */ + hr = IMediaDet_put_CurrentStream(pM, 1); + ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream\n"); + hr = IMediaDet_get_OutputStreams(pM, &nstrms); ok(hr == S_OK, "IMediaDet_get_OutputStreams\n"); ok(nstrms == 1, "IMediaDet_get_OutputStreams\n"); @@ -139,13 +165,33 @@ static void test_mediadet(void) hr = IMediaDet_get_Filename(pM, NULL); ok(hr == E_POINTER, "IMediaDet_get_Filename\n"); + strm = -1; + hr = IMediaDet_get_CurrentStream(pM, &strm); + ok(hr == S_OK, "IMediaDet_get_CurrentStream\n"); + ok(strm == 0, "IMediaDet_get_CurrentStream\n"); + + hr = IMediaDet_get_CurrentStream(pM, NULL); + ok(hr == E_POINTER, "IMediaDet_get_CurrentStream\n"); + + hr = IMediaDet_put_CurrentStream(pM, -1); + ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream\n"); + + hr = IMediaDet_put_CurrentStream(pM, 1); + ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream\n"); + + /* Try again. */ + strm = -1; + hr = IMediaDet_get_CurrentStream(pM, &strm); + ok(hr == S_OK, "IMediaDet_get_CurrentStream\n"); + ok(strm == 0, "IMediaDet_get_CurrentStream\n"); + hr = IMediaDet_put_CurrentStream(pM, 0); - todo_wine ok(hr == S_OK, "IMediaDet_put_CurrentStream\n"); + ok(hr == S_OK, "IMediaDet_put_CurrentStream\n"); strm = -1; hr = IMediaDet_get_CurrentStream(pM, &strm); - todo_wine ok(hr == S_OK, "IMediaDet_get_CurrentStream\n"); - todo_wine ok(strm == 0, "IMediaDet_get_CurrentStream\n"); + ok(hr == S_OK, "IMediaDet_get_CurrentStream\n"); + ok(strm == 0, "IMediaDet_get_CurrentStream\n"); ZeroMemory(&mt, sizeof mt); hr = IMediaDet_get_StreamMediaType(pM, &mt); @@ -185,7 +231,7 @@ static void test_mediadet(void) flags = 0; hr = IMediaDet_put_CurrentStream(pM, 0); - todo_wine ok(hr == S_OK, "IMediaDet_put_CurrentStream\n"); + ok(hr == S_OK, "IMediaDet_put_CurrentStream\n"); ZeroMemory(&mt, sizeof mt); hr = IMediaDet_get_StreamMediaType(pM, &mt); @@ -197,7 +243,12 @@ static void test_mediadet(void) : 0)); hr = IMediaDet_put_CurrentStream(pM, 1); - todo_wine ok(hr == S_OK, "IMediaDet_put_CurrentStream\n"); + ok(hr == S_OK, "IMediaDet_put_CurrentStream\n"); + + strm = -1; + hr = IMediaDet_get_CurrentStream(pM, &strm); + ok(hr == S_OK, "IMediaDet_get_CurrentStream\n"); + ok(strm == 1, "IMediaDet_get_CurrentStream\n"); ZeroMemory(&mt, sizeof mt); hr = IMediaDet_get_StreamMediaType(pM, &mt); @@ -210,6 +261,14 @@ static void test_mediadet(void) todo_wine ok(flags == 3, "IMediaDet_get_StreamMediaType\n"); + hr = IMediaDet_put_CurrentStream(pM, 2); + ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream\n"); + + strm = -1; + hr = IMediaDet_get_CurrentStream(pM, &strm); + ok(hr == S_OK, "IMediaDet_get_CurrentStream\n"); + ok(strm == 1, "IMediaDet_get_CurrentStream\n"); + hr = IMediaDet_Release(pM); ok(hr == 0, "IMediaDet_Release returned: %x\n", hr);

1 0