From 2dcad120a04ac42987756d244125bb814e5ca5f5 Mon Sep 17 00:00:00 2001 From: Patrick Rudolph Date: Mon, 12 Jan 2015 17:58:14 +0100 Subject: [PATCH] st/nine: Set [out] argument to NULL for some functions Wine tests, and probably some apps, check for errors by checking for NULL instead of error codes. Fixes wine test test_surface_blocks() Reviewed-by: Axel davy Signed-off-by: Patrick Rudolph --- src/gallium/state_trackers/nine/device9.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/gallium/state_trackers/nine/device9.c b/src/gallium/state_trackers/nine/device9.c index 46b4c5a6c44..fdcf7a28756 100644 --- a/src/gallium/state_trackers/nine/device9.c +++ b/src/gallium/state_trackers/nine/device9.c @@ -765,6 +765,7 @@ NineDevice9_CreateTexture( struct NineDevice9 *This, D3DUSAGE_DYNAMIC | D3DUSAGE_NONSECURE | D3DUSAGE_RENDERTARGET | D3DUSAGE_SOFTWAREPROCESSING | D3DUSAGE_TEXTAPI; + *ppTexture = NULL; user_assert(Width && Height, D3DERR_INVALIDCALL); user_assert(!pSharedHandle || This->ex, D3DERR_INVALIDCALL); /* When is used shared handle, Pool must be @@ -806,6 +807,7 @@ NineDevice9_CreateVolumeTexture( struct NineDevice9 *This, Usage &= D3DUSAGE_DYNAMIC | D3DUSAGE_NONSECURE | D3DUSAGE_SOFTWAREPROCESSING; + *ppVolumeTexture = NULL; user_assert(Width && Height && Depth, D3DERR_INVALIDCALL); user_assert(!pSharedHandle || Pool == D3DPOOL_DEFAULT, D3DERR_INVALIDCALL); @@ -839,6 +841,7 @@ NineDevice9_CreateCubeTexture( struct NineDevice9 *This, D3DUSAGE_NONSECURE | D3DUSAGE_RENDERTARGET | D3DUSAGE_SOFTWAREPROCESSING; + *ppCubeTexture = NULL; user_assert(EdgeLength, D3DERR_INVALIDCALL); user_assert(!pSharedHandle || Pool == D3DPOOL_DEFAULT, D3DERR_INVALIDCALL); @@ -1020,6 +1023,7 @@ NineDevice9_CreateRenderTarget( struct NineDevice9 *This, IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle ) { + *ppSurface = NULL; return create_zs_or_rt_surface(This, 0, D3DPOOL_DEFAULT, Width, Height, Format, MultiSample, MultisampleQuality, @@ -1037,6 +1041,7 @@ NineDevice9_CreateDepthStencilSurface( struct NineDevice9 *This, IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle ) { + *ppSurface = NULL; return create_zs_or_rt_surface(This, 1, D3DPOOL_DEFAULT, Width, Height, Format, MultiSample, MultisampleQuality, @@ -1474,6 +1479,7 @@ NineDevice9_CreateOffscreenPlainSurface( struct NineDevice9 *This, Width, Height, d3dformat_to_string(Format), Format, Pool, ppSurface, pSharedHandle); + *ppSurface = NULL; user_assert(!pSharedHandle || Pool == D3DPOOL_DEFAULT || Pool == D3DPOOL_SYSTEMMEM, D3DERR_INVALIDCALL); user_assert(Pool != D3DPOOL_MANAGED, D3DERR_INVALIDCALL); -- 2.30.2