fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-04 19:10:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: fix texstore with GL_COLOR_INDEX data

Browse source 
This got broken by 3dbf5bf657.
GL_COLOR_INDEX data is still supported (in legacy contexts), but the new
texstore_swizzle path cannot handle it (and didn't detect this).
Unfortunately there's no piglit test trying to specify textures with a
GL_COLOR_INDEX source format, and I don't really understand how all the color
map stuff which is used by this works, but this caused conform failures
(with a reported mesa implementation error when trying to figure out the color
mapping).

Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
This commit is contained in:
Roland Scheidegger 2014-08-13 19:30:48 +02:00
parent 64c379a3a8
commit b6d29de2c4
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mesa/main/texstore.c
View file

@ -1495,6 +1495,9 @@ texstore_swizzle(TEXSTORE_PARAMS)
if (!is_array)
return GL_FALSE;
if (srcFormat == GL_COLOR_INDEX)
return GL_FALSE;
switch (srcType) {
case GL_FLOAT:
case GL_UNSIGNED_BYTE: