summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/pack.h
diff options
context:
space:
mode:
authorEduardo Lima Mitev <[email protected]>2014-10-21 19:11:41 +0200
committerIago Toral Quiroga <[email protected]>2015-01-12 11:20:29 +0100
commit87c595c17b9cf8277c0483389204ff82525f65cf (patch)
tree4293f7bab9ebf53dfb8ed2d4ab604a2142f0c867 /src/mesa/main/pack.h
parentea79ab3e8c3766c17d3080e846b815d48c249186 (diff)
mesa: Replace _mesa_unpack_bitmap with _mesa_unpack_image()
_mesa_unpack_bitmap() was introduced by commit 02b801c to handle the case when data is stored in PBO by display lists, in the context of this bug: Incorrect pixels read back if draw bitmap texture through Display list https://bugs.freedesktop.org/show_bug.cgi?id=10370 Since _mesa_unpack_image() already handles the case of GL_BITMAP, this patch removes _mesa_unpack_bitmap() and makes affected calls go through _mesa_unapck_image() instead. The sample test attached to the original bug report passes with this change and there are no piglit regressions. Signed-off-by: Eduardo Lima Mitev <[email protected]> Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/mesa/main/pack.h')
-rw-r--r--src/mesa/main/pack.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mesa/main/pack.h b/src/mesa/main/pack.h
index ddba82eea54..198368fcc83 100644
--- a/src/mesa/main/pack.h
+++ b/src/mesa/main/pack.h
@@ -41,10 +41,6 @@ _mesa_pack_polygon_stipple(const GLuint pattern[32], GLubyte *dest,
const struct gl_pixelstore_attrib *packing);
-extern GLvoid *
-_mesa_unpack_bitmap(GLint width, GLint height, const GLubyte *pixels,
- const struct gl_pixelstore_attrib *packing);
-
extern void
_mesa_pack_bitmap(GLint width, GLint height, const GLubyte *source,
GLubyte *dest, const struct gl_pixelstore_attrib *packing);