mesa: add MaxNumLevels to gl_texture_image, remove MaxLog2
authorMarek Olšák <maraeo@gmail.com>
Sun, 11 Nov 2012 14:22:32 +0000 (15:22 +0100)
committerMarek Olšák <maraeo@gmail.com>
Fri, 23 Nov 2012 00:27:00 +0000 (01:27 +0100)
commitefa6b5e42b427c1ec9f2d636d280c84e7da71346
tree5a9670308ffe91287815db398aea584b0185053c
parent492b69f3be3e355064c67bc6f4a30d40e997ce9d
mesa: add MaxNumLevels to gl_texture_image, remove MaxLog2

MaxLog2 led to bugs, because it didn't work well with 1D and 3D textures.

NOTE: This is a candidate for the stable branches.

v2: correct the comment at MaxNumlevels

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
(cherry picked from commit 8111342e814304730bed34446ea816cbc17a5775)

Conflicts:
src/mesa/main/teximage.h
src/mesa/drivers/dri/nouveau/nouveau_texture.c
src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
src/mesa/main/mtypes.h
src/mesa/main/teximage.c
src/mesa/main/teximage.h