diff options
| author | Axel Davy <axel.davy@ens.fr> | 2016-01-26 18:00:30 +0100 |
|---|---|---|
| committer | Axel Davy <axel.davy@ens.fr> | 2016-02-12 23:26:36 +0100 |
| commit | 6c4774bbe4f259cf7af329ce6493d9b50310689f (patch) | |
| tree | 320bda618db307597c53dab399b5075dff069838 /src/gallium/state_trackers/nine/volumetexture9.c | |
| parent | bb65b189f34fb497b69e1b267cb355a6829d4b6b (diff) | |
| download | external_mesa3d-6c4774bbe4f259cf7af329ce6493d9b50310689f.zip external_mesa3d-6c4774bbe4f259cf7af329ce6493d9b50310689f.tar.gz external_mesa3d-6c4774bbe4f259cf7af329ce6493d9b50310689f.tar.bz2 | |
st/nine: Clean pSharedHandle Texture ctors checks
Clarify the behaviour and clean the checks
Signed-off-by: Axel Davy <axel.davy@ens.fr>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Diffstat (limited to 'src/gallium/state_trackers/nine/volumetexture9.c')
| -rw-r--r-- | src/gallium/state_trackers/nine/volumetexture9.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gallium/state_trackers/nine/volumetexture9.c b/src/gallium/state_trackers/nine/volumetexture9.c index cdfe7f2..cdec21f 100644 --- a/src/gallium/state_trackers/nine/volumetexture9.c +++ b/src/gallium/state_trackers/nine/volumetexture9.c @@ -49,14 +49,15 @@ NineVolumeTexture9_ctor( struct NineVolumeTexture9 *This, Usage, Format, Pool, pSharedHandle); user_assert(Width && Height && Depth, D3DERR_INVALIDCALL); - user_assert(!pSharedHandle || Pool == D3DPOOL_DEFAULT, D3DERR_INVALIDCALL); + + /* user_assert(!pSharedHandle || Pool == D3DPOOL_DEFAULT, D3DERR_INVALIDCALL); */ + user_assert(!pSharedHandle, D3DERR_INVALIDCALL); /* TODO */ + /* An IDirect3DVolume9 cannot be bound as a render target can it ? */ user_assert(!(Usage & (D3DUSAGE_RENDERTARGET | D3DUSAGE_DEPTHSTENCIL)), D3DERR_INVALIDCALL); user_assert(!(Usage & D3DUSAGE_AUTOGENMIPMAP), D3DERR_INVALIDCALL); - user_assert(!pSharedHandle, D3DERR_INVALIDCALL); /* TODO */ - pf = d3d9_to_pipe_format_checked(screen, Format, PIPE_TEXTURE_3D, 0, PIPE_BIND_SAMPLER_VIEW, FALSE); if (pf == PIPE_FORMAT_NONE) |