Mesa (main): Revert "gallium: add a is_dri_blit_image bool to pipe_blit_info"

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Oct 18 15:59:44 UTC 2021


Module: Mesa
Branch: main
Commit: 7a2e40df5e8490de739c66865f90fa6804e41f6d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7a2e40df5e8490de739c66865f90fa6804e41f6d

Author: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Date:   Fri Oct 15 14:35:09 2021 +0200

Revert "gallium: add a is_dri_blit_image bool to pipe_blit_info"

This reverts commit 22a1b7c5b3a9cdbf05a0fd97fb193763a525b732.

The only use was radeonsi and it switched to PIPE_BIND_DRI_PRIME
instead.

Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13362>

---

 src/gallium/frontends/dri/dri2.c   | 1 -
 src/gallium/include/pipe/p_state.h | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/gallium/frontends/dri/dri2.c b/src/gallium/frontends/dri/dri2.c
index 0bf82bbe72a..1cad733e414 100644
--- a/src/gallium/frontends/dri/dri2.c
+++ b/src/gallium/frontends/dri/dri2.c
@@ -1718,7 +1718,6 @@ dri2_blit_image(__DRIcontext *context, __DRIimage *dst, __DRIimage *src,
    blit.src.format = src->texture->format;
    blit.mask = PIPE_MASK_RGBA;
    blit.filter = PIPE_TEX_FILTER_NEAREST;
-   blit.is_dri_blit_image = true;
 
    pipe->blit(pipe, &blit);
 
diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
index 884d837dba3..c96a387bab8 100644
--- a/src/gallium/include/pipe/p_state.h
+++ b/src/gallium/include/pipe/p_state.h
@@ -903,7 +903,6 @@ struct pipe_blit_info
    bool render_condition_enable; /**< whether the blit should honor the
                                  current render condition */
    bool alpha_blend; /* dst.rgb = src.rgb * src.a + dst.rgb * (1 - src.a) */
-   bool is_dri_blit_image;
 };
 
 /**



More information about the mesa-commit mailing list