March 2009 - Wine-commits - list.winehq.org

Henri Verbeet : d3d10core: Implement ID3D10Device::IASetInputLayout().
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: de7749b3fbf447399f8d1b22268e6043302a7bb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de7749b3fbf447399f8d1b222… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 09:38:14 2009 +0200 d3d10core: Implement ID3D10Device::IASetInputLayout(). --- dlls/d3d10core/device.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index ff31b53..336ae85 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -166,7 +166,12 @@ static void STDMETHODCALLTYPE d3d10_device_PSSetConstantBuffers(ID3D10Device *if static void STDMETHODCALLTYPE d3d10_device_IASetInputLayout(ID3D10Device *iface, ID3D10InputLayout *input_layout) { - FIXME("iface %p, input_layout %p stub!\n", iface, input_layout); + struct d3d10_device *This = (struct d3d10_device *)iface; + + TRACE("iface %p, input_layout %p\n", iface, input_layout); + + IWineD3DDevice_SetVertexDeclaration(This->wined3d_device, + ((struct d3d10_input_layout *)input_layout)->wined3d_decl); } static void STDMETHODCALLTYPE d3d10_device_IASetVertexBuffers(ID3D10Device *iface,

1 0

Henri Verbeet : d3d10core: Implement ID3D10Device::IASetVertexBuffers().
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 9ef184c168f47ae0c611b288c7ca0e9f45ce3fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ef184c168f47ae0c611b288c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 09:38:14 2009 +0200 d3d10core: Implement ID3D10Device::IASetVertexBuffers(). --- dlls/d3d10core/device.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 336ae85..bd82316 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -178,8 +178,17 @@ static void STDMETHODCALLTYPE d3d10_device_IASetVertexBuffers(ID3D10Device *ifac UINT start_slot, UINT buffer_count, ID3D10Buffer *const *buffers, const UINT *strides, const UINT *offsets) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p, strides %p, offsets %p stub!\n", + struct d3d10_device *This = (struct d3d10_device *)iface; + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p, strides %p, offsets %p\n", iface, start_slot, buffer_count, buffers, strides, offsets); + + for (i = 0; i < buffer_count; ++i) + { + IWineD3DDevice_SetStreamSource(This->wined3d_device, start_slot, + ((struct d3d10_buffer *)buffers[i])->wined3d_buffer, offsets[i], strides[i]); + } } static void STDMETHODCALLTYPE d3d10_device_IASetIndexBuffer(ID3D10Device *iface,

1 0

Henri Verbeet : wined3d: Care for things like pitch and blocksize when copying DXT surfaces.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 0591442469b8dfe28b05fb001d6b2338448d54aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=0591442469b8dfe28b05fb001… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 09:38:14 2009 +0200 wined3d: Care for things like pitch and blocksize when copying DXT surfaces. --- dlls/wined3d/surface_base.c | 37 +++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 8d9d941..4b1629d 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1664,6 +1664,10 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst /* Handle first the FOURCC surfaces... */ if (sEntry->Flags & dEntry->Flags & WINED3DFMT_FLAG_FOURCC) { + UINT block_width; + UINT block_height; + UINT block_byte_size; + TRACE("Fourcc -> Fourcc copy\n"); if (trans) FIXME("trans arg not supported when a FOURCC surface is involved\n"); @@ -1675,8 +1679,37 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst ret = WINED3DERR_WRONGTEXTUREFORMAT; goto error; } - /* FIXME: Watch out that the size is correct for FOURCC surfaces */ - memcpy(dbuf, sbuf, This->resource.size); + + if (This->resource.format_desc->format == WINED3DFMT_DXT1) + { + block_width = 4; + block_height = 4; + block_byte_size = 8; + } + else if (This->resource.format_desc->format == WINED3DFMT_DXT2 + || This->resource.format_desc->format == WINED3DFMT_DXT3 + || This->resource.format_desc->format == WINED3DFMT_DXT4 + || This->resource.format_desc->format == WINED3DFMT_DXT5) + { + block_width = 4; + block_height = 4; + block_byte_size = 16; + } + else + { + FIXME("Unsupported FourCC format %s.\n", debug_d3dformat(This->resource.format_desc->format)); + block_width = 1; + block_height = 1; + block_byte_size = This->resource.format_desc->byte_count; + } + + for (y = 0; y < h; y += block_height) + { + memcpy(dbuf, sbuf, (w / block_width) * block_byte_size); + dbuf += dlock.Pitch; + sbuf += slock.Pitch; + } + goto error; } if ((sEntry->Flags & WINED3DFMT_FLAG_FOURCC) && !(dEntry->Flags & WINED3DFMT_FLAG_FOURCC))

1 0

Henri Verbeet : d3d10core: Set the initial buffer data, when present.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 4ccbc948a16eb84180381bd9e2359484e91e2c7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ccbc948a16eb84180381bd9e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 09:38:14 2009 +0200 d3d10core: Set the initial buffer data, when present. --- dlls/d3d10core/device.c | 2 +- dlls/wined3d/device.c | 27 +++++++++++++++++++++++++-- include/wine/wined3d.idl | 1 + 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index bd82316..b0eae7f 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -620,7 +620,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBuffer(ID3D10Device *iface, wined3d_desc.misc_flags = desc->MiscFlags; hr = IWineD3DDevice_CreateBuffer(This->wined3d_device, &wined3d_desc, - (IUnknown *)object, &object->wined3d_buffer); + data ? data->pSysMem : NULL, (IUnknown *)object, &object->wined3d_buffer); if (FAILED(hr)) { ERR("CreateBuffer failed, returning %#x\n", hr); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0f6885f..aebcfaf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -435,13 +435,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetParent(IWineD3DDevice *iface, IUnkno } static HRESULT WINAPI IWineD3DDeviceImpl_CreateBuffer(IWineD3DDevice *iface, - struct wined3d_buffer_desc *desc, IUnknown *parent, IWineD3DBuffer **buffer) + struct wined3d_buffer_desc *desc, const void *data, IUnknown *parent, IWineD3DBuffer **buffer) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; struct wined3d_buffer *object; HRESULT hr; - TRACE("iface %p, desc %p, parent %p, buffer %p\n", iface, desc, parent, buffer); + TRACE("iface %p, desc %p, data %p, parent %p, buffer %p\n", iface, desc, data, parent, buffer); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) @@ -471,6 +471,29 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateBuffer(IWineD3DDevice *iface, TRACE("size %#x, usage=%#x, format %s, memory @ %p, iface @ %p\n", object->resource.size, object->resource.usage, debug_d3dformat(object->resource.format_desc->format), object->resource.allocatedMemory, object); + if (data) + { + BYTE *ptr; + + hr = IWineD3DBuffer_Map((IWineD3DBuffer *)object, 0, desc->byte_width, &ptr, 0); + if (FAILED(hr)) + { + ERR("Failed to map buffer, hr %#x\n", hr); + IWineD3DBuffer_Release((IWineD3DBuffer *)object); + return hr; + } + + memcpy(ptr, data, desc->byte_width); + + hr = IWineD3DBuffer_Unmap((IWineD3DBuffer *)object); + if (FAILED(hr)) + { + ERR("Failed to unmap buffer, hr %#x\n", hr); + IWineD3DBuffer_Release((IWineD3DBuffer *)object); + return hr; + } + } + *buffer = (IWineD3DBuffer *)object; return WINED3D_OK; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index ad6197f..604781b 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2909,6 +2909,7 @@ interface IWineD3DDevice : IWineD3DBase { HRESULT CreateBuffer( [in] struct wined3d_buffer_desc *desc, + [in] const void *data, [in] IUnknown *parent, [out] IWineD3DBuffer **buffer );

1 0

Henri Verbeet : wined3d: Don' t leak the swapchain in IWineD3DDeviceImpl_Reset() if the display mode is unsupported.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 7f740f2a51f564be6f6ba47c66b3234811c73d4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f740f2a51f564be6f6ba47c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 09:38:14 2009 +0200 wined3d: Don't leak the swapchain in IWineD3DDeviceImpl_Reset() if the display mode is unsupported. --- dlls/wined3d/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index aebcfaf..ecc00d6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7605,6 +7605,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE WARN("Rejecting Reset() call because the requested display mode is not supported\n"); WARN("Requested mode: %d, %d\n", pPresentationParameters->BackBufferWidth, pPresentationParameters->BackBufferHeight); + IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); return WINED3DERR_INVALIDCALL; }

1 0

Alexandre Julliard : inetcomm: Include ws2tcpip.h before anything else.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 2e8d68d68301d3f6a4a4874a38d29dd5203161fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e8d68d68301d3f6a4a4874a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 31 12:12:13 2009 +0200 inetcomm: Include ws2tcpip.h before anything else. --- dlls/inetcomm/internettransport.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/inetcomm/internettransport.c b/dlls/inetcomm/internettransport.c index f0499bc..af4772c 100644 --- a/dlls/inetcomm/internettransport.c +++ b/dlls/inetcomm/internettransport.c @@ -20,19 +20,15 @@ #define COBJMACROS -#include <stdarg.h> -#include <stdio.h> - +#include "ws2tcpip.h" #include "windef.h" -#include "winbase.h" #include "winnt.h" -#include "winuser.h" -#include "winsock2.h" -#include "ws2tcpip.h" #include "objbase.h" #include "ole2.h" #include "mimeole.h" +#include <stdio.h> + #include "wine/debug.h" #include "inetcomm_private.h"

1 0

Alexandre Julliard : ws2_32/tests: Don't use socklen_t.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 65e71259df49574bb3c63ca9ba5f9d417b077fff URL: http://source.winehq.org/git/wine.git/?a=commit;h=65e71259df49574bb3c63ca9b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 31 12:13:15 2009 +0200 ws2_32/tests: Don't use socklen_t. --- dlls/ws2_32/tests/sock.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 22455ef..ffc7ba9 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -270,7 +270,7 @@ static int do_synchronous_recv ( SOCKET s, char *buf, int buflen, int recvlen ) return p - buf; } -static int do_synchronous_recvfrom ( SOCKET s, char *buf, int buflen,int flags,struct sockaddr *from, socklen_t *fromlen, int recvlen ) +static int do_synchronous_recvfrom ( SOCKET s, char *buf, int buflen,int flags,struct sockaddr *from, int *fromlen, int recvlen ) { char* last = buf + buflen, *p; int n = 1; @@ -642,7 +642,7 @@ static VOID WINAPI simple_mixed_client ( client_params *par ) test_params *gen = par->general; client_memory *mem; int pos, n_sent, n_recvd, n_expected = gen->n_chunks * gen->chunk_size, id; - socklen_t fromLen = sizeof(mem->addr); + int fromLen = sizeof(mem->addr); struct sockaddr test; id = GetCurrentThreadId();

1 0

Alexandre Julliard : include: Try to avoid socklen_t redefinition in winsock.h.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: a6aa7771d3b7db21819ce8f07518f85149404039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6aa7771d3b7db21819ce8f07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 31 12:19:03 2009 +0200 include: Try to avoid socklen_t redefinition in winsock.h. --- include/winsock.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/winsock.h b/include/winsock.h index 537e16a..6870197 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -79,12 +79,14 @@ # define fd_set unix_fd_set # define timeval unix_timeval # define select unix_select +# define socklen_t unix_socklen_t # include <sys/types.h> # include <time.h> # include <stdlib.h> # undef fd_set # undef timeval # undef select +# undef socklen_t # undef FD_SETSIZE # undef FD_CLR # undef FD_SET

1 0

Alexandre Julliard : winedos: Release the 16-bit lock before calling ExitThread.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: c5bdfdfb2da8c2cb414a3263939467d920b987cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5bdfdfb2da8c2cb414a32639… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 31 12:39:10 2009 +0200 winedos: Release the 16-bit lock before calling ExitThread. This avoids deadlocks with the loader lock. --- dlls/winedos/dosexe.h | 1 + dlls/winedos/int21.c | 4 ++-- dlls/winedos/int31.c | 4 ++-- dlls/winedos/interrupts.c | 2 +- dlls/winedos/module.c | 16 ++++++++++++++-- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/winedos/dosexe.h b/dlls/winedos/dosexe.h index 023d691..77eed9e 100644 --- a/dlls/winedos/dosexe.h +++ b/dlls/winedos/dosexe.h @@ -352,6 +352,7 @@ extern BOOL WINAPI MZ_Current( void ); extern void WINAPI MZ_AllocDPMITask( void ); extern void WINAPI MZ_RunInThread( PAPCFUNC proc, ULONG_PTR arg ); extern BOOL DOSVM_IsWin16(void); +extern void DOSVM_Exit( WORD retval ); /* dosvm.c */ extern void DOSVM_SendQueuedEvents( CONTEXT86 * ); diff --git a/dlls/winedos/int21.c b/dlls/winedos/int21.c index cbce913..79aa8ea 100644 --- a/dlls/winedos/int21.c +++ b/dlls/winedos/int21.c @@ -4176,7 +4176,7 @@ void WINAPI DOSVM_Int21Handler( CONTEXT86 *context ) case 0x00: /* TERMINATE PROGRAM */ TRACE("TERMINATE PROGRAM\n"); if (DOSVM_IsWin16()) - ExitThread( 0 ); + DOSVM_Exit( 0 ); else if(ISV86(context)) MZ_Exit( context, FALSE, 0 ); else @@ -5050,7 +5050,7 @@ void WINAPI DOSVM_Int21Handler( CONTEXT86 *context ) case 0x4c: /* "EXIT" - TERMINATE WITH RETURN CODE */ TRACE( "EXIT with return code %d\n", AL_reg(context) ); if (DOSVM_IsWin16()) - ExitThread( AL_reg(context) ); + DOSVM_Exit( AL_reg(context) ); else if(ISV86(context)) MZ_Exit( context, FALSE, AL_reg(context) ); else diff --git a/dlls/winedos/int31.c b/dlls/winedos/int31.c index e555e97..9cc9e90 100644 --- a/dlls/winedos/int31.c +++ b/dlls/winedos/int31.c @@ -626,11 +626,11 @@ static void StartPM( CONTEXT86 *context ) TRACE( "Protected mode DOS program is terminating\n" ); /* - * FIXME: Instead of calling ExitThread, we should release all + * FIXME: Instead of calling DOSVM_Exit, we should release all * allocated protected mode resources and call MZ_Exit * using real mode context. See DPMI specification. */ - ExitThread( DPMI_retval ); + DOSVM_Exit( DPMI_retval ); #if 0 wine_ldt_free_entries( psp->environment, 1 ); diff --git a/dlls/winedos/interrupts.c b/dlls/winedos/interrupts.c index db0f17e..81cb2bb 100644 --- a/dlls/winedos/interrupts.c +++ b/dlls/winedos/interrupts.c @@ -951,7 +951,7 @@ static void WINAPI DOSVM_Int1aHandler( CONTEXT86 *context ) static void WINAPI DOSVM_Int20Handler( CONTEXT86 *context ) { if (DOSVM_IsWin16()) - ExitThread( 0 ); + DOSVM_Exit( 0 ); else if(ISV86(context)) MZ_Exit( context, TRUE, 0 ); else diff --git a/dlls/winedos/module.c b/dlls/winedos/module.c index a88aa0c..3b2abe7 100644 --- a/dlls/winedos/module.c +++ b/dlls/winedos/module.c @@ -64,6 +64,18 @@ BOOL DOSVM_IsWin16(void) return DOSVM_isdosexe ? FALSE : TRUE; } +/********************************************************************** + * DOSVM_Exit + */ +void DOSVM_Exit( WORD retval ) +{ + DWORD count; + + ReleaseThunkLock( &count ); + ExitThread( retval ); +} + + #ifdef MZ_SUPPORTED #ifdef HAVE_SYS_MMAN_H @@ -731,7 +743,7 @@ void WINAPI MZ_Exit( CONTEXT86 *context, BOOL cs_psp, WORD retval ) } else TRACE("killing DOS task\n"); } - ExitThread( retval ); + DOSVM_Exit( retval ); } @@ -785,7 +797,7 @@ void WINAPI MZ_RunInThread( PAPCFUNC proc, ULONG_PTR arg ) */ void WINAPI MZ_Exit( CONTEXT86 *context, BOOL cs_psp, WORD retval ) { - ExitThread( retval ); + DOSVM_Exit( retval ); } /***********************************************************************

1 0

Tobias Jakobi : wined3d: Add pow2Matrix_identity flag to BaseTextureClass struct.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 31f8cd9621f6074293eeac21745adfce7cefdaef URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f8cd9621f6074293eeac217… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Thu Mar 26 03:12:50 2009 +0100 wined3d: Add pow2Matrix_identity flag to BaseTextureClass struct. New flag helps to quickly find out whether the pow2Matrix is a identity matrix (no texcoord fixup needed) or not. --- dlls/wined3d/basetexture.c | 1 + dlls/wined3d/device.c | 18 +++++++++++++++--- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 8349064..caf2148 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -35,6 +35,7 @@ void basetexture_init(struct IWineD3DBaseTextureClass *texture, UINT levels, DWO texture->dirty = TRUE; texture->srgbDirty = TRUE; texture->is_srgb = FALSE; + texture->pow2Matrix_identity = TRUE; } void basetexture_cleanup(IWineD3DBaseTexture *iface) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5d3f400..0f6885f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1233,6 +1233,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, (Width != pow2Width || Height != pow2Height) && !((Format == WINED3DFMT_P8) && GL_SUPPORT(EXT_PALETTED_TEXTURE) && (wined3d_settings.rendertargetlock_mode == RTL_READTEX || wined3d_settings.rendertargetlock_mode == RTL_TEXTEX))) { + if ((Width != 1) || (Height != 1)) { + object->baseTexture.pow2Matrix_identity = FALSE; + } + object->baseTexture.pow2Matrix[0] = (float)Width; object->baseTexture.pow2Matrix[5] = (float)Height; object->baseTexture.pow2Matrix[10] = 1.0; @@ -1241,8 +1245,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, object->cond_np2 = TRUE; object->baseTexture.minMipLookup = minMipLookup_noFilter; } else { - object->baseTexture.pow2Matrix[0] = (((float)Width) / ((float)pow2Width)); - object->baseTexture.pow2Matrix[5] = (((float)Height) / ((float)pow2Height)); + if ((Width != pow2Width) || (Height != pow2Height)) { + object->baseTexture.pow2Matrix_identity = FALSE; + object->baseTexture.pow2Matrix[0] = (((float)Width) / ((float)pow2Width)); + object->baseTexture.pow2Matrix[5] = (((float)Height) / ((float)pow2Height)); + } else { + object->baseTexture.pow2Matrix[0] = 1.0; + object->baseTexture.pow2Matrix[5] = 1.0; + } + object->baseTexture.pow2Matrix[10] = 1.0; object->baseTexture.pow2Matrix[15] = 1.0; object->target = GL_TEXTURE_2D; @@ -1540,7 +1551,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface pow2EdgeLength = 1; while (pow2EdgeLength < EdgeLength) pow2EdgeLength <<= 1; - if (GL_SUPPORT(ARB_TEXTURE_NON_POWER_OF_TWO)) { + if (GL_SUPPORT(ARB_TEXTURE_NON_POWER_OF_TWO) || (EdgeLength == pow2EdgeLength)) { /* Precalculated scaling for 'faked' non power of two texture coords */ object->baseTexture.pow2Matrix[ 0] = 1.0; object->baseTexture.pow2Matrix[ 5] = 1.0; @@ -1552,6 +1563,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface object->baseTexture.pow2Matrix[ 5] = ((float)EdgeLength) / ((float)pow2EdgeLength); object->baseTexture.pow2Matrix[10] = ((float)EdgeLength) / ((float)pow2EdgeLength); object->baseTexture.pow2Matrix[15] = 1.0; + object->baseTexture.pow2Matrix_identity = FALSE; } if (object->resource.format_desc->Flags & WINED3DFMT_FLAG_FILTERING) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fdd28da..abab9dc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1384,6 +1384,7 @@ typedef struct IWineD3DBaseTextureClass LONG bindCount; DWORD sampler; BOOL is_srgb; + BOOL pow2Matrix_identity; const struct min_lookup *minMipLookup; const GLenum *magLookup; void (*internal_preload)(IWineD3DBaseTexture *iface, enum WINED3DSRGB srgb);

1 0