summaryrefslogtreecommitdiff
path: root/src/mesa/swrast/s_blend.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-08-20mesa: fix float blend bugMark Anderson
2008-07-24mesa: Prefix main includes with dir to avoid conflicts.José Fonseca
Some of the headers in src/mesa/main have pretty common names which easily conflict with third-party code, e.g. config.h
2006-10-01New SWspan and SWspanarrays typedefs.Brian Paul
2006-09-29more changes for runtime renderbuffer depthsBrian Paul
2006-09-25Initial work for supporting different renderbuffer color depths at runtime.Brian Paul
2006-09-24Change logicop, blend, masking functions to use the colors/indexes in theBrian Paul
sw_span object, rather than an explicit parameter.
2005-09-16Fix potential segfault when trying to read pixels outside renderbuffer bounds.Brian Paul
Use _swrast_get_values() which does clipping.
2005-06-02Remove last of the old span code.Brian Paul
2005-05-04Major check-in of changes for GL_EXT_framebuffer_object extension.Brian Paul
Main driver impacts: - new code for creating the Mesa GLframebuffer - new span/pixel read/write code Some drivers not yet updated/tested.
2004-01-28s/BlendEquatioRGB/BlendEquationRGB/Brian Paul
2004-01-27Added support for EXT_blend_equation_separate / ATI_blend_equation_separate.Ian Romanick
The internal driver interface was also changed to use BlendEquationSeparate instead of BlendEquation.
2004-01-14added blurb about NVIDIA extensionsBrian Paul
2003-12-15fix GL_MIN/MAX w/ glBlendFuncSeparate bug (Ian Romanick)Brian Paul
2003-11-12Ville Syrjala's logic op patchBrian Paul
2003-06-10fixes for x86 buildsBrian Paul
2003-06-05Removed all RCS / CVS tags (Id, Header, Date, etc.) from everything.Ian Romanick
2003-03-25replace _mesa_ prefix with _swrast_, remove s_histogram.[ch]Brian Paul
2002-10-17patches from Gerk Huisma for float-channel renderingBrian Paul
2002-08-07struct sw_span is again allocated on the stack, but the arrays of spanBrian Paul
data are broken out into a new struct span_arrays which is allocated per-context (to avoid huge stack allocations - a problem on Windows). This lets us use span.redStep instead of span->redStep (for example) to hopefully get slightly better performance in the triangle functions.
2002-06-30blending fixes for CHAN_TYPE==GL_FLOAT (Gerk Huisma)Brian Paul
2002-04-19Added min and max blend functions.Jose Fonseca
Slight optimization of _mesa_mmx_blend_add.
2002-04-19MMX add blending function added.Jose Fonseca
2002-04-19MMX modulate belding function added.Jose Fonseca
Factorization of more common MMX code.
2002-04-10new MMX blend code (Jose Fonseca)Brian Paul
2002-04-04fixed 16 bit/channel problem in blend_modulate()Brian Paul
2002-04-04blend_add() modified for GLfloat channelsBrian Paul
2002-04-02more blending updates from JoseBrian Paul
2002-04-02faster blending (Jose Fonseca)Brian Paul
2002-03-27fixed inequality in an assertionBrian Paul
2002-02-12fix compiler warning (windows)Karl Schultz
2002-02-02Converted line drawing over to new span code, pb no longer used.Brian Paul
Big clean-up of line drawing code. Removed many obsolete span processing functions.
2002-02-02sw_span can now hold x/y arrays of fragment positions - getting ready toBrian Paul
ditch the pb (pixel buffer) code. Converted point drawing, bitmaps and aa lines to use new span functions.
2001-12-13special case blend optmizations (Jeremy Fitzhardinge)Brian Paul
2001-07-16disable MMX blend code until it gets fixedBrian Paul
2001-07-13assorted changes for supporting GLfloat color channels (not done)Brian Paul
2001-03-19Split driver struct into swrast/tnl/core components.Keith Whitwell
2001-03-12Consistent copyright info (version number, date) across all files.Gareth Hughes
2001-03-08More g++ warning fixes. Fixes for CHAN_BITS==16, it seems to work.Brian Paul
2001-03-03more clean-upsBrian Paul
2001-03-03lots of gl_*() to _mesa_*() namespace clean-upBrian Paul
2000-11-05Reorganized software rasterizer as a module which manages its own state,Keith Whitwell
with tighter interfaces with the rest of the world. Proper documentation to come.
2000-10-31Moved software rasterizer functionality to new directory.Keith Whitwell