Józef Kucia : d3dx9: Do not try to fill textures other than ARGB in fill texture functions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2c19f22c8a83cf0e1dfc8932b3e30047c4382898
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2c19f22c8a83cf0e1dfc8932b3...

Author: Józef Kucia 
Date:   Mon Oct 22 17:20:28 2012 +0200

d3dx9: Do not try to fill textures other than ARGB in fill texture functions.

---

dlls/d3dx9_36/texture.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c
index 8aa5f97..050bb7a 100644
--- a/dlls/d3dx9_36/texture.c
+++ b/dlls/d3dx9_36/texture.c
@@ -1344,7 +1344,7 @@ HRESULT WINAPI D3DXFillTexture(LPDIRECT3DTEXTURE9 texture,
             return D3DERR_INVALIDCALL;

format = get_format_info(desc.Format);
-        if (format->format == D3DFMT_UNKNOWN)
+        if (format->type != FORMAT_ARGB)
         {
             FIXME("Unsupported texture format %#x\n", desc.Format);
             return D3DERR_INVALIDCALL;
@@ -1746,7 +1746,7 @@ HRESULT WINAPI D3DXFillCubeTexture(LPDIRECT3DCUBETEXTURE9 texture,
             return D3DERR_INVALIDCALL;

format = get_format_info(desc.Format);
-        if (format->format == D3DFMT_UNKNOWN)
+        if (format->type != FORMAT_ARGB)
         {
             FIXME("Unsupported texture format %#x\n", desc.Format);
             return D3DERR_INVALIDCALL;
@@ -1840,7 +1840,7 @@ HRESULT WINAPI D3DXFillVolumeTexture(LPDIRECT3DVOLUMETEXTURE9 texture,
             return D3DERR_INVALIDCALL;

format = get_format_info(desc.Format);
-        if (format->format == D3DFMT_UNKNOWN)
+        if (format->type != FORMAT_ARGB)
         {
             FIXME("Unsupported texture format %#x\n", desc.Format);
             return D3DERR_INVALIDCALL;