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
May 2022
----- 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
907 discussions
Start a n
N
ew thread
Eric Pouech : winedbg: Do type / id discrimination when parsing.
by Alexandre Julliard
24 May '22
24 May '22
Module: wine Branch: master Commit: 73770ce573422c95347abc774928cf8e9b7c546a URL:
https://source.winehq.org/git/wine.git/?a=commit;h=73770ce573422c95347abc77…
Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri May 20 17:03:27 2022 +0200 winedbg: Do type / id discrimination when parsing. - Get rid of struct type_expr_t - Enable back typecasts (and rewrite the typecast to fit the type parsing scheme) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/dbg.y | 14 ++--- programs/winedbg/debug.l | 9 +++- programs/winedbg/debugger.h | 34 +++--------- programs/winedbg/expr.c | 125 +++++++++++++++++++------------------------- programs/winedbg/stack.c | 8 +-- programs/winedbg/types.c | 85 +++++++++++++++++------------- 6 files changed, 130 insertions(+), 145 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=73770ce573422c95347a…
1
0
0
0
Eric Pouech : winedbg: Use data model for basic type on input.
by Alexandre Julliard
24 May '22
24 May '22
Module: wine Branch: master Commit: af0c59bcc8250bcecb33c80a17afbb69c7c962bc URL:
https://source.winehq.org/git/wine.git/?a=commit;h=af0c59bcc8250bcecb33c80a…
Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri May 20 17:03:27 2022 +0200 winedbg: Use data model for basic type on input. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/dbg.y | 64 ++++-- programs/winedbg/debug.l | 32 ++- programs/winedbg/debugger.h | 36 ++-- programs/winedbg/types.c | 513 +++++++++++++++++++++----------------------- 4 files changed, 329 insertions(+), 316 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=af0c59bcc8250bcecb33…
1
0
0
0
Eric Pouech : winedbg: Redefine internal types with predefined sizes.
by Alexandre Julliard
24 May '22
24 May '22
Module: wine Branch: master Commit: 2d8b709021cf58479d6385f5ced2148ff1358993 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=2d8b709021cf58479d6385f5…
Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri May 20 17:03:27 2022 +0200 winedbg: Redefine internal types with predefined sizes. This will help mapping a name to a basic type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/be_arm.c | 36 ++++++++-------- programs/winedbg/be_arm64.c | 68 +++++++++++++++--------------- programs/winedbg/be_i386.c | 68 +++++++++++++++--------------- programs/winedbg/be_x86_64.c | 98 +++++++++++++++++++++---------------------- programs/winedbg/dbg.y | 34 +++++++-------- programs/winedbg/debugger.h | 30 ++++++++------ programs/winedbg/intvar.h | 22 +++++----- programs/winedbg/stack.c | 7 ++-- programs/winedbg/types.c | 99 ++++++++++++++++++++++++++++++++++++-------- 9 files changed, 266 insertions(+), 196 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=2d8b709021cf58479d63…
1
0
0
0
Eric Pouech : winedbg: Fix retrieving integral values.
by Alexandre Julliard
24 May '22
24 May '22
Module: wine Branch: master Commit: 685126e85711131c4a7b02bd612111a22fd5f53c URL:
https://source.winehq.org/git/wine.git/?a=commit;h=685126e85711131c4a7b02bd…
Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri May 20 17:03:27 2022 +0200 winedbg: Fix retrieving integral values. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/types.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 899e7f472b2..0abd2320570 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -91,11 +91,15 @@ dbg_lgint_t types_extract_as_lgint(const struct dbg_lvalue* lvalue, switch (bt) { case btChar: + case btWChar: + case btBool: case btInt: + case btLong: if (!memory_fetch_integer(lvalue, (unsigned)size, s = TRUE, &rtn)) RaiseException(DEBUG_STATUS_INTERNAL_ERROR, 0, 0, NULL); break; case btUInt: + case btULong: if (!memory_fetch_integer(lvalue, (unsigned)size, s = FALSE, &rtn)) RaiseException(DEBUG_STATUS_INTERNAL_ERROR, 0, 0, NULL); break;
1
0
0
0
Eric Pouech : winedbg: Simplify character output.
by Alexandre Julliard
24 May '22
24 May '22
Module: wine Branch: master Commit: 66c3b8176b74dc933e21786010bb88b789baa6fb URL:
https://source.winehq.org/git/wine.git/?a=commit;h=66c3b8176b74dc933e217860…
Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri May 20 17:03:27 2022 +0200 winedbg: Simplify character output. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/memory.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 16d322cd82c..aa5c32b42f2 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -500,7 +500,6 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) case btInt: case btLong: if (!memory_fetch_integer(lvalue, size, TRUE, &val_int)) return; - if (size == 1) goto print_char; dbg_print_hex(size, val_int); break; case btUInt: @@ -513,17 +512,18 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) dbg_printf("%f", val_real); break; case btChar: - case btWChar: - /* sometimes WCHAR is defined as btChar with size = 2, so discrimate - * Ansi/Unicode based on size, not on basetype - */ if (!memory_fetch_integer(lvalue, size, TRUE, &val_int)) return; - print_char: - if ((size == 1 && isprint((char)val_int)) || - (size == 2 && val_int < 127 && isprint((char)val_int))) + if (size == 1 && isprint((char)val_int)) dbg_printf("'%c'", (char)val_int); else - dbg_printf("%d", (int)val_int); + dbg_print_hex(size, val_int); + break; + case btWChar: + if (!memory_fetch_integer(lvalue, size, TRUE, &val_int)) return; + if (size == 2 && iswprint((WCHAR)val_int)) + dbg_printf("L'%lc'", (WCHAR)val_int); + else + dbg_print_hex(size, val_int); break; case btBool: if (!memory_fetch_integer(lvalue, size, TRUE, &val_int)) return; @@ -549,11 +549,11 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) char buffer[1024]; if (!val_ptr) dbg_printf("0x0"); - else if (((bt == btChar || bt == btInt) && size64 == 1) || (bt == btUInt && size64 == 2)) + else if ((bt == btChar && size64 == 1) || (bt == btWChar && size64 == 2)) { if (memory_get_string(dbg_curr_process, val_ptr, sub_lvalue.in_debuggee, - size64 == 2, buffer, sizeof(buffer))) - dbg_printf("\"%s\"", buffer); + bt == btWChar, buffer, sizeof(buffer))) + dbg_printf("%s\"%s\"", bt == btWChar ? "L" : "", buffer); else dbg_printf("*** invalid address %p ***", val_ptr); break;
1
0
0
0
Chip Davis : wined3d: Rename format flags to caps.
by Alexandre Julliard
24 May '22
24 May '22
Module: wine Branch: master Commit: 06b19322187e5ef8ffc06504c322ce9bcdaaa6ee URL:
https://source.winehq.org/git/wine.git/?a=commit;h=06b19322187e5ef8ffc06504…
Author: Chip Davis <cdavis5x(a)gmail.com> Date: Sun May 8 16:37:26 2022 -0500 wined3d: Rename format flags to caps. Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> --- dlls/wined3d/context_gl.c | 2 +- dlls/wined3d/cs.c | 10 +- dlls/wined3d/device.c | 3 +- dlls/wined3d/directx.c | 51 ++-- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/resource.c | 10 +- dlls/wined3d/shader.c | 2 +- dlls/wined3d/state.c | 6 +- dlls/wined3d/texture.c | 28 +- dlls/wined3d/utils.c | 606 +++++++++++++++++++-------------------- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 48 ++-- 13 files changed, 387 insertions(+), 385 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=06b19322187e5ef8ffc0…
1
0
0
0
Chip Davis : wined3d: Move WINED3DFMT_FLAG_CAST_TO_BLOCK to the attributes group.
by Alexandre Julliard
24 May '22
24 May '22
Module: wine Branch: master Commit: ea4de99fad4f35f33201965abe5336a416d88c9e URL:
https://source.winehq.org/git/wine.git/?a=commit;h=ea4de99fad4f35f33201965a…
Author: Chip Davis <cdavis5x(a)gmail.com> Date: Sun May 8 16:37:25 2022 -0500 wined3d: Move WINED3DFMT_FLAG_CAST_TO_BLOCK to the attributes group. Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> --- dlls/wined3d/device.c | 4 +-- dlls/wined3d/utils.c | 55 +++++++++++++++--------------------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 22 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 72c5167131a..33ae584f817 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4723,9 +4723,9 @@ static bool resources_format_compatible(const struct wined3d_resource *src_resou if (src_resource->device->cs->c.state->feature_level < WINED3D_FEATURE_LEVEL_10_1) return false; if ((src_resource->format_attrs & WINED3D_FORMAT_ATTR_BLOCKS) - && (dst_resource->format_flags & WINED3DFMT_FLAG_CAST_TO_BLOCK)) + && (dst_resource->format_attrs & WINED3D_FORMAT_ATTR_CAST_TO_BLOCK)) return src_resource->format->block_byte_count == dst_resource->format->byte_count; - if ((src_resource->format_flags & WINED3DFMT_FLAG_CAST_TO_BLOCK) + if ((src_resource->format_attrs & WINED3D_FORMAT_ATTR_CAST_TO_BLOCK) && (dst_resource->format_attrs & WINED3D_FORMAT_ATTR_BLOCKS)) return src_resource->format->byte_count == dst_resource->format->block_byte_count; return false; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9308848ce97..5b62ae0f542 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -328,42 +328,25 @@ static const struct wined3d_format_base_flags format_base_flags[] = {WINED3DFMT_NVDB, WINED3D_FORMAT_ATTR_EXTENSION}, {WINED3DFMT_ATOC, WINED3D_FORMAT_ATTR_EXTENSION}, {WINED3DFMT_RESZ, WINED3D_FORMAT_ATTR_EXTENSION}, - {WINED3DFMT_R32G32B32A32_TYPELESS, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32G32B32A32_FLOAT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32G32B32A32_UINT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32G32B32A32_SINT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R16G16B16A16_TYPELESS, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R16G16B16A16_FLOAT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R16G16B16A16_UNORM, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R16G16B16A16_UINT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R16G16B16A16_SNORM, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R16G16B16A16_SINT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32G32_TYPELESS, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32G32_FLOAT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32G32_UINT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32G32_SINT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32_TYPELESS, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32_FLOAT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32_UINT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK | WINED3DFMT_FLAG_INDEX_BUFFER}, - {WINED3DFMT_R32_SINT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32B32A32_TYPELESS, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32B32A32_FLOAT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32B32A32_UINT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32B32A32_SINT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R16G16B16A16_TYPELESS, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R16G16B16A16_UNORM, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R16G16B16A16_SNORM, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R16G16B16A16_SINT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32_TYPELESS, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32_FLOAT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32_UINT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32_SINT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32_TYPELESS, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32_FLOAT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32_UINT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK, + WINED3DFMT_FLAG_INDEX_BUFFER}, + {WINED3DFMT_R32_SINT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, {WINED3DFMT_R16_UINT, 0, WINED3DFMT_FLAG_INDEX_BUFFER}, {WINED3DFMT_A8_UNORM, WINED3D_FORMAT_ATTR_NORMALISED}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7145c0ca64b..3d9d19dd880 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6119,6 +6119,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3D_FORMAT_ATTR_BROKEN_PITCH 0x00000100 #define WINED3D_FORMAT_ATTR_HEIGHT_SCALE 0x00000200 #define WINED3D_FORMAT_ATTR_MAPPABLE 0x00000400 +#define WINED3D_FORMAT_ATTR_CAST_TO_BLOCK 0x00000800 /* WineD3D pixel format flags */ #define WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING 0x00000001 @@ -6137,7 +6138,6 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_GEN_MIPMAP 0x00400000 #define WINED3DFMT_FLAG_VERTEX_ATTRIBUTE 0x01000000 #define WINED3DFMT_FLAG_BLIT 0x02000000 -#define WINED3DFMT_FLAG_CAST_TO_BLOCK 0x08000000 #define WINED3DFMT_FLAG_INDEX_BUFFER 0x10000000 struct wined3d_rational
1
0
0
0
Chip Davis : wined3d: Move WINED3DFMT_FLAG_MAPPABLE to the attributes group.
by Alexandre Julliard
24 May '22
24 May '22
Module: wine Branch: master Commit: 03196b9ff9cb54fdb4024aa5cd2dc30db8cfe0ee URL:
https://source.winehq.org/git/wine.git/?a=commit;h=03196b9ff9cb54fdb4024aa5…
Author: Chip Davis <cdavis5x(a)gmail.com> Date: Sun May 8 16:37:24 2022 -0500 wined3d: Move WINED3DFMT_FLAG_MAPPABLE to the attributes group. Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> --- dlls/wined3d/resource.c | 2 +- dlls/wined3d/utils.c | 12 ++++-------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 4ad8745f109..72a0914026f 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -195,7 +195,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->multisample_quality = multisample_quality; resource->usage = usage; resource->bind_flags = bind_flags; - if (resource->format_flags & WINED3DFMT_FLAG_MAPPABLE) + if (resource->format_attrs & WINED3D_FORMAT_ATTR_MAPPABLE) access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; resource->access = access; resource->width = width; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9c472f94160..9308848ce97 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -315,14 +315,10 @@ struct wined3d_format_base_flags * resource size. */ static const struct wined3d_format_base_flags format_base_flags[] = { - {WINED3DFMT_ATI1N, WINED3D_FORMAT_ATTR_BROKEN_PITCH, - WINED3DFMT_FLAG_MAPPABLE}, - {WINED3DFMT_ATI2N, WINED3D_FORMAT_ATTR_BROKEN_PITCH, - WINED3DFMT_FLAG_MAPPABLE}, - {WINED3DFMT_D16_LOCKABLE, 0, - WINED3DFMT_FLAG_MAPPABLE}, - {WINED3DFMT_INTZ, 0, - WINED3DFMT_FLAG_MAPPABLE}, + {WINED3DFMT_ATI1N, WINED3D_FORMAT_ATTR_MAPPABLE | WINED3D_FORMAT_ATTR_BROKEN_PITCH}, + {WINED3DFMT_ATI2N, WINED3D_FORMAT_ATTR_MAPPABLE | WINED3D_FORMAT_ATTR_BROKEN_PITCH}, + {WINED3DFMT_D16_LOCKABLE, WINED3D_FORMAT_ATTR_MAPPABLE}, + {WINED3DFMT_INTZ, WINED3D_FORMAT_ATTR_MAPPABLE}, {WINED3DFMT_R11G11B10_FLOAT, WINED3D_FORMAT_ATTR_FLOAT}, {WINED3DFMT_D32_FLOAT, WINED3D_FORMAT_ATTR_FLOAT}, {WINED3DFMT_S8_UINT_D24_FLOAT, WINED3D_FORMAT_ATTR_FLOAT}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6a5e718950a..7145c0ca64b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6118,6 +6118,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3D_FORMAT_ATTR_COMPRESSED 0x00000080 #define WINED3D_FORMAT_ATTR_BROKEN_PITCH 0x00000100 #define WINED3D_FORMAT_ATTR_HEIGHT_SCALE 0x00000200 +#define WINED3D_FORMAT_ATTR_MAPPABLE 0x00000400 /* WineD3D pixel format flags */ #define WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING 0x00000001 @@ -6136,7 +6137,6 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_GEN_MIPMAP 0x00400000 #define WINED3DFMT_FLAG_VERTEX_ATTRIBUTE 0x01000000 #define WINED3DFMT_FLAG_BLIT 0x02000000 -#define WINED3DFMT_FLAG_MAPPABLE 0x04000000 #define WINED3DFMT_FLAG_CAST_TO_BLOCK 0x08000000 #define WINED3DFMT_FLAG_INDEX_BUFFER 0x10000000
1
0
0
0
Chip Davis : wined3d: Move WINED3DFMT_FLAG_COMPRESSED and HEIGHT_SCALE to the attributes group.
by Alexandre Julliard
24 May '22
24 May '22
Module: wine Branch: master Commit: c24ca3409913d793afc5ac0e4756f70ed672df70 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=c24ca3409913d793afc5ac0e…
Author: Chip Davis <cdavis5x(a)gmail.com> Date: Sun May 8 16:37:22 2022 -0500 wined3d: Move WINED3DFMT_FLAG_COMPRESSED and HEIGHT_SCALE to the attributes group. Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/surface.c | 7 ++----- dlls/wined3d/texture.c | 31 +++++++++++++-------------- dlls/wined3d/utils.c | 44 +++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 6 +++--- 6 files changed, 45 insertions(+), 51 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=c24ca3409913d793afc5…
1
0
0
0
Chip Davis : wined3d: Move WINED3DFMT_FLAG_BLOCKS, BROKEN_PITCH, and BLOCKS_NO_VERIFY to the attributes group.
by Alexandre Julliard
24 May '22
24 May '22
Module: wine Branch: master Commit: 16bfa3b6d2fea8b2931c22fd2b7e6dc336504e36 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=16bfa3b6d2fea8b2931c22fd…
Author: Chip Davis <cdavis5x(a)gmail.com> Date: Sun May 8 16:37:20 2022 -0500 wined3d: Move WINED3DFMT_FLAG_BLOCKS, BROKEN_PITCH, and BLOCKS_NO_VERIFY to the attributes group. Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> --- dlls/wined3d/device.c | 7 +-- dlls/wined3d/resource.c | 9 ++-- dlls/wined3d/surface.c | 11 ++-- dlls/wined3d/texture.c | 8 +-- dlls/wined3d/utils.c | 115 +++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 6 +-- 6 files changed, 93 insertions(+), 63 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=16bfa3b6d2fea8b2931c…
1
0
0
0
← Newer
1
...
18
19
20
21
22
23
24
...
91
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
Results per page:
10
25
50
100
200