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

d3dx9: Add some TRACEs and FIXMEs to D3DXCreateTextureFromFileInMemoryEx.

This commit is contained in:
Matteo Bruni 2014-02-14 15:53:09 +01:00 committed by Alexandre Julliard
parent cd22e8c223
commit dda9da793f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/d3dx9_36/texture.c
View File

@ -534,9 +534,9 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
hr = D3DXGetImageInfoFromFileInMemory(srcdata, srcdatasize, &imginfo); hr = D3DXGetImageInfoFromFileInMemory(srcdata, srcdatasize, &imginfo);
if (FAILED(hr)) if (FAILED(hr))
{ {
FIXME("Unrecognized file format, returning failure.\n");
*texture = NULL; *texture = NULL;
return hr; return hr;
} }
@ -583,9 +583,9 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi
/* fix texture creation parameters */ /* fix texture creation parameters */
hr = D3DXCheckTextureRequirements(device, &width, &height, &miplevels, usage, &format, pool); hr = D3DXCheckTextureRequirements(device, &width, &height, &miplevels, usage, &format, pool);
if (FAILED(hr)) if (FAILED(hr))
{ {
FIXME("Couldn't find suitable texture parameters.\n");
*texture = NULL; *texture = NULL;
return hr; return hr;
} }
@ -622,11 +622,12 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi
if (FAILED(hr)) if (FAILED(hr))
{ {
FIXME("Texture creation failed.\n");
*texture = NULL; *texture = NULL;
return hr; return hr;
} }
/* Load the file */ TRACE("Texture created correctly. Now loading the texture data into it.\n");
if (imginfo.ImageFileFormat != D3DXIFF_DDS) if (imginfo.ImageFileFormat != D3DXIFF_DDS)
{ {
IDirect3DTexture9_GetSurfaceLevel(*texptr, 0, &surface); IDirect3DTexture9_GetSurfaceLevel(*texptr, 0, &surface);
@ -640,6 +641,7 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi
if (FAILED(hr)) if (FAILED(hr))
{ {
FIXME("Texture loading failed.\n");
IDirect3DTexture9_Release(*texptr); IDirect3DTexture9_Release(*texptr);
*texture = NULL; *texture = NULL;
return hr; return hr;
@ -647,9 +649,9 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi
loaded_miplevels = min(IDirect3DTexture9_GetLevelCount(*texptr), imginfo.MipLevels); loaded_miplevels = min(IDirect3DTexture9_GetLevelCount(*texptr), imginfo.MipLevels);
hr = D3DXFilterTexture((IDirect3DBaseTexture9*) *texptr, palette, loaded_miplevels - 1, mipfilter); hr = D3DXFilterTexture((IDirect3DBaseTexture9*) *texptr, palette, loaded_miplevels - 1, mipfilter);
if (FAILED(hr)) if (FAILED(hr))
{ {
FIXME("Texture filtering failed.\n");
IDirect3DTexture9_Release(*texptr); IDirect3DTexture9_Release(*texptr);
*texture = NULL; *texture = NULL;
return hr; return hr;