diff options
| author | Axel Davy <axel.davy@ens.fr> | 2015-02-20 12:51:55 +0100 |
|---|---|---|
| committer | Axel Davy <axel.davy@ens.fr> | 2015-04-29 08:28:10 +0200 |
| commit | e7b1a1e57cdfd8d019ba0ff4cdc2c7239066869f (patch) | |
| tree | 14aa84ae7357f72f2c83631d0674a64996fd6e5b | |
| parent | 907f28f87e3858028bce4477f0b57f7e5d76060a (diff) | |
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>
| -rw-r--r-- | src/gallium/state_trackers/nine/adapter9.c | 2 | ||||
| -rw-r--r-- | src/gallium/state_trackers/nine/device9.c | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/gallium/state_trackers/nine/adapter9.c b/src/gallium/state_trackers/nine/adapter9.c index 069cc03a031..1d751559991 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 9ca1bb93597..1a776a777ca 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; |