Mesa (master): st/nine: Add pool check to SetTexture (v2)
Emil Velikov
evelikov at kemper.freedesktop.org
Wed Nov 26 20:13:36 UTC 2014
Module: Mesa
Branch: master
Commit: 4eea2496bcb573d730f84f34fb76db3e1ec2e733
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4eea2496bcb573d730f84f34fb76db3e1ec2e733
Author: Axel Davy <axel.davy at ens.fr>
Date: Tue Nov 25 00:38:06 2014 +0100
st/nine: Add pool check to SetTexture (v2)
D3DPOOL_SCRATCH is disallowed according to spec.
D3DPOOL_SYSTEMMEM should be allowed but we don't handle it right for now.
v2: Fixes segfault in SetTexture when unsetting the texture
Cc: "10.4" <mesa-stable at lists.freedesktop.org>
Tested-by: David Heidelberg <david at ixit.cz>
Signed-off-by: Axel Davy <axel.davy at ens.fr>
---
src/gallium/state_trackers/nine/device9.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/gallium/state_trackers/nine/device9.c b/src/gallium/state_trackers/nine/device9.c
index e083536..66d5e66 100644
--- a/src/gallium/state_trackers/nine/device9.c
+++ b/src/gallium/state_trackers/nine/device9.c
@@ -2199,6 +2199,7 @@ NineDevice9_SetTexture( struct NineDevice9 *This,
IDirect3DBaseTexture9 *pTexture )
{
struct nine_state *state = This->update;
+ struct NineBaseTexture9 *tex = NineBaseTexture9(pTexture);
DBG("This=%p Stage=%u pTexture=%p\n", This, Stage, pTexture);
@@ -2206,12 +2207,19 @@ NineDevice9_SetTexture( struct NineDevice9 *This,
Stage == D3DDMAPSAMPLER ||
(Stage >= D3DVERTEXTEXTURESAMPLER0 &&
Stage <= D3DVERTEXTEXTURESAMPLER3), D3DERR_INVALIDCALL);
+ user_assert(!tex || tex->base.pool != D3DPOOL_SCRATCH, D3DERR_INVALIDCALL);
+
+ if (unlikely(tex && tex->base.pool == D3DPOOL_SYSTEMMEM)) {
+ /* TODO: Currently not implemented. Better return error
+ * with message telling what's wrong */
+ ERR("This=%p D3DPOOL_SYSTEMMEM not implemented for SetTexture\n", This);
+ user_assert(tex->base.pool != D3DPOOL_SYSTEMMEM, D3DERR_INVALIDCALL);
+ }
if (Stage >= D3DDMAPSAMPLER)
Stage = Stage - D3DDMAPSAMPLER + NINE_MAX_SAMPLERS_PS;
if (!This->is_recording) {
- struct NineBaseTexture9 *tex = NineBaseTexture9(pTexture);
struct NineBaseTexture9 *old = state->texture[Stage];
if (old == tex)
return D3D_OK;
More information about the mesa-commit
mailing list