winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
December 2008
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
1225 discussions
Start a n
N
ew thread
Francois Gouget : d3d9/tests: Make some functions static.
by Alexandre Julliard
12 Dec '08
12 Dec '08
Module: wine Branch: master Commit: 287dee6e78aada157af12f0c552555a8716dea45 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=287dee6e78aada157af12f0c5…
Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 12 10:21:06 2008 +0100 d3d9/tests: Make some functions static. --- dlls/d3d9/tests/visual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index fdf341f..9bcb42f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5774,7 +5774,7 @@ static void pshader_version_varying_test(IDirect3DDevice9 *device) { if(texture) IDirect3DTexture9_Release(texture); } -void test_compare_instructions(IDirect3DDevice9 *device) +static void test_compare_instructions(IDirect3DDevice9 *device) { DWORD shader_sge_vec_code[] = { 0xfffe0101, /* vs_1_1 */ @@ -5912,7 +5912,7 @@ void test_compare_instructions(IDirect3DDevice9 *device) IDirect3DVertexShader9_Release(shader_slt_scalar); } -void test_vshader_input(IDirect3DDevice9 *device) +static void test_vshader_input(IDirect3DDevice9 *device) { DWORD swapped_shader_code_3[] = { 0xfffe0300, /* vs_3_0 */
1
0
0
0
Francois Gouget : cabinet/tests: Make CopyProgress() static.
by Alexandre Julliard
12 Dec '08
12 Dec '08
Module: wine Branch: master Commit: 897af57deb665012b1a7fb66ad7aa3a6fc912c26 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=897af57deb665012b1a7fb66a…
Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 12 10:20:58 2008 +0100 cabinet/tests: Make CopyProgress() static. --- dlls/cabinet/tests/fdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index f90b6f0..e9765ad 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -594,7 +594,7 @@ static void test_FDIIsCabinet(void) } -INT_PTR __cdecl CopyProgress (FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) +static INT_PTR __cdecl CopyProgress(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) { return 0; }
1
0
0
0
Francois Gouget : ole32: Fix the STORAGE_dump_pps_entry() description.
by Alexandre Julliard
12 Dec '08
12 Dec '08
Module: wine Branch: master Commit: ec4d74baef753edbc3d0ebc8e677fa9d23a8fd83 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ec4d74baef753edbc3d0ebc8e…
Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 12 10:20:27 2008 +0100 ole32: Fix the STORAGE_dump_pps_entry() description. --- dlls/ole32/storage.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage.c b/dlls/ole32/storage.c index 2e5203f..7e345dc 100644 --- a/dlls/ole32/storage.c +++ b/dlls/ole32/storage.c @@ -706,8 +706,7 @@ STORAGE_look_for_named_pps(stream_access16*str,int n,LPOLESTR name) { /****************************************************************************** * STORAGE_dump_pps_entry [Internal] * - * FIXME - * Function is unused + * This function is there to simplify debugging. It is otherwise unused. */ void STORAGE_dump_pps_entry(struct storage_pps_entry *stde) {
1
0
0
0
Francois Gouget : shell32: Add a couple of spaces in the spec file.
by Alexandre Julliard
12 Dec '08
12 Dec '08
Module: wine Branch: master Commit: ae3a8e1da229a652a0ceaa4666d27bbfab595631 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ae3a8e1da229a652a0ceaa466…
Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 12 10:19:43 2008 +0100 shell32: Add a couple of spaces in the spec file. --- dlls/shell32/shell32.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 7e98b5f..b4761c6 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -34,7 +34,7 @@ 35 stdcall -noname PathRemoveFileSpec(ptr) PathRemoveFileSpecAW 36 stdcall -noname PathAppend(ptr ptr) PathAppendAW 37 stdcall -noname PathCombine(ptr ptr ptr) PathCombineAW - 38 stdcall -noname PathStripPath(ptr)PathStripPathAW + 38 stdcall -noname PathStripPath(ptr) PathStripPathAW 39 stdcall -noname PathIsUNC(ptr) PathIsUNCAW 40 stdcall -noname PathIsRelative(ptr) PathIsRelativeAW 41 stdcall -noname IsLFNDriveA(str) @@ -42,7 +42,7 @@ 43 stdcall -noname PathIsExe(ptr) PathIsExeAW 45 stdcall -noname PathFileExists(ptr) PathFileExistsAW 46 stdcall -noname PathMatchSpec(ptr ptr) PathMatchSpecAW - 47 stdcall -noname PathMakeUniqueName(ptr long ptr ptr ptr)PathMakeUniqueNameAW + 47 stdcall -noname PathMakeUniqueName(ptr long ptr ptr ptr) PathMakeUniqueNameAW 48 stdcall -noname PathSetDlgItemPath(long long ptr) PathSetDlgItemPathAW 49 stdcall -noname PathQualify(ptr) PathQualifyAW 50 stdcall -noname PathStripToRoot(ptr) PathStripToRootAW
1
0
0
0
Francois Gouget : msvcrt: Remove _adjust_fdiv() as it is unused.
by Alexandre Julliard
12 Dec '08
12 Dec '08
Module: wine Branch: master Commit: ade1326480e2c53fdec045b38313c2166360e93e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ade1326480e2c53fdec045b38…
Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 12 10:19:03 2008 +0100 msvcrt: Remove _adjust_fdiv() as it is unused. --- dlls/msvcrt/math.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 30d7956..9ea8245 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1194,17 +1194,6 @@ void _adj_fptan(void) } /*********************************************************************** - * _adjust_fdiv (MSVCRT.@) - * FIXME - * I _think_ this function should be a variable indicating whether - * Pentium fdiv bug safe code should be used. - */ -void _adjust_fdiv(void) -{ - TRACE("(): stub\n"); -} - -/*********************************************************************** * _safe_fdiv (MSVCRT.@) * FIXME * This function is likely to have the wrong number of arguments.
1
0
0
0
Francois Gouget : msvcrt/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard
12 Dec '08
12 Dec '08
Module: wine Branch: master Commit: 33dd86d05c09d1abd1280598c513c3139b4a705a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=33dd86d05c09d1abd1280598c…
Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 12 10:16:45 2008 +0100 msvcrt/tests: Add a trailing '\n' to ok() calls. --- dlls/msvcrt/tests/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 8dcba00..9642d75 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -903,7 +903,7 @@ static void test_stat(void) fd = open("stat.tst", O_WRONLY | O_CREAT | O_BINARY, _S_IREAD |_S_IWRITE); if (fd >= 0) { - ok(fstat(fd, &buf) == 0, "fstat failed: errno=%d", errno); + ok(fstat(fd, &buf) == 0, "fstat failed: errno=%d\n", errno); ok((buf.st_mode & _S_IFMT) == _S_IFREG, "bad format = %06o\n", buf.st_mode); ok((buf.st_mode & 0777) == 0666, "bad st_mode = %06o\n", buf.st_mode); ok(buf.st_dev == 0, "st_dev is %d, expected 0\n", buf.st_dev); @@ -911,7 +911,7 @@ static void test_stat(void) ok(buf.st_nlink == 1, "st_nlink is %d, expected 1\n", buf.st_nlink); ok(buf.st_size == 0, "st_size is %d, expected 0\n", buf.st_size); - ok(stat("stat.tst", &buf) == 0, "stat failed: errno=%d", errno); + ok(stat("stat.tst", &buf) == 0, "stat failed: errno=%d\n", errno); ok((buf.st_mode & _S_IFMT) == _S_IFREG, "bad format = %06o\n", buf.st_mode); ok((buf.st_mode & 0777) == 0666, "bad st_mode = %06o\n", buf.st_mode); ok(buf.st_dev == buf.st_rdev, "st_dev (%d) and st_rdev (%d) differ\n", buf.st_dev, buf.st_rdev);
1
0
0
0
Henri Verbeet : wined3d: Don' t leak memory on failure in allocate_shader_constants().
by Alexandre Julliard
12 Dec '08
12 Dec '08
Module: wine Branch: master Commit: 3e035ddf05b0d6e3df4a0068c28df59fd21fafc5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3e035ddf05b0d6e3df4a0068c…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 12 09:33:52 2008 +0100 wined3d: Don't leak memory on failure in allocate_shader_constants(). --- dlls/wined3d/stateblock.c | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1f35e82..d568de6 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -38,28 +38,39 @@ HRESULT allocate_shader_constants(IWineD3DStateBlockImpl* object) { IWineD3DStateBlockImpl *This = object; -#define WINED3D_MEMCHECK(_object) if (NULL == _object) { FIXME("Out of memory!\n"); return E_OUTOFMEMORY; } - /* Allocate space for floating point constants */ object->pixelShaderConstantF = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(float) * GL_LIMITS(pshader_constantsF) * 4); - WINED3D_MEMCHECK(object->pixelShaderConstantF); + if (!object->pixelShaderConstantF) goto fail; + object->changed.pixelShaderConstantsF = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BOOL) * GL_LIMITS(pshader_constantsF)); - WINED3D_MEMCHECK(object->changed.pixelShaderConstantsF); + if (!object->changed.pixelShaderConstantsF) goto fail; + object->vertexShaderConstantF = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(float) * GL_LIMITS(vshader_constantsF) * 4); - WINED3D_MEMCHECK(object->vertexShaderConstantF); + if (!object->vertexShaderConstantF) goto fail; + object->changed.vertexShaderConstantsF = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BOOL) * GL_LIMITS(vshader_constantsF)); - WINED3D_MEMCHECK(object->changed.vertexShaderConstantsF); + if (!object->changed.vertexShaderConstantsF) goto fail; + object->contained_vs_consts_f = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) * GL_LIMITS(vshader_constantsF)); - WINED3D_MEMCHECK(object->contained_vs_consts_f); + if (!object->contained_vs_consts_f) goto fail; + object->contained_ps_consts_f = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) * GL_LIMITS(pshader_constantsF)); - WINED3D_MEMCHECK(object->contained_ps_consts_f); + if (!object->contained_ps_consts_f) goto fail; list_init(&object->set_vconstantsF); list_init(&object->set_pconstantsF); -#undef WINED3D_MEMCHECK - return WINED3D_OK; + +fail: + ERR("Failed to allocate memory\n"); + HeapFree(GetProcessHeap(), 0, object->pixelShaderConstantF); + HeapFree(GetProcessHeap(), 0, object->changed.pixelShaderConstantsF); + HeapFree(GetProcessHeap(), 0, object->vertexShaderConstantF); + HeapFree(GetProcessHeap(), 0, object->changed.vertexShaderConstantsF); + HeapFree(GetProcessHeap(), 0, object->contained_vs_consts_f); + HeapFree(GetProcessHeap(), 0, object->contained_ps_consts_f); + return E_OUTOFMEMORY; } /** Copy all members of one stateblock to another */
1
0
0
0
Henri Verbeet : wined3d: Use a simpler way to calculate the number of texture levels.
by Alexandre Julliard
12 Dec '08
12 Dec '08
Module: wine Branch: master Commit: 7d29aecd6fa0fb3c541f318ad50a442f47e0c732 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7d29aecd6fa0fb3c541f318ad…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 12 09:33:52 2008 +0100 wined3d: Use a simpler way to calculate the number of texture levels. It's probably slightly faster too. --- dlls/wined3d/device.c | 28 +++------------------------- dlls/wined3d/utils.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 30 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d091b58..a99ff56 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -855,15 +855,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, U } object->baseTexture.levels = 1; } else if (Levels == 0) { - TRACE("calculating levels %d\n", object->baseTexture.levels); - object->baseTexture.levels++; - tmpW = Width; - tmpH = Height; - while (tmpW > 1 || tmpH > 1) { - tmpW = max(1, tmpW >> 1); - tmpH = max(1, tmpH >> 1); - object->baseTexture.levels++; - } + object->baseTexture.levels = wined3d_log2i(max(Width, Height)) + 1; TRACE("Calculated levels = %d\n", object->baseTexture.levels); } @@ -958,16 +950,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa } object->baseTexture.levels = 1; } else if (Levels == 0) { - object->baseTexture.levels++; - tmpW = Width; - tmpH = Height; - tmpD = Depth; - while (tmpW > 1 || tmpH > 1 || tmpD > 1) { - tmpW = max(1, tmpW >> 1); - tmpH = max(1, tmpH >> 1); - tmpD = max(1, tmpD >> 1); - object->baseTexture.levels++; - } + object->baseTexture.levels = wined3d_log2i(max(max(Width, Height), Depth)) + 1; TRACE("Calculated levels = %d\n", object->baseTexture.levels); } @@ -1117,12 +1100,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface } object->baseTexture.levels = 1; } else if (Levels == 0) { - object->baseTexture.levels++; - tmpW = EdgeLength; - while (tmpW > 1) { - tmpW = max(1, tmpW >> 1); - object->baseTexture.levels++; - } + object->baseTexture.levels = wined3d_log2i(EdgeLength) + 1; TRACE("Calculated levels = %d\n", object->baseTexture.levels); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7fc874b..f65bcdc 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2245,3 +2245,29 @@ BOOL ffp_frag_program_key_compare(const void *keya, const void *keyb) return memcmp(ka, kb, sizeof(*ka)) == 0; } + +UINT wined3d_log2i(UINT32 x) +{ + static const BYTE l[] = + { + 0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + }; + UINT32 i; + + return (i = x >> 16) ? (x = i >> 8) ? l[x] + 24 : l[i] + 16 : (i = x >> 8) ? l[i] + 8 : l[x]; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e28bb6d..0b444bb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2031,6 +2031,7 @@ BOOL getDepthStencilBits(WINED3DFORMAT fmt, short *depthSize, short *stencilSize /* Math utils */ void multiply_matrix(WINED3DMATRIX *dest, const WINED3DMATRIX *src1, const WINED3DMATRIX *src2); unsigned int count_bits(unsigned int mask); +UINT wined3d_log2i(UINT32 x); /***************************************************************************** * To enable calling of inherited functions, requires prototypes
1
0
0
0
Henri Verbeet : wined3d: Get rid of the textureDimensions field in the state block.
by Alexandre Julliard
12 Dec '08
12 Dec '08
Module: wine Branch: master Commit: 70ed814b95f7719d52fa5b18a375d566a185a9ec URL:
http://source.winehq.org/git/wine.git/?a=commit;h=70ed814b95f7719d52fa5b18a…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 12 09:33:51 2008 +0100 wined3d: Get rid of the textureDimensions field in the state block. --- dlls/wined3d/device.c | 14 +-- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/state.c | 140 +++++++++++++++++++--------------- dlls/wined3d/stateblock.c | 2 - dlls/wined3d/utils.c | 57 ++++++++------ dlls/wined3d/wined3d_private.h | 1 - 6 files changed, 119 insertions(+), 97 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=70ed814b95f7719d52fa5…
1
0
0
0
Henri Verbeet : wined3d: We only care is a sampler is sampled at all in device_map_vsamplers(), not the specific type.
by Alexandre Julliard
12 Dec '08
12 Dec '08
Module: wine Branch: master Commit: f36c377d0e7eadda583697c85719b3aedf1e6224 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f36c377d0e7eadda583697c85…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 12 09:33:51 2008 +0100 wined3d: We only care is a sampler is sampled at all in device_map_vsamplers(), not the specific type. --- dlls/wined3d/device.c | 5 ++--- dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0541c59..2a55feb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3861,9 +3861,8 @@ static void device_map_vsamplers(IWineD3DDeviceImpl *This, BOOL ps) { if (ps) { IWineD3DPixelShaderImpl *pshader = (IWineD3DPixelShaderImpl *)This->stateBlock->pixelShader; - /* Make sure the shader's reg_maps are up to date. This is only relevant for 1.x pixelshaders. */ - pixelshader_update_samplers(&pshader->baseShader.reg_maps, This->stateBlock->textures, - pshader->baseShader.hex_version); + /* Note that we only care if a sampler is sampled or not, not the sampler's specific type. + * Otherwise we'd need to call shader_update_samplers() here for 1.x pixelshaders. */ pshader_sampler_tokens = pshader->baseShader.reg_maps.samplers; } diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 200a2bc..5857ce7 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -395,7 +395,7 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *i return WINED3D_OK; } -void pixelshader_update_samplers(struct shader_reg_maps *reg_maps, IWineD3DBaseTexture * const *textures, +static void pixelshader_update_samplers(struct shader_reg_maps *reg_maps, IWineD3DBaseTexture * const *textures, DWORD shader_version) { DWORD *samplers = reg_maps->samplers; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8cb8cea..60646c9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2401,8 +2401,6 @@ extern const SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[]; extern const IWineD3DPixelShaderVtbl IWineD3DPixelShader_Vtbl; GLuint find_gl_pshader(IWineD3DPixelShaderImpl *shader, const struct ps_compile_args *args); void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImpl *stateblock, struct ps_compile_args *args); -void pixelshader_update_samplers(struct shader_reg_maps *reg_maps, IWineD3DBaseTexture * const *textures, - DWORD shader_version); /* sRGB correction constants */ static const float srgb_cmp = 0.0031308;
1
0
0
0
← Newer
1
...
63
64
65
66
67
68
69
...
123
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
Results per page:
10
25
50
100
200