Reviewed-by: Ilia Mirkin <imir...@alum.mit.edu>
On Fri, Apr 24, 2015 at 4:09 PM, Axel Davy <axel.d...@ens.fr> wrote:
> No major vendor advertises it, and we weren't supporting it.
>
> Signed-off-by: Axel Davy <axel.d...@ens.fr>
> ---
> src/gallium/state_trackers/nine/adapter9.c | 2 +-
> 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 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;
> --
> 2.1.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
