Merge branch 'glsl2'
[mesa.git] / src / mesa / swrast / s_texcombine.c
2010-07-27 Eric AnholtMerge remote branch 'origin/master' into glsl2
2010-06-28 Jakob BornecrantzMerge branch 'gallium-drm-driver-drescriptor'
2010-06-24 Eric AnholtMerge branch 'glsl2-head' into glsl2
2010-06-24 Brian PaulMerge branch 'shader-file-reorg'
2010-06-11 Brian Paulmesa: rename src/mesa/shader/ to src/mesa/program/
2010-02-17 Ian RomanickMerge commit '381d5e209815235911c4aab516037c868c8f695f'
2010-02-14 Karl Schultzmesa: Fix compiler warnings
2010-02-09 Roland ScheideggerMerge branch 'gallium-nopointsizeminmax'
2010-01-31 José FonsecaMerge remote branch 'origin/master' into lp-binning
2010-01-28 Roland ScheideggerMerge commit 'origin/perrtblend'
2010-01-28 Brian Paulswrast: silence double->float assignment warnings
2010-01-20 Chia-I WuMerge remote branch 'origin/opengl-es-v2'
2010-01-16 José FonsecaMerge remote branch 'origin/master' into lp-binning
2010-01-15 Roland ScheideggerMerge branch 'gallium-noconstbuf'
2010-01-14 Jakob BornecrantzMerge branch 'mesa_7_7_branch'
2010-01-13 Vinson Leeswrast: Remove unnecessary header from s_texcombine.c.
2009-06-12 Alex DeucherMerge master and fix conflicts
2009-04-22 Dave AirlieMerge remote branch 'origin/master' into radeon-rewrite
2009-04-20 Brian Paulswrast: fix pointer arithmetic error in get_texel_array()
2009-04-10 Alex DeucherMerge branch 'radeon-rewrite' of git+ssh://agd5f@git...
2009-04-10 Brian Paulswrast: remove some unneeded CHAN_TYPE!=GL_FLOAT code
2009-04-09 Dave AirlieMerge remote branch 'origin/master' into radeon-rewrite
2009-04-07 Brian Paulswrast: more texcombine clean-ups
2009-04-07 Brian Paulswrast: asst. clean-ups in texcombine code
2009-04-06 Brian Paulswrast: fix incorrect arithmetic for GL_ADD_SIGNED...
2009-04-02 Brian Paulswrast: remove old texture_apply() code; always use...
2009-04-02 Brian Paulswrast: fix bad optimization check
2009-04-02 Brian Paulswrast: remove unused parameter
2009-04-02 Brian Paulswrast: minor improvements, clean-ups in texcombine...
2009-04-02 Brian Paulswrast: use float4_array typedef to simplify the code...
2009-04-02 Brian Paulmesa: texture combine clean-ups
2009-04-02 Brian Paulswrast: general clean-up of texture combine code
2009-04-02 Brian Paulswrast: do texture sampling/combining in floating point
2009-03-20 Dave AirlieMerge remote branch 'main/master' into radeon-rewrite
2009-03-12 Roland Scheideggermesa: add support for ATI_envmap_bumpmap
2009-03-03 José FonsecaMerge commit 'origin/gallium-0.1'
2009-03-03 Keith WhitwellMerge commit 'origin/gallium-0.1'
2009-02-23 José FonsecaMerge commit 'origin/gallium-0.1'
2009-02-18 Keith WhitwellMerge commit 'origin/gallium-0.1'
2009-02-16 Keith WhitwellMerge branch 'master' into gallium-texture-transfer
2009-02-12 Dave AirlieMerge remote branch 'origin/master' into radeon-rewrite
2009-02-10 Brian PaulMerge commit 'origin/gallium-0.2' into gallium-master...
2009-02-09 Brian Paulmesa: merge gallium-0.2 into gallium-master-merge
2009-01-30 Brian Paulswrast: replace macro with inline function
2009-01-28 Brian PaulMerge commit 'origin/master' into texture_swizzle
2009-01-28 Brian Paulmesa: implement texture swizzling in swrast
2009-01-24 Brian PaulMerge branch 'tex_combine4'
2009-01-24 Brian Paulswrast: updates for GL_NV_texture_env_combine4
2009-01-08 José FonsecaMerge commit 'origin/gallium-0.1' into gallium-0.2
2008-12-31 José FonsecaMerge commit 'origin/gallium-0.1' into gallium-0.2
2008-12-22 José FonsecaMerge commit 'origin/gallium-0.1' into gallium-0.2
2008-12-15 Alan HourihaneMerge commit 'origin/gallium-0.1' into gallium-0.2
2008-12-11 Brian PaulMerge commit 'origin/gallium-0.1' into gallium-0.2
2008-12-09 Alan HourihaneMerge commit 'origin/gallium-0.1' into gallium-0.2
2008-11-28 Alan HourihaneMerge commit 'origin/gallium-0.1' into gallium-0.2
2008-11-25 Alan HourihaneMerge commit 'origin/gallium-0.1' into gallium-0.2
2008-11-19 Keith WhitwellMerge commit 'origin/gallium-0.1' into gallium-0.2
2008-11-15 Keith WhitwellMerge commit 'origin/gallium-0.1' into gallium-0.2
2008-11-12 Pekka PaalanenMerge commit 'origin/gallium-0.1' into gallium-0.2
2008-11-10 Brian PaulMerge commit 'origin/gallium-0.1' into gallium-0.2
2008-11-07 Brian PaulMerge commit 'origin/gallium-0.1' into gallium-0.2
2008-11-06 Brian PaulMerge commit 'origin/gallium-0.1' into gallium-0.2
2008-11-05 Brian PaulMerge commit 'origin/gallium-0.1' into gallium-0.2
2008-10-27 Ben SkeggsMerge remote branch 'nouveau/gallium-0.1' into gallium-0.2
2008-10-17 Brian PaulMerge commit 'origin/gallium-0.1' into gallium-0.2
2008-10-15 Keith WhitwellMerge commit 'origin/gallium-0.1' into gallium-0.2
2008-10-15 Ben SkeggsMerge remote branch 'origin/gallium-0.2' into gallium-0.2
2008-10-10 Brian PaulMerge commit 'origin/master' into gallium-0.2
2008-10-10 Brian Paulmesa: include needed header
2008-10-10 Keith WhitwellMerge commit 'origin/gallium-0.1' into gallium-0.2
2008-09-30 Ben SkeggsMerge remote branch 'origin/gallium-0.2' into gallium-0.2
2008-09-21 Keith WhitwellMerge commit 'origin/gallium-0.1' into gallium-0.2
2008-09-21 Keith WhitwellMerge branch 'master' into gallium-0.2
2008-09-18 Brian Paulmesa: prefix a bunch of #include lines with "main/".
2008-09-18 Keith WhitwellMerge commit 'origin/master' into gallium-0.2
2008-09-11 Alan HourihaneMerge branch 'master' of git+ssh://git.freedesktop...
2008-09-11 Keith WhitwellMerge branch 'gallium-0.1' into gallium-0.2
2008-07-26 Ben SkeggsMerge remote branch 'upstream/gallium-0.1' into nouveau...
2008-07-24 José Fonsecamesa: Prefix main includes with dir to avoid conflicts.
2008-06-22 Ben SkeggsMerge remote branch 'upstream/gallium-0.1' into nouveau...
2008-06-09 Brian Paulmesa: refactor: move pixel map/scale/bias code into...
2007-07-06 michalMerge branch 'master' of git+ssh://michal@git.freedeskt...
2007-07-04 Zou Nan haiMerge branch 'master' of git+ssh://znh@git.freedesktop...
2007-06-08 JoukMerge branch 'master' of git+ssh://joukj@git.freedeskto...
2007-05-24 Eric AnholtMerge branch 'master' into i915-unification
2007-05-20 BrianOverhaul/simplify SWvertex and SWspan attribute handling.
2007-03-30 Eric AnholtMerge branch 'crestline-qa', adding support for the...
2007-03-26 Brianmerge of glsl-compiler-1 branch
2007-03-21 Brianmerge from master
2007-03-10 BrianMerge branch 'master' of git+ssh://brianp@git.freedeskt...
2007-03-09 BrianMerge branch 'origin' into glsl-compiler-1
2007-02-22 BrianMerge branch 'origin' into glsl-compiler-1
2007-02-01 BrianNew SWspanarrays attribs[] array.
2006-12-19 Dave AirlieMerge branch 'nouveau-import'
2006-10-13 Brian PaulRevamp color table code.
2006-10-01 Brian PaulNew SWspan and SWspanarrays typedefs.
2006-05-18 Brian Paulminor simplification
2006-05-18 Brian Paultexture EnvColor needs to be converted to GLchan, not...
2006-04-27 Brian Paulfixes for CHAN_BITS!=8
2005-10-05 Brian PaulIn gl_texture_image replace IntFormat with InternalForm...
next