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/resource9.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/resource9.c')
| -rw-r--r-- | src/gallium/state_trackers/nine/resource9.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gallium/state_trackers/nine/resource9.c b/src/gallium/state_trackers/nine/resource9.c index c82180be37c..6bdc1d08bac 100644 --- a/src/gallium/state_trackers/nine/resource9.c +++ b/src/gallium/state_trackers/nine/resource9.c @@ -63,7 +63,6 @@ NineResource9_ctor( struct NineResource9 *This, return D3DERR_OUTOFVIDEOMEMORY; } - This->data = NULL; /* FIXME remove, rather set it to null in surface9.c*/ This->type = Type; This->pool = Pool; This->usage = Usage; @@ -88,10 +87,6 @@ NineResource9_dtor( struct NineResource9 *This ) * still hold a reference. */ pipe_resource_reference(&This->resource, NULL); - /* release allocated system memory for non-D3DPOOL_DEFAULT resources */ - if (This->data) - FREE(This->data); - NineUnknown_dtor(&This->base); } |