diff options
| author | Axel Davy <axel.davy@ens.fr> | 2014-11-25 00:38:03 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-11-26 20:09:10 +0000 |
| commit | 6aeae7442d1d5a8b1ff77b6f50f4ac7333cd22b0 (patch) | |
| tree | d39b6e4e69407b1b93d25a0b3aa79bd30ad0e7e1 /src/gallium/state_trackers/nine/swapchain9.c | |
| parent | 133b2087c5ba9942527bc1b218a32205fb7a10a6 (diff) | |
| download | external_mesa3d-6aeae7442d1d5a8b1ff77b6f50f4ac7333cd22b0.zip external_mesa3d-6aeae7442d1d5a8b1ff77b6f50f4ac7333cd22b0.tar.gz external_mesa3d-6aeae7442d1d5a8b1ff77b6f50f4ac7333cd22b0.tar.bz2 | |
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" <mesa-stable@lists.freedesktop.org>
Tested-by: David Heidelberg <david@ixit.cz>
Signed-off-by: Axel Davy <axel.davy@ens.fr>
Diffstat (limited to 'src/gallium/state_trackers/nine/swapchain9.c')
| -rw-r--r-- | src/gallium/state_trackers/nine/swapchain9.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/state_trackers/nine/swapchain9.c b/src/gallium/state_trackers/nine/swapchain9.c index b6f5ef6..5061bf2 100644 --- a/src/gallium/state_trackers/nine/swapchain9.c +++ b/src/gallium/state_trackers/nine/swapchain9.c @@ -304,7 +304,7 @@ NineSwapChain9_Resize( struct NineSwapChain9 *This, } else { desc.Format = pParams->BackBufferFormat; desc.Usage = D3DUSAGE_RENDERTARGET; - hr = NineSurface9_new(pDevice, NineUnknown(This), resource, 0, + hr = NineSurface9_new(pDevice, NineUnknown(This), resource, NULL, 0, 0, 0, &desc, &This->buffers[i]); if (has_present_buffers) pipe_resource_reference(&resource, NULL); @@ -347,7 +347,7 @@ NineSwapChain9_Resize( struct NineSwapChain9 *This, /* XXX wine thinks the container of this should be the device */ desc.Format = pParams->AutoDepthStencilFormat; desc.Usage = D3DUSAGE_DEPTHSTENCIL; - hr = NineSurface9_new(pDevice, NineUnknown(pDevice), resource, 0, + hr = NineSurface9_new(pDevice, NineUnknown(pDevice), resource, NULL, 0, 0, 0, &desc, &This->zsbuf); pipe_resource_reference(&resource, NULL); if (FAILED(hr)) { @@ -832,7 +832,7 @@ NineSwapChain9_GetFrontBufferData( struct NineSwapChain9 *This, /* NineSurface9_CopySurface needs same format. */ desc.Format = dest_surface->desc.Format; desc.Usage = D3DUSAGE_RENDERTARGET; - hr = NineSurface9_new(pDevice, NineUnknown(This), temp_resource, 0, + hr = NineSurface9_new(pDevice, NineUnknown(This), temp_resource, NULL, 0, 0, 0, &desc, &temp_surface); pipe_resource_reference(&temp_resource, NULL); if (FAILED(hr)) { |