May 2022 - Wine-commits - list.winehq.org

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

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

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

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

Gabriel Ivăncescu : include: Add IDOMProgressEvent interface and dispinterface.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: efe39dc5d6bcb77da16ed0f9f439e0b7e8c089ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=efe39dc5d6bcb77da16ed0f9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon May 23 18:22:06 2022 +0300 include: Add IDOMProgressEvent interface and dispinterface. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 12 +++++++++++ include/mshtml.idl | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 31e75709db6..f56fc4d6f83 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -141,6 +141,12 @@ #define DISPID_DOMSTORAGEEVENT (DISPID_DOMMESSAGEEVENT+25) #define DISPID_DOMBEFOREUNLOADEVENT (DISPID_DOMSTORAGEEVENT+25) #define DISPID_DOMDRAGEVENT (DISPID_DOMBEFOREUNLOADEVENT+25) +#define DISPID_DOMMSPOINTEREVENT (DISPID_DOMDRAGEVENT+25) +#define DISPID_DOMMSGESTUREEVENT (DISPID_DOMMSPOINTEREVENT+25) +#define DISPID_DOMMSTRANSITIONEVENT (DISPID_DOMMSGESTUREEVENT+25) +#define DISPID_DOMMSANIMATIONEVENT (DISPID_DOMMSTRANSITIONEVENT+25) +#define DISPID_DOMMSMANIPULATIONEVENT (DISPID_DOMMSANIMATIONEVENT+25) +#define DISPID_DOMPROGRESSEVENT (DISPID_DOMMSMANIPULATIONEVENT+25) #define DISPID_DOMIMPLEMENTATION DISPID_NORMAL_FIRST #define DISPID_DOCUMENTCOMPATIBLEINFO DISPID_NORMAL_FIRST @@ -4704,6 +4710,12 @@ #define DISPID_IDOMMESSAGEEVENT_SOURCE DISPID_DOMMESSAGEEVENT+3 #define DISPID_IDOMMESSAGEEVENT_INITMESSAGEEVENT DISPID_DOMMESSAGEEVENT+4 +/* IDOMProgressEvent */ +#define DISPID_IDOMPROGRESSEVENT_LENGTHCOMPUTABLE DISPID_DOMPROGRESSEVENT+1 +#define DISPID_IDOMPROGRESSEVENT_LOADED DISPID_DOMPROGRESSEVENT+2 +#define DISPID_IDOMPROGRESSEVENT_TOTAL DISPID_DOMPROGRESSEVENT+3 +#define DISPID_IDOMPROGRESSEVENT_INITPROGRESSEVENT DISPID_DOMPROGRESSEVENT+4 + /* IHTMLControlElement */ #define DISPID_IHTMLCONTROLELEMENT_TABINDEX STDPROPID_XOBJ_TABINDEX #define DISPID_IHTMLCONTROLELEMENT_FOCUS (DISPID_SITE+0) diff --git a/include/mshtml.idl b/include/mshtml.idl index 162a9691fb6..afeb44213d2 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -28495,6 +28495,68 @@ methods: [in] IHTMLWindow2 *source); } +/***************************************************************************** + * IDOMProgressEvent interface + */ +[ + odl, + oleautomation, + dual, + uuid(3051071e-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDOMProgressEvent : IDispatch +{ + [propget, id(DISPID_IDOMPROGRESSEVENT_LENGTHCOMPUTABLE)] + HRESULT lengthComputable([out, retval] VARIANT_BOOL *p); + + [propget, id(DISPID_IDOMPROGRESSEVENT_LOADED)] + HRESULT loaded([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IDOMPROGRESSEVENT_TOTAL)] + HRESULT total([out, retval] ULONGLONG *p); + + [id(DISPID_IDOMPROGRESSEVENT_INITPROGRESSEVENT)] + HRESULT initProgressEvent( + [in] BSTR eventType, + [in] VARIANT_BOOL canBubble, + [in] VARIANT_BOOL cancelable, + [in] VARIANT_BOOL lengthComputableArg, + [in] ULONGLONG loadedArg, + [in] ULONGLONG totalArg); +}; + +/***************************************************************************** + * DispDOMProgressEvent dispinterface + */ +[ + hidden, + uuid(30590091-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispDOMProgressEvent +{ +properties: +methods: + WINE_IDOMEVENT_DISPINTERFACE_DECL; + + [propget, id(DISPID_IDOMPROGRESSEVENT_LENGTHCOMPUTABLE)] + VARIANT_BOOL lengthComputable(); + + [propget, id(DISPID_IDOMPROGRESSEVENT_LOADED)] + ULONGLONG loaded(); + + [propget, id(DISPID_IDOMPROGRESSEVENT_TOTAL)] + ULONGLONG total(); + + [id(DISPID_IDOMPROGRESSEVENT_INITPROGRESSEVENT)] + void initProgressEvent( + [in] BSTR eventType, + [in] VARIANT_BOOL canBubble, + [in] VARIANT_BOOL cancelable, + [in] VARIANT_BOOL lengthComputableArg, + [in] ULONGLONG loadedArg, + [in] ULONGLONG totalArg); +}; + /***************************************************************************** * IHTMLNamespaceCollection interface */

1 0

Chip Davis : wined3d: Move WINED3DFMT_FLAG_FLOAT to a separate group.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 93add6f3f67f021ffd28d0bffaef9494a3c9ee5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=93add6f3f67f021ffd28d0bf… Author: Chip Davis <cdavis5x(a)gmail.com> Date: Sun May 8 16:36:56 2022 -0500 wined3d: Move WINED3DFMT_FLAG_FLOAT to a separate group. There are only three unused format flags left. I will soon submit changes which add four more format flags. I've noticed that format flags generally fall into two groups: * The first group consists of flags describing the content of a pixel format, e.g. whether or not this is a depth format, or whether this is a blocked format. These flags are the same for all resource types. * The second group consists of flags describing capabilities of the implementation with this format. These can and do vary by resource type. Only the second group needs to be stored per-resource-type. Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> --- dlls/wined3d/adapter_gl.c | 4 +- dlls/wined3d/device.c | 3 +- dlls/wined3d/resource.c | 1 + dlls/wined3d/utils.c | 106 ++++++++++++++++++++++------------------- dlls/wined3d/view.c | 1 + dlls/wined3d/wined3d_private.h | 7 ++- 6 files changed, 68 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=93add6f3f67f021ffd28…

1 0

Chip Davis : wined3d: Move WINED3DFMT_FLAG_INTEGER to the attributes group.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: b4efd57854dd67b612c1dabdd12c92e9b806412f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4efd57854dd67b612c1dabd… Author: Chip Davis <cdavis5x(a)gmail.com> Date: Sun May 8 16:37:15 2022 -0500 wined3d: Move WINED3DFMT_FLAG_INTEGER to the attributes group. Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> --- dlls/wined3d/context_gl.c | 3 ++- dlls/wined3d/texture.c | 2 +- dlls/wined3d/utils.c | 6 +++--- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 0a731dc85f0..95817b74b14 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -5734,6 +5734,7 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c if (element->stride) { DWORD format_flags = format_gl->f.flags[WINED3D_GL_RES_TYPE_BUFFER]; + unsigned int format_attrs = format_gl->f.attrs; bo = wined3d_bo_gl_id(element->data.buffer_object); if (current_bo != bo) @@ -5746,7 +5747,7 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c * pointer. vb can point to a user pointer data blob. In that case * current_bo will be 0. If there is a vertex buffer but no vbo we * won't be load converted attributes anyway. */ - if (vs && vs->reg_maps.shader_version.major >= 4 && (format_flags & WINED3DFMT_FLAG_INTEGER)) + if (vs && vs->reg_maps.shader_version.major >= 4 && (format_attrs & WINED3D_FORMAT_ATTR_INTEGER)) { GL_EXTCALL(glVertexAttribIPointer(i, format_gl->vtx_format, format_gl->vtx_type, element->stride, offset)); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c952f366a68..b3c7d2a9106 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -6655,7 +6655,7 @@ static void vk_blitter_clear_rendertargets(struct wined3d_context_vk *context_vk wined3d_rendertarget_view_vk_barrier(rtv_vk, context_vk, WINED3D_BIND_RENDER_TARGET); c = &clear_values[attachment_count].color; - if (view->format_flags & WINED3DFMT_FLAG_INTEGER) + if (view->format_attrs & WINED3D_FORMAT_ATTR_INTEGER) { c->int32[0] = colour->r; c->int32[1] = colour->g; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index bd909fec6b8..c7ff807d366 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2117,7 +2117,7 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter) if (channel_type == WINED3D_CHANNEL_TYPE_UNORM || channel_type == WINED3D_CHANNEL_TYPE_SNORM) flags |= WINED3DFMT_FLAG_NORMALISED; if (channel_type == WINED3D_CHANNEL_TYPE_UINT || channel_type == WINED3D_CHANNEL_TYPE_SINT) - flags |= WINED3DFMT_FLAG_INTEGER; + attrs |= WINED3D_FORMAT_ATTR_INTEGER; if (channel_type == WINED3D_CHANNEL_TYPE_FLOAT) attrs |= WINED3D_FORMAT_ATTR_FLOAT; if (channel_type != WINED3D_CHANNEL_TYPE_UNUSED) @@ -2598,7 +2598,7 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for if (status == GL_FRAMEBUFFER_COMPLETE && ((format->f.flags[type] & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING) || !(gl_info->quirks & WINED3D_QUIRK_LIMITED_TEX_FILTERING)) - && !(format->f.flags[type] & WINED3DFMT_FLAG_INTEGER) + && !(format->f.attrs & WINED3D_FORMAT_ATTR_INTEGER) && format->f.id != WINED3DFMT_NULL && format->f.id != WINED3DFMT_P8_UINT && format->format != GL_LUMINANCE && format->format != GL_LUMINANCE_ALPHA && (format->f.red_size || format->f.alpha_size)) @@ -3214,7 +3214,7 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win /* ARB_texture_rg defines integer formats if EXT_texture_integer is also supported. */ if (!gl_info->supported[EXT_TEXTURE_INTEGER] - && (format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_INTEGER)) + && (format->f.attrs & WINED3D_FORMAT_ATTR_INTEGER)) continue; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 8ef22ba1999..0874bd506ce 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1571,7 +1571,7 @@ void wined3d_unordered_access_view_gl_clear(struct wined3d_unordered_access_view packed = wined3d_format_pack(&format_gl->f, clear_value); data = &packed; } - else if (resource->format_flags & WINED3DFMT_FLAG_INTEGER) + else if (resource->format_attrs & WINED3D_FORMAT_ATTR_INTEGER) { gl_format = GL_RGBA_INTEGER; gl_type = GL_UNSIGNED_INT; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 596e6c5b1f3..b44997cfce4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6109,6 +6109,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN /* Pixel format attributes */ #define WINED3D_FORMAT_ATTR_FLOAT 0x00000001 +#define WINED3D_FORMAT_ATTR_INTEGER 0x00000002 /* WineD3D pixel format flags */ #define WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING 0x00000001 @@ -6131,7 +6132,6 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_HEIGHT_SCALE 0x00040000 #define WINED3DFMT_FLAG_TEXTURE 0x00080000 #define WINED3DFMT_FLAG_BLOCKS_NO_VERIFY 0x00100000 -#define WINED3DFMT_FLAG_INTEGER 0x00200000 #define WINED3DFMT_FLAG_GEN_MIPMAP 0x00400000 #define WINED3DFMT_FLAG_NORMALISED 0x00800000 #define WINED3DFMT_FLAG_VERTEX_ATTRIBUTE 0x01000000

1 0

Chip Davis : wined3d: Move WINED3DFMT_FLAG_NORMALISED to the attributes group.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: f6ee5b552fd5e466100a4a5300514f47e14116d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6ee5b552fd5e466100a4a53… Author: Chip Davis <cdavis5x(a)gmail.com> Date: Sun May 8 16:37:17 2022 -0500 wined3d: Move WINED3DFMT_FLAG_NORMALISED to the attributes group. Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> --- dlls/wined3d/context_gl.c | 3 +-- dlls/wined3d/device.c | 3 +-- dlls/wined3d/utils.c | 27 +++++++++++++-------------- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 95817b74b14..628b3ffe145 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -5733,7 +5733,6 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c if (element->stride) { - DWORD format_flags = format_gl->f.flags[WINED3D_GL_RES_TYPE_BUFFER]; unsigned int format_attrs = format_gl->f.attrs; bo = wined3d_bo_gl_id(element->data.buffer_object); @@ -5755,7 +5754,7 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c else { GL_EXTCALL(glVertexAttribPointer(i, format_gl->vtx_format, format_gl->vtx_type, - !!(format_flags & WINED3DFMT_FLAG_NORMALISED), element->stride, offset)); + !!(format_attrs & WINED3D_FORMAT_ATTR_NORMALISED), element->stride, offset)); } if (!(context->numbered_array_mask & (1u << i))) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a7227f4f444..baf30fa86ba 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5120,8 +5120,7 @@ void CDECL wined3d_device_context_clear_uav_float(struct wined3d_device_context { TRACE("context %p, view %p, clear_value %s.\n", context, view, debug_vec4(clear_value)); - if (!((view->format->attrs & WINED3D_FORMAT_ATTR_FLOAT) || - (view->format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_NORMALISED))) + if (!(view->format->attrs & (WINED3D_FORMAT_ATTR_FLOAT | WINED3D_FORMAT_ATTR_NORMALISED))) { WARN("Not supported for view format %s.\n", debug_d3dformat(view->format->id)); return; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index c7ff807d366..39010ab5269 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -347,16 +347,16 @@ static const struct wined3d_format_base_flags format_base_flags[] = {WINED3DFMT_R32_UINT, 0, WINED3DFMT_FLAG_CAST_TO_BLOCK | WINED3DFMT_FLAG_INDEX_BUFFER}, {WINED3DFMT_R32_SINT, 0, WINED3DFMT_FLAG_CAST_TO_BLOCK}, {WINED3DFMT_R16_UINT, 0, WINED3DFMT_FLAG_INDEX_BUFFER}, - {WINED3DFMT_A8_UNORM, 0, WINED3DFMT_FLAG_NORMALISED}, - {WINED3DFMT_B10G10R10A2_UNORM, 0, WINED3DFMT_FLAG_NORMALISED}, - {WINED3DFMT_B2G3R3_UNORM, 0, WINED3DFMT_FLAG_NORMALISED}, - {WINED3DFMT_B4G4R4A4_UNORM, 0, WINED3DFMT_FLAG_NORMALISED}, - {WINED3DFMT_B4G4R4X4_UNORM, 0, WINED3DFMT_FLAG_NORMALISED}, - {WINED3DFMT_B5G5R5A1_UNORM, 0, WINED3DFMT_FLAG_NORMALISED}, - {WINED3DFMT_B5G5R5X1_UNORM, 0, WINED3DFMT_FLAG_NORMALISED}, - {WINED3DFMT_B5G6R5_UNORM, 0, WINED3DFMT_FLAG_NORMALISED}, - {WINED3DFMT_B8G8R8_UNORM, 0, WINED3DFMT_FLAG_NORMALISED}, - {WINED3DFMT_R10G10B10A2_UNORM, 0, WINED3DFMT_FLAG_NORMALISED}, + {WINED3DFMT_A8_UNORM, WINED3D_FORMAT_ATTR_NORMALISED}, + {WINED3DFMT_B10G10R10A2_UNORM, WINED3D_FORMAT_ATTR_NORMALISED}, + {WINED3DFMT_B2G3R3_UNORM, WINED3D_FORMAT_ATTR_NORMALISED}, + {WINED3DFMT_B4G4R4A4_UNORM, WINED3D_FORMAT_ATTR_NORMALISED}, + {WINED3DFMT_B4G4R4X4_UNORM, WINED3D_FORMAT_ATTR_NORMALISED}, + {WINED3DFMT_B5G5R5A1_UNORM, WINED3D_FORMAT_ATTR_NORMALISED}, + {WINED3DFMT_B5G5R5X1_UNORM, WINED3D_FORMAT_ATTR_NORMALISED}, + {WINED3DFMT_B5G6R5_UNORM, WINED3D_FORMAT_ATTR_NORMALISED}, + {WINED3DFMT_B8G8R8_UNORM, WINED3D_FORMAT_ATTR_NORMALISED}, + {WINED3DFMT_R10G10B10A2_UNORM, WINED3D_FORMAT_ATTR_NORMALISED}, }; static void rgb888_from_rgb565(WORD rgb565, BYTE *r, BYTE *g, BYTE *b) @@ -2082,8 +2082,8 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter) for (i = 0; i < ARRAY_SIZE(typed_formats); ++i) { struct wined3d_format *typeless_format; - unsigned int flags = 0, attrs = 0; unsigned int component_count = 0; + unsigned int attrs = 0; if (!(format = get_format_internal(adapter, typed_formats[i].id))) return FALSE; @@ -2115,7 +2115,7 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter) enum wined3d_channel_type channel_type = map_channel_type(typed_formats[i].channels[j]); if (channel_type == WINED3D_CHANNEL_TYPE_UNORM || channel_type == WINED3D_CHANNEL_TYPE_SNORM) - flags |= WINED3DFMT_FLAG_NORMALISED; + attrs |= WINED3D_FORMAT_ATTR_NORMALISED; if (channel_type == WINED3D_CHANNEL_TYPE_UINT || channel_type == WINED3D_CHANNEL_TYPE_SINT) attrs |= WINED3D_FORMAT_ATTR_INTEGER; if (channel_type == WINED3D_CHANNEL_TYPE_FLOAT) @@ -2138,7 +2138,6 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter) format->component_count = component_count; format->attrs |= attrs; - format_set_flag(format, flags); } for (i = 0; i < ARRAY_SIZE(ddi_formats); ++i) @@ -6117,7 +6116,7 @@ void wined3d_format_convert_from_float(const struct wined3d_format *format, return; } - if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_NORMALISED) + if (format->attrs & WINED3D_FORMAT_ATTR_NORMALISED) { uint32_t *ret_i = ret; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b44997cfce4..9f03f0a3925 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6110,6 +6110,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN /* Pixel format attributes */ #define WINED3D_FORMAT_ATTR_FLOAT 0x00000001 #define WINED3D_FORMAT_ATTR_INTEGER 0x00000002 +#define WINED3D_FORMAT_ATTR_NORMALISED 0x00000004 /* WineD3D pixel format flags */ #define WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING 0x00000001 @@ -6133,7 +6134,6 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_TEXTURE 0x00080000 #define WINED3DFMT_FLAG_BLOCKS_NO_VERIFY 0x00100000 #define WINED3DFMT_FLAG_GEN_MIPMAP 0x00400000 -#define WINED3DFMT_FLAG_NORMALISED 0x00800000 #define WINED3DFMT_FLAG_VERTEX_ATTRIBUTE 0x01000000 #define WINED3DFMT_FLAG_BLIT 0x02000000 #define WINED3DFMT_FLAG_MAPPABLE 0x04000000

1 0

Chip Davis : wined3d: Move WINED3DFMT_FLAG_BUMPMAP to the attributes group.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 9bdbf0e49c990b669d56b85c5f42da3928faa04f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bdbf0e49c990b669d56b85c… Author: Chip Davis <cdavis5x(a)gmail.com> Date: Sun May 8 16:37:18 2022 -0500 wined3d: Move WINED3DFMT_FLAG_BUMPMAP to the attributes group. Move initialization of the flag itself to `wined3d_format_base_flags`. Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> --- dlls/wined3d/directx.c | 11 +++++++++-- dlls/wined3d/utils.c | 44 ++++++++++++++++++------------------------ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 29 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9bdbf0e49c990b669d56…

1 0

Chip Davis : wined3d: Move WINED3DFMT_FLAG_EXTENSION to the attributes group.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 9e89444bbd59f49cfd1dc85da0aaa9dd927d6c98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e89444bbd59f49cfd1dc85d… Author: Chip Davis <cdavis5x(a)gmail.com> Date: Sun May 8 16:37:19 2022 -0500 wined3d: Move WINED3DFMT_FLAG_EXTENSION to the attributes group. Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> --- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/utils.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f315d590607..c0e722c3bc0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1901,8 +1901,8 @@ static BOOL wined3d_check_surface_format(const struct wined3d_format *format) if ((format->flags[WINED3D_GL_RES_TYPE_TEX_2D] | format->flags[WINED3D_GL_RES_TYPE_RB]) & WINED3DFMT_FLAG_BLIT) return TRUE; - if ((format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_EXTENSION | WINED3DFMT_FLAG_TEXTURE)) - == (WINED3DFMT_FLAG_EXTENSION | WINED3DFMT_FLAG_TEXTURE)) + if ((format->attrs & WINED3D_FORMAT_ATTR_EXTENSION) + && (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_TEXTURE)) return TRUE; return FALSE; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9783b464d06..085e4947f22 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -323,11 +323,11 @@ static const struct wined3d_format_base_flags format_base_flags[] = {WINED3DFMT_D32_FLOAT, WINED3D_FORMAT_ATTR_FLOAT}, {WINED3DFMT_S8_UINT_D24_FLOAT, WINED3D_FORMAT_ATTR_FLOAT}, {WINED3DFMT_D32_FLOAT_S8X24_UINT, WINED3D_FORMAT_ATTR_FLOAT}, - {WINED3DFMT_INST, 0, WINED3DFMT_FLAG_EXTENSION}, - {WINED3DFMT_NULL, 0, WINED3DFMT_FLAG_EXTENSION}, - {WINED3DFMT_NVDB, 0, WINED3DFMT_FLAG_EXTENSION}, - {WINED3DFMT_ATOC, 0, WINED3DFMT_FLAG_EXTENSION}, - {WINED3DFMT_RESZ, 0, WINED3DFMT_FLAG_EXTENSION}, + {WINED3DFMT_INST, WINED3D_FORMAT_ATTR_EXTENSION}, + {WINED3DFMT_NULL, WINED3D_FORMAT_ATTR_EXTENSION}, + {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}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 55ad4adf2f4..81d4ec919e9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6112,6 +6112,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3D_FORMAT_ATTR_INTEGER 0x00000002 #define WINED3D_FORMAT_ATTR_NORMALISED 0x00000004 #define WINED3D_FORMAT_ATTR_BUMPMAP 0x00000008 +#define WINED3D_FORMAT_ATTR_EXTENSION 0x00000010 /* WineD3D pixel format flags */ #define WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING 0x00000001 @@ -6119,7 +6120,6 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_UNORDERED_ACCESS 0x00000004 #define WINED3DFMT_FLAG_DEPTH_STENCIL 0x00000008 #define WINED3DFMT_FLAG_RENDERTARGET 0x00000010 -#define WINED3DFMT_FLAG_EXTENSION 0x00000020 #define WINED3DFMT_FLAG_FBO_ATTACHABLE 0x00000040 #define WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB 0x00000080 #define WINED3DFMT_FLAG_DECOMPRESS 0x00000100

1 0