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
July
June
May
April
March
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 2016
----- 2025 -----
July 2025
June 2025
May 2025
April 2025
March 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
755 discussions
Start a n
N
ew thread
Michael Müller : include: Add definitions for Win8 pseudo handles.
by Alexandre Julliard
11 Feb '16
11 Feb '16
Module: wine Branch: master Commit: e7bbca8fcc5f460c5b7dc43cfaca661bc802f413 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e7bbca8fcc5f460c5b7dc43cf…
Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 10 22:22:30 2016 +0100 include: Add definitions for Win8 pseudo handles. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/winbase.h b/include/winbase.h index f35391d..89f27c9 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2973,6 +2973,10 @@ WINBASEAPI VOID WINAPI SetLastError(DWORD); #define GetCurrentThread() ((HANDLE)~(ULONG_PTR)1) #endif +#define GetCurrentProcessToken() ((HANDLE)~(ULONG_PTR)3) +#define GetCurrentThreadToken() ((HANDLE)~(ULONG_PTR)4) +#define GetCurrentThreadEffectiveToken() ((HANDLE)~(ULONG_PTR)5) + /* WinMain(entry point) must be declared in winbase.h. */ /* If this is not declared, we cannot compile many sources written with C++. */ int WINAPI WinMain(HINSTANCE,HINSTANCE,LPSTR,int);
1
0
0
0
Henri Verbeet : wined3d: Use wined3d_texture_get_pitch() in wined3d_surface_map().
by Alexandre Julliard
11 Feb '16
11 Feb '16
Module: wine Branch: master Commit: 4155c22e25464f4aa6fa121a786b34d748664bd4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4155c22e25464f4aa6fa121a7…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 10 19:30:00 2016 +0100 wined3d: Use wined3d_texture_get_pitch() in wined3d_surface_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 95ee255..45cefca 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2414,10 +2414,15 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ } if (fmt_flags & WINED3DFMT_FLAG_BROKEN_PITCH) + { map_desc->row_pitch = surface->resource.width * format->byte_count; + map_desc->slice_pitch = surface->resource.height * map_desc->row_pitch; + } else - map_desc->row_pitch = wined3d_surface_get_pitch(surface); - map_desc->slice_pitch = surface->resource.height * map_desc->row_pitch; + { + wined3d_texture_get_pitch(surface->container, surface->texture_level, + &map_desc->row_pitch, &map_desc->slice_pitch); + } if (!box) {
1
0
0
0
Henri Verbeet : wined3d: Use wined3d_texture_get_pitch() in surface_upload_from_surface().
by Alexandre Julliard
11 Feb '16
11 Feb '16
Module: wine Branch: master Commit: bb385366a110a8223667a3fbbc8f5960a4cca321 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=bb385366a110a8223667a3fbb…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 10 19:29:59 2016 +0100 wined3d: Use wined3d_texture_get_pitch() in surface_upload_from_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 820fbfa..95ee255 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1590,6 +1590,7 @@ static BOOL surface_check_block_align_rect(struct wined3d_surface *surface, cons HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) { + unsigned int src_row_pitch, src_slice_pitch; const struct wined3d_format *src_format; const struct wined3d_format *dst_format; unsigned int src_fmt_flags, dst_fmt_flags; @@ -1599,7 +1600,6 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P UINT update_w, update_h; UINT dst_w, dst_h; RECT r, dst_rect; - UINT src_pitch; POINT p; TRACE("dst_surface %p, dst_point %s, src_surface %p, src_rect %s.\n", @@ -1687,10 +1687,10 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P wined3d_texture_bind_and_dirtify(dst_surface->container, context, FALSE); surface_get_memory(src_surface, &data, src_surface->locations); - src_pitch = wined3d_surface_get_pitch(src_surface); + wined3d_texture_get_pitch(src_surface->container, src_surface->texture_level, &src_row_pitch, &src_slice_pitch); wined3d_surface_upload_data(dst_surface, gl_info, src_format, src_rect, - src_pitch, dst_point, FALSE, wined3d_const_bo_address(&data)); + src_row_pitch, dst_point, FALSE, wined3d_const_bo_address(&data)); context_release(context);
1
0
0
0
Henri Verbeet : wined3d: Use wined3d_texture_get_pitch() in surface_download_data().
by Alexandre Julliard
11 Feb '16
11 Feb '16
Module: wine Branch: master Commit: ef040d71db045a13df0b3209f542ba4a50787a8d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ef040d71db045a13df0b3209f…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 10 19:29:58 2016 +0100 wined3d: Use wined3d_texture_get_pitch() in surface_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b31e2ea..820fbfa 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1330,14 +1330,15 @@ static void surface_download_data(struct wined3d_surface *surface, const struct } else { - unsigned int src_row_pitch, src_slice_pitch, dst_pitch = 0; + unsigned int dst_row_pitch, dst_slice_pitch; + unsigned int src_row_pitch, src_slice_pitch; GLenum gl_format = format->glFormat; GLenum gl_type = format->glType; void *mem; if (surface->flags & SFLAG_NONPOW2) { - dst_pitch = wined3d_surface_get_pitch(surface); + wined3d_texture_get_pitch(surface->container, surface->texture_level, &dst_row_pitch, &dst_slice_pitch); wined3d_format_calculate_pitch(format, surface->resource.device->surface_alignment, surface->pow2Width, surface->pow2Height, &src_row_pitch, &src_slice_pitch); mem = HeapAlloc(GetProcessHeap(), 0, src_slice_pitch); @@ -1425,12 +1426,12 @@ static void surface_download_data(struct wined3d_surface *surface, const struct * won't be released, and doesn't have to be re-read. */ src_data = mem; dst_data = data.addr; - TRACE("Repacking the surface data from pitch %u to pitch %u.\n", src_row_pitch, dst_pitch); + TRACE("Repacking the surface data from pitch %u to pitch %u.\n", src_row_pitch, dst_row_pitch); for (y = 0; y < surface->resource.height; ++y) { - memcpy(dst_data, src_data, dst_pitch); + memcpy(dst_data, src_data, dst_row_pitch); src_data += src_row_pitch; - dst_data += dst_pitch; + dst_data += dst_row_pitch; } HeapFree(GetProcessHeap(), 0, mem);
1
0
0
0
Henri Verbeet : wined3d: Use wined3d_texture_get_pitch() in surface_create_dib_section().
by Alexandre Julliard
11 Feb '16
11 Feb '16
Module: wine Branch: master Commit: fdecf9e452042be81f86aa9ec3de49a65d06759d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=fdecf9e452042be81f86aa9ec…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 10 19:29:57 2016 +0100 wined3d: Use wined3d_texture_get_pitch() in surface_create_dib_section(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bd8cf45..b31e2ea 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -360,6 +360,7 @@ HRESULT surface_create_dib_section(struct wined3d_surface *surface) { const struct wined3d_format *format = surface->resource.format; unsigned int format_flags = surface->container->resource.format_flags; + unsigned int row_pitch, slice_pitch; SYSTEM_INFO sysInfo; BITMAPINFO *b_info; int extraline = 0; @@ -409,10 +410,10 @@ HRESULT surface_create_dib_section(struct wined3d_surface *surface) b_info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); /* TODO: Is there a nicer way to force a specific alignment? (8 byte for ddraw) */ - b_info->bmiHeader.biWidth = wined3d_surface_get_pitch(surface) / format->byte_count; + wined3d_texture_get_pitch(surface->container, surface->texture_level, &row_pitch, &slice_pitch); + b_info->bmiHeader.biWidth = row_pitch / format->byte_count; b_info->bmiHeader.biHeight = 0 - surface->resource.height - extraline; - b_info->bmiHeader.biSizeImage = (surface->resource.height + extraline) - * wined3d_surface_get_pitch(surface); + b_info->bmiHeader.biSizeImage = (surface->resource.height + extraline) * row_pitch; b_info->bmiHeader.biPlanes = 1; b_info->bmiHeader.biBitCount = format->byte_count * 8;
1
0
0
0
Henri Verbeet : wined3d: Use wined3d_texture_get_pitch() in wined3d_volume_map().
by Alexandre Julliard
11 Feb '16
11 Feb '16
Module: wine Branch: master Commit: 7f69a345748daea05581f48c089012481b6a2820 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7f69a345748daea05581f48c0…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 10 19:29:56 2016 +0100 wined3d: Use wined3d_texture_get_pitch() in wined3d_volume_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 8 ++------ dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 16b6555..75585d8 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -40,11 +40,6 @@ BOOL volume_prepare_system_memory(struct wined3d_volume *volume) return TRUE; } -void wined3d_volume_get_pitch(const struct wined3d_volume *volume, UINT *row_pitch, UINT *slice_pitch) -{ - wined3d_texture_get_pitch(volume->container, volume->texture_level, row_pitch, slice_pitch); -} - /* This call just uploads data, the caller is responsible for binding the * correct texture. */ /* Context activation is done by the caller. */ @@ -588,7 +583,8 @@ HRESULT wined3d_volume_map(struct wined3d_volume *volume, } else { - wined3d_volume_get_pitch(volume, &map_desc->row_pitch, &map_desc->slice_pitch); + wined3d_texture_get_pitch(volume->container, volume->texture_level, + &map_desc->row_pitch, &map_desc->slice_pitch); } if (!box) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 470db1f..56ca786 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2444,7 +2444,6 @@ BOOL volume_prepare_system_memory(struct wined3d_volume *volume) DECLSPEC_HIDDEN HRESULT wined3d_volume_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, unsigned int level, struct wined3d_volume **volume) DECLSPEC_HIDDEN; void wined3d_volume_destroy(struct wined3d_volume *volume) DECLSPEC_HIDDEN; -void wined3d_volume_get_pitch(const struct wined3d_volume *volume, UINT *row_pitch, UINT *slice_pitch) DECLSPEC_HIDDEN; void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) DECLSPEC_HIDDEN; void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD location) DECLSPEC_HIDDEN;
1
0
0
0
Nikolay Sivov : usp10: Use memcpy() to return ScriptLayout() results.
by Alexandre Julliard
11 Feb '16
11 Feb '16
Module: wine Branch: master Commit: a8c6c9f49a8c49a6e14fd4dc6a71f9ef7726180e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a8c6c9f49a8c49a6e14fd4dc6…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 10 13:09:44 2016 +0300 usp10: Use memcpy() to return ScriptLayout() results. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 253177a..3b31867 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3645,7 +3645,6 @@ HRESULT WINAPI ScriptLayout(int runs, const BYTE *level, int *vistolog, int *log if (!indexs) return E_OUTOFMEMORY; - if (vistolog) { for( ich = 0; ich < runs; ich++) @@ -3654,11 +3653,9 @@ HRESULT WINAPI ScriptLayout(int runs, const BYTE *level, int *vistolog, int *log ich = 0; while (ich < runs) ich += BIDI_ReorderV2lLevel(0, indexs+ich, level+ich, runs - ich, FALSE); - for (ich = 0; ich < runs; ich++) - vistolog[ich] = indexs[ich]; + memcpy(vistolog, indexs, runs * sizeof(*vistolog)); } - if (logtovis) { for( ich = 0; ich < runs; ich++) @@ -3667,8 +3664,7 @@ HRESULT WINAPI ScriptLayout(int runs, const BYTE *level, int *vistolog, int *log ich = 0; while (ich < runs) ich += BIDI_ReorderL2vLevel(0, indexs+ich, level+ich, runs - ich, FALSE); - for (ich = 0; ich < runs; ich++) - logtovis[ich] = indexs[ich]; + memcpy(logtovis, indexs, runs * sizeof(*logtovis)); } heap_free(indexs);
1
0
0
0
Jacek Caban : winetest: Added hello.php, a copy of hello.html that avoids caching.
by Alexandre Julliard
11 Feb '16
11 Feb '16
Module: tools Branch: master Commit: be8034671e4a9849a8a32f49221dd50c421c6900 URL:
http://source.winehq.org/git/tools.git/?a=commit;h=be8034671e4a9849a8a32f49…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 11 15:20:24 2016 +0100 winetest: Added hello.php, a copy of hello.html that avoids caching. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/tests/hello.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/winetest/tests/hello.php b/winetest/tests/hello.php new file mode 100644 index 0000000..bed858b --- /dev/null +++ b/winetest/tests/hello.php @@ -0,0 +1,4 @@ +<html><body> +<h1>Hello world!</h1> +This is a test page for the Wine regression test suite. +</body></html>
1
0
0
0
Józef Kucia : wined3d: Add remaining sRGB formats.
by Alexandre Julliard
10 Feb '16
10 Feb '16
Module: wine Branch: master Commit: 9c98d632779862aae15e9e3a25f59065fae03386 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9c98d632779862aae15e9e3a2…
Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 10 02:14:26 2016 +0100 wined3d: Add remaining sRGB formats. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 14 +++++++++++++- include/wine/wined3d.h | 7 +++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9f21be6..d355ee1 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -85,7 +85,9 @@ static const struct wined3d_format_channels formats[] = /* Standard ARGB formats. */ {WINED3DFMT_B8G8R8_UNORM, 8, 8, 8, 0, 16, 8, 0, 0, 3, 0, 0}, {WINED3DFMT_B8G8R8A8_UNORM, 8, 8, 8, 8, 16, 8, 0, 24, 4, 0, 0}, + {WINED3DFMT_B8G8R8A8_UNORM_SRGB, 8, 8, 8, 8, 16, 8, 0, 24, 4, 0, 0}, {WINED3DFMT_B8G8R8X8_UNORM, 8, 8, 8, 0, 16, 8, 0, 0, 4, 0, 0}, + {WINED3DFMT_B8G8R8X8_UNORM_SRGB, 8, 8, 8, 0, 16, 8, 0, 0, 4, 0, 0}, {WINED3DFMT_B5G6R5_UNORM, 5, 6, 5, 0, 11, 5, 0, 0, 2, 0, 0}, {WINED3DFMT_B5G5R5X1_UNORM, 5, 5, 5, 0, 10, 5, 0, 0, 2, 0, 0}, {WINED3DFMT_B5G5R5A1_UNORM, 5, 5, 5, 1, 10, 5, 0, 15, 2, 0, 0}, @@ -1414,10 +1416,13 @@ struct wined3d_format_srgb_info static const struct wined3d_format_srgb_info format_srgb_info[] = { + {WINED3DFMT_R8G8B8A8_UNORM_SRGB, WINED3DFMT_R8G8B8A8_UNORM}, {WINED3DFMT_BC1_UNORM_SRGB, WINED3DFMT_BC1_UNORM}, {WINED3DFMT_BC2_UNORM_SRGB, WINED3DFMT_BC2_UNORM}, {WINED3DFMT_BC3_UNORM_SRGB, WINED3DFMT_BC3_UNORM}, - {WINED3DFMT_R8G8B8A8_UNORM_SRGB, WINED3DFMT_R8G8B8A8_UNORM}, + {WINED3DFMT_B8G8R8A8_UNORM_SRGB, WINED3DFMT_B8G8R8A8_UNORM}, + {WINED3DFMT_B8G8R8X8_UNORM_SRGB, WINED3DFMT_B8G8R8X8_UNORM}, + {WINED3DFMT_BC7_UNORM_SRGB, WINED3DFMT_BC7_UNORM}, }; static inline int getFmtIdx(enum wined3d_format_id format_id) @@ -3276,6 +3281,13 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_B5G5R5A1_UNORM); FMT_TO_STR(WINED3DFMT_B8G8R8A8_UNORM); FMT_TO_STR(WINED3DFMT_B8G8R8X8_UNORM); + FMT_TO_STR(WINED3DFMT_B8G8R8A8_TYPELESS); + FMT_TO_STR(WINED3DFMT_B8G8R8A8_UNORM_SRGB); + FMT_TO_STR(WINED3DFMT_B8G8R8X8_TYPELESS); + FMT_TO_STR(WINED3DFMT_B8G8R8X8_UNORM_SRGB); + FMT_TO_STR(WINED3DFMT_BC7_TYPELESS); + FMT_TO_STR(WINED3DFMT_BC7_UNORM); + FMT_TO_STR(WINED3DFMT_BC7_UNORM_SRGB); FMT_TO_STR(WINED3DFMT_INTZ); FMT_TO_STR(WINED3DFMT_RESZ); FMT_TO_STR(WINED3DFMT_NULL); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index df95da9..f314af3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -214,6 +214,13 @@ enum wined3d_format_id WINED3DFMT_B5G5R5A1_UNORM, WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8X8_UNORM, + WINED3DFMT_B8G8R8A8_TYPELESS, + WINED3DFMT_B8G8R8A8_UNORM_SRGB, + WINED3DFMT_B8G8R8X8_TYPELESS, + WINED3DFMT_B8G8R8X8_UNORM_SRGB, + WINED3DFMT_BC7_TYPELESS, + WINED3DFMT_BC7_UNORM, + WINED3DFMT_BC7_UNORM_SRGB, /* FOURCC formats. */ WINED3DFMT_UYVY = WINEMAKEFOURCC('U','Y','V','Y'), WINED3DFMT_YUY2 = WINEMAKEFOURCC('Y','U','Y','2'),
1
0
0
0
Józef Kucia : wined3d: Fix comment in init_format_texture_info().
by Alexandre Julliard
10 Feb '16
10 Feb '16
Module: wine Branch: master Commit: a8585c2d8d013a1ee40995bcd3610529f6c8e689 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a8585c2d8d013a1ee40995bcd…
Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 10 02:14:25 2016 +0100 wined3d: Fix comment in init_format_texture_info(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index beb104a..9f21be6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2378,7 +2378,7 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win && (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT)) continue; - /* ARB_texture_rg defines integer formats if ARB_texture_integer is also supported. */ + /* ARB_texture_rg defines integer formats if EXT_texture_integer is also supported. */ if (!gl_info->supported[EXT_TEXTURE_INTEGER] && (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_INTEGER)) continue;
1
0
0
0
← Newer
1
...
44
45
46
47
48
49
50
...
76
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
Results per page:
10
25
50
100
200