From 5d11094db15d6a418e58eeed9695186ac9f5f5a9 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 16 Jul 2018 16:44:58 -0700 Subject: [PATCH] v3d: Respect a sampler view's first_layer field. Fixes texturing from EGL images created from cubemap faces, as in dEQP-EGL.functional.image.create.gles2_cubemap_negative_x_rgba_texture --- src/gallium/drivers/v3d/v3dx_state.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/v3d/v3dx_state.c b/src/gallium/drivers/v3d/v3dx_state.c index a092b1fb9e1..4bb90f1a98b 100644 --- a/src/gallium/drivers/v3d/v3dx_state.c +++ b/src/gallium/drivers/v3d/v3dx_state.c @@ -768,7 +768,9 @@ v3d_create_sampler_view(struct pipe_context *pctx, struct pipe_resource *prsc, */ tex.texture_base_pointer = cl_address(NULL, rsc->bo->offset + - rsc->slices[0].offset), + rsc->slices[0].offset + + cso->u.tex.first_layer * + rsc->cube_map_stride), tex.swizzle_r = translate_swizzle(so->swizzle[0]); tex.swizzle_g = translate_swizzle(so->swizzle[1]); -- 2.30.2