From: Axel Davy <axel.davy@ens.fr>
Date: Fri, 20 Feb 2015 11:51:55 +0000 (+0100)
Subject: st/nine: Do not advertise D3DDEVCAPS_TEXTURESYSTEMMEMORY
X-Git-Tag: upstream/17.1.0~19193
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e7b1a1e57cdfd8d019ba0ff4cdc2c7239066869f;p=platform%2Fupstream%2Fmesa.git

st/nine: Do not advertise D3DDEVCAPS_TEXTURESYSTEMMEMORY

No major vendor advertises it, and we weren't supporting it.

Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Axel Davy <axel.davy@ens.fr>
---

diff --git a/src/gallium/state_trackers/nine/adapter9.c b/src/gallium/state_trackers/nine/adapter9.c
index 069cc03..1d75155 100644
--- a/src/gallium/state_trackers/nine/adapter9.c
+++ b/src/gallium/state_trackers/nine/adapter9.c
@@ -545,7 +545,7 @@ NineAdapter9_GetDeviceCaps( struct NineAdapter9 *This,
                      /*D3DDEVCAPS_RTPATCHHANDLEZERO |*/
                      /*D3DDEVCAPS_SEPARATETEXTUREMEMORIES |*/
                      /*D3DDEVCAPS_TEXTURENONLOCALVIDMEM |*/
-                     D3DDEVCAPS_TEXTURESYSTEMMEMORY |
+                     /* D3DDEVCAPS_TEXTURESYSTEMMEMORY |*/
                      D3DDEVCAPS_TEXTUREVIDEOMEMORY |
                      D3DDEVCAPS_TLVERTEXSYSTEMMEMORY |
                      D3DDEVCAPS_TLVERTEXVIDEOMEMORY;
diff --git a/src/gallium/state_trackers/nine/device9.c b/src/gallium/state_trackers/nine/device9.c
index 9ca1bb9..1a776a7 100644
--- a/src/gallium/state_trackers/nine/device9.c
+++ b/src/gallium/state_trackers/nine/device9.c
@@ -2406,14 +2406,8 @@ 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);
-    }
+    user_assert(!tex || (tex->base.pool != D3DPOOL_SCRATCH &&
+                tex->base.pool != D3DPOOL_SYSTEMMEM), D3DERR_INVALIDCALL);
 
     if (Stage >= D3DDMAPSAMPLER)
         Stage = Stage - D3DDMAPSAMPLER + NINE_MAX_SAMPLERS_PS;