aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/main/texcompress_fxt1.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-111-4/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * mesa: Use standard integer types.José Fonseca2008-06-241-9/+4
| | | | | | | | Especially get rid of the non-portable long long.
* | Use the GLuint64EXT type defined by GL_EXT_timer_queryBrian Paul2008-05-291-11/+6
|/ | | | Removes some compiler #ifdef stuff.
* Fix a number of MINGW32 issuesZhang2007-07-211-0/+5
|
* mesa: enhance fxt1_quantize_ALPHA1Xiang, Haihao2007-03-181-33/+44
| | | | If possible, let minCol != maxCol
* fix bug 9046Brian Paul2006-11-161-2/+2
|
* include mipmap.hBrian Paul2006-09-291-0/+1
|
* In gl_texture_image, replace ImageStride with an ImageOffsets array.Brian Paul2006-05-201-4/+6
| | | | | | | | | Some hardware lays out 3D mipmaps in a manner that can't be expressed with a simple image stride. The ImageOffsets array is allocated and initialized to typical defaults in the _mesa_init_teximage_fields() function. If needed, a driver will then have to replace these offsets. TexStore and TexelFetch routines updated to use offsets array.
* Replace MESA_FORMAT_DEPTH_COMPONENT_FLOAT32 with 32-bit integer format.Brian Paul2006-04-061-0/+2
| | | | | | | This allows render to depth texture (we don't support floating pt. Z buffers). Rename MESA_FORMAT_DEPTH_COMPONENT16/32 as MESA_FORMAT_Z16/32. Software fallback for glCopyTexImage now uses integer temporary image instead of float, eliminates a lot of float/int conversions.
* fxt1_decode_1() should not be staticBrian Paul2005-11-301-2/+2
|
* Initial work for GL_EXT_packed_depth_stencil extension.Brian Paul2005-09-281-0/+2
| | | | glReadPixels done, glDrawPixels mostly done.
* init a=0Brian Paul2005-09-191-1/+1
|
* use mesa import wrappers, bug 4468Brian Paul2005-09-161-2/+2
|
* remove rendundant r,g,b,a vars (bug 4331)Brian Paul2005-09-121-1/+0
|
* fix GLubyte/GLchan inconsistencies (bug 4331)Brian Paul2005-09-101-77/+121
|
* assorted warning clean-ups for x86_64, etc (Mikko T.)Brian Paul2005-05-071-4/+4
|
* added a bunch of const in the decoderDaniel Borca2005-02-141-30/+29
|
* fxt1_decode_1() needs to be non-static for the tdfx and glide drivers.Adam Jackson2004-12-151-2/+2
|
* explicit cast in a few placesDaniel Borca2004-12-061-2/+2
|
* Use the GL datatypes. Lots of assorted clean-ups.Brian Paul2004-12-031-245/+250
|
* silence a variety of warnings found with g++ 3.4.2Brian Paul2004-12-031-8/+10
|
* use float constantsDaniel Borca2004-11-151-3/+3
|
* cleaned up the mess a bitDaniel Borca2004-11-011-211/+91
|
* decoder "width" parameter represents "stride-in-pixels"Daniel Borca2004-10-291-3/+3
|
* use RowStride instead of Width in texel fetchers.Daniel Borca2004-10-181-11/+11
| | | | changed some pointers to be (char *) instead of (long)
* revived unused code, but got rid of warningsDaniel Borca2004-08-301-10/+10
|
* Silence gcc 3.4 warnings on ReactOS. Mostly unused var warnings. (patch ↵Brian Paul2004-08-251-2/+17
| | | | 1015696)
* Silent compiler "variable may be used uninitialized" warnings.Philippe Houdoin2004-08-141-5/+6
|
* init some vars to silence warningsBrian Paul2004-07-021-8/+8
|
* added support for non-64bit compilersDaniel Borca2004-06-211-29/+64
|
* reworked FXT1Daniel Borca2004-05-311-77/+921
| | | | minor fixes to fxMesa
* oopsDaniel Borca2004-05-251-1/+0
|
* FXT1 texture compression (initial draft)Daniel Borca2004-05-251-35/+640
|
* Fix minor warnings found with g++.Brian Paul2004-05-041-3/+3
|
* texture compression: getting warmerDaniel Borca2004-05-041-19/+13
|
* unbloat namespaceDaniel Borca2004-05-031-16/+18
|
* FXT1: getting warmerDaniel Borca2004-04-301-2/+2
|
* FXT1 preparationsDaniel Borca2004-04-291-6/+133
|
* Removed the old teximage code.Brian Paul2004-04-271-0/+155
Moved all code related to specific texture compression modes into new texcompress_s3tc.c and texcompress_fxt1.c files (but not implemented).