diff options
| author | Axel Davy <[email protected]> | 2014-11-25 00:38:03 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-11-26 20:09:10 +0000 |
| commit | 6aeae7442d1d5a8b1ff77b6f50f4ac7333cd22b0 (patch) | |
| tree | d39b6e4e69407b1b93d25a0b3aa79bd30ad0e7e1 /src/gallium/state_trackers/nine/basetexture9.c | |
| parent | 133b2087c5ba9942527bc1b218a32205fb7a10a6 (diff) | |
st/nine: rework the way D3DPOOL_SYSTEMMEM is handled
This patch moves the data field from Resource9 to Surface9 and cleans
D3DPOOL_SYSTEMMEM handling in Texture9. This fixes HL2 lost coast.
It also removes in Texture9 some code written to support importing
and exporting non D3DPOOL_SYSTEMMEM shared buffers. This code hadn't
the design required to support the feature and wasn't used.
Cc: "10.4" <[email protected]>
Tested-by: David Heidelberg <[email protected]>
Signed-off-by: Axel Davy <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers/nine/basetexture9.c')
| -rw-r--r-- | src/gallium/state_trackers/nine/basetexture9.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/nine/basetexture9.c b/src/gallium/state_trackers/nine/basetexture9.c index 6d415921799..7bf2f564ea0 100644 --- a/src/gallium/state_trackers/nine/basetexture9.c +++ b/src/gallium/state_trackers/nine/basetexture9.c @@ -493,9 +493,9 @@ NineBaseTexture9_PreLoad( struct NineBaseTexture9 *This ) void NineBaseTexture9_Dump( struct NineBaseTexture9 *This ) { - DBG("\nNineBaseTexture9(%p->%p/%p): Pool=%s Type=%s Usage=%s\n" + DBG("\nNineBaseTexture9(%p->NULL/%p): Pool=%s Type=%s Usage=%s\n" "Format=%s Dims=%ux%ux%u/%u LastLevel=%u Lod=%u(%u)\n", This, - This->base.resource, This->base.data, + This->base.resource, nine_D3DPOOL_to_str(This->base.pool), nine_D3DRTYPE_to_str(This->base.type), nine_D3DUSAGE_to_str(This->base.usage), |