fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-08 08:08:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

st/mesa: treat 1D ARRAY upload like a depth or 2D array upload.

Browse source 
This is because the HW doesn't always store a 1D array like a
2D texture, it more likely stores it like 2D texture (i.e.
alignments etc).

This means we upload each slice separately and let the driver
work out where to put it.

this might break nvc0 as I can't test it, I have only nv50 here.

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2011-02-18 14:51:58 +10:00
parent 100cd214e3
commit 13f5a4d316
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/mesa/state_tracker/st_cb_texture.c
View file

@ -579,6 +579,12 @@ st_TexImage(struct gl_context * ctx,
pixels, unpack, "glTexImage");
}
/* for a 1D array upload the image as a series of layer with height = 1 */
if (target == GL_TEXTURE_1D_ARRAY) {
depth = height;
height = 1;
}
/*
* Prepare to store the texture data. Either map the gallium texture buffer
* memory or malloc space for it.
@ -986,6 +992,12 @@ st_TexSubimage(struct gl_context *ctx, GLint dims, GLenum target, GLint level,
if (!pixels)
return;
/* for a 1D array upload the image as a series of layer with height = 1 */
if (target == GL_TEXTURE_1D_ARRAY) {
depth = height;
height = 1;
}
/* Map buffer if necessary. Need to lock to prevent other contexts
* from uploading the buffer under us.
*/