[PATCH v4 05/10] wined3d: Move WINED3DFMT_FLAG_EXTENSION to the attributes group.
Chip Davis
wine at gitlab.winehq.org
Thu May 19 23:44:23 CDT 2022
From: Chip Davis <cdavis5x at 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 6305d4dadf4..8bf6cc47361 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1706,8 +1706,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 298cb6aee79..f4275fd3d39 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 e4084cf5778..964b6de68ab 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
#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
@@ -6117,7 +6118,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
--
GitLab
https://gitlab.winehq.org/wine/wine/-/merge_requests/79
More information about the wine-devel
mailing list