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

st/nine: Optimize volume upload with conversion

Browse Source 
Use nine_context_box_upload instead of locking the pipe
for volume upload with format conversion.
nine_context_box_upload already handles format
conversion.

Signed-off-by: Axel Davy <davyaxel0@gmail.com>
This commit is contained in:
Axel Davy
2019-04-10 22:21:48 +02:00
parent fac3f99377
commit 4a51a7c1da
1 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/state_trackers/nine/volume9.c
+25 -27
View File
@@ -372,39 +372,37 @@ NineVolume9_UnlockBox( struct NineVolume9 *This )
--This->lock_count;
if (This->data_conversion) {
struct pipe_transfer *transfer;
uint8_t *dst = This->data;
struct pipe_box box;
u_box_3d(0, 0, 0, This->desc.Width, This->desc.Height, This->desc.Depth,
&box);
pipe = NineDevice9_GetPipe(This->base.device);
if (!dst) {
dst = pipe->transfer_map(pipe,
This->resource,
This->level,
PIPE_TRANSFER_WRITE |
PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE,
&box, &transfer);
if (!dst)
return D3D_OK;
if (This->data) {
(void) util_format_translate_3d(This->info.format,
This->data, This->stride,
This->layer_stride,
0, 0, 0,
This->format_conversion,
This->data_conversion,
This->stride_conversion,
This->layer_stride_conversion,
0, 0, 0,
This->desc.Width, This->desc.Height,
This->desc.Depth);
} else {
nine_context_box_upload(This->base.device,
&This->pending_uploads_counter,
(struct NineUnknown *)This,
This->resource,
This->level,
&box,
This->format_conversion,
This->data_conversion,
This->stride_conversion,
This->layer_stride_conversion,
&box);
}
(void) util_format_translate_3d(This->info.format,
dst, This->data ? This->stride : transfer->stride,
This->data ? This->layer_stride : transfer->layer_stride,
0, 0, 0,
This->format_conversion,
This->data_conversion,
This->stride_conversion,
This->layer_stride_conversion,
0, 0, 0,
This->desc.Width, This->desc.Height,
This->desc.Depth);
if (!This->data)
pipe_transfer_unmap(pipe, transfer);
}
return D3D_OK;