History log of /external/mesa3d/src/mesa/swrast/s_texcombine.c
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
cbdc1d53542b3ecca0085399c4bb3b3371f94809 12-Jun-2012 Pauli Nieminen <pauli.nieminen@linux.intel.com> swrast: Support sampler object for texture fetching state

swrast needs to pass sampler object into all texture fetching functions
to use correct sampling state when sampler object is bound to the unit.
The changes were made using half manual regular expression replace.

v2: Fix NULL deref in _swrast_choose_triangle(), because the _Current
values aren't set yet, so we need to look at our texObj2D. (anholt)

Signed-off-by: Pauli Nieminen <pauli.nieminen@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/swrast/s_texcombine.c
47d88ef204b42a9220c6be3e98c92df9c9aa0860 20-Feb-2012 Brian Paul <brianp@vmware.com> swrast: define, use SWRAST_MAX_WIDTH/HEIGHT

We'll get rid of MAX_WIDTH, MAX_HEIGHT soon.
/external/mesa3d/src/mesa/swrast/s_texcombine.c
2e6402feb754dd6384ee27fe623a7f9fce66dcaf 21-Nov-2011 Yuanhan Liu <yuanhan.liu@linux.intel.com> swrast: fix unmatched span->array->ChanType

texture_combine converts the result rgba to CHAN_TYPE from FLOAT. At the
same time, make sure the span->array->ChanType is changed, too.

v2: pick a nicer comment from Brian

Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
/external/mesa3d/src/mesa/swrast/s_texcombine.c
6ba8f0688a35ffac93bd025739aefe8e3694ca0c 18-Nov-2011 Yuanhan Liu <yuanhan.liu@linux.intel.com> swrast: simplify the prototype of function texture_combine

Parameter n and rgbaChan are both from structure span, thus using span
as paramter to simplify the prototype. Function texture_combine is only
used by _swrast_texture_span, so I guess it's safe to do so.

This patch is mainly for the next patch.

Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
/external/mesa3d/src/mesa/swrast/s_texcombine.c
c81b441ba2b8ab61d5e1f24ec7a34914c8a3b215 25-Oct-2011 Vinson Lee <vlee@vmware.com> swrast: Fix memory leak in out-of-memory path.

Fixes Coverity resource leak defect.

Reviewed-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/swrast/s_texcombine.c
9119269ca14ed42b51c7d8e2e662500311b29fa3 04-Oct-2011 Brian Paul <brianp@vmware.com> swrast: fix delayed texel buffer allocation regression

Commit 617cdcd4c7b1cffb584c829c35bdf9c9bf04627b delayed the texel
buffer allocation until texture_combine() is called. But the
texel buffer is needed sooner in _swrast_texture_span() at line 649.

Fixes https://bugs.freedesktop.org/show_bug.cgi?id=41433
/external/mesa3d/src/mesa/swrast/s_texcombine.c
617cdcd4c7b1cffb584c829c35bdf9c9bf04627b 22-Sep-2011 Eric Anholt <eric@anholt.net> mesa: Delay s_texcombine.c memory allocation until it's used.

Generally we're using fragment programs in all our drivers, so wasting
4MB for code that's never called is pretty lame. Reduces i965 memory
allocation for a short shader program from 21,932,128B to 17,737,816B.
/external/mesa3d/src/mesa/swrast/s_texcombine.c
9520f483b8f1e45fa474674b415554988de5d8d3 01-Oct-2011 Brian Paul <brianp@vmware.com> mesa: s/INLINE/inline/

INLINE is still seen in some files (some generated files, etc) but this
is a good start.

Acked-by: Kenneth Graunke <kenneth@whitecape.org>
/external/mesa3d/src/mesa/swrast/s_texcombine.c
e411cd7b0a54d2f9b9f4cda4918aa7742ed5c2a6 10-Aug-2011 Andreas Fänger <a.faenger@e-sign.com> swrast: initial multi-threaded span rendering

Optional parallel rendering of spans using OpenMP.
Initial implementation for aa triangles. A new option for scons is
also provided to activate the openmp support (off by default).

Signed-off-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/swrast/s_texcombine.c
8a98aabe0bcea42cfdc982001ae4876e3d9b1214 18-May-2011 Andreas Faenger <a.faenger@e-sign.com> swrast: anisotropic filtering extension

Anisotropic filtering extension for swrast intended to be used by osmesa
to create high quality renderings.
Based on Higher Quality Elliptical Weighted Avarage Filter (EWA).
A 2nd implementation using footprint assembly is also provided.

Signed-off-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/swrast/s_texcombine.c
ecfaab88b2577bd0395bc05d75a036126806a9c4 10-Apr-2011 Brian Paul <brianp@vmware.com> mesa: move sampler state into new gl_sampler_object type

gl_texture_object contains an instance of this type for the regular
texture object sampling state. glGenSamplers() generates new instances
of gl_sampler_object which can override that state with glBindSampler().
/external/mesa3d/src/mesa/swrast/s_texcombine.c
9d20849516fe34bb0a430b007cef7878858cf0c7 01-Mar-2011 Brian Paul <brianp@vmware.com> mesa: remove GL_SGI_texture_color_table support

It was only implemented in the swrast driver and probably not used by
any applications. A modern app would use a dependent/chained texture
lookup in the fragment shader.
/external/mesa3d/src/mesa/swrast/s_texcombine.c
aa28efe60dee4570730538ef091d1c79f42fa1cd 02-Dec-2010 Brian Paul <brianp@vmware.com> swrast: avoid large stack allocations in tex combine code
/external/mesa3d/src/mesa/swrast/s_texcombine.c
1c131752c3e07ef91f49d4970dafca6d26585334 23-Oct-2010 Brian Paul <brianp@vmware.com> mesa: split up the image.c file

New files:
pack.c - image/row packing/unpacking functions
pixeltransfer.c - pixel scale/bias/lookup functions
/external/mesa3d/src/mesa/swrast/s_texcombine.c
f9995b30756140724f41daf963fa06167912be7f 12-Oct-2010 Kristian Høgsberg <krh@bitplanet.net> Drop GLcontext typedef and use struct gl_context instead
/external/mesa3d/src/mesa/swrast/s_texcombine.c
ec2b92f98c2e7f161521b447cc1d9a36bce3707c 11-Jun-2010 Brian Paul <brianp@vmware.com> mesa: rename src/mesa/shader/ to src/mesa/program/
/external/mesa3d/src/mesa/swrast/s_texcombine.c
b30898f4ab533085d97a33638ad0a1cf9ddb1d67 14-Feb-2010 Karl Schultz <karl.w.schultz@gmail.com> mesa: Fix compiler warnings

Add explicit casts, fix constant types, fix variable types.
Fixes about 340 warnings in MSFT Visual Studio.
/external/mesa3d/src/mesa/swrast/s_texcombine.c
880411c72aee7c0ec81366bdf6ab8cf25bebb9d5 28-Jan-2010 Brian Paul <brianp@vmware.com> swrast: silence double->float assignment warnings

Reported by Karl Schultz.
/external/mesa3d/src/mesa/swrast/s_texcombine.c
a01b9eac0458eabf07b68bb52afe7026dd8bdfb2 13-Jan-2010 Vinson Lee <vlee@vmware.com> swrast: Remove unnecessary header from s_texcombine.c.
/external/mesa3d/src/mesa/swrast/s_texcombine.c
5d5db81076c6a6e07336f90fbfb7eeaeaf216278 20-Apr-2009 Brian Paul <brianp@vmware.com> swrast: fix pointer arithmetic error in get_texel_array()

This came from commit 1b2ab023673261b4b942e1126c0b599d02fbd4a0
/external/mesa3d/src/mesa/swrast/s_texcombine.c
6c2d1e68395da7fd7f1bd8b777e075388d6964f4 09-Apr-2009 Brian Paul <brianp@vmware.com> swrast: remove some unneeded CHAN_TYPE!=GL_FLOAT code
/external/mesa3d/src/mesa/swrast/s_texcombine.c
3630da9916a4f24a03d3a63420690f8016a9b72a 07-Apr-2009 Brian Paul <brianp@vmware.com> swrast: more texcombine clean-ups
/external/mesa3d/src/mesa/swrast/s_texcombine.c
1b2ab023673261b4b942e1126c0b599d02fbd4a0 07-Apr-2009 Brian Paul <brianp@vmware.com> swrast: asst. clean-ups in texcombine code
/external/mesa3d/src/mesa/swrast/s_texcombine.c
87c356a222bb97ecf9b04e8d509b103199159b11 06-Apr-2009 Brian Paul <brianp@vmware.com> swrast: fix incorrect arithmetic for GL_ADD_SIGNED/GL_COMBINE4_NV mode
/external/mesa3d/src/mesa/swrast/s_texcombine.c
7aed2b0c30c6d29d70efd2402a68a8e3de98418c 11-Mar-2009 Brian Paul <brianp@vmware.com> swrast: remove old texture_apply() code; always use texture combine code
/external/mesa3d/src/mesa/swrast/s_texcombine.c
84b24efe8dc1bd67680f4d3c656fb4693fd405c1 11-Mar-2009 Brian Paul <brianp@vmware.com> swrast: fix bad optimization check
/external/mesa3d/src/mesa/swrast/s_texcombine.c
0d8d90482331b219b861e500a0bc830133b1b377 10-Mar-2009 Brian Paul <brianp@vmware.com> swrast: remove unused parameter
/external/mesa3d/src/mesa/swrast/s_texcombine.c
aef2e1c1dcda77b6dc5fcfd2de7c9d720effa4e7 10-Mar-2009 Brian Paul <brianp@vmware.com> swrast: minor improvements, clean-ups in texcombine code
/external/mesa3d/src/mesa/swrast/s_texcombine.c
0695413d2be5999f7597ce07ba5a4c8fd6a6b333 09-Mar-2009 Brian Paul <brianp@vmware.com> swrast: use float4_array typedef to simplify the code a bit
/external/mesa3d/src/mesa/swrast/s_texcombine.c
bd9b2be8284fda3f8aac235908ded118b5648a38 09-Mar-2009 Brian Paul <brianp@vmware.com> mesa: texture combine clean-ups

Use MAX_COMBINER_TERMS instead of 4.
Rename some vars.
Update comments.
/external/mesa3d/src/mesa/swrast/s_texcombine.c
933f3b13c34c2ed9223755c0e7c7dc22f09d23e8 08-Mar-2009 Brian Paul <brianp@vmware.com> swrast: general clean-up of texture combine code
/external/mesa3d/src/mesa/swrast/s_texcombine.c
de2afd8688ceb45013d15be7c6e0995199b80e5a 08-Mar-2009 Brian Paul <brianp@vmware.com> swrast: do texture sampling/combining in floating point

The code's cleaner and a step toward supporting float-valued texture sampling.
Some optimizations for common cases can be added and re-enabled...
/external/mesa3d/src/mesa/swrast/s_texcombine.c
114152e068ec919feb0a57a1259c2ada970b9f02 12-Mar-2009 Roland Scheidegger <sroland@vmware.com> mesa: add support for ATI_envmap_bumpmap

add new entrypoints, new texture format, etc
translate in texenvprogram.c for drivers using the mesa-generated tex env
fragment program
also handled in swrast, but not tested (cannot work due to negative texel
results not handled correctly)
/external/mesa3d/src/mesa/swrast/s_texcombine.c
81ca8b93f212d1946c70660041ce97d98f352608 29-Jan-2009 Brian Paul <brianp@vmware.com> swrast: replace macro with inline function
/external/mesa3d/src/mesa/swrast/s_texcombine.c
54c62ba5c36f3e2b279151f5df851d2ceee15319 28-Jan-2009 Brian Paul <brianp@vmware.com> mesa: implement texture swizzling in swrast

And enable GL_EXT_texture_swizzle for software drivers.
/external/mesa3d/src/mesa/swrast/s_texcombine.c
2d508c1d5c53dc475e5262593dd4dac5575a6b08 24-Jan-2009 Brian Paul <brianp@vmware.com> swrast: updates for GL_NV_texture_env_combine4
/external/mesa3d/src/mesa/swrast/s_texcombine.c
bf9d9a9d01b7697f4a30305cb9574430cba351fa 11-Oct-2008 Brian Paul <brian.paul@tungstengraphics.com> mesa: include needed header
/external/mesa3d/src/mesa/swrast/s_texcombine.c
bbd287103dad776d8a45c87c4e51fbc26d9b80d5 18-Sep-2008 Brian Paul <brian.paul@tungstengraphics.com> mesa: prefix a bunch of #include lines with "main/".

This is another step toward removing a whole bunch of -I flags from
the cc commands. Still need to address driver code...
/external/mesa3d/src/mesa/swrast/s_texcombine.c
9e8a961dd7d7b717a9fb4ecdea1c1b60ea355efe 20-May-2007 Brian <brian@yutani.localnet.net> Overhaul/simplify SWvertex and SWspan attribute handling.

Instead of separate fog/specular/texcoord/varying code, just treat all of
them as generic attributes. Simplifies the point/line/triangle functions.
/external/mesa3d/src/mesa/swrast/s_texcombine.c
f3e507ef9f75dbfc58ccd07b5fe8cfca10d9a9e3 01-Feb-2007 Brian <brian@yutani.localnet.net> New SWspanarrays attribs[] array.

Replace texcoord[], varying[], etc. arrays with single attribs[] array, indexed
by FRAG_ATTRIB_* values.
Eliminates need to copy data into fragment program machine input registers.
Will lead to future clean-ups.
/external/mesa3d/src/mesa/swrast/s_texcombine.c
e5a6fcc345867b550a159a7d94912a81e618279c 13-Oct-2006 Brian Paul <brian.paul@tungstengraphics.com> Revamp color table code.
Always store all color tables as both float and ubyte.
/external/mesa3d/src/mesa/swrast/s_texcombine.c
cdb27e8242215271364602995d85607cfc06d441 01-Oct-2006 Brian Paul <brian.paul@tungstengraphics.com> New SWspan and SWspanarrays typedefs.
/external/mesa3d/src/mesa/swrast/s_texcombine.c
23a5c57ceec4e7d555f1896a7ca825a9ac9969f6 19-May-2006 Brian Paul <brian.paul@tungstengraphics.com> minor simplification
/external/mesa3d/src/mesa/swrast/s_texcombine.c
0ca9082cbdf3c7a646a516b73b852fe7a8fd504c 19-May-2006 Brian Paul <brian.paul@tungstengraphics.com> texture EnvColor needs to be converted to GLchan, not GLint
/external/mesa3d/src/mesa/swrast/s_texcombine.c
c4fe46f0b8b45407ea40500b869ae1beca71063c 27-Apr-2006 Brian Paul <brian.paul@tungstengraphics.com> fixes for CHAN_BITS!=8
/external/mesa3d/src/mesa/swrast/s_texcombine.c
a9fc8ba756dd25a07dc19058fe60f65bda82a055 05-Oct-2005 Brian Paul <brian.paul@tungstengraphics.com> In gl_texture_image replace IntFormat with InternalFormat and Format with
_BaseFormat to be consistant with gl_renderbuffer.
/external/mesa3d/src/mesa/swrast/s_texcombine.c
b0a0ca8bd9edc13e495a39709cc28953dd3fbd9c 01-Oct-2005 Brian Paul <brian.paul@tungstengraphics.com> GL_EXT_packed_depth_stencil changes
/external/mesa3d/src/mesa/swrast/s_texcombine.c
aa8abf8081023c00469b6c88760ed0291033eb6e 16-Sep-2005 Brian Paul <brian.paul@tungstengraphics.com> Rework the texture filtering functions a bit.
No need to pass the texture unit number as an argument.
/external/mesa3d/src/mesa/swrast/s_texcombine.c
2cd8791cad11ea3961533c0cd8f9c1bbf50ef6cc 15-Sep-2005 Brian Paul <brian.paul@tungstengraphics.com> Split the s_texture.c file into two new files:
s_texcombine.c - for texture combining/application
s_texfilter.c - for texture sampling/filtering
/external/mesa3d/src/mesa/swrast/s_texcombine.c