summaryrefslogtreecommitdiff
path: root/src/mesa/main/texstore.c
AgeCommit message (Collapse)Author
2008-09-11Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into ↵Alan Hourihane
gallium-0.2 Conflicts: src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/main/texstore.c src/mesa/tnl/t_vp_build.c src/mesa/vbo/vbo_exec_draw.c
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-09-04mesa: merge stencil values into depth values for MESA_FORMAT_S8_Z24Xiang, Haihao
2008-09-04mesa: Support for MESA_FORMAT_S8_Z24 textureJakob Bornecrantz
cherry-picked from gallium-0.1
2008-08-08mesa: fix some pixel transfer state tests for depth formatsBrian Paul
2008-08-08mesa: fix out-of-bounds memory reads in swizzle_copy()Brian Paul
2008-08-08mesa: fix out-of-bounds memory reads in swizzle_copy()Brian Paul
2008-07-29mesa: fix issues causing warnings on WindowsBrian Paul
2008-07-25mesa: fix issues causing warnings on WindowsBrian Paul
2008-07-25mesa: Mark as XXX unresolved warnings on windows.Michal Krol
2008-07-15mesa: Silence compiler warnings on Windows.Michal Krol
2008-06-24mesa: Move variable declarations to the scope top.José Fonseca
2008-06-18mesa: Fix bug in _mesa_swizzle_ubyte_imageBrian Paul
2008-06-18mesa: _mesa_texstore_s8_z24 now supports depth only uploadsJakob Bornecrantz
2008-06-18mesa: Added _mesa_texstore_s8_z24Jakob Bornecrantz
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-10mesa: refactor: move #define FEATURE flags into new mfeatures.h fileBrian Paul
Also, check the FEATURE flags in many places.
2008-05-09Remove unused texunit parameter to ctx->Driver.GenerateMipmap()Brian
(cherry picked from commit c3395f4473c8fdf75d04c0dd72e687bc8d8127a7)
2008-05-09Added ctx->Driver.GenerateMipmap() driver hookDave Airlie
(cherry picked from commit 4c2f3dbca940f289e67248682b84a3516d5a3031) Conflicts: src/mesa/drivers/common/driverfuncs.c
2008-02-25Change GetCompressedTexImage in dd_function_table to not take const pointers.Kristian Høgsberg
They're changed by the intel driver implementation and thus not const. Fixes compilation warning.
2008-02-13_mesa_swizzle_ubyt_image: Don't use single swizzle_copy callXiang, Haihao
if components don't match. fix #13508
2008-02-08Remove unused texunit parameter to ctx->Driver.GenerateMipmap()Brian
2008-02-06Added ctx->Driver.GenerateMipmap() driver hookBrian
2007-12-05Fix endianness bug in _mesa_texstore_argb8888()Brian
On big-endian, storing in _mesa_texformat_argb8888 format produced wrong res Also, clean-up nearby code to match. picked from gallium-0.1 branch
2007-12-05Fix endianness bug in _mesa_texstore_argb8888()Brian
On big-endian, storing in _mesa_texformat_argb8888 format produced wrong results. Also, clean-up nearby code to match.
2007-07-08Change float depthScale param to _mesa_unpack_depth_span() to GLuint depthMax.Brian
2007-04-09i915tex: Make sure texture format fetch hooks are initialized.Michel Dänzer
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-17fix some format conversion bugs in glGetTexImage(), bug 10288Haihao Xiang
2007-03-09New IMAGE_RED_TO_LUMINANCE flag passed to _mesa_pack_rgba_span_float() to ↵Brian
fix glGetTexImage(GL_LUMINANCE) bug #10232.
2006-12-14_mesa_swizzle_ubyte_image: Only use single swizzle_copy call when strides match.Michel Dänzer
This fixes texture data corruption with glTexSubimage (and probably glTexImage under some circumstances) with the texstore swizzle path.
2006-11-02comment about a valgrind errorBrian Paul
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-09-29Move mipmap generation functions, texture scaling functions into newBrian Paul
mipmap.c file.
2006-09-25Fix and re-enable swizzling paths for big endian platforms.Michel Dänzer
2006-09-21replace assert(0) with error report, improved comments, etcBrian Paul
2006-09-21Fix incorrect byteswap_mapping(). Disable swizzle path on bigEndianKeith Whitwell
until someone can figure out whats wrong there.
2006-09-21use new _mesa_little_endian() functionBrian Paul
2006-09-21Fix the dstMap for rgb888 and bgr888 texture formats, which are theKeith Whitwell
opposite to what you'd naively expect.
2006-09-20Deal with the overloading of _mesa_texstore_rgba, which is actuallyKeith Whitwell
used to store all sorts of formats. Software mesa fails the glean pixelFormats test, but it appears to be failing even with the swizzle code disabled??
2006-09-20Extend swizzle support to all remaining source formats and textureKeith Whitwell
destination formats.
2006-09-20Support both big and little endian, more source types and moreKeith Whitwell
destination formats through the swizzle path. It would be great to see this tested on eg, PPC machines...
2006-09-20reenable code in _mesa_texstore_rgba8888 to avoid the generic copy path if ↵Roland Scheidegger
only swizzling is required as it works just fine (tested with glean pixelFormats test and a hacked up r200 driver which always uses that format).
2006-09-20Fix various typos to pass glean pixelFormats test.Keith Whitwell
2006-09-20Enhance compute_component_mapping() to convert to and from any of theKeith Whitwell
color base formats.
2006-09-20Fix _mesa_swizzle_ubyte_image() to deal with RGBA->RGB->RGBAKeith Whitwell
conversions, ensuring that the final A value is 0xff in those cases where we use a RGBA hardware texture format to store RGB textures. Fix a couple of cases where hardwired texture conversions were ignoring this restriction.
2006-09-13detect some more cases which can use straight memcpy for _mesa_texstore_rgba8888Roland Scheidegger
2006-08-10finish up texstore for SL8 texture formatBrian Paul
2006-08-09implement some of the sRGB texstore functionsBrian Paul