KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Axel Davy 2015-02-20 12:51:55 +01:00
parent 907f28f87e
commit e7b1a1e57c
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/state_trackers/nine/adapter9.c
View File

@ -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;

10
src/gallium/state_trackers/nine/device9.c
View File

@ -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;