aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers
diff options
context:
space:
mode:
authorAxel Davy <[email protected]>2016-03-07 21:55:30 +0100
committerAxel Davy <[email protected]>2016-05-18 23:37:14 +0200
commit755fbcdf242ac6e2de337de320271386a1774bda (patch)
treea668dd07f36da4ec051d27997101848290dc33d9 /src/gallium/state_trackers
parent52cb8e33c32c3fac1691ff0db34f4c6cd5909995 (diff)
st/nine: Add format fallback with conversion to surfaces
Signed-off-by: Axel Davy <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers')
-rw-r--r--src/gallium/state_trackers/nine/surface9.c70
-rw-r--r--src/gallium/state_trackers/nine/surface9.h3
2 files changed, 72 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/nine/surface9.c b/src/gallium/state_trackers/nine/surface9.c
index da2b46ec3b9..79d4b926902 100644
--- a/src/gallium/state_trackers/nine/surface9.c
+++ b/src/gallium/state_trackers/nine/surface9.c
@@ -105,6 +105,26 @@ NineSurface9_ctor( struct NineSurface9 *This,
if (pDesc->Usage & D3DUSAGE_DEPTHSTENCIL)
This->base.info.bind |= PIPE_BIND_DEPTH_STENCIL;
+ /* Get true format */
+ This->format_conversion = d3d9_to_pipe_format_checked(This->base.info.screen,
+ pDesc->Format,
+ This->base.info.target,
+ This->base.info.nr_samples,
+ This->base.info.bind,
+ FALSE,
+ TRUE);
+ if (This->base.info.format != This->format_conversion) {
+ This->data_conversion = align_malloc(
+ nine_format_get_level_alloc_size(This->format_conversion,
+ pDesc->Width,
+ pDesc->Height,
+ 0), 32);
+ if (!This->data_conversion)
+ return E_OUTOFMEMORY;
+ This->stride_conversion = nine_format_get_stride(This->format_conversion,
+ pDesc->Width);
+ }
+
/* Ram buffer with no parent. Has to allocate the resource itself */
if (!pResource && !pContainer) {
assert(!user_buffer);
@@ -164,6 +184,8 @@ NineSurface9_dtor( struct NineSurface9 *This )
/* Release system memory when we have to manage it (no parent) */
if (!This->base.base.container && This->data)
align_free(This->data);
+ if (This->data_conversion)
+ align_free(This->data_conversion);
NineResource9_dtor(&This->base);
}
@@ -384,7 +406,12 @@ NineSurface9_LockRect( struct NineSurface9 *This,
user_warn(This->desc.Format == D3DFMT_NULL);
- if (This->data) {
+ if (This->data_conversion) {
+ /* For now we only have uncompressed formats here */
+ pLockedRect->Pitch = This->stride_conversion;
+ pLockedRect->pBits = This->data_conversion + box.y * This->stride_conversion +
+ util_format_get_stride(This->format_conversion, box.x);
+ } else if (This->data) {
DBG("returning system memory\n");
/* ATI1 and ATI2 need special handling, because of d3d9 bug.
* We must advertise to the application as if it is uncompressed
@@ -434,6 +461,37 @@ NineSurface9_UnlockRect( struct NineSurface9 *This )
This->transfer = NULL;
}
--This->lock_count;
+
+ if (This->data_conversion) {
+ struct pipe_transfer *transfer;
+ uint8_t *dst = This->data;
+ struct pipe_box box;
+
+ u_box_origin_2d(This->desc.Width, This->desc.Height, &box);
+
+ if (!dst) {
+ dst = This->pipe->transfer_map(This->pipe,
+ This->base.resource,
+ This->level,
+ PIPE_TRANSFER_WRITE |
+ PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE,
+ &box, &transfer);
+ if (!dst)
+ return D3D_OK;
+ }
+
+ (void) util_format_translate(This->base.info.format,
+ dst, This->data ? This->stride : transfer->stride,
+ 0, 0,
+ This->format_conversion,
+ This->data_conversion,
+ This->stride_conversion,
+ 0, 0,
+ This->desc.Width, This->desc.Height);
+
+ if (!This->data)
+ pipe_transfer_unmap(This->pipe, transfer);
+ }
return D3D_OK;
}
@@ -532,6 +590,16 @@ NineSurface9_CopyMemToDefault( struct NineSurface9 *This,
pipe_transfer_unmap(pipe, transfer);
+ if (This->data_conversion)
+ (void) util_format_translate(This->format_conversion,
+ This->data_conversion,
+ This->stride_conversion,
+ dst_x, dst_y,
+ From->base.info.format,
+ From->data, From->stride,
+ src_x, src_y,
+ copy_width, copy_height);
+
NineSurface9_MarkContainerDirty(This);
}
diff --git a/src/gallium/state_trackers/nine/surface9.h b/src/gallium/state_trackers/nine/surface9.h
index 7e8f2d35267..a83e8dd4c71 100644
--- a/src/gallium/state_trackers/nine/surface9.h
+++ b/src/gallium/state_trackers/nine/surface9.h
@@ -48,7 +48,10 @@ struct NineSurface9
D3DSURFACE_DESC desc;
uint8_t *data; /* system memory backing */
+ uint8_t *data_conversion; /* for conversions */
+ enum pipe_format format_conversion;
unsigned stride; /* for system memory backing */
+ unsigned stride_conversion;
};
static inline struct NineSurface9 *
NineSurface9( void *data )