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

Author: Lucas Stach <[email protected]>
Date:   Wed Aug 10 21:27:27 2022 +0200

etnaviv: properly check number of layers in surface creation

3D textures store their number of layers in the resource depth. As the
assert only checks the array_size, it fails on perfectly valid surface
creation requests. Use the proper helper to get the number of layers.

Fixes piglit spec@arb_framebuffer_object@fbo-incomplete

Signed-off-by: Lucas Stach <[email protected]>
Reviewed-by: Christian Gmeiner <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17996>

---

 src/gallium/drivers/etnaviv/etnaviv_surface.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/etnaviv/etnaviv_surface.c 
b/src/gallium/drivers/etnaviv/etnaviv_surface.c
index e342b96ec78..85a7d470314 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_surface.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_surface.c
@@ -90,7 +90,7 @@ etna_create_surface(struct pipe_context *pctx, struct 
pipe_resource *prsc,
    assert(templat->u.tex.first_layer == templat->u.tex.last_layer);
    unsigned layer = templat->u.tex.first_layer;
    unsigned level = templat->u.tex.level;
-   assert(layer < rsc->base.array_size);
+   assert(layer <= util_max_layer(prsc, level));
 
    surf->base.context = pctx;
 

Reply via email to