From: Chip Davis cdavis5x@gmail.com
Signed-off-by: Chip Davis cdavis5x@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