Henri Verbeet : wined3d: Get rid of CheckPostPixelShaderBlendingCapability( ).
Alexandre Julliard
julliard at winehq.org
Thu Jan 24 12:59:49 CST 2013
Module: wine
Branch: master
Commit: 63902bfd5cc5061e156274b47dfab667e6827317
URL: http://source.winehq.org/git/wine.git/?a=commit;h=63902bfd5cc5061e156274b47dfab667e6827317
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Jan 24 11:37:40 2013 +0100
wined3d: Get rid of CheckPostPixelShaderBlendingCapability().
---
dlls/wined3d/directx.c | 18 ++++--------------
1 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 33871c6..0af31ad 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -3528,16 +3528,6 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter,
return FALSE;
}
-/* Check if a format support blending in combination with pixel shaders */
-static BOOL CheckPostPixelShaderBlendingCapability(const struct wined3d_adapter *adapter,
- const struct wined3d_format *format)
-{
- /* The flags entry of a format contains the post pixel shader blending capability */
- if (format->flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING) return TRUE;
-
- return FALSE;
-}
-
static BOOL CheckWrapAndMipCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format)
{
/* OpenGL supports mipmapping on all formats basically. Wrapping is unsupported,
@@ -3966,7 +3956,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad
if (usage & WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING)
{
- if (!CheckPostPixelShaderBlendingCapability(adapter, format))
+ if (!(format->flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING))
{
TRACE("[FAILED] - No post pixelshader blending support.\n");
return WINED3DERR_NOTAVAILABLE;
@@ -4049,7 +4039,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad
if (usage & WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING)
{
- if (!CheckPostPixelShaderBlendingCapability(adapter, format))
+ if (!(format->flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING))
{
TRACE("[FAILED] - No post pixelshader blending support.\n");
return WINED3DERR_NOTAVAILABLE;
@@ -4132,7 +4122,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad
if (usage & WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING)
{
- if (!CheckPostPixelShaderBlendingCapability(adapter, format))
+ if (!(format->flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING))
{
TRACE("[FAILED] - No post pixelshader blending support.\n");
return WINED3DERR_NOTAVAILABLE;
@@ -4300,7 +4290,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad
if (usage & WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING)
{
- if (!CheckPostPixelShaderBlendingCapability(adapter, format))
+ if (!(format->flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING))
{
TRACE("[FAILED] - No post pixelshader blending support.\n");
return WINED3DERR_NOTAVAILABLE;
More information about the wine-cvs
mailing list