diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2019-05-27 18:47:31 -0400 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-06-04 09:08:16 -0700 |
| commit | 083159c78e7a73ee88cfe043175324033da8aed6 (patch) | |
| tree | 01a18fd3e6bbdf1c1900691f96e3aed7dbb7d69a | |
| parent | 6bf0ccb6f5e85bdfc01ff84f7836b9561605f9a3 (diff) | |
| download | mesa-083159c78e7a73ee88cfe043175324033da8aed6.tar.gz | |
u_blitter: don't fail mipmap generation for depth formats containing stencil
Bugzilla: https://bugzilla.freedesktop.org/show_bug.cgi?id=109754
Cc: 19.0 19.1 <mesa-stable@lists.freedesktop.org>
Tested-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
(cherry picked from commit 4b11ed443b85e4fcddc5d0ef60dec096ecdb951e)
| -rw-r--r-- | src/gallium/auxiliary/util/u_blitter.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c index e19fde9873d..3dc49cd0958 100644 --- a/src/gallium/auxiliary/util/u_blitter.c +++ b/src/gallium/auxiliary/util/u_blitter.c @@ -2059,7 +2059,8 @@ void util_blitter_generate_mipmap(struct blitter_context *blitter, target = PIPE_TEXTURE_2D_ARRAY; assert(tex->nr_samples <= 1); - assert(!util_format_has_stencil(desc)); + /* Disallow stencil formats without depth. */ + assert(!util_format_has_stencil(desc) || util_format_has_depth(desc)); is_depth = desc->colorspace == UTIL_FORMAT_COLORSPACE_ZS; |