summaryrefslogtreecommitdiff
path: root/src/mesa/state_tracker
diff options
context:
space:
mode:
authorNanley Chery <nanley.g.chery@intel.com>2022-07-21 17:28:22 -0700
committerMarge Bot <emma+marge@anholt.net>2023-02-10 01:40:47 +0000
commitfdabf886be7f6f00d854a7dfa995c3c5b18f0033 (patch)
tree577a640f61d02dcc54510f88ba7f701243c15c17 /src/mesa/state_tracker
parent6d57614fd01228f11a7cf77b56fbe7514790d759 (diff)
mesa/st: Enable compute-based transcoding to DXT5
By enabling this path, we get a 56% decrease in upload time on a texture upload microbenchmark. This was measured on an Ice Lake with an iris driver that tries to use the compressed format fallback path. Reviewed-by: Tapani Pälli <tapani.palli@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19827>
Diffstat (limited to 'src/mesa/state_tracker')
-rw-r--r--src/mesa/state_tracker/st_cb_texture.c31
1 files changed, 31 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index f292ed2333b..fe66d66c000 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -27,6 +27,7 @@
#include <stdio.h>
#include "main/bufferobj.h"
+#include "main/context.h"
#include "main/enums.h"
#include "main/errors.h"
#include "main/fbobject.h"
@@ -65,6 +66,7 @@
#include "state_tracker/st_gen_mipmap.h"
#include "state_tracker/st_atom.h"
#include "state_tracker/st_sampler_view.h"
+#include "state_tracker/st_texcompress_compute.h"
#include "state_tracker/st_util.h"
#include "pipe/p_context.h"
@@ -557,6 +559,35 @@ st_UnmapTextureImage(struct gl_context *ctx,
if (itransfer->box.depth != 0) {
assert(itransfer->box.depth == 1);
+ if (_mesa_is_format_astc_2d(texImage->TexFormat) &&
+ util_format_is_compressed(texImage->pt->format)) {
+
+ /* DXT5 is the only supported transcode target from ASTC. */
+ assert(texImage->pt->format == PIPE_FORMAT_DXT5_RGBA ||
+ texImage->pt->format == PIPE_FORMAT_DXT5_SRGBA);
+
+ /* Try a compute-based transcode. */
+ if (itransfer->box.x == 0 &&
+ itransfer->box.y == 0 &&
+ itransfer->box.width == texImage->Width &&
+ itransfer->box.height == texImage->Height &&
+ _mesa_has_compute_shaders(ctx) &&
+ st_compute_transcode_astc_to_dxt5(st,
+ itransfer->temp_data,
+ itransfer->temp_stride,
+ texImage->TexFormat,
+ texImage->pt,
+ st_texture_image_resource_level(texImage),
+ itransfer->box.z)) {
+
+ /* Mark the unmap as complete. */
+ assert(itransfer->transfer == NULL);
+ memset(itransfer, 0, sizeof(struct st_texture_image_transfer));
+
+ return;
+ }
+ }
+
struct pipe_transfer *transfer;
GLubyte *map = st_texture_image_map(st, texImage,
PIPE_MAP_WRITE |