wine-commits July 2008

wine-commits@winehq.org

3 participants
1114 discussions

Dylan Smith : richedit: Fixed regression caused by destroying the caret.
by Alexandre Julliard 16 Jul '08

16 Jul '08

Module: wine Branch: master Commit: 97d56caafe42b13da2283057f818db54963347d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97d56caafe42b13da2283057f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jul 15 16:33:22 2008 -0400 richedit: Fixed regression caused by destroying the caret. The regression was caused by destroying the caret when it didn't need to be shown in the richedit control, but this affected other controls. --- dlls/riched20/caret.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index da83c9d..30bb956 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -242,8 +242,6 @@ ME_MoveCaret(ME_TextEditor *editor) x = min(x, rect.right-2); CreateCaret(editor->hWnd, NULL, 0, height); SetCaretPos(x, y); - } else { - DestroyCaret(); } }

1 0

Luis Busquets : d3dx9: Add a test for D3DXGetShaderSize().
by Alexandre Julliard 16 Jul '08

16 Jul '08

Module: wine Branch: master Commit: 9e2b04893c8ac3b6155441960a84167d2c6a82fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e2b04893c8ac3b6155441960… Author: Luis Busquets <luis.busquets(a)ilidium.com> Date: Mon Jul 14 22:47:28 2008 +0200 d3dx9: Add a test for D3DXGetShaderSize(). --- dlls/d3dx9_36/tests/Makefile.in | 3 +- dlls/d3dx9_36/tests/shader.c | 60 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/Makefile.in b/dlls/d3dx9_36/tests/Makefile.in index 5d72504..40500e2 100644 --- a/dlls/d3dx9_36/tests/Makefile.in +++ b/dlls/d3dx9_36/tests/Makefile.in @@ -6,7 +6,8 @@ TESTDLL = d3dx9_36.dll IMPORTS = d3dx9 kernel32 CTESTS = \ - math.c + math.c \ + shader.c @MAKE_TEST_RULES@ diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c new file mode 100644 index 0000000..b08285d --- /dev/null +++ b/dlls/d3dx9_36/tests/shader.c @@ -0,0 +1,60 @@ +/* + * Copyright 2008 Luis Busquets + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/test.h" +#include "d3dx9.h" + +static const DWORD simple_vs[] = { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position0 v0 */ + 0x00000009, 0xc0010000, 0x90e40000, 0xa0e40000, /* dp4 oPos.x, v0, c0 */ + 0x00000009, 0xc0020000, 0x90e40000, 0xa0e40001, /* dp4 oPos.y, v0, c1 */ + 0x00000009, 0xc0040000, 0x90e40000, 0xa0e40002, /* dp4 oPos.z, v0, c2 */ + 0x00000009, 0xc0080000, 0x90e40000, 0xa0e40003, /* dp4 oPos.w, v0, c3 */ + 0x0000ffff}; /* END */ + +static const DWORD simple_ps[] = { + 0xffff0101, /* ps_1_1 */ + 0x00000051, 0xa00f0001, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, /* def c1 = 1.0, 0.0, 0.0, 0.0 */ + 0x00000042, 0xb00f0000, /* tex t0 */ + 0x00000008, 0x800f0000, 0xa0e40001, 0xa0e40000, /* dp3 r0, c1, c0 */ + 0x00000005, 0x800f0000, 0x90e40000, 0x80e40000, /* mul r0, v0, r0 */ + 0x00000005, 0x800f0000, 0xb0e40000, 0x80e40000, /* mul r0, t0, r0 */ + 0x0000ffff}; /* END */ + + +static void test_get_shader_size(void) +{ + UINT shader_size, expected; + + shader_size = D3DXGetShaderSize(simple_vs); + expected = sizeof(simple_vs); + ok(shader_size == expected, "Got shader size %u, expected %u\n", shader_size, expected); + + shader_size = D3DXGetShaderSize(simple_ps); + expected = sizeof(simple_ps); + ok(shader_size == expected, "Got shader size %u, expected %u\n", shader_size, expected); + + shader_size = D3DXGetShaderSize(NULL); + ok(shader_size == 0, "Got shader size %u, expected 0\n", shader_size); +} + +START_TEST(shader) +{ + test_get_shader_size(); +}

1 0

Luis Busquets : d3dx9: Implement D3DXGetShaderSize().
by Alexandre Julliard 16 Jul '08

16 Jul '08

Module: wine Branch: master Commit: 9a93a49174c458fb25d110ee8ef3df6521becf8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a93a49174c458fb25d110ee8… Author: Luis Busquets <luis.busquets(a)ilidium.com> Date: Mon Jul 14 22:47:19 2008 +0200 d3dx9: Implement D3DXGetShaderSize(). --- dlls/d3dx9_36/Makefile.in | 3 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/shader.c | 49 +++++++++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/d3dx9.h | 1 + include/d3dx9shader.h | 34 +++++++++++++++++++++++++++++ 6 files changed, 88 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index 4c3f09a..78cfd97 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -9,7 +9,8 @@ IMPORTS = d3d9 d3dx8 kernel32 C_SRCS = \ d3dx9_36_main.c \ font.c \ - math.c + math.c \ + shader.c RC_SRCS = version.rc diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index e616d23..93ba132 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -162,7 +162,7 @@ @ stub D3DXGetShaderInputSemantics @ stub D3DXGetShaderOutputSemantics @ stub D3DXGetShaderSamplers -@ stub D3DXGetShaderSize +@ stdcall D3DXGetShaderSize(ptr) @ stub D3DXGetShaderVersion @ stub D3DXGetVertexShaderProfile @ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) d3dx8.D3DXIntersect diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c new file mode 100644 index 0000000..bbda961 --- /dev/null +++ b/dlls/d3dx9_36/shader.c @@ -0,0 +1,49 @@ +/* + * Copyright 2008 Luis Busquets + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" +#include "wine/debug.h" +#include "windef.h" +#include "wingdi.h" +#include "d3dx9.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +UINT WINAPI D3DXGetShaderSize(const DWORD *byte_code) +{ + const DWORD *ptr = byte_code; + + TRACE("byte_code %p\n", byte_code); + + if (!ptr) return 0; + + /* Look for the END token, skipping the VERSION token */ + while (*++ptr != D3DSIO_END) + { + /* Skip comments */ + if ((*ptr & D3DSI_OPCODE_MASK) == D3DSIO_COMMENT) + { + ptr += ((*ptr & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT); + } + } + ++ptr; + + /* Return the shader size in bytes */ + return (ptr - byte_code) * sizeof(*ptr); +} diff --git a/include/Makefile.in b/include/Makefile.in index 5631199..56cc587 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -133,6 +133,7 @@ SRCDIR_INCLUDES = \ d3dx9core.h \ d3dx9math.h \ d3dx9math.inl \ + d3dx9shader.h \ d3dx9tex.h \ dbghelp.h \ dbinit.idl \ diff --git a/include/d3dx9.h b/include/d3dx9.h index 50b1b5a..b551eba 100644 --- a/include/d3dx9.h +++ b/include/d3dx9.h @@ -24,6 +24,7 @@ #include "d3d9.h" #include "d3dx9math.h" #include "d3dx9core.h" +#include "d3dx9shader.h" #include "d3dx9tex.h" #define _FACDD 0x876 diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h new file mode 100644 index 0000000..5eb4fe6 --- /dev/null +++ b/include/d3dx9shader.h @@ -0,0 +1,34 @@ +/* + * Copyright 2008 Luis Busquets + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __D3DX9SHADER_H__ +#define __D3DX9SHADER_H__ + +#include "d3dx9.h" + +#ifdef __cplusplus +extern "C" { +#endif + +UINT WINAPI D3DXGetShaderSize(const DWORD *byte_code); + +#ifdef __cplusplus +} +#endif + +#endif /* __D3DX9SHADER_H__ */

1 0

Maarten Lankhorst : quartz: Fix wrong assignment of variable in parser.
by Alexandre Julliard 16 Jul '08

16 Jul '08

Module: wine Branch: master Commit: 5299795a8dd55c81e40208eb9a57e5cb64e3732e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5299795a8dd55c81e40208eb9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Jul 14 11:49:08 2008 -0700 quartz: Fix wrong assignment of variable in parser. --- dlls/quartz/parser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 91d1ce9..7f25300 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -317,7 +317,7 @@ HRESULT WINAPI Parser_Run(IBaseFilter * iface, REFERENCE_TIME tStart) hr_any = hr; } - hr_any = hr; + hr = hr_any; if (SUCCEEDED(hr)) { LeaveCriticalSection(&This->csFilter);

1 0

Dan Hipschman : kernel32/tests: Fix p_BindIoCompletionCallback declaration so it compiles with the MS compiler .
by Alexandre Julliard 16 Jul '08

16 Jul '08

Module: wine Branch: master Commit: c70e6125bf7a3ee8d15b42f47d38527e7e960370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c70e6125bf7a3ee8d15b42f47… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Jul 15 17:49:57 2008 -0700 kernel32/tests: Fix p_BindIoCompletionCallback declaration so it compiles with the MS compiler. --- dlls/kernel32/tests/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 842a6e9..8d365ff 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -432,7 +432,7 @@ static void CALLBACK iocp_callback(DWORD dwErrorCode, DWORD dwNumberOfBytesTrans ReleaseSemaphore(sem, 1, NULL); } -static BOOL WINAPI (*p_BindIoCompletionCallback)( HANDLE FileHandle, LPOVERLAPPED_COMPLETION_ROUTINE Function, ULONG Flags) = NULL; +static BOOL (WINAPI *p_BindIoCompletionCallback)( HANDLE FileHandle, LPOVERLAPPED_COMPLETION_ROUTINE Function, ULONG Flags) = NULL; static void test_iocp_callback(void) {

1 0

Dan Hipschman : libs/wine: Avoid over-allocating memory in default_dbgstr_wn.
by Alexandre Julliard 16 Jul '08

16 Jul '08

Module: wine Branch: master Commit: 1b392bfa069eb43f0d6a65a4d623c95b6f624d85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b392bfa069eb43f0d6a65a4d… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Jul 15 15:55:36 2008 -0700 libs/wine: Avoid over-allocating memory in default_dbgstr_wn. --- libs/wine/debug.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wine/debug.c b/libs/wine/debug.c index 67cc172..12dbeb8 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -339,7 +339,7 @@ static const char *default_dbgstr_wn( const WCHAR *str, int n ) } if (n < 0) n = 0; size = 12 + min( 300, n * 5 ); - dst = res = funcs.get_temp_buffer( n * 5 + 7 ); + dst = res = funcs.get_temp_buffer( size ); *dst++ = 'L'; *dst++ = '"'; while (n-- > 0 && dst <= res + size - 10)

1 0

Rob Shearman : rpcrt4: Fix the memory pointer passed into the conformant array marshaller in NdrComplexStructMarshall .
by Alexandre Julliard 16 Jul '08

16 Jul '08

Module: wine Branch: master Commit: 8af1dba5a9f7ba29c8b319e46db13fbf1a64858f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8af1dba5a9f7ba29c8b319e46… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Jul 15 23:35:40 2008 +0100 rpcrt4: Fix the memory pointer passed into the conformant array marshaller in NdrComplexStructMarshall. It needs to be the end of the memory used by the constant part of the structure, which is returned by CompkexStructMarshall. --- dlls/rpcrt4/ndr_marshall.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 3d06cf1..836410b 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2858,7 +2858,7 @@ unsigned char * WINAPI NdrComplexStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, pStubMsg->Memory = pMemory; - ComplexMarshall(pStubMsg, pMemory, pFormat, pointer_desc); + pMemory = ComplexMarshall(pStubMsg, pMemory, pFormat, pointer_desc); if (conf_array) NdrConformantArrayMarshall(pStubMsg, pMemory, conf_array);

1 0

H. Verbeet : wined3d: Use rev_tex_unit_map instead of assuming there's a 1: 1 mapping between samplers and texture units.
by Alexandre Julliard 16 Jul '08

16 Jul '08

Module: wine Branch: master Commit: 7f741f0414f3cbdb8baf8cfce5946a11b4f2cb17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f741f0414f3cbdb8baf8cfce… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jul 15 23:54:44 2008 +0200 wined3d: Use rev_tex_unit_map instead of assuming there's a 1:1 mapping between samplers and texture units. --- dlls/wined3d/context.c | 25 +++++++++++++++++++------ dlls/wined3d/device.c | 13 ++++++++++--- dlls/wined3d/surface.c | 12 ++++++++---- 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4701f9a..efa1006 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -640,7 +640,7 @@ static inline void set_blit_dimension(UINT width, UINT height) { * *****************************************************************************/ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *context, UINT width, UINT height) { - int i; + int i, sampler; const struct StateEntry *StateTable = This->StateTable; TRACE("Setting up context %p for blitting\n", context); @@ -677,6 +677,7 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex * function texture unit. No need to care for higher samplers */ for(i = GL_LIMITS(textures) - 1; i > 0 ; i--) { + sampler = This->rev_tex_unit_map[i]; GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i)); checkGLcall("glActiveTextureARB"); @@ -692,12 +693,19 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); checkGLcall("glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);"); - Context_MarkStateDirty(context, STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP), StateTable); - Context_MarkStateDirty(context, STATE_SAMPLER(i), StateTable); + if (sampler != -1) { + if (sampler < MAX_TEXTURES) { + Context_MarkStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3DTSS_COLOROP), StateTable); + } + Context_MarkStateDirty(context, STATE_SAMPLER(sampler), StateTable); + } } GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); checkGLcall("glActiveTextureARB"); } + + sampler = This->rev_tex_unit_map[0]; + if(GL_SUPPORT(ARB_TEXTURE_CUBE_MAP)) { glDisable(GL_TEXTURE_CUBE_MAP_ARB); checkGLcall("glDisable GL_TEXTURE_CUBE_MAP_ARB"); @@ -713,7 +721,6 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex checkGLcall("glMatrixMode(GL_TEXTURE)"); glLoadIdentity(); checkGLcall("glLoadIdentity()"); - Context_MarkStateDirty(context, STATE_TRANSFORM(WINED3DTS_TEXTURE0), StateTable); if (GL_SUPPORT(EXT_TEXTURE_LOD_BIAS)) { glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, @@ -721,8 +728,14 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex 0.0); checkGLcall("glTexEnvi GL_TEXTURE_LOD_BIAS_EXT ..."); } - Context_MarkStateDirty(context, STATE_SAMPLER(0), StateTable); - Context_MarkStateDirty(context, STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), StateTable); + + if (sampler != -1) { + if (sampler < MAX_TEXTURES) { + Context_MarkStateDirty(context, STATE_TRANSFORM(WINED3DTS_TEXTURE0 + sampler), StateTable); + Context_MarkStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3DTSS_COLOROP), StateTable); + } + Context_MarkStateDirty(context, STATE_SAMPLER(sampler), StateTable); + } /* Other misc states */ glDisable(GL_ALPHA_TEST); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6c78ec4..0e7c21a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5752,6 +5752,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, int rowoffset = 0; /* how many bytes to add onto the end of a row to wraparound to the beginning of the next */ glDescriptor *glDescription = NULL; GLenum dummy; + int sampler; int bpp; CONVERT_TYPES convert = NO_CONVERSION; @@ -5922,7 +5923,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, LEAVE_GL(); IWineD3DSurface_ModifyLocation(pDestinationSurface, SFLAG_INTEXTURE, TRUE); - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(0)); + sampler = This->rev_tex_unit_map[0]; + if (sampler != -1) { + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(sampler)); + } return WINED3D_OK; } @@ -6854,7 +6858,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetCursorProperties(IWineD3DDevice* i INT height = This->cursorHeight; INT width = This->cursorWidth; INT bpp = tableEntry->bpp; - INT i; + INT i, sampler; /* Reformat the texture memory (pitch and width can be * different) */ @@ -6874,7 +6878,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetCursorProperties(IWineD3DDevice* i GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); checkGLcall("glActiveTextureARB"); } - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(0)); + sampler = This->rev_tex_unit_map[0]; + if (sampler != -1) { + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(sampler)); + } /* Create a new cursor texture */ glGenTextures(1, &This->cursorTexture); checkGLcall("glGenTextures"); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 57b5c92..53070f2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -40,7 +40,7 @@ static inline void clear_unused_channels(IWineD3DSurfaceImpl *This); static void surface_remove_pbo(IWineD3DSurfaceImpl *This); static void surface_bind_and_dirtify(IWineD3DSurfaceImpl *This) { - GLint active_texture; + int active_sampler; /* We don't need a specific texture unit, but after binding the texture the current unit is dirty. * Read the unit back instead of switching to 0, this avoids messing around with the state manager's @@ -49,14 +49,18 @@ static void surface_bind_and_dirtify(IWineD3DSurfaceImpl *This) { * TODO: Track the current active texture per GL context instead of using glGet */ if (GL_SUPPORT(ARB_MULTITEXTURE)) { + GLint active_texture; ENTER_GL(); glGetIntegerv(GL_ACTIVE_TEXTURE, &active_texture); LEAVE_GL(); - active_texture -= GL_TEXTURE0_ARB; + active_sampler = This->resource.wineD3DDevice->rev_tex_unit_map[active_texture - GL_TEXTURE0_ARB]; } else { - active_texture = 0; + active_sampler = 0; + } + + if (active_sampler != -1) { + IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_SAMPLER(active_sampler)); } - IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_SAMPLER(active_texture)); IWineD3DSurface_BindTexture((IWineD3DSurface *)This); }

1 0

H. Verbeet : wined3d: Improve some shader traces.
by Alexandre Julliard 16 Jul '08

16 Jul '08

Module: wine Branch: master Commit: be405c71c0297b97790fad35d05e83ff0b0acaaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=be405c71c0297b97790fad35d… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jul 15 23:54:37 2008 +0200 wined3d: Improve some shader traces. Make it clear the traced values are hexadecimal. --- dlls/wined3d/baseshader.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 3fcbc88..7b52510 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -154,8 +154,8 @@ int shader_skip_unrecognized( tokens_read += shader_get_param(iface, pToken, &param, &addr_token); pToken += tokens_read; - FIXME("Unrecognized opcode param: token=%08x " - "addr_token=%08x name=", param, addr_token); + FIXME("Unrecognized opcode param: token=0x%08x " + "addr_token=0x%08x name=", param, addr_token); shader_dump_param(iface, param, addr_token, i); FIXME("\n"); ++i; @@ -511,7 +511,7 @@ static void shader_dump_decl_usage( case WINED3DSTT_2D: TRACE("_2d"); break; case WINED3DSTT_CUBE: TRACE("_cube"); break; case WINED3DSTT_VOLUME: TRACE("_volume"); break; - default: TRACE("_unknown_ttype(%08x)", ttype); + default: TRACE("_unknown_ttype(0x%08x)", ttype); } } else { @@ -574,7 +574,7 @@ static void shader_dump_decl_usage( TRACE("sample"); break; default: - FIXME("unknown_semantics(%08x)", usage); + FIXME("unknown_semantics(0x%08x)", usage); } } } @@ -835,7 +835,7 @@ void shader_generate_main( /* Unknown opcode and its parameters */ if (NULL == curOpcode) { - FIXME("Unrecognized opcode: token=%08x\n", hw_arg.opcode_token); + FIXME("Unrecognized opcode: token=0x%08x\n", hw_arg.opcode_token); pToken += shader_skip_unrecognized(iface, pToken); /* Nothing to do */ @@ -963,7 +963,7 @@ void shader_trace_init( if (NULL == curOpcode) { int tokens_read; - FIXME("Unrecognized opcode: token=%08x\n", opcode_token); + FIXME("Unrecognized opcode: token=0x%08x\n", opcode_token); tokens_read = shader_skip_unrecognized(iface, pToken); pToken += tokens_read; len += tokens_read;

1 0

Frans Kool : wordpad: Fixed and added Dutch translations.
by Alexandre Julliard 16 Jul '08

16 Jul '08

Module: wine Branch: master Commit: 4c31603eb6048fc08561238d37eaf17584b439ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c31603eb6048fc08561238d3… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Tue Jul 15 21:57:06 2008 +0200 wordpad: Fixed and added Dutch translations. --- programs/wordpad/Nl.rc | 139 ++++++++++++++++++++++++----------------------- 1 files changed, 71 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c31603eb6048fc085612…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2008