Re: [Mesa-dev] [PATCH] st/mesa: also move yoffset to zoffset for 1d array textures

2015-08-16 Thread Marek Olšák
Reviewed-by: Marek Olšák 

On Sun, Aug 16, 2015 at 3:45 AM, Ilia Mirkin  wrote:
> Do the same as in st_TexSubImage. This fixes
> arb_get_texture_sub_image-get on llvmpipe when it is set to prefer
> blits, and nouveau when it uses the 3d engine for blits.
>
> Signed-off-by: Ilia Mirkin 
> ---
>  src/mesa/state_tracker/st_cb_texture.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/src/mesa/state_tracker/st_cb_texture.c 
> b/src/mesa/state_tracker/st_cb_texture.c
> index 715d69c..4f2ef6b 100644
> --- a/src/mesa/state_tracker/st_cb_texture.c
> +++ b/src/mesa/state_tracker/st_cb_texture.c
> @@ -1071,6 +1071,8 @@ st_GetTexSubImage(struct gl_context * ctx,
>
> /* From now on, we need the gallium representation of dimensions. */
> if (gl_target == GL_TEXTURE_1D_ARRAY) {
> +  zoffset = yoffset;
> +  yoffset = 0;
>depth = height;
>height = 1;
> }
> --
> 2.4.6
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH] st/mesa: also move yoffset to zoffset for 1d array textures

2015-08-15 Thread Ilia Mirkin
Do the same as in st_TexSubImage. This fixes
arb_get_texture_sub_image-get on llvmpipe when it is set to prefer
blits, and nouveau when it uses the 3d engine for blits.

Signed-off-by: Ilia Mirkin 
---
 src/mesa/state_tracker/st_cb_texture.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/mesa/state_tracker/st_cb_texture.c 
b/src/mesa/state_tracker/st_cb_texture.c
index 715d69c..4f2ef6b 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -1071,6 +1071,8 @@ st_GetTexSubImage(struct gl_context * ctx,
 
/* From now on, we need the gallium representation of dimensions. */
if (gl_target == GL_TEXTURE_1D_ARRAY) {
+  zoffset = yoffset;
+  yoffset = 0;
   depth = height;
   height = 1;
}
-- 
2.4.6

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev