wined3d: Restore support for d3d9 extension formats.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
d6b523e69f
commit
6b98d3ebf1
|
@ -5220,6 +5220,13 @@ static BOOL wined3d_check_surface_capability(const struct wined3d_format *format
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ((format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_EXTENSION | WINED3DFMT_FLAG_TEXTURE))
|
||||||
|
== (WINED3DFMT_FLAG_EXTENSION | WINED3DFMT_FLAG_TEXTURE))
|
||||||
|
{
|
||||||
|
TRACE("[OK]\n");
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
/* Reject other formats */
|
/* Reject other formats */
|
||||||
TRACE("[FAILED]\n");
|
TRACE("[FAILED]\n");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
|
@ -333,6 +333,10 @@ static const struct wined3d_format_base_flags format_base_flags[] =
|
||||||
{WINED3DFMT_D32_FLOAT, WINED3DFMT_FLAG_FLOAT},
|
{WINED3DFMT_D32_FLOAT, WINED3DFMT_FLAG_FLOAT},
|
||||||
{WINED3DFMT_S8_UINT_D24_FLOAT, WINED3DFMT_FLAG_FLOAT},
|
{WINED3DFMT_S8_UINT_D24_FLOAT, WINED3DFMT_FLAG_FLOAT},
|
||||||
{WINED3DFMT_D32_FLOAT_S8X24_UINT, WINED3DFMT_FLAG_FLOAT},
|
{WINED3DFMT_D32_FLOAT_S8X24_UINT, WINED3DFMT_FLAG_FLOAT},
|
||||||
|
{WINED3DFMT_INST, WINED3DFMT_FLAG_EXTENSION},
|
||||||
|
{WINED3DFMT_NULL, WINED3DFMT_FLAG_EXTENSION},
|
||||||
|
{WINED3DFMT_NVDB, WINED3DFMT_FLAG_EXTENSION},
|
||||||
|
{WINED3DFMT_RESZ, WINED3DFMT_FLAG_EXTENSION},
|
||||||
};
|
};
|
||||||
|
|
||||||
struct wined3d_format_block_info
|
struct wined3d_format_block_info
|
||||||
|
|
|
@ -4114,6 +4114,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN
|
||||||
#define WINED3DFMT_FLAG_DEPTH 0x00000004
|
#define WINED3DFMT_FLAG_DEPTH 0x00000004
|
||||||
#define WINED3DFMT_FLAG_STENCIL 0x00000008
|
#define WINED3DFMT_FLAG_STENCIL 0x00000008
|
||||||
#define WINED3DFMT_FLAG_RENDERTARGET 0x00000010
|
#define WINED3DFMT_FLAG_RENDERTARGET 0x00000010
|
||||||
|
#define WINED3DFMT_FLAG_EXTENSION 0x00000020
|
||||||
#define WINED3DFMT_FLAG_FBO_ATTACHABLE 0x00000040
|
#define WINED3DFMT_FLAG_FBO_ATTACHABLE 0x00000040
|
||||||
#define WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB 0x00000080
|
#define WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB 0x00000080
|
||||||
#define WINED3DFMT_FLAG_FLOAT 0x00000200
|
#define WINED3DFMT_FLAG_FLOAT 0x00000200
|
||||||
|
|
Loading…
Reference in New Issue