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
Juan Lang : crypt32: Make a function static.
by Alexandre Julliard
19 Dec '08
19 Dec '08
Module: wine Branch: master Commit: a29ba27361ab9d175e5e8c4c2f8be41d4a7a0da6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a29ba27361ab9d175e5e8c4c2…
Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 18 14:50:56 2008 -0800 crypt32: Make a function static. --- dlls/crypt32/context.c | 2 +- dlls/crypt32/crypt32_private.h | 2 -- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index fa08581..fa7922f 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -288,7 +288,7 @@ void ContextList_Delete(struct ContextList *list, void *context) list->contextInterface->free(context); } -void ContextList_Empty(struct ContextList *list) +static void ContextList_Empty(struct ContextList *list) { struct list *entry, *next; diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index b0f6101..46d4797 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -379,8 +379,6 @@ void *ContextList_Enum(struct ContextList *list, void *pPrev); void ContextList_Delete(struct ContextList *list, void *context); -void ContextList_Empty(struct ContextList *list); - void ContextList_Free(struct ContextList *list); /**
1
0
0
0
Nikolay Sivov : ole32: Make OleSetClipboard affected by previous OleInitialize() calls.
by Alexandre Julliard
19 Dec '08
19 Dec '08
Module: wine Branch: master Commit: 0eeb042067fde019d02674858cef2241ed8231b8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0eeb042067fde019d02674858…
Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Dec 18 23:20:35 2008 +0300 ole32: Make OleSetClipboard affected by previous OleInitialize() calls. --- dlls/ole32/clipboard.c | 9 +++++++++ dlls/ole32/tests/clipboard.c | 2 -- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 5320988..762afc7 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -78,6 +78,8 @@ #include "storage32.h" +#include "compobj_private.h" + #define HANDLE_ERROR(err) { hr = err; TRACE("(HRESULT=%x)\n", (HRESULT)err); goto CLEANUP; } WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -313,6 +315,7 @@ HRESULT WINAPI OleSetClipboard(IDataObject* pDataObj) IEnumFORMATETC* penumFormatetc = NULL; FORMATETC rgelt; BOOL bClipboardOpen = FALSE; + struct oletls *info = COM_CurrentInfo(); /* HGLOBAL hDataObject = 0; OLEClipbrd **ppDataObject; @@ -320,6 +323,12 @@ HRESULT WINAPI OleSetClipboard(IDataObject* pDataObj) TRACE("(%p)\n", pDataObj); + if(!info) + WARN("Could not allocate tls\n"); + else + if(!info->ole_inits) + return CO_E_NOTINITIALIZED; + /* * Make sure we have a clipboard object */ diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index e714064..7e3809e 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -439,12 +439,10 @@ static void test_set_clipboard(void) return; hr = OleSetClipboard(data1); - todo_wine ok(hr == CO_E_NOTINITIALIZED, "OleSetClipboard should have failed with CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); CoInitialize(NULL); hr = OleSetClipboard(data1); - todo_wine ok(hr == CO_E_NOTINITIALIZED || hr == CLIPBRD_E_CANT_SET, /* win9x */ "OleSetClipboard should have failed with "
1
0
0
0
Christian Costa : winealsa.drv: Initialize correctly the header before adding it to the queue.
by Alexandre Julliard
19 Dec '08
19 Dec '08
Module: wine Branch: master Commit: c983cd6423038f2c4709ddf5f832296da0177694 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c983cd6423038f2c4709ddf5f…
Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Dec 18 21:21:45 2008 +0100 winealsa.drv: Initialize correctly the header before adding it to the queue. --- dlls/winealsa.drv/midi.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index cabe9e2..bcb39cd 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -578,7 +578,10 @@ static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) return MIDIERR_UNPREPARED; EnterCriticalSection(&crit_sect); + lpMidiHdr->dwFlags &= ~WHDR_DONE; lpMidiHdr->dwFlags |= MHDR_INQUEUE; + lpMidiHdr->dwBytesRecorded = 0; + lpMidiHdr->lpNext = 0; if (MidiInDev[wDevID].lpQueueHdr == 0) { MidiInDev[wDevID].lpQueueHdr = lpMidiHdr; } else {
1
0
0
0
Andrew Talbot : jscript: Remove unused Wine debug channel.
by Alexandre Julliard
19 Dec '08
19 Dec '08
Module: wine Branch: master Commit: ebf3a680c71c18a6610ea7cd4658783e938c39e8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ebf3a680c71c18a6610ea7cd4…
Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 18 20:19:45 2008 +0000 jscript: Remove unused Wine debug channel. --- dlls/jscript/parser.y | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 9f3b6d4..96ba29c 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -21,10 +21,6 @@ #include "jscript.h" #include "engine.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); - #define YYLEX_PARAM ctx #define YYPARSE_PARAM ctx
1
0
0
0
Andrew Talbot : kernel32: Remove unused Wine debug channel.
by Alexandre Julliard
19 Dec '08
19 Dec '08
Module: wine Branch: master Commit: a1e31e580ef69354d17ee7e39f66a3f094195e27 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a1e31e580ef69354d17ee7e39…
Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 18 20:19:49 2008 +0000 kernel32: Remove unused Wine debug channel. --- dlls/kernel32/fiber.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/fiber.c b/dlls/kernel32/fiber.c index fda5f92..f828cdc 100644 --- a/dlls/kernel32/fiber.c +++ b/dlls/kernel32/fiber.c @@ -34,9 +34,6 @@ #include "winternl.h" #include "wine/exception.h" #include "wine/library.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(fiber); struct fiber_data {
1
0
0
0
Andrew Talbot : msvcr71: Remove unused Wine debug channel.
by Alexandre Julliard
19 Dec '08
19 Dec '08
Module: wine Branch: master Commit: c1526fd33a227f7d00da64423b91759392c3c64a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c1526fd33a227f7d00da64423…
Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 18 20:19:52 2008 +0000 msvcr71: Remove unused Wine debug channel. --- dlls/msvcr71/msvcr71.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr71/msvcr71.c b/dlls/msvcr71/msvcr71.c index 3ada089..6134982 100644 --- a/dlls/msvcr71/msvcr71.c +++ b/dlls/msvcr71/msvcr71.c @@ -22,9 +22,6 @@ #include "windef.h" #include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msvcr71); BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) {
1
0
0
0
Andrew Talbot : msvcrt40: Remove unused Wine debug channel.
by Alexandre Julliard
19 Dec '08
19 Dec '08
Module: wine Branch: master Commit: bebbc4b7808cb1880a360990f885c5875becc10c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=bebbc4b7808cb1880a360990f…
Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 18 20:19:55 2008 +0000 msvcrt40: Remove unused Wine debug channel. --- dlls/msvcrt40/msvcrt40.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt40/msvcrt40.c b/dlls/msvcrt40/msvcrt40.c index 48e4af0..f178ea0 100644 --- a/dlls/msvcrt40/msvcrt40.c +++ b/dlls/msvcrt40/msvcrt40.c @@ -22,9 +22,6 @@ #include "windef.h" #include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msvcrt40); BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) {
1
0
0
0
Andrew Talbot : ole32: Remove unused Wine debug channel.
by Alexandre Julliard
19 Dec '08
19 Dec '08
Module: wine Branch: master Commit: 96d7c6e2ea00056c830554b4617d4b3c0d3ef6aa URL:
http://source.winehq.org/git/wine.git/?a=commit;h=96d7c6e2ea00056c830554b46…
Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 18 20:19:58 2008 +0000 ole32: Remove unused Wine debug channel. --- dlls/ole32/oleproxy.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index dfc3bc1..11a3ad1 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -41,10 +41,6 @@ #include "moniker.h" #include "comcat.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ole); - /*********************************************************************** * DllGetClassObject [OLE32.@] */
1
0
0
0
Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : oleview: Updated Korean resource.
by Alexandre Julliard
19 Dec '08
19 Dec '08
Module: wine Branch: master Commit: a4a64dc6ef21525968fe59dfb81ff6976a32b05e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a4a64dc6ef21525968fe59dfb…
Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Dec 15 09:51:10 2008 +0900 oleview: Updated Korean resource. --- programs/oleview/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/oleview/Ko.rc b/programs/oleview/Ko.rc index 94d5a53..23d88bd 100644 --- a/programs/oleview/Ko.rc +++ b/programs/oleview/Ko.rc @@ -98,7 +98,7 @@ STRINGTABLE IDS_ABOUTVER "���� 1.0" IDS_TYPELIBTITLE "ITypeLib ���" IDS_OPEN "����" - IDS_OPEN_TYPELIB_FILTER "TypeLib Files (*.tlb;*.olb;*.dll;*.ocx;*.exe)\0*.tlb;*.olb;*.dll;*.ocx;*.exe\0All Files (*.*)\0*.*\0\0" + IDS_OPEN_TYPELIB_FILTER "TypeLib ���� (*.tlb;*.olb;*.dll;*.ocx;*.exe)\0*.tlb;*.olb;*.dll;*.ocx;*.exe\0All Files (*.*)\0*.*\0\0" IDM_BIND, "���� �������� ���� ����" IDM_TYPELIB, "Ÿ�� ���̺귯�� ������ ���� ���� ����"
1
0
0
0
Stefan Dösinger : wined3d: Make pixelshaders disable fog properly.
by Alexandre Julliard
19 Dec '08
19 Dec '08
Module: wine Branch: master Commit: 690cbe76ac4f84b67cebe7779a14e23332e271d8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=690cbe76ac4f84b67cebe7779…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 15 19:35:40 2008 +0100 wined3d: Make pixelshaders disable fog properly. This is a first step towards cleaning up the fog mess. The fog parameter is added to the pixelshader compile args structure. That way multiple pshaders are compiled for different fog settings, and the pixel shader can remove the fog line if fog is not enabled. That way we don't need special fog start and end settings, and this allows us to implement EXP and EXP2 fog in the future too. --- dlls/wined3d/arb_program_shader.c | 42 +++++++++++++++++++++++++----------- dlls/wined3d/glsl_shader.c | 18 ++++++++++++--- dlls/wined3d/pixelshader.c | 26 ++++++++++++++++++++++- dlls/wined3d/state.c | 22 ------------------- dlls/wined3d/wined3d_private.h | 15 ++++++++----- 5 files changed, 77 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4f7f955..b31590a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1905,27 +1905,43 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, SHADER_BUF shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION); /* We need two variables for fog blending */ - shader_addline(buffer, "TEMP TMP_FOG;\n"); + if(args->fog != FOG_OFF) shader_addline(buffer, "TEMP TMP_FOG;\n"); if (shader_version >= WINED3DPS_VERSION(2,0)) shader_addline(buffer, "TEMP TMP_COLOR;\n"); /* Base Shader Body */ shader_generate_main( (IWineD3DBaseShader*) This, buffer, reg_maps, function); - /* calculate fog and blend it - * NOTE: state.fog.params.y and state.fog.params.z don't hold fog start s and end e but - * -1/(e-s) and e/(e-s) respectively. - */ - shader_addline(buffer, "MAD_SAT TMP_FOG, fragment.fogcoord, state.fog.params.y, state.fog.params.z;\n"); - - fragcolor = (shader_version < WINED3DPS_VERSION(2,0)) ? "R0" : "TMP_COLOR"; - + if (shader_version < WINED3DPS_VERSION(2,0)) { + fragcolor = "R0"; + } else { + fragcolor = "TMP_COLOR"; + } if(args->srgb_correction) { arbfp_add_sRGB_correction(buffer, fragcolor, "TMP", "TMP2", "TA", "TB"); } - if (shader_version < WINED3DPS_VERSION(3,0)) - { - shader_addline(buffer, "LRP result.color.rgb, TMP_FOG.x, %s, state.fog.color;\n", fragcolor); - shader_addline(buffer, "MOV result.color.a, %s.a;\n", fragcolor); + if (shader_version < WINED3DPS_VERSION(3,0)) { + /* calculate fog and blend it + * NOTE: state.fog.params.y and state.fog.params.z don't hold fog start s and end e but + * -1/(e-s) and e/(e-s) respectively. + */ + switch(args->fog) { + case FOG_OFF: + shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); + break; + case FOG_LINEAR: + shader_addline(buffer, "MAD_SAT TMP_FOG, fragment.fogcoord, state.fog.params.y, state.fog.params.z;\n"); + shader_addline(buffer, "LRP result.color.rgb, TMP_FOG.x, %s, state.fog.color;\n", fragcolor); + shader_addline(buffer, "MOV result.color.a, %s.a;\n", fragcolor); + break; + case FOG_EXP: + FIXME("Implement EXP fog in ARB\n"); + shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); + break; + case FOG_EXP2: + FIXME("Implement EXP2 fog in ARB\n"); + shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); + break; + } } shader_addline(buffer, "END\n"); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 59e3427..b9a0e2e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3675,10 +3675,20 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShader *iface, SHADER_BU * NOTE: gl_Fog.start and gl_Fog.end don't hold fog start s and end e but * -1/(e-s) and e/(e-s) respectively. */ - if (reg_maps->shader_version < WINED3DPS_VERSION(3,0)) - { - shader_addline(buffer, "float Fog = clamp(gl_FogFragCoord * gl_Fog.start + gl_Fog.end, 0.0, 1.0);\n"); - shader_addline(buffer, "%s.xyz = mix(gl_Fog.color.xyz, %s.xyz, Fog);\n", fragcolor, fragcolor); + if(reg_maps->shader_version < WINED3DPS_VERSION(3,0)) { + switch(args->fog) { + case FOG_OFF: break; + case FOG_LINEAR: + shader_addline(buffer, "float Fog = clamp(gl_FogFragCoord * gl_Fog.start + gl_Fog.end, 0.0, 1.0);\n"); + shader_addline(buffer, "%s.xyz = mix(gl_Fog.color.xyz, %s.xyz, Fog);\n", fragcolor, fragcolor); + break; + case FOG_EXP: + FIXME("Implement EXP fog in glsl\n"); + break; + case FOG_EXP2: + FIXME("Implement EXP2 fog in glsl\n"); + break; + } } shader_addline(buffer, "}\n"); diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 94a45cf..15392d8 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -463,9 +463,9 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImp UINT i, sampler; IWineD3DBaseTextureImpl *tex; + memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set */ args->srgb_correction = stateblock->renderState[WINED3DRS_SRGBWRITEENABLE] ? 1 : 0; - memset(args->color_fixup, 0, sizeof(args->color_fixup)); for(i = 0; i < shader->baseShader.num_sampled_samplers; i++) { sampler = shader->baseShader.sampled_samplers[i]; tex = (IWineD3DBaseTextureImpl *) stateblock->textures[sampler]; @@ -484,8 +484,32 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImp } else { args->vp_mode = fixedfunction; } + args->fog = FOG_OFF; } else { args->vp_mode = vertexshader; + if(stateblock->renderState[WINED3DRS_FOGENABLE]) { + switch(stateblock->renderState[WINED3DRS_FOGTABLEMODE]) { + case WINED3DFOG_NONE: + if(((IWineD3DDeviceImpl *) shader->baseShader.device)->strided_streams.u.s.position_transformed || + use_vs((IWineD3DDeviceImpl *) shader->baseShader.device)) { + args->fog = FOG_LINEAR; + break; + } + switch(stateblock->renderState[WINED3DRS_FOGVERTEXMODE]) { + case WINED3DFOG_NONE: /* Drop through */ + case WINED3DFOG_LINEAR: args->fog = FOG_LINEAR; break; + case WINED3DFOG_EXP: args->fog = FOG_EXP; break; + case WINED3DFOG_EXP2: args->fog = FOG_EXP2; break; + } + break; + + case WINED3DFOG_LINEAR: args->fog = FOG_LINEAR; break; + case WINED3DFOG_EXP: args->fog = FOG_EXP; break; + case WINED3DFOG_EXP2: args->fog = FOG_EXP2; break; + } + } else { + args->fog = FOG_OFF; + } } } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0bf357d..e4c819d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -911,18 +911,6 @@ static void state_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo /* No fog? Disable it, and we're done :-) */ glDisable(GL_FOG); checkGLcall("glDisable GL_FOG"); - if (use_ps(stateblock->wineD3DDevice) - && ps_impl->baseShader.reg_maps.shader_version < WINED3DPS_VERSION(3,0)) - { - /* disable fog in the pixel shader - * NOTE: For pixel shader, GL_FOG_START and GL_FOG_END don't hold fog start s and end e but - * -1/(e-s) and e/(e-s) respectively. - */ - glFogf(GL_FOG_START, 0.0f); - checkGLcall("glFogf(GL_FOG_START, fogstart)"); - glFogf(GL_FOG_END, 1.0f); - checkGLcall("glFogf(GL_FOG_END, fogend)"); - } return; } @@ -1168,16 +1156,6 @@ static void state_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo } else { glDisable(GL_FOG); checkGLcall("glDisable GL_FOG"); - if( use_ps(stateblock->wineD3DDevice) ) { - /* disable fog in the pixel shader - * NOTE: For pixel shader, GL_FOG_START and GL_FOG_END don't hold fog start s and end e but - * -1/(e-s) and e/(e-s) respectively. - */ - glFogf(GL_FOG_START, 0.0f); - checkGLcall("glFogf(GL_FOG_START, fogstart)"); - glFogf(GL_FOG_END, 1.0f); - checkGLcall("glFogf(GL_FOG_END, fogend)"); - } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f308c40..d433b53 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -438,6 +438,13 @@ struct stb_const_desc { UINT const_num; }; +enum fogmode { + FOG_OFF, + FOG_LINEAR, + FOG_EXP, + FOG_EXP2 +}; + /* Stateblock dependent parameters which have to be hardcoded * into the shader code */ @@ -445,6 +452,7 @@ struct ps_compile_args { struct color_fixup_desc color_fixup[MAX_FRAGMENT_SAMPLERS]; BOOL srgb_correction; enum vertexprocessing_mode vp_mode; + enum fogmode fog; /* Projected textures(ps 1.0-1.3) */ /* Texture types(2D, Cube, 3D) in ps 1.x */ }; @@ -974,12 +982,7 @@ struct texture_stage_op struct ffp_frag_settings { struct texture_stage_op op[MAX_TEXTURES]; - enum { - FOG_OFF, - FOG_LINEAR, - FOG_EXP, - FOG_EXP2 - } fog; + enum fogmode fog; /* Use an int instead of a char to get dword alignment */ unsigned int sRGB_write; };
1
0
0
0
← Newer
1
...
35
36
37
38
39
40
41
...
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