[Mesa-dev] [PATCH] mesa: fix texture view use of _mesa_get_tex_image()

[Brian Paul]

On 12/07/2013 11:17 PM, Chris Forbes wrote:
> The target parameter to _mesa_get_tex_image() is a target enum, not an index.
> When we're setting up faces for a cubemap, it should be
> CUBE_MAP_POSITIVE_X .. CUBE_MAP_NEGATIVE_Z; for all other targets it
> should be the same as the texobj's target.
>
> Fixes broken cubemaps [had only +X face but claimed to have all] produced by
> glTextureView, which then caused various crashes in the driver when we
> tried to use them.
>
> Applies on top of Courtney's texture_view-rc6 branch.
>
> Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
> ---
>   src/mesa/main/textureview.c | 9 +++++++--
>   1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/src/mesa/main/textureview.c b/src/mesa/main/textureview.c
> index 5c08b1a..572dcf3 100644
> --- a/src/mesa/main/textureview.c
> +++ b/src/mesa/main/textureview.c
> @@ -208,8 +208,13 @@ initialize_texture_fields(struct gl_context *ctx,
>      /* Set up all the texture object's gl_texture_images */
>      for (level = 0; level < levels; level++) {
>         for (face = 0; face < numFaces; face++) {
> -         struct gl_texture_image *texImage =
> -                 _mesa_get_tex_image(ctx, texObj, face, level);
> +         struct gl_texture_image *texImage;
> +         GLenum faceTarget = target;
> +
> +         if (target == GL_TEXTURE_CUBE_MAP)
> +            faceTarget = GL_TEXTURE_CUBE_MAP_POSITIVE_X + face;
> +
> +         texImage = _mesa_get_tex_image(ctx, texObj, faceTarget, level);
>
>            if (!texImage) {
>               _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexStorage");
>

Reviewed-by: Brian Paul <brianp at vmware.com>

We could probably add an assertion in _mesa_tex_target_to_face() for 
target >= GL_TEXTURE_1D to make sure target is an enum and not an index.

-Brian