September 2008 - Wine-Commits

Detlef Riekenberg : jscript/tests: Fix a typo in ok().
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 60bbae4b40622627a2106a1354322ce00d62e1fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=60bbae4b40622627a2106a135… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Sep 19 15:23:12 2008 +0200 jscript/tests: Fix a typo in ok(). --- dlls/jscript/tests/lang.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 2a6e04a..dbe714d 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -633,7 +633,7 @@ do { ok(tmp === 0, "tmp !=== 0"); tmp++; } while(false); -ok(tmp === 1, "tmp !== 4"); +ok(tmp === 1, "tmp !== 1"); tmp = 0; while(tmp < 4) {

1 0

Francois Gouget : jscript: Remove spaces before '\n' in Wine traces.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: f26c27acc6e80569567786ae36df6af00247833a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f26c27acc6e80569567786ae3… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Sep 20 13:26:13 2008 +0200 jscript: Remove spaces before '\n' in Wine traces. --- dlls/jscript/regexp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index e8e9bea..863b52e 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -2571,7 +2571,7 @@ SimpleMatch(REGlobalData *gData, REMatchState *x, REOp op, if (!updatecp) x->cp = startcp; *startpc = pc; - TRACE(" * \n"); + TRACE(" *\n"); return result; } x->cp = startcp; @@ -3001,7 +3001,7 @@ ExecuteREBytecode(REGlobalData *gData, REMatchState *x) }while(0) if (!result) { - TRACE(" - \n"); + TRACE(" -\n"); /* * Non-greedy failure - try to consume another child. */

1 0

Alexandre Julliard : winex11: Fix SetLayeredWindowAttributes when called on a thread that doesn' t have any window.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: fb84ba59d91dcb7ee0d0ca8da6b7e15c7dfbfa6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb84ba59d91dcb7ee0d0ca8da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 22 12:52:53 2008 +0200 winex11: Fix SetLayeredWindowAttributes when called on a thread that doesn't have any window. --- dlls/winex11.drv/window.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4c03b4a..b9b2059 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2204,9 +2204,18 @@ int X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) */ void X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags ) { - Window win = X11DRV_get_whole_window( hwnd ); + struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); - if (win) sync_window_opacity( thread_display(), win, key, alpha, flags ); + if (data) + { + if (data->whole_window) + sync_window_opacity( thread_display(), data->whole_window, key, alpha, flags ); + } + else + { + Window win = X11DRV_get_whole_window( hwnd ); + if (win) sync_window_opacity( gdi_display, win, key, alpha, flags ); + } }

1 0

Roderick Colenbrander : wined3d: Re-add a comment which got lost.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: c13b3f6179fb6ec2b0358d72765ff19752b3ddc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c13b3f6179fb6ec2b0358d727… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Sep 21 21:13:27 2008 +0000 wined3d: Re-add a comment which got lost. --- dlls/wined3d/surface.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 004d329..bba2050 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3459,6 +3459,12 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * /* Activate the destination context, set it up for blitting */ ActivateContext(myDevice, (IWineD3DSurface *) This, CTXUSAGE_BLIT); + /* The coordinates of the ddraw front buffer are always fullscreen ('screen coordinates', + * while OpenGL coordinates are window relative. + * Also beware of the origin difference(top left vs bottom left). + * Also beware that the front buffer's surface size is screen width x screen height, + * whereas the real gl drawable size is the size of the window. + */ if (dstSwapchain && (IWineD3DSurface *)This == dstSwapchain->frontBuffer) { RECT windowsize; POINT offset = {0,0};

1 0

Henri Verbeet : wined3d: Don' t try to draw with unsupported attribute data types.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: f84680e66c298b93b1cf78515c42f2be7928568d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f84680e66c298b93b1cf78515… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 18 14:57:54 2008 +0200 wined3d: Don't try to draw with unsupported attribute data types. --- dlls/wined3d/drawprim.c | 17 +++++--- dlls/wined3d/vertexdeclaration.c | 89 +++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 100 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 37cbe19..c4154a7 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -219,17 +219,22 @@ void primitiveDeclarationConvertToStridedData( stride_used = fixed_get_input(element->Usage, element->UsageIndex, &idx); if (stride_used) { - TRACE("Loaded %s array %u [usage=%s, usage_idx=%u, " + TRACE("Load %s array %u [usage=%s, usage_idx=%u, " "stream=%u, offset=%u, stride=%u, type=%s, VBO=%u]\n", useVertexShaderFunction? "shader": "fixed function", idx, debug_d3ddeclusage(element->Usage), element->UsageIndex, element->Stream, element->Offset, stride, debug_d3ddecltype(element->Type), streamVBO); - strided->u.input[idx].lpData = data; - strided->u.input[idx].dwType = element->Type; - strided->u.input[idx].dwStride = stride; - strided->u.input[idx].VBO = streamVBO; - strided->u.input[idx].streamNo = element->Stream; + if (!useVertexShaderFunction && !vertexDeclaration->ffp_valid[i]) { + WARN("Skipping unsupported fixed function element of type %s and usage %s\n", + debug_d3ddecltype(element->Type), debug_d3ddeclusage(element->Usage)); + } else { + strided->u.input[idx].lpData = data; + strided->u.input[idx].dwType = element->Type; + strided->u.input[idx].dwStride = stride; + strided->u.input[idx].VBO = streamVBO; + strided->u.input[idx].streamNo = element->Stream; + } } } /* Now call PreLoad on all the vertex buffers. In the very rare case diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 7b57e55..7fc711b 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -74,6 +74,7 @@ static ULONG WINAPI IWineD3DVertexDeclarationImpl_Release(IWineD3DVertexDeclarat } HeapFree(GetProcessHeap(), 0, This->pDeclarationWine); + HeapFree(GetProcessHeap(), 0, This->ffp_valid); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -118,6 +119,90 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_GetDeclaration(IWineD3DVerte return hr; } +static BOOL declaration_element_valid_ffp(const WINED3DVERTEXELEMENT *element) +{ + switch(element->Usage) + { + case WINED3DDECLUSAGE_POSITION: + case WINED3DDECLUSAGE_POSITIONT: + switch(element->Type) + { + case WINED3DDECLTYPE_FLOAT2: + case WINED3DDECLTYPE_FLOAT3: + case WINED3DDECLTYPE_FLOAT4: + case WINED3DDECLTYPE_SHORT2: + case WINED3DDECLTYPE_SHORT4: + case WINED3DDECLTYPE_FLOAT16_2: + case WINED3DDECLTYPE_FLOAT16_4: + return TRUE; + default: + return FALSE; + } + + case WINED3DDECLUSAGE_BLENDWEIGHT: + switch(element->Type) + { + case WINED3DDECLTYPE_D3DCOLOR: + case WINED3DDECLTYPE_UBYTE4: + case WINED3DDECLTYPE_SHORT2: + case WINED3DDECLTYPE_SHORT4: + case WINED3DDECLTYPE_FLOAT16_2: + case WINED3DDECLTYPE_FLOAT16_4: + return TRUE; + default: + return FALSE; + } + + case WINED3DDECLUSAGE_NORMAL: + switch(element->Type) + { + case WINED3DDECLTYPE_FLOAT3: + case WINED3DDECLTYPE_FLOAT4: + case WINED3DDECLTYPE_SHORT4: + case WINED3DDECLTYPE_FLOAT16_4: + return TRUE; + default: + return FALSE; + } + + case WINED3DDECLUSAGE_TEXCOORD: + switch(element->Type) + { + case WINED3DDECLTYPE_FLOAT1: + case WINED3DDECLTYPE_FLOAT2: + case WINED3DDECLTYPE_FLOAT3: + case WINED3DDECLTYPE_FLOAT4: + case WINED3DDECLTYPE_SHORT2: + case WINED3DDECLTYPE_SHORT4: + case WINED3DDECLTYPE_FLOAT16_2: + case WINED3DDECLTYPE_FLOAT16_4: + return TRUE; + default: + return FALSE; + } + + case WINED3DDECLUSAGE_COLOR: + switch(element->Type) + { + case WINED3DDECLTYPE_FLOAT3: + case WINED3DDECLTYPE_FLOAT4: + case WINED3DDECLTYPE_D3DCOLOR: + case WINED3DDECLTYPE_UBYTE4: + case WINED3DDECLTYPE_SHORT4: + case WINED3DDECLTYPE_UBYTE4N: + case WINED3DDECLTYPE_SHORT4N: + case WINED3DDECLTYPE_USHORT4N: + case WINED3DDECLTYPE_FLOAT16_4: + return TRUE; + default: + return FALSE; + } + + default: + return FALSE; + } +} + static HRESULT WINAPI IWineD3DVertexDeclarationImpl_SetDeclaration(IWineD3DVertexDeclaration *iface, const WINED3DVERTEXELEMENT *elements, UINT element_count) { IWineD3DVertexDeclarationImpl *This = (IWineD3DVertexDeclarationImpl *)iface; @@ -136,7 +221,8 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_SetDeclaration(IWineD3DVerte This->declarationWNumElements = element_count; This->pDeclarationWine = HeapAlloc(GetProcessHeap(), 0, sizeof(WINED3DVERTEXELEMENT) * element_count); - if (!This->pDeclarationWine) { + This->ffp_valid = HeapAlloc(GetProcessHeap(), 0, sizeof(*This->ffp_valid) * element_count); + if (!This->pDeclarationWine || !This->ffp_valid) { ERR("Memory allocation failed\n"); return WINED3DERR_OUTOFVIDEOMEMORY; } else { @@ -149,6 +235,7 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_SetDeclaration(IWineD3DVerte This->num_streams = 0; This->position_transformed = FALSE; for (i = 0; i < element_count; ++i) { + This->ffp_valid[i] = declaration_element_valid_ffp(&This->pDeclarationWine[i]); if(This->pDeclarationWine[i].Usage == WINED3DDECLUSAGE_POSITIONT) { This->position_transformed = TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f2c1701..0354ead 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1500,6 +1500,7 @@ typedef struct IWineD3DVertexDeclarationImpl { IWineD3DDeviceImpl *wineD3DDevice; WINED3DVERTEXELEMENT *pDeclarationWine; + BOOL *ffp_valid; UINT declarationWNumElements; DWORD streams[MAX_STREAMS];

1 0

Philip Nilsson : configure: Add i486-mingw to the cross-compiler prefixes.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 2876bcd098621dfaa16004caa4b7b0915a22a2d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2876bcd098621dfaa16004caa… Author: Philip Nilsson <pnilsson(a)nullref.se> Date: Fri Sep 19 16:17:39 2008 +0200 configure: Add i486-mingw to the cross-compiler prefixes. --- aclocal.m4 | 2 +- configure | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index be9192e..528c4d3 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -141,7 +141,7 @@ dnl AC_DEFUN([WINE_CHECK_MINGW_PROG], [AC_CHECK_PROGS([$1], m4_foreach([ac_wine_prefix], - [i586-mingw32msvc, i386-mingw32msvc, i686-mingw32, i586-mingw32, i386-mingw32, mingw32, mingw], + [i586-mingw32msvc, i386-mingw32msvc, i686-mingw32, i586-mingw32, i486-mingw32, i386-mingw32, mingw32, mingw], [ac_wine_prefix-$2 ]), [$3],[$4])]) diff --git a/configure b/configure index bc57d85..0e75218 100755 --- a/configure +++ b/configure @@ -9384,7 +9384,7 @@ echo "${ECHO_T}$ac_cv_c_dll_hpux" >&6; } if test "$cross_compiling" = "no" then - for ac_prog in i586-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i386-mingw32-gcc mingw32-gcc mingw-gcc + for ac_prog in i586-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc mingw32-gcc mingw-gcc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -9427,7 +9427,7 @@ fi done test -n "$CROSSCC" || CROSSCC="false" - for ac_prog in i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i586-mingw32-dlltool i386-mingw32-dlltool mingw32-dlltool mingw-dlltool + for ac_prog in i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i586-mingw32-dlltool i486-mingw32-dlltool i386-mingw32-dlltool mingw32-dlltool mingw-dlltool do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -9470,7 +9470,7 @@ fi done test -n "$DLLTOOL" || DLLTOOL="false" - for ac_prog in i586-mingw32msvc-windres i386-mingw32msvc-windres i686-mingw32-windres i586-mingw32-windres i386-mingw32-windres mingw32-windres mingw-windres + for ac_prog in i586-mingw32msvc-windres i386-mingw32msvc-windres i686-mingw32-windres i586-mingw32-windres i486-mingw32-windres i386-mingw32-windres mingw32-windres mingw-windres do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -9513,7 +9513,7 @@ fi done test -n "$CROSSWINDRES" || CROSSWINDRES="false" - for ac_prog in i586-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i586-mingw32-ar i386-mingw32-ar mingw32-ar mingw-ar + for ac_prog in i586-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i586-mingw32-ar i486-mingw32-ar i386-mingw32-ar mingw32-ar mingw-ar do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2

1 0

Henri Verbeet : wined3d: Fix a memory leak.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 3862347bce0a8213316324bcd2de857d4776a786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3862347bce0a8213316324bcd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 18 14:57:54 2008 +0200 wined3d: Fix a memory leak. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/vertexdeclaration.c | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6a12b93..ff16f60 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1718,8 +1718,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclaration(IWineD3DDevice* hr = IWineD3DVertexDeclaration_SetDeclaration((IWineD3DVertexDeclaration *)object, elements, element_count); if(FAILED(hr)) { + IWineD3DVertexDeclaration_Release((IWineD3DVertexDeclaration *)object); *ppVertexDeclaration = NULL; - HeapFree(GetProcessHeap(), 0, object); } return hr; diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 936ef57..7b57e55 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -167,7 +167,6 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_SetDeclaration(IWineD3DVerte if(This->pDeclarationWine[i].Offset & 0x3) { WARN("Declaration element %d is not 4 byte aligned(%d), returning E_FAIL\n", i, This->pDeclarationWine[i].Offset); - HeapFree(GetProcessHeap(), 0, This->pDeclarationWine); return E_FAIL; }

1 0

Henri Verbeet : wined3d: Make sure update_minfilter and update_magfilter are initialized.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 459673da1a0f32a53bc47b56659c3786825957c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=459673da1a0f32a53bc47b566… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 22 08:54:58 2008 +0200 wined3d: Make sure update_minfilter and update_magfilter are initialized. --- dlls/wined3d/context.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 76d449a..1d50434 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -77,7 +77,8 @@ static void context_apply_attachment_filter_states(IWineD3DDevice *iface, IWineD IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; const IWineD3DSurfaceImpl *surface_impl = (IWineD3DSurfaceImpl *)surface; IWineD3DBaseTextureImpl *texture_impl; - BOOL update_minfilter, update_magfilter; + BOOL update_minfilter = FALSE; + BOOL update_magfilter = FALSE; /* Update base texture states array */ if (SUCCEEDED(IWineD3DSurface_GetContainer(surface, &IID_IWineD3DBaseTexture, (void **)&texture_impl)))

1 0

Henri Verbeet : wined3d: Destroy FBO entries in the context.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 76de76e5088006fed2c50e890026219c819453a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76de76e5088006fed2c50e890… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 18 14:57:53 2008 +0200 wined3d: Destroy FBO entries in the context. --- dlls/wined3d/context.c | 42 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/device.c | 24 ++++------------------ dlls/wined3d/wined3d_private.h | 3 +- 3 files changed, 47 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1d50434..2aeb5fa 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -226,7 +226,7 @@ static struct fbo_entry *context_create_fbo_entry(IWineD3DDevice *iface) return entry; } -void context_destroy_fbo_entry(IWineD3DDeviceImpl *This, struct fbo_entry *entry) +static void context_destroy_fbo_entry(IWineD3DDeviceImpl *This, struct fbo_entry *entry) { if (entry->id) { @@ -320,6 +320,46 @@ static void context_apply_fbo_state(IWineD3DDevice *iface) context_check_fbo_status(iface); } +void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource, WINED3DRESOURCETYPE type) +{ + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + UINT i; + + switch(type) + { + case WINED3DRTYPE_SURFACE: + { + for (i = 0; i < This->numContexts; ++i) + { + struct fbo_entry *entry, *entry2; + + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &This->contexts[i]->fbo_list, struct fbo_entry, entry) + { + BOOL destroyed = FALSE; + UINT j; + + for (j = 0; !destroyed && j < GL_LIMITS(buffers); ++j) + { + if (entry->render_targets[j] == (IWineD3DSurface *)resource) + { + context_destroy_fbo_entry(This, entry); + destroyed = TRUE; + } + } + + if (!destroyed && entry->depth_stencil == (IWineD3DSurface *)resource) + context_destroy_fbo_entry(This, entry); + } + } + + break; + } + + default: + break; + } +} + /***************************************************************************** * Context_MarkStateDirty * diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4ca96e6..6a12b93 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7325,10 +7325,14 @@ static void WINAPI IWineD3DDeviceImpl_RemoveResource(IWineD3DDevice *iface, IWin static void WINAPI IWineD3DDeviceImpl_ResourceReleased(IWineD3DDevice *iface, IWineD3DResource *resource){ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; + WINED3DRESOURCETYPE type = IWineD3DResource_GetType(resource); int counter; TRACE("(%p) : resource %p\n", This, resource); - switch(IWineD3DResource_GetType(resource)){ + + context_resource_released(iface, resource, type); + + switch (type) { /* TODO: check front and back buffers, rendertargets etc.. possibly swapchains? */ case WINED3DRTYPE_SURFACE: { unsigned int i; @@ -7374,24 +7378,6 @@ static void WINAPI IWineD3DDeviceImpl_ResourceReleased(IWineD3DDevice *iface, IW if (This->stencilBufferTarget == (IWineD3DSurface *)resource) { This->stencilBufferTarget = NULL; } - - for (i = 0; i < This->numContexts; ++i) { - struct fbo_entry *entry, *entry2; - int j; - - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &This->contexts[i]->fbo_list, struct fbo_entry, entry) { - BOOL destroyed = FALSE; - for (j = 0; !destroyed && j < GL_LIMITS(buffers); ++j) { - if (entry->render_targets[j] == (IWineD3DSurface *)resource) { - context_destroy_fbo_entry(This, entry); - destroyed = TRUE; - } - } - if (!destroyed && entry->depth_stencil == (IWineD3DSurface *)resource) { - context_destroy_fbo_entry(This, entry); - } - } - } } break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d347807..f2c1701 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -629,6 +629,7 @@ typedef enum ContextUsage { void ActivateContext(IWineD3DDeviceImpl *device, IWineD3DSurface *target, ContextUsage usage); WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, HWND win, BOOL create_pbuffer, const WINED3DPRESENT_PARAMETERS *pPresentParms); void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context); +void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource, WINED3DRESOURCETYPE type); void context_bind_fbo(IWineD3DDevice *iface, GLenum target, GLuint *fbo); void context_attach_depth_stencil_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, IWineD3DSurface *depth_stencil, BOOL use_render_buffer); void context_attach_surface_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, DWORD idx, IWineD3DSurface *surface); @@ -2442,6 +2443,4 @@ static inline BOOL use_ps(IWineD3DDeviceImpl *device) { void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED3DRECT *src_rect, IWineD3DSurface *dst_surface, WINED3DRECT *dst_rect, const WINED3DTEXTUREFILTERTYPE filter, BOOL flip); void depth_blt(IWineD3DDevice *iface, GLuint texture, GLsizei w, GLsizei h); - -void context_destroy_fbo_entry(IWineD3DDeviceImpl *This, struct fbo_entry *entry); #endif

1 0

Stefan Dösinger : wined3d: Initialize standalone surface parameters.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 2e6717ab79b5679839c9a68f0823f831cf2b457d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e6717ab79b5679839c9a68f0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 22 08:54:40 2008 +0200 wined3d: Initialize standalone surface parameters. --- dlls/wined3d/surface.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index be6ffb3..004d329 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2365,6 +2365,19 @@ static void WINAPI IWineD3DSurfaceImpl_BindTexture(IWineD3DSurface *iface) { glGenTextures(1, &This->glDescription.textureName); checkGLcall("glGenTextures"); TRACE("Surface %p given name %d\n", This, This->glDescription.textureName); + + glBindTexture(This->glDescription.target, This->glDescription.textureName); + checkGLcall("glBindTexture"); + glTexParameteri(This->glDescription.target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + checkGLcall("glTexParameteri(dimension, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE)"); + glTexParameteri(This->glDescription.target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + checkGLcall("glTexParameteri(dimension, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE)"); + glTexParameteri(This->glDescription.target, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); + checkGLcall("glTexParameteri(dimension, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE)"); + glTexParameteri(This->glDescription.target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + checkGLcall("glTexParameteri(dimension, GL_TEXTURE_MIN_FILTER, GL_NEAREST)"); + glTexParameteri(This->glDescription.target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + checkGLcall("glTexParameteri(dimension, GL_TEXTURE_MAG_FILTER, GL_NEAREST)"); } /* This is where we should be reducing the amount of GLMemoryUsed */ } else if (This->glDescription.textureName) {

1 0