ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Get rid of CheckSrgbReadCapability().

This commit is contained in:
Henri Verbeet 2013-01-22 11:34:09 +01:00 committed by Alexandre Julliard
parent 9307327ede
commit c90a1e5e21
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/wined3d/directx.c
View File

@ -3527,11 +3527,6 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter,
return FALSE; return FALSE;
} }
static BOOL CheckSrgbReadCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format)
{
return format->flags & WINED3DFMT_FLAG_SRGB_READ;
}
/* Check if a format support blending in combination with pixel shaders */ /* Check if a format support blending in combination with pixel shaders */
static BOOL CheckPostPixelShaderBlendingCapability(const struct wined3d_adapter *adapter, static BOOL CheckPostPixelShaderBlendingCapability(const struct wined3d_adapter *adapter,
const struct wined3d_format *format) const struct wined3d_format *format)
@ -3998,7 +3993,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad
if (usage & WINED3DUSAGE_QUERY_SRGBREAD) if (usage & WINED3DUSAGE_QUERY_SRGBREAD)
{ {
if (!CheckSrgbReadCapability(adapter, format)) if (!(format->flags & WINED3DFMT_FLAG_SRGB_READ))
{ {
TRACE("[FAILED] - No sRGB read support.\n"); TRACE("[FAILED] - No sRGB read support.\n");
return WINED3DERR_NOTAVAILABLE; return WINED3DERR_NOTAVAILABLE;
@ -4164,7 +4159,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad
if (usage & WINED3DUSAGE_QUERY_SRGBREAD) if (usage & WINED3DUSAGE_QUERY_SRGBREAD)
{ {
if (!CheckSrgbReadCapability(adapter, format)) if (!(format->flags & WINED3DFMT_FLAG_SRGB_READ))
{ {
TRACE("[FAILED] - No sRGB read support.\n"); TRACE("[FAILED] - No sRGB read support.\n");
return WINED3DERR_NOTAVAILABLE; return WINED3DERR_NOTAVAILABLE;
@ -4332,7 +4327,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad
if (usage & WINED3DUSAGE_QUERY_SRGBREAD) if (usage & WINED3DUSAGE_QUERY_SRGBREAD)
{ {
if (!CheckSrgbReadCapability(adapter, format)) if (!(format->flags & WINED3DFMT_FLAG_SRGB_READ))
{ {
TRACE("[FAILED] - No sRGB read support.\n"); TRACE("[FAILED] - No sRGB read support.\n");
return WINED3DERR_NOTAVAILABLE; return WINED3DERR_NOTAVAILABLE;