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
February 2010
----- 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
783 discussions
Start a n
N
ew thread
Peter Rosin : kernel32: Document SetThreadErrorMode and GetThreadErrorMode.
by Alexandre Julliard
05 Feb '10
05 Feb '10
Module: wine Branch: master Commit: 678cb27b3aa40404de09c131c95344f66274d856 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=678cb27b3aa40404de09c131c…
Author: Peter Rosin <peda(a)lysator.liu.se> Date: Thu Feb 4 14:22:28 2010 +0100 kernel32: Document SetThreadErrorMode and GetThreadErrorMode. --- dlls/kernel32/thread.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index e3754c2..f6a2b0f 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -671,6 +671,17 @@ static DWORD rtlmode_to_win32mode( DWORD rtlmode ) /*********************************************************************** * SetThreadErrorMode (KERNEL32.@) + * + * Set the thread local error mode. + * + * PARAMS + * mode [I] The new error mode, a bitwise or of SEM_FAILCRITICALERRORS, + * SEM_NOGPFAULTERRORBOX and SEM_NOOPENFILEERRORBOX. + * oldmode [O] Destination of the old error mode (may be NULL) + * + * RETURNS + * Success: TRUE + * Failure: FALSE, check GetLastError */ BOOL WINAPI SetThreadErrorMode( DWORD mode, LPDWORD oldmode ) { @@ -707,6 +718,14 @@ BOOL WINAPI SetThreadErrorMode( DWORD mode, LPDWORD oldmode ) /*********************************************************************** * GetThreadErrorMode (KERNEL32.@) + * + * Get the thread local error mode. + * + * PARAMS + * None. + * + * RETURNS + * The current thread local error mode. */ DWORD WINAPI GetThreadErrorMode( void ) {
1
0
0
0
Peter Rosin : ntdll: Document RtlSetThreadErrorMode and RtlGetThreadErrorMode.
by Alexandre Julliard
05 Feb '10
05 Feb '10
Module: wine Branch: master Commit: 091f0fedfe3736cf9690d32bef6ddfb3dd1fb50b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=091f0fedfe3736cf9690d32be…
Author: Peter Rosin <peda(a)lysator.liu.se> Date: Thu Feb 4 08:20:10 2010 +0100 ntdll: Document RtlSetThreadErrorMode and RtlGetThreadErrorMode. --- dlls/ntdll/rtl.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 69a2955..d4a7045 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1168,6 +1168,16 @@ NTSTATUS WINAPI RtlDecompressBuffer(USHORT CompressionFormat, PUCHAR Uncompresse /*********************************************************************** * RtlSetThreadErrorMode [NTDLL.@] + * + * Set the thread local error mode. + * + * PARAMS + * mode [I] The new error mode + * oldmode [O] Destination of the old error mode (may be NULL) + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: STATUS_INVALID_PARAMETER_1 */ NTSTATUS WINAPI RtlSetThreadErrorMode( DWORD mode, LPDWORD oldmode ) { @@ -1183,6 +1193,14 @@ NTSTATUS WINAPI RtlSetThreadErrorMode( DWORD mode, LPDWORD oldmode ) /*********************************************************************** * RtlGetThreadErrorMode [NTDLL.@] + * + * Get the thread local error mode. + * + * PARAMS + * None. + * + * RETURNS + * The current thread local error mode. */ DWORD WINAPI RtlGetThreadErrorMode( void ) {
1
0
0
0
André Hentschel : oleaut32/tests: Use testvalues from VarDateFromUdate also for regression testing of DosDateTimeToVariantTime .
by Alexandre Julliard
05 Feb '10
05 Feb '10
Module: wine Branch: master Commit: 691e15b427c6be44744f8796099d09d18c8c7e09 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=691e15b427c6be44744f87960…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Feb 4 21:16:18 2010 +0100 oleaut32/tests: Use testvalues from VarDateFromUdate also for regression testing of DosDateTimeToVariantTime. --- dlls/oleaut32/tests/vartest.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index c5d65a2..ef2445a 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1779,6 +1779,41 @@ static void test_DosDateTimeToVariantTime(void) DOS2DT(1,1,1980,0,0,60,0,0.0); /* Invalid seconds */ DOS2DT(1,1,1980,23,0,0,1,29221.95833333333); /* 1/1/1980 11:00:00 PM */ DOS2DT(1,1,1980,24,0,0,0,0.0); /* Invalid hours */ + + DOS2DT(1,1,1980,0,0,1,1,29221.0); + DOS2DT(2,1,1980,0,0,0,1,29222.0); + DOS2DT(2,1,1980,0,0,0,1,29222.0); + DOS2DT(31,12,1990,0,0,0,1,33238.0); + DOS2DT(31,12,90,0,0,0,1,40543.0); + DOS2DT(30,12,1899,0,0,0,1,46751.0); + DOS2DT(1,1,100,0,0,0,1,43831.0); + DOS2DT(31,12,9999,0,0,0,1,59901.0); + DOS2DT(1,1,10000,0,0,0,1,59902.0); + DOS2DT(1,1,-10000,0,0,0,1,48214.0); + + DOS2DT(30,12,1899,0,0,0,1,46751.0); + DOS2DT(30,12,1899,0,0,1,1,46751.0); + + DOS2DT(1,1,1980,18,1,16,1,29221.75087962963); + DOS2DT(1,300,1980,18,1,16,1,29556.75087962963); + DOS2DT(300,1,1980,18,1,16,1,29232.75087962963); + DOS2DT(0,1,1980,42,1,16,1,29220.4175462963); + DOS2DT(1,1,1980,17,61,16,0,0.0); + DOS2DT(1,1,1980,18,0,76,1,29221.75013888889); + DOS2DT(1,-300,1980,18,1,16,1,29312.75087962963); + DOS2DT(-300,1,1980,18,1,16,1,29240.75087962963); + DOS2DT(3,1,1980,-30,1,16,1,29223.08421296296); + DOS2DT(1,1,1980,20,-119,16,1,29221.83976851852); + DOS2DT(1,1,1980,18,3,-104,1,29221.75236111111); + DOS2DT(1,12001,-1020,18,1,16,1,55519.75087962963); + DOS2DT(1,-23,1982,18,1,16,1,30195.75087962963); + DOS2DT(-59,3,1980,18,1,16,1,29285.75087962963); + DOS2DT(1,1,0,0,0,0,1,54058.0); + DOS2DT(0,0,1980,0,0,0,1,29189.0); + DOS2DT(0,1,1980,0,0,0,1,29220.0); + DOS2DT(-1,1,1980,18,1,16,1,29251.75087962963); + DOS2DT(1,1,-1,18,1,16,1,53693.75087962963); + DOS2DT(1,-1,1980,18,1,16,0,0); } static void test_dt2dos(int line, double dt, INT r, WORD d, WORD m, WORD y,
1
0
0
0
Matteo Bruni : wpp: Assure if_stack is clean before returning.
by Alexandre Julliard
05 Feb '10
05 Feb '10
Module: wine Branch: master Commit: b40bb31995b70a9bf88f194deac34084c16a4c86 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b40bb31995b70a9bf88f194de…
Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Thu Feb 4 18:56:52 2010 +0100 wpp: Assure if_stack is clean before returning. --- libs/wpp/wpp.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index 47989f1..de4286f 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -193,9 +193,11 @@ int wpp_parse( const char *input, FILE *output ) ret = ppy_parse(); /* If there were errors during processing, return an error code */ - if(!ret && pp_status.state) ret = pp_status.state; + if (!ret && pp_status.state) ret = pp_status.state; if (input) wpp_callbacks->close(pp_status.file); + /* Clean if_stack, it could remain dirty on errors */ + while (pp_get_if_depth()) pp_pop_if(); pp_pop_define_state(); return ret; }
1
0
0
0
Dylan Smith : richedit: Removed unused local variable yStart.
by Alexandre Julliard
05 Feb '10
05 Feb '10
Module: wine Branch: master Commit: e9693d627295280ee9f622588522b2189178be8b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e9693d627295280ee9f622588…
Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Feb 4 12:52:57 2010 -0500 richedit: Removed unused local variable yStart. --- dlls/riched20/wrap.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 00229b2..75f47a2 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -580,7 +580,6 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) ME_DisplayItem *item; ME_Context c; BOOL bModified = FALSE; - int yStart = -1; int totalWidth = 0; ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); @@ -598,11 +597,7 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) ME_WrapTextParagraph(&c, item); if (bRedraw) - { item->member.para.nFlags |= MEPF_REPAINT; - if (yStart == -1) - yStart = c.pt.y; - } bModified = bModified | bRedraw;
1
0
0
0
Henri Verbeet : wined3d: Use the HDC from the acquired context to call SwapBuffer().
by Alexandre Julliard
05 Feb '10
05 Feb '10
Module: wine Branch: master Commit: ba8e6f713bcae6ba3aa90061ddce0fa9069af25c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ba8e6f713bcae6ba3aa90061d…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 4 18:30:08 2010 +0100 wined3d: Use the HDC from the acquired context to call SwapBuffer(). These should be the same, but this way the relation is clearer. --- dlls/wined3d/swapchain.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 838d461..cbdb961 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -274,7 +274,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO IWineD3DSurface_BltFast(This->backBuffer[0], 0, 0, This->device->logo_surface, NULL, WINEDDBLTFAST_SRCCOLORKEY); } - TRACE("presetting HDC %p\n", This->context[0]->hdc); + TRACE("Presenting HDC %p.\n", context->hdc); render_to_fbo = This->render_to_fbo; @@ -341,7 +341,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO } if (This->num_contexts > 1) wglFinish(); - SwapBuffers(This->context[0]->hdc); /* TODO: cycle through the swapchain buffers */ + SwapBuffers(context->hdc); /* TODO: cycle through the swapchain buffers */ TRACE("SwapBuffers called, Starting new frame\n"); /* FPS support */
1
0
0
0
Henri Verbeet : wined3d: Call SetDestWindowOverride() before acquiring a context.
by Alexandre Julliard
05 Feb '10
05 Feb '10
Module: wine Branch: master Commit: d0afc7567b33f64f0a441d9a3ffeeeb4a81a5e43 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d0afc7567b33f64f0a441d9a3…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 4 18:30:07 2010 +0100 wined3d: Call SetDestWindowOverride() before acquiring a context. --- dlls/wined3d/swapchain.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 6b44cd5..838d461 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -217,6 +217,8 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO unsigned int sync; int retval; + IWineD3DSwapChain_SetDestWindowOverride(iface, hDestWindowOverride); + context = context_acquire(This->device, This->backBuffer[0], CTXUSAGE_RESOURCELOAD); /* Render the cursor onto the back buffer, using our nifty directdraw blitting code :-) */ @@ -274,11 +276,6 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO TRACE("presetting HDC %p\n", This->context[0]->hdc); - /* Don't call checkGLcall, as glGetError is not applicable here */ - if (hDestWindowOverride && This->win_handle != hDestWindowOverride) { - IWineD3DSwapChain_SetDestWindowOverride(iface, hDestWindowOverride); - } - render_to_fbo = This->render_to_fbo; if (pSourceRect) @@ -522,7 +519,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_SetDestWindowOverride(IWineD3DSwapCh WINED3DLOCKED_RECT r; BYTE *mem; - if(window == This->win_handle) return WINED3D_OK; + if (!window || window == This->win_handle) return WINED3D_OK; TRACE("Performing dest override of swapchain %p from window %p to %p\n", This, This->win_handle, window); if (This->context[0] == This->device->contexts[0])
1
0
0
0
Henri Verbeet : wined3d: Get rid of the now redundant max_ffp_texture_stages device field.
by Alexandre Julliard
05 Feb '10
05 Feb '10
Module: wine Branch: master Commit: 3df59ef0d5fa407362648220e394030214befc1e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3df59ef0d5fa407362648220e…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 4 18:30:06 2010 +0100 wined3d: Get rid of the now redundant max_ffp_texture_stages device field. --- dlls/wined3d/device.c | 33 ++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a25f5e4..f10348c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3101,15 +3101,17 @@ static void device_update_fixed_function_usage_map(IWineD3DDeviceImpl *This) { } } -static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This) { +static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This, const struct wined3d_gl_info *gl_info) +{ unsigned int i, tex; WORD ffu_map; device_update_fixed_function_usage_map(This); ffu_map = This->fixed_function_usage_map; - if (This->max_ffp_textures == This->max_ffp_texture_stages || - This->stateBlock->lowest_disabled_stage <= This->max_ffp_textures) { + if (This->max_ffp_textures == gl_info->limits.texture_stages + || This->stateBlock->lowest_disabled_stage <= This->max_ffp_textures) + { for (i = 0; ffu_map; ffu_map >>= 1, ++i) { if (!(ffu_map & 1)) continue; @@ -3139,10 +3141,10 @@ static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This) { } } -static void device_map_psamplers(IWineD3DDeviceImpl *This) { +static void device_map_psamplers(IWineD3DDeviceImpl *This, const struct wined3d_gl_info *gl_info) +{ const WINED3DSAMPLER_TEXTURE_TYPE *sampler_type = ((IWineD3DPixelShaderImpl *)This->stateBlock->pixelShader)->baseShader.reg_maps.sampler_type; - const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; unsigned int i; for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) { @@ -3182,11 +3184,12 @@ static BOOL device_unit_free_for_vs(IWineD3DDeviceImpl *This, const DWORD *pshad return !vshader_sampler_tokens[current_mapping - MAX_FRAGMENT_SAMPLERS]; } -static void device_map_vsamplers(IWineD3DDeviceImpl *This, BOOL ps) { +static void device_map_vsamplers(IWineD3DDeviceImpl *This, BOOL ps, const struct wined3d_gl_info *gl_info) +{ const WINED3DSAMPLER_TEXTURE_TYPE *vshader_sampler_type = ((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->baseShader.reg_maps.sampler_type; const WINED3DSAMPLER_TEXTURE_TYPE *pshader_sampler_type = NULL; - int start = min(MAX_COMBINED_SAMPLERS, This->adapter->gl_info.limits.combined_samplers) - 1; + int start = min(MAX_COMBINED_SAMPLERS, gl_info->limits.combined_samplers) - 1; int i; if (ps) { @@ -3223,7 +3226,9 @@ static void device_map_vsamplers(IWineD3DDeviceImpl *This, BOOL ps) { } } -void IWineD3DDeviceImpl_FindTexUnitMap(IWineD3DDeviceImpl *This) { +void IWineD3DDeviceImpl_FindTexUnitMap(IWineD3DDeviceImpl *This) +{ + const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; BOOL vs = use_vs(This->stateBlock); BOOL ps = use_ps(This->stateBlock); /* @@ -3233,15 +3238,10 @@ void IWineD3DDeviceImpl_FindTexUnitMap(IWineD3DDeviceImpl *This) { * -> When the mapping of a stage is changed, sampler and ALL texture stage states have * to be reset. Because of that try to work with a 1:1 mapping as much as possible */ - if (ps) { - device_map_psamplers(This); - } else { - device_map_fixed_function_samplers(This); - } + if (ps) device_map_psamplers(This, gl_info); + else device_map_fixed_function_samplers(This, gl_info); - if (vs) { - device_map_vsamplers(This, ps); - } + if (vs) device_map_vsamplers(This, ps, gl_info); } static HRESULT WINAPI IWineD3DDeviceImpl_SetPixelShader(IWineD3DDevice *iface, IWineD3DPixelShader *pShader) { @@ -7054,7 +7054,6 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, device->frag_pipe = fragment_pipeline; fragment_pipeline->get_caps(&adapter->gl_info, &ffp_caps); device->max_ffp_textures = ffp_caps.MaxSimultaneousTextures; - device->max_ffp_texture_stages = ffp_caps.MaxTextureBlendStages; hr = compile_state_table(device->StateTable, device->multistate_funcs, &adapter->gl_info, ffp_vertexstate_template, fragment_pipeline, misc_state_template); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1f568eb..5dcc521 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1515,7 +1515,7 @@ struct IWineD3DDeviceImpl const struct fragment_pipeline *frag_pipe; const struct blit_shader *blitter; - unsigned int max_ffp_textures, max_ffp_texture_stages; + unsigned int max_ffp_textures; DWORD d3d_vshader_constantF, d3d_pshader_constantF; /* Advertised d3d caps, not GL ones */ DWORD vs_clipping;
1
0
0
0
Henri Verbeet : wined3d: Set the texture stage limit based on the fragment pipe caps.
by Alexandre Julliard
05 Feb '10
05 Feb '10
Module: wine Branch: master Commit: 4c7bcb883b2affd7cd023e66c554c912fd15d5bf URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4c7bcb883b2affd7cd023e66c…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 4 18:30:05 2010 +0100 wined3d: Set the texture stage limit based on the fragment pipe caps. --- dlls/wined3d/directx.c | 27 ++++++++++++--------------- dlls/wined3d/state.c | 2 +- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1215414..7335a71 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1674,6 +1674,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) const char *GL_Extensions = NULL; const char *WGL_Extensions = NULL; const char *gl_string = NULL; + struct fragment_caps fragment_caps; enum wined3d_pci_vendor vendor; enum wined3d_pci_device device; GLint gl_max; @@ -1739,7 +1740,6 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) memset(gl_info->supported, 0, sizeof(gl_info->supported)); gl_info->limits.buffers = 1; gl_info->limits.textures = 1; - gl_info->limits.texture_stages = 1; gl_info->limits.fragment_samplers = 1; gl_info->limits.vertex_samplers = 0; gl_info->limits.combined_samplers = gl_info->limits.fragment_samplers + gl_info->limits.vertex_samplers; @@ -1907,6 +1907,13 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) gl_info->supported[ATI_FRAGMENT_SHADER] = FALSE; } } + + if (gl_info->supported[NV_REGISTER_COMBINERS]) + { + glGetIntegerv(GL_MAX_GENERAL_COMBINERS_NV, &gl_max); + gl_info->limits.general_combiners = gl_max; + TRACE_(d3d_caps)("Max general combiners: %d.\n", gl_max); + } if (gl_info->supported[ARB_DRAW_BUFFERS]) { glGetIntegerv(GL_MAX_DRAW_BUFFERS_ARB, &gl_max); @@ -1919,20 +1926,6 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) gl_info->limits.textures = min(MAX_TEXTURES, gl_max); TRACE_(d3d_caps)("Max textures: %d.\n", gl_info->limits.textures); - if (gl_info->supported[NV_REGISTER_COMBINERS]) - { - GLint tmp; - glGetIntegerv(GL_MAX_GENERAL_COMBINERS_NV, &tmp); - gl_info->limits.general_combiners = tmp; - gl_info->limits.texture_stages = min(MAX_TEXTURES, tmp); - TRACE_(d3d_caps)("Max general combiners: %d.\n", tmp); - } - else - { - gl_info->limits.texture_stages = min(MAX_TEXTURES, gl_max); - } - TRACE_(d3d_caps)("Max texture stages: %d.\n", gl_info->limits.texture_stages); - if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) { GLint tmp; @@ -2110,6 +2103,10 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) adapter->shader_backend = select_shader_backend(adapter); adapter->blitter = select_blit_implementation(adapter); + adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); + gl_info->limits.texture_stages = fragment_caps.MaxTextureBlendStages; + TRACE_(d3d_caps)("Max texture stages: %u.\n", gl_info->limits.texture_stages); + /* In some cases the number of texture stages can be larger than the number * of samplers. The GF4 for example can use only 2 samplers (no fragment * shaders), but 8 texture stages (register combiners). */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6f27baf..5efe069 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5552,7 +5552,7 @@ static void ffp_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct if (gl_info->supported[ARB_TEXTURE_ENV_DOT3]) pCaps->TextureOpCaps |= WINED3DTEXOPCAPS_DOTPRODUCT3; - pCaps->MaxTextureBlendStages = gl_info->limits.texture_stages; + pCaps->MaxTextureBlendStages = gl_info->limits.textures; pCaps->MaxSimultaneousTextures = gl_info->limits.textures; }
1
0
0
0
Henri Verbeet : wined3d: Add the general combiner limit to wined3d_gl_info.
by Alexandre Julliard
05 Feb '10
05 Feb '10
Module: wine Branch: master Commit: b59dd0e4e8b0ed172b093c1cf3a7cd945b88f2f0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b59dd0e4e8b0ed172b093c1cf…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 4 18:30:04 2010 +0100 wined3d: Add the general combiner limit to wined3d_gl_info. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8ba33ba..1215414 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1923,7 +1923,9 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) { GLint tmp; glGetIntegerv(GL_MAX_GENERAL_COMBINERS_NV, &tmp); + gl_info->limits.general_combiners = tmp; gl_info->limits.texture_stages = min(MAX_TEXTURES, tmp); + TRACE_(d3d_caps)("Max general combiners: %d.\n", tmp); } else { diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 56e2ee7..64bb883 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -670,7 +670,7 @@ static void nvrc_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct WINED3DTEXOPCAPS_PREMODULATE */ #endif - pCaps->MaxTextureBlendStages = gl_info->limits.texture_stages; + pCaps->MaxTextureBlendStages = min(MAX_TEXTURES, gl_info->limits.general_combiners); pCaps->MaxSimultaneousTextures = gl_info->limits.textures; pCaps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_TSSARGTEMP; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 07ce7af..5a3fbb4 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -4619,6 +4619,7 @@ struct wined3d_gl_limits UINT fragment_samplers; UINT vertex_samplers; UINT combined_samplers; + UINT general_combiners; UINT sampler_stages; UINT clipplanes; UINT texture_size;
1
0
0
0
← Newer
1
...
51
52
53
54
55
56
57
...
79
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
Results per page:
10
25
50
100
200