summaryrefslogtreecommitdiff
path: root/src/mesa/main/image.c
AgeCommit message (Collapse)Author
2008-09-11Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell
A first attempt at moving gallium onto a branch directly off master... It will be interesting to see how much work this takes to get running. Have resolved the conflicts semi-arbitarily, not compiled or tested. Conflicts: .gitignore Makefile configs/config.mgw configs/darwin configs/darwin-x86ppc configs/default configs/freebsd-dri configs/linux-dri configs/linux-dri-xcb configs/linux-fbdev configs/linux-static configs/linux-x86-64-static configs/linux-x86-static doxygen/Makefile include/GL/gl.h progs/demos/Makefile progs/demos/descrip.mms progs/demos/texenv.c progs/egl/.gitignore progs/egl/Makefile progs/glsl/.gitignore progs/glsl/Makefile progs/glsl/convolutions.c progs/samples/Makefile.mgw progs/tests/.gitignore progs/trivial/.gitignore progs/trivial/point-param.c progs/trivial/tri.c progs/xdemos/.gitignore progs/xdemos/glthreads.c src/egl/drivers/demo/Makefile src/egl/drivers/dri/Makefile src/egl/main/Makefile src/glu/Makefile src/glu/sgi/Makefile src/glu/sgi/Makefile.mgw src/glut/glx/Makefile.mgw src/glut/os2/WarpWin.cpp src/glut/os2/glut_cindex.cpp src/glut/os2/glut_gamemode.cpp src/glut/os2/glut_win.cpp src/glut/os2/glut_winmisc.cpp src/glut/os2/os2_glx.cpp src/glut/os2/os2_menu.cpp src/glut/os2/os2_winproc.cpp src/glw/Makefile src/glx/x11/dri_glx.c src/glx/x11/glxext.c src/mesa/Makefile src/mesa/Makefile.mgw src/mesa/descrip.mms src/mesa/drivers/beos/Makefile src/mesa/drivers/common/descrip.mms src/mesa/drivers/common/driverfuncs.c src/mesa/drivers/directfb/Makefile src/mesa/drivers/dri/Makefile.template src/mesa/drivers/dri/common/dri_bufmgr.c src/mesa/drivers/dri/common/dri_bufmgr.h src/mesa/drivers/dri/common/dri_util.c src/mesa/drivers/dri/common/extension_helper.h src/mesa/drivers/dri/common/mmio.h src/mesa/drivers/dri/common/utils.c src/mesa/drivers/dri/common/utils.h src/mesa/drivers/dri/glcore/Makefile src/mesa/drivers/dri/i810/i810screen.c src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/drivers/dri/i915/intel_ioctl.h src/mesa/drivers/dri/i915/intel_screen.c src/mesa/drivers/dri/i915/server/i830_common.h src/mesa/drivers/dri/i915/server/i830_dri.h src/mesa/drivers/dri/i965/intel_screen.c src/mesa/drivers/dri/i965/server/i830_common.h src/mesa/drivers/dri/i965/server/i830_dri.h src/mesa/drivers/dri/mach64/mach64_screen.c src/mesa/drivers/dri/nouveau/nouveau_context.h src/mesa/drivers/dri/nouveau/nouveau_fifo.c src/mesa/drivers/dri/nouveau/nouveau_fifo.h src/mesa/drivers/dri/nouveau/nouveau_screen.c src/mesa/drivers/dri/nouveau/nouveau_screen.h src/mesa/drivers/dri/r128/r128_tex.h src/mesa/drivers/dri/savage/savageioctl.h src/mesa/drivers/fbdev/Makefile src/mesa/drivers/osmesa/Makefile src/mesa/drivers/osmesa/descrip.mms src/mesa/drivers/x11/Makefile src/mesa/drivers/x11/descrip.mms src/mesa/drivers/x11/xm_dd.c src/mesa/glapi/glapi.c src/mesa/glapi/glthread.c src/mesa/main/api_validate.c src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/main/bufferobj.h src/mesa/main/buffers.c src/mesa/main/config.h src/mesa/main/context.c src/mesa/main/descrip.mms src/mesa/main/drawpix.c src/mesa/main/enums.c src/mesa/main/fbobject.c src/mesa/main/glheader.h src/mesa/main/imports.c src/mesa/main/mipmap.c src/mesa/main/mm.c src/mesa/main/mm.h src/mesa/main/mtypes.h src/mesa/main/points.c src/mesa/main/sources src/mesa/main/state.c src/mesa/main/texcompress_fxt1.c src/mesa/main/texenvprogram.c src/mesa/main/texobj.c src/mesa/main/texstate.c src/mesa/main/texstore.c src/mesa/math/descrip.mms src/mesa/shader/arbprogram.c src/mesa/shader/descrip.mms src/mesa/shader/prog_execute.c src/mesa/shader/prog_statevars.c src/mesa/shader/prog_statevars.h src/mesa/shader/prog_uniform.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/shader_api.c src/mesa/shader/slang/descrip.mms src/mesa/shader/slang/library/slang_vertex_builtin_gc.h src/mesa/sources src/mesa/swrast/descrip.mms src/mesa/swrast/s_drawpix.c src/mesa/swrast/s_fragprog.c src/mesa/swrast/s_readpix.c src/mesa/swrast/s_span.c src/mesa/swrast_setup/descrip.mms src/mesa/tnl/descrip.mms src/mesa/tnl/t_context.h src/mesa/tnl/t_vp_build.c src/mesa/tnl/tnl.h src/mesa/vbo/descrip.mms src/mesa/vbo/vbo_context.c src/mesa/vbo/vbo_exec_array.c src/mesa/x86-64/xform4.S src/mesa/x86/rtasm/x86sse.c src/mesa/x86/rtasm/x86sse.h windows/VC6/progs/glut/glut.dsp windows/VC7/mesa/gdi/gdi.vcproj windows/VC7/mesa/glu/glu.vcproj windows/VC7/mesa/mesa.sln windows/VC7/mesa/mesa/mesa.vcproj windows/VC7/mesa/osmesa/osmesa.vcproj windows/VC7/progs/glut/glut.vcproj windows/VC8/mesa/gdi/gdi.vcproj windows/VC8/mesa/glu/glu.vcproj windows/VC8/mesa/mesa.sln windows/VC8/mesa/mesa/mesa.vcproj windows/VC8/progs/glut/glut.vcproj
2008-06-17mesa: fix inconsistent use of GL_UNSIGNED_INT vs. GL_UNSIGNED_INT_24_8_EXT ↵Brian Paul
for Z unpacking
2008-06-17mesa: fix inconsistent use of GL_UNSIGNED_INT vs. GL_UNSIGNED_INT_24_8_EXT ↵Brian Paul
for Z unpacking
2008-06-09mesa: refactor: move _mesa_update_minmax/histogram() into image.cBrian Paul
2008-06-09mesa: refactor: move pixel map/scale/bias code into image.cBrian Paul
pixel.c is just the API-related code now.
2008-05-31mesa: Apply MSVC portability fixes from Alan Hourihane.José Fonseca
2007-09-26don't use scissored bounds in _mesa_clip_copytexsubimage()Brian
2007-09-26Added new _mesa_clip_copytexsubimage() function to do avoid clipping down in ↵Brian
the drivers. This should probably be pulled into main-line Mesa...
2007-08-09fix byte swap bug for GLint stencil indexes (bug 11909)Brian
2007-08-02fix stencil value masking bug 11805, and fix sizeof() bugBrian
2007-07-30handle LSB_FIRST in _mesa_pack_bitmap by the way used inXiang, Haihao
_mesa_unpack_bitmap
2007-07-08Change float depthScale param to _mesa_unpack_depth_span() to GLuint depthMax.Brian
2007-07-08check depthScale value for optimized ushort->uint case (fixes bug 11474)Brian
2007-07-05stencil pixel map didn't work in _mesa_unpack_stencil_span(), bug 11475Brian
2007-07-02avoid unnecessary clamping of depth values (bug 11448)Brian
2007-05-10more indentation fixes, remove 'register' keywordsBrian
2007-05-10re-indent some codeBrian
2007-04-21fix SkipPixels bugs in _mesa_pack_bitmap(), bug 10690Brian
2007-04-19In _mesa_unpack_depth_span() look for special cases of GLuint->GLushort and ↵Brian
GLushort->GLuint conversion. This improves performance and avoids int/float/int conversion problems that can introduce errors during glCopyTexImage(). Another fix for the depth peeling algorithm.
2007-03-21mesa: revert f9f79c8d770e696249bd98c68b563f887562c974Xiang, Haihao
to fix #10232 Table6.1(in gl2.1) has been applied for glGetTexImage before calling into _mesa_pack_rgba_span_float.
2007-03-18mesa: SWAP_BUFF support when calling DrawPixels(DEPTH_COMPONENT)Xiang, Haihao
or TexImage(DEPTH_COMPONENT)
2007-03-16Colortable re-org.Brian
The pixel transfer path has three color table lookups. Use an array [3] to store that info, rather than separate variables.
2007-03-15implement byteswapping for all multi-byte types in ↵Brian
_mesa_pack_rgba_span_float(), bug 10298
2007-03-14Re-org of gl_pixel_attrib struct.Brian
Reorder fields according to the order in which the pixel transfer operations take place. Improve comments. Move the pixel maps out of gl_pixel_attrib since they're not supposed to be pushed/popped by glPush/PopAttrib. New gl_pixelmap and gl_pixelmaps structs to contain the pixelmaps.
2007-03-13mesa: _mesa_unpack_imageXiang, Haihao
1. take packed pixel data as a component 2. fix for GL_BITMAP when compiling glTexImage, etc into a display list: a. flip byte if lsbFirst is true since DefaultPacking->lsbFirst is false. b. handle SkipPixels
2007-03-12clean-up, simplify _mesa_image_row_stride()Brian
2007-03-12take GL_UNPACK_ALIGNMENT into account in _mesa_image_row_stride() for ↵Brian
GL_BITMAP type (bug 10261)
2007-03-09New IMAGE_RED_TO_LUMINANCE flag passed to _mesa_pack_rgba_span_float() to ↵Brian
fix glGetTexImage(GL_LUMINANCE) bug #10232.
2007-01-31_mesa_pack_rgba_span_float: fix for packing data into groupXiang, Haihao
2006-11-16fix glDrawPixels(GL_COLOR_INDEX, GL_BITMAP) bug 9044Brian Paul
2006-10-13remove needless conditionBrian Paul
2006-10-13Consolidate, move, fix code related to color index and stencil image transferBrian Paul
operations (shift, offset, table lookup, etc).
2006-10-13In _mesa_pack_rgba_span_float() we don't need to make a temporary copy ofBrian Paul
incoming colors when applying pixel transfer ops. In all cases, the caller either indicates there's no pixel transfer ops, or the incoming colors are coming from temporary storage already and can be safely modified.
2006-10-13s/GLuint/GLbitfield/Brian Paul
2006-10-13removed obsolete _mesa_pack_rgba_span_chan()Brian Paul
2006-10-12don't use temp storage in _mesa_convert_colors() when possibleBrian Paul
2006-10-11Added _mesa_convert_colors().Brian Paul
_mesa_clip_drawpixels() now handles Pixel.ZoomY==-1.
2006-09-11undo some accidental changes in _mesa_is_legal_format_and_type()Brian Paul
2006-09-10Redefine the BYTE_TO_FLOAT() and SHORT_TO_FLOAT() macros to avoid problemsBrian Paul
converting 0 to exactly 0.0 This goes against the OpenGL spec (see table 2.6) but solves problems when doing byte -> float -> ubyte conversion for particular texture formats.
2006-05-07misc clean-upsBrian Paul
2006-05-05check for float->uint overflow in _mesa_unpack_depth_span()Brian Paul
2006-03-28comment about byteswapping in _mesa_unpack_depth_span()Brian Paul
2006-03-26merge from texman branchBrian Paul
2005-11-12Added OSMesaColorClamp(), bug 4917Brian Paul
2005-11-09Bug 4996.Brian Paul
Replace use of FLOAT_TO_USHORT with either CLAMPED_FLOAT_TO_USHORT or UNCLAMPED_FLOAT_TO_USHORT. Same should be done for UBYTE, UINT, etc.
2005-10-01added _mesa_pack_depth_stencil_span()Brian Paul
2005-09-28Initial work for GL_EXT_packed_depth_stencil extension.Brian Paul
glReadPixels done, glDrawPixels mostly done.
2005-09-06remove DEFARRAY, CHECKARRAY stuffBrian Paul
2004-12-03silence a variety of warnings found with g++ 3.4.2Brian Paul
2004-11-10GL_(UN)PACK_SKIP_IMAGES should only be applied to 3D texture pack/unpackingBrian Paul
and ignored for 1D and 2D images. Need to pass in image dimensions (1,2,3) to the _mesa_image_address() function. This change gets propogated to some other routines. Also added new _mesa_image_address[123]d() convenience functions.