History log of /external/mesa3d/src/mesa/swrast/s_context.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_context.c
f4a93e0665881dd58a95abb6525676bd1cc2e6af 17-Mar-2012 Brian Paul <brianp@vmware.com> mesa: rework texture completeness testing

Instead of gl_texture_object::_Complete there are now two fields:
_BaseComplete and _MipmapComplete. The former indicates whether the base
texture level is valid. The later indicates whether the whole mipmap is
valid.

With sampler objects, a single texture can appear to be both complete and
incomplete at the same time. See the GL_ARB_sampler_objects spec for more
details. To implement this we now check if the texture is complete with
respect to a sampler state.

Another benefit of this is we no longer need to invalidate a texture's
completeness state when we change the minification/magnification filters
with glTexParameter().

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
/external/mesa3d/src/mesa/swrast/s_context.c
938aaec981761a51043f4f68289c9a3f0e12e19c 12-Mar-2012 Brian Paul <brianp@vmware.com> swrast: s/_DD_NEW_SEPARATE_SPECULAR/_MESA_NEW_SEPARATE_SPECULAR/

Another step toward removing the _DD_NEW_x flags

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
/external/mesa3d/src/mesa/swrast/s_context.c
70d3363757d286f2fa97c9b60268a96156fdb224 20-Feb-2012 Brian Paul <brianp@vmware.com> mesa: remove MAX_WIDTH from prog_execute.h

define a PROG_MAX_WIDTH var instead. It has to match MAX_WIDTH in
swrast. More elaborate refactoring could fix that (someday).
/external/mesa3d/src/mesa/swrast/s_context.c
cb49def3d6f946def1f53c736d1179ed9b576ab1 20-Feb-2012 Brian Paul <brianp@vmware.com> swrast: check max renderbuffer size against SWRAST_MAX_WIDTH
/external/mesa3d/src/mesa/swrast/s_context.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_context.c
32bf36106ea433038b524311fc10cc5b835862f1 20-Feb-2012 Brian Paul <brianp@vmware.com> swrast: remove MAX_WIDTH arrays in stencil code

Use some per-context temporary arrays instead.
/external/mesa3d/src/mesa/swrast/s_context.c
08687c7912f3d1b8f5420ba3c0a4fc474fa80d37 20-Feb-2012 Brian Paul <brianp@vmware.com> mesa: move/fix MAX_WIDTH/HEIGHT-related assertions

Max texture and viewport size is only limited by MAX_WIDTH/HEIGHT for swrast.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
/external/mesa3d/src/mesa/swrast/s_context.c
1c0f1dd42a50464eeb81de4aad8eecf24b3d6c89 26-Jan-2012 Chad Versace <chad.versace@linux.intel.com> swrast: Fix fixed-function fragment processing

On i965, _mesa_ir_link_shader is never called. As a consequence, the
current fragment program (ctx->FragmentProgram->_Current) exists but is
invalid because it has no instructions. Yet swrast continued to attempt to
use the empty program.

To avoid using the empty program, this patch 1) defines a new function,
_swrast_use_fragment_program, which checks if the current fragment program
exists and differs from the fixed function fragment program, and, when
appropriate, 2) replaces checks of the form
if (ctx->FragmentProgram->_Current == NULL)
with
if (_swrast_use_fragment_program(ctx))

Fixes the following oglconform regressions on i965/gen6:
api-fogcoord(basic.allCases.log)
api-mtexcoord(basic.allCases.log)
api-seccolor(basic.allCases.log)
api-texcoord(basic.allCases.log)
blend-separate(basic.allCases)
colorsum(basic.allCases.log)

The tests were ran with the GLXFBConfig:
visual x bf lv rg d st colorbuffer sr ax dp st accumbuffer ms cav
id dep cl sp sz l ci b ro r g b a F gb bf th cl r g b a ns b eat
----------------------------------------------------------------------------
0x021 24 tc 0 32 0 r y . 8 8 8 8 . . 0 24 8 0 0 0 0 0 0 None

(Note: I originally believed that the hunk in
_swrast_update_fragment_program was unnecessary. But it is required to fix
blend-separate.)

Note: This is a candidate for the 8.0 branch.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43327
Reveiwed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Ian Romanick <idr@freedesktop.org>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
/external/mesa3d/src/mesa/swrast/s_context.c
56d83ac4bf0267982554f25c6fdb3c1dd6e14a9c 16-Jan-2012 Brian Paul <brianp@vmware.com> mesa: remove ctx->Driver.Map/UnmapTexture() hooks

No longer used anywhere.
/external/mesa3d/src/mesa/swrast/s_context.c
fc9f74839d50ab5480ae657524cf2ddebf55d451 16-Jan-2012 Brian Paul <brianp@vmware.com> swrast: flush pending rendering before unmapping buffers
/external/mesa3d/src/mesa/swrast/s_context.c
706400f0a7a59bba89eca8e97a1ada45445ee6df 12-Jan-2012 Brian Paul <brianp@vmware.com> swrast: use BITFIELD64_BIT() macro to fix MSVC warnings

NOTE: This is a candidate for the 8.0 branch.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
/external/mesa3d/src/mesa/swrast/s_context.c
8dffb6bdab25dcacf165851e9d1fdb3beb73099a 07-Jan-2012 Brian Paul <brianp@vmware.com> swrast: s/GLbitfield/GLbitfield64/ for sw_span::arrayAttribs

This is a bitfield of FRAG_BIT_x values so it should be 64-bits now.
/external/mesa3d/src/mesa/swrast/s_context.c
7d960a352f9b4ae263371c5f318299e8cbabe277 07-Jan-2012 Brian Paul <brianp@vmware.com> swrast: s/GLint/GLuint/ to silence MSVC signed/unsigned comparison warning
/external/mesa3d/src/mesa/swrast/s_context.c
030e408181f6ba0cd992c1519de485f38adad8be 06-Jan-2012 Brian Paul <brianp@vmware.com> swrast: remove calls to _swrast_update_depth/stencil_buffer()

These functions updated the gl_renderbuffer::_DepthBuffer and
_StencilBuffer fields. But those fields are no longer used.

Reviewed-by: Eric Anholt <eric@anholt.net>
/external/mesa3d/src/mesa/swrast/s_context.c
6e1228976b6ff91492b2fc338282e21404870d26 10-Dec-2011 Brian Paul <brianp@vmware.com> mesa: move depth/stencil buffer validation to swrast

Since gl_framebuffer::_DepthBuffer and _StencilBuffer are only used
by swrast, do the validation of those fields in swrast too.
The main/depthstencil.[ch] code is no longer used and will be removed
next.

Reviewed-by: Eric Anholt <eric@anholt.net>
/external/mesa3d/src/mesa/swrast/s_context.c
bb887b72f71e1323ce35c676f5207a6b2424fed4 03-Dec-2011 Brian Paul <brianp@vmware.com> swrast: remove dead accum buffer context fields
/external/mesa3d/src/mesa/swrast/s_context.c
b64dc2a275714ae67c735298d8104ff292c60edf 04-Nov-2011 Brian Paul <brianp@vmware.com> swrast: update program type assertion

Fixes bogus failed assertion when using NV_fragment_program, such
as with demos/fplight.c

Note: This is a candidate for the 7.11 branch.
/external/mesa3d/src/mesa/swrast/s_context.c
68da4b50e9b6aa72a9b155f650952620063e1b94 23-Oct-2011 Brian Paul <brianp@vmware.com> mesa: add swrast_texture_image::Buffer

In the past, swrast_texture_image::Data has been overloaded. It could
either point to malloc'd memory storing texture data, or it could point
to a current mapping of GPU memory.

Now, Buffer always points to malloc'd memory (if we're not using GPU
memory) and Data always points to mapped memory. The next step would
be to rename Data -> Map.

This change also involves adding swrast functions for mapping textures
and renderbuffers prior to rendering to setup the Data pointer. Plus,
corresponding functions to unmap texures and renderbuffers. This is
very much like similar code in the dri drivers.
/external/mesa3d/src/mesa/swrast/s_context.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_context.c
c5943d6c1cc4eedbea088bc1f611abc153e90524 26-Sep-2011 Brian Paul <brianp@vmware.com> swrast: always call _swrast_choose_texture_sample_func()

_swrast_choose_texture_sample_func() handles null texture object pointers
and will return the "null" sampler function which returns (0,0,0,1). This
fixes a minor regression from ce82914f5ad4bb9148370826099925590e9798fd
/external/mesa3d/src/mesa/swrast/s_context.c
2836aab2031d5b6926923fbc70f867ec638301bd 09-Sep-2011 Ian Romanick <ian.d.romanick@intel.com> mesa: Use ColorLogicOpEnabled instead of _LogicOpEnabled

Since GL_EXT_blend_logic_op is removed, _LogicOpEnabled and
ColorLogicOpEnabled always have the same value.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Marek Olšák <maraeo@gmail.com>
/external/mesa3d/src/mesa/swrast/s_context.c
baeefef2c0445bfd717a3086fdd9b5bd5d9cb675 17-Sep-2011 Brian Paul <brianp@vmware.com> mesa: move software texel fetch code into swrast

It's only used by swrast now so move it out of core Mesa.
/external/mesa3d/src/mesa/swrast/s_context.c
ce82914f5ad4bb9148370826099925590e9798fd 17-Sep-2011 Brian Paul <brianp@vmware.com> mesa: move _mesa_update_fetch_functions() calls into swrast

Do it during swrast state validation since the FetchTexel() functions
are only called from swrast now and not core Mesa.
Remove assertions in mipmap.c since they're no longer appropriate.
/external/mesa3d/src/mesa/swrast/s_context.c
e26e9f77e761775592204edb53b6028eef0c1f11 30-Aug-2011 Brian Paul <brianp@vmware.com> swrast: initialize program native limits

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
/external/mesa3d/src/mesa/swrast/s_context.c
ddd6e5b8bce96cfcb72c7e7412296c9f39bdd5d7 30-Jul-2011 Brian Paul <brianp@vmware.com> swrast: Remove swrast eject/validate texture image code.

No driver used the eject function, or set the validate hook that made
that function do anything.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
/external/mesa3d/src/mesa/swrast/s_context.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_context.c
cd354b4eb84839837a9349bd91e89b55d06e5837 22-Apr-2011 Ian Romanick <ian.d.romanick@intel.com> mesa: Remove SWcontext::_FogMode, use gl_context::gl_fog_attrib::Mode everywhere

Reviewed-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/swrast/s_context.c
f0188d4b08b84aa72c6d8148ca94e40d665c7b68 16-Apr-2011 Ian Romanick <ian.d.romanick@intel.com> mesa: gl_fragment_program::FogOption is always GL_NONE so don't check it

Reviewed-by: Eric Anholt <eric@anholt.net>
Acked-by: Corbin Simpson <MostAwesomeDude@gmail.com>
Acked-by: Alex Deucher <alexdeucher@gmail.com>
/external/mesa3d/src/mesa/swrast/s_context.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_context.c
86af037e6a1643284f87c5e01c3fcb09dd07bf35 01-Sep-2010 Eric Anholt <eric@anholt.net> mesa: Fix many printf-like warnings.

Most of these are just typecasting to long to match the arg type. I
don't really care too much about getting a GLsizei or whatever
appropriate type in. However, there were a number of real bugs, like
missing arguments or passing floats to integer format specifiers. My
favorite: printflike("%s, argument") is missing an argument.
/external/mesa3d/src/mesa/swrast/s_context.c
1a537b639ee7f2d35230c68ba89491711919656d 30-Jul-2010 Vinson Lee <vlee@vmware.com> mesa: Remove unnecessary headers.
/external/mesa3d/src/mesa/swrast/s_context.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_context.c
2b7911d37dc1518b9047b02acdc6f8476abad70f 25-Feb-2010 Ian Romanick <ian.d.romanick@intel.com> swrast: Remove remaining color-index state tracking infrastructure

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
/external/mesa3d/src/mesa/swrast/s_context.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_context.c
fd5511d27fc44096117c47ab503fb5b47f993061 30-Dec-2009 Brian Paul <brianp@vmware.com> mesa: implement per-buffer color masking

This is part of the GL_EXT_draw_buffers2 extension and part of GL 3.0.

The ctx->Color.ColorMask field is now a 2-D array. Until drivers are
modified to support per-buffer color masking, they can just look at
the 0th color mask.

The new _mesa_ColorMaskIndexed() function will be called by
glColorMaskIndexedEXT() or glColorMaski().
/external/mesa3d/src/mesa/swrast/s_context.c
18656201ef62da1892d66e0899001ae82e2555c2 31-Aug-2009 Brian Paul <brianp@vmware.com> swrast: can't use deferred texture/shading if using KIL instruction

If the fragment program uses KIL, we have to execute it before z/stencil
testing. Otherwise, deferred texture/shading lets us skip shading for
pixels that fail z/stencil testing.
/external/mesa3d/src/mesa/swrast/s_context.c
88527220e44fd36c317f73e667bc6abebb0af112 10-Jun-2009 Brian Paul <brianp@vmware.com> swrast: fix state validation bug for changing program constants

Add _NEW_PROGRAM_CONSTANTS to _SWRAST_NEW_DERIVED.
This makes sure that we update the fragment shader's constants when state
vars (such as point size) changes.
Fixes the progs/glsl/points.c demo.
/external/mesa3d/src/mesa/swrast/s_context.c
7872b8e37e13719fbea71b3a92507eb00e7fc9db 22-Apr-2009 Brian Paul <brianp@vmware.com> swrast: simplify state update logic for fragment shader const buffers
/external/mesa3d/src/mesa/swrast/s_context.c
76ac75af8e5481b498981c133836efa2101be2dc 07-Apr-2009 Brian Paul <brianp@vmware.com> swrast: fix secondary color add for glBitmap

Also, clean up the logic involved in choosing per-vertex vs. per-fragment
primary+secondary color addition.
/external/mesa3d/src/mesa/swrast/s_context.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_context.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_context.c
91e61f435a71436c209934a0ece165b540aba3e0 02-Mar-2009 Brian Paul <brianp@vmware.com> mesa: use Stencil._Enabled field instead of Stencil.Enabled
/external/mesa3d/src/mesa/swrast/s_context.c
8d475822e6e19fa79719c856a2db5b6a205db1b9 28-Feb-2009 Brian Paul <brianp@vmware.com> mesa: rename, reorder FRAG_RESULT_x tokens

s/FRAG_RESULT_DEPR/FRAG_RESULT_DEPTH/
s/FRAG_RESULT_COLR/FRAG_RESULT/COLOR/
Remove FRAG_RESULT_COLH (NV half-precision) output since we never used it.
Next, we might merge the COLOR and DATA outputs (COLOR0, COLOR1, etc).
/external/mesa3d/src/mesa/swrast/s_context.c
9644fa6c48f596875f6955728c3a8af1b01a5028 21-Sep-2008 Keith Whitwell <keith@tungstengraphics.com> Merge branch 'master' into gallium-0.2

Conflicts:

include/GLES/egl.h
include/GLES/egltypes.h
src/egl/main/eglconfig.c
src/egl/main/eglconfig.h
src/glu/sgi/libnurbs/interface/bezierEval.h
src/glu/sgi/libnurbs/interface/bezierPatch.h
src/glu/sgi/libnurbs/interface/bezierPatchMesh.h
src/glu/sgi/libnurbs/internals/dataTransform.h
src/glu/sgi/libnurbs/internals/displaymode.h
src/glu/sgi/libnurbs/internals/sorter.h
src/glu/sgi/libnurbs/nurbtess/definitions.h
src/glu/sgi/libnurbs/nurbtess/directedLine.h
src/glu/sgi/libnurbs/nurbtess/gridWrap.h
src/glu/sgi/libnurbs/nurbtess/monoChain.h
src/glu/sgi/libnurbs/nurbtess/monoPolyPart.h
src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h
src/glu/sgi/libnurbs/nurbtess/partitionX.h
src/glu/sgi/libnurbs/nurbtess/partitionY.h
src/glu/sgi/libnurbs/nurbtess/polyDBG.h
src/glu/sgi/libnurbs/nurbtess/polyUtil.h
src/glu/sgi/libnurbs/nurbtess/primitiveStream.h
src/glu/sgi/libnurbs/nurbtess/quicksort.h
src/glu/sgi/libnurbs/nurbtess/rectBlock.h
src/glu/sgi/libnurbs/nurbtess/sampleComp.h
src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h
src/glu/sgi/libnurbs/nurbtess/sampleCompRight.h
src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h
src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.h
src/glu/sgi/libnurbs/nurbtess/sampledLine.h
src/glu/sgi/libnurbs/nurbtess/searchTree.h
src/glu/sgi/libnurbs/nurbtess/zlassert.h
src/glu/sgi/libutil/error.c
src/glu/sgi/libutil/glue.c
src/glu/sgi/libutil/gluint.h
src/glu/sgi/libutil/project.c
src/glu/sgi/libutil/registry.c
src/glx/x11/Makefile
src/glx/x11/glxclient.h
src/glx/x11/glxext.c
src/mesa/drivers/dri/ffb/ffb_dd.h
src/mesa/drivers/dri/ffb/ffb_points.h
src/mesa/drivers/dri/gamma/gamma_context.h
src/mesa/drivers/dri/gamma/gamma_macros.h
src/mesa/drivers/dri/i810/i810context.h
src/mesa/drivers/dri/r128/r128_dd.h
src/mesa/drivers/dri/r128/r128_tex.h
src/mesa/drivers/dri/tdfx/tdfx_dd.h
src/mesa/drivers/x11/xm_buffer.c
src/mesa/glapi/glapi.c
src/mesa/main/dispatch.c
src/mesa/main/state.c
src/mesa/main/texstate.c
src/mesa/shader/arbprogparse.c
src/mesa/shader/arbprogram.c
src/mesa/shader/nvfragparse.c
src/mesa/shader/nvprogram.c
src/mesa/shader/shader_api.c
src/mesa/sources
src/mesa/swrast/s_aaline.c
src/mesa/swrast/s_aaline.h
src/mesa/swrast/s_aatriangle.h
src/mesa/swrast/s_accum.c
src/mesa/swrast/s_alpha.h
src/mesa/swrast/s_bitmap.c
src/mesa/swrast/s_blend.h
src/mesa/swrast/s_context.c
src/mesa/swrast/s_copypix.c
src/mesa/swrast/s_depth.c
src/mesa/swrast/s_depth.h
src/mesa/swrast/s_drawpix.c
src/mesa/swrast/s_drawpix.h
src/mesa/swrast/s_feedback.c
src/mesa/swrast/s_feedback.h
src/mesa/swrast/s_fog.h
src/mesa/swrast/s_lines.h
src/mesa/swrast/s_logic.h
src/mesa/swrast/s_masking.h
src/mesa/swrast/s_points.c
src/mesa/swrast/s_points.h
src/mesa/swrast/s_readpix.c
src/mesa/swrast/s_span.c
src/mesa/swrast/s_span.h
src/mesa/swrast/s_stencil.h
src/mesa/swrast/s_texcombine.c
src/mesa/swrast/s_texcombine.h
src/mesa/swrast/s_texfilter.c
src/mesa/swrast/s_texfilter.h
src/mesa/swrast/s_texstore.c
src/mesa/swrast/s_triangle.c
src/mesa/swrast/s_triangle.h
src/mesa/swrast/s_zoom.h
src/mesa/swrast_setup/ss_context.c
src/mesa/swrast_setup/ss_triangle.h
src/mesa/tnl/t_draw.c
src/mesa/tnl/t_vb_light.c
src/mesa/tnl/t_vertex_generic.c
src/mesa/tnl/t_vertex_sse.c
src/mesa/tnl/t_vp_build.h
src/mesa/tnl/tnl.h
src/mesa/x86/common_x86.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_context.c
0397b2bb41b0f337af2949a15bcd7d0e7e8a7dc1 11-Sep-2008 Keith Whitwell <keith@tungstengraphics.com> Merge branch 'gallium-0.1' into gallium-0.2

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
505606349e5154c67d1a857d7125048669a594c3 13-Aug-2008 Brian Paul <brian.paul@tungstengraphics.com> mesa: fix a swrast state validation bug

Fixes progs/glsl/points.c
/external/mesa3d/src/mesa/swrast/s_context.c
101d1a658a614d1e2ec02b1e697f6161291af653 23-Jul-2008 José Fonseca <jrfonseca@tungstengraphics.com> mesa: Prefix main includes with dir to avoid conflicts.

Some of the headers in src/mesa/main have pretty common names which
easily conflict with third-party code, e.g. config.h
/external/mesa3d/src/mesa/swrast/s_context.c
ec2d0decbd739df99cac4baba57fe0005bf4894d 16-Jun-2008 Brian Paul <brian.paul@tungstengraphics.com> mesa: allocate pixel zoom arrays on heap, not stack

Fixes stack overflow on Windows.
/external/mesa3d/src/mesa/swrast/s_context.c
ff73c783cc47361ff0dd819c82d067b4b85870dd 06-Jan-2008 Brian <brian.paul@tungstengraphics.com> Simplify ctx->_NumColorDrawBuffers, _ColorDrawBuffers and fix bug 13835.

These fields are no longer indexed by shader output. Now, we just have
a simple array of renderbuffer pointers.

If the shader writes to gl_FragData[i], send those colors to the N
_ColorDrawBuffers. Otherwise, replicate the single gl_FragColor (or
the fixed-function color) to the N _ColorDrawBuffers.

A few more changes and simplifications can follow from this...
/external/mesa3d/src/mesa/swrast/s_context.c
507d43f95bc1623f413603e7f8c134553d11c184 14-Dec-2007 Brian <brian.paul@tungstengraphics.com> fix polygon cull regression
/external/mesa3d/src/mesa/swrast/s_context.c
fcd7c37fd3d0f61cf6ac81170bc0b3fca64ad9bb 30-Nov-2007 Brian <brian.paul@tungstengraphics.com> fix broken two-sided stencil
/external/mesa3d/src/mesa/swrast/s_context.c
9ba4311e71f510797e1b446ab7dc6b6d4dc55dd5 17-Aug-2007 Brian <brian.paul@tungstengraphics.com> check for null swrast (pipe work-around)
/external/mesa3d/src/mesa/swrast/s_context.c
c223c6b663cd5db39ba19c2be74b88cc3b8f53f3 04-Jul-2007 Brian <brian.paul@tungstengraphics.com> Be more consistant with paths in #includes. Eventually, eliminate a bunch of -I flags.
/external/mesa3d/src/mesa/swrast/s_context.c
fe11b2c04bf206bd50654c31e6789519c6c07563 21-Jun-2007 Brian <brian@i915.localnet.net> rename _swrast_update_fragment_attribs()
/external/mesa3d/src/mesa/swrast/s_context.c
e4b037051e79a607044ed233b7eda66cf1873245 25-May-2007 Brian <brian.paul@tungstengraphics.com> fix logic for calling _swrast_update_deferred_texture()
/external/mesa3d/src/mesa/swrast/s_context.c
04255489617f6eeb9604daba14efed8376d1d824 22-May-2007 Brian <brian.paul@tungstengraphics.com> don't treat FRAG_BIT_WPOS as a generic attribute (fixes depth peel regression)
/external/mesa3d/src/mesa/swrast/s_context.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_context.c
6d27194dffa52e076aba49edb222a70fcc77628b 25-Apr-2007 Brian <brian@yutani.localnet.net> fix attribsMask (re-fixes depth peeling algorithm)
/external/mesa3d/src/mesa/swrast/s_context.c
3db3dc58bcc361637d7473ee4b7c4e3b036c283c 24-Apr-2007 Brian <brian@nostromo.localnet.net> disable some errant code
/external/mesa3d/src/mesa/swrast/s_context.c
afc132e7a9c2b2c870b61ef10311272b36ea9bf2 24-Apr-2007 Brian <brian@nostromo.localnet.net> remove SWvertex->fog field, use attrib field
/external/mesa3d/src/mesa/swrast/s_context.c
0bdf216dd06d5136b8529297297aa962bab548c2 24-Apr-2007 Brian <brian@nostromo.localnet.net> Improve the code for interpolating fragment attributes a little. More to come...
/external/mesa3d/src/mesa/swrast/s_context.c
30a79f76fc4ae3bbf2307489bf9da1527f124e91 18-Apr-2007 Brian <brian@yutani.localnet.net> improved fog comment
/external/mesa3d/src/mesa/swrast/s_context.c
04bda46739beb0dab7c8820bdbe67136470d42be 17-Apr-2007 Brian <brian@yutani.localnet.net> Enable texture sampling for vertex programs/shaders.

This is a bit of a hack for now because the tnl module is using the swrast
module to fetch texels. The texture fetch/filter code should probably be
moved into the main/ module since it doesn't really depend upon other
swrast code.
/external/mesa3d/src/mesa/swrast/s_context.c
4f9d3a07bbe731709e6819448d21dee609a37806 07-Apr-2007 Richard Hughes <hughsient@gmail.com> fix references to non-existant sz4 field
/external/mesa3d/src/mesa/swrast/s_context.c
1c09bcfdda4083636a3ac27d804a34ef87875ce7 12-Mar-2007 Brian <brian@nostromo.localnet.net> Implement support for GL_ARB_draw_buffers with GL_MAX_DRAW_BUFFERS > 1.

GL_MAX_DRAW_BUFFERS is currently 4.
Added gl_FragData[] output for fragment programs.
In _swrast_write_rgba_span() loop over the color outputs/renderbuffers.
/external/mesa3d/src/mesa/swrast/s_context.c
1fcb4ecc07685872c9c42569ba13faa1cad54d3c 10-Mar-2007 Brian <brian@yutani.localnet.net> clean-up formatting
/external/mesa3d/src/mesa/swrast/s_context.c
5e80c62f3178a65bebca942aa0b1e5d16c34b2a9 24-Feb-2007 Brian <brian@yutani.localnet.net> Remove unneeded _Fragment/VertexShaderPresent fields, update comments.
/external/mesa3d/src/mesa/swrast/s_context.c
29c471aafc6a3fef23d553e31a555d1782854a77 22-Feb-2007 Brian <brian@yutani.localnet.net> Merge branch 'origin' into glsl-compiler-1

Conflicts:

src/mesa/main/state.c
src/mesa/shader/program.c
src/mesa/shader/program.h
src/mesa/shader/programopt.c
src/mesa/shader/slang/slang_execute.c
src/mesa/sources
src/mesa/swrast/s_arbshader.c
src/mesa/swrast/s_context.c
src/mesa/swrast/s_span.c
src/mesa/swrast/s_zoom.c
src/mesa/tnl/t_context.c
src/mesa/tnl/t_save_api.c
src/mesa/tnl/t_vb_arbprogram.c
src/mesa/tnl/t_vp_build.c
src/mesa/tnl/t_vtx_eval.c
dd34fe8679fa200e55cfaf8e80bbecdecea084e3 05-Feb-2007 Brian <brian@nostromo.localnet.net> Merge SWvertex texcoord and varying fields into attrib[] array field.

Fragment texcoords and varying code is now unified in the point/line/triangle
rasterization code. In the future, merge color, fog, etc. attribs.
/external/mesa3d/src/mesa/swrast/s_context.c
4e7fd7ad9604f6b9700a6011338c2bf1381b28da 02-Feb-2007 Brian <brian@yutani.localnet.net> get rid of unused span->start field
/external/mesa3d/src/mesa/swrast/s_context.c
7e85b0a025a82c3ffed060a757a3b4adae03d269 23-Jan-2007 Brian <brian@nostromo.localnet.net> silence C++ warnings
/external/mesa3d/src/mesa/swrast/s_context.c
9a78ef980d89c0d18f859036d5a0cdf82acd303c 09-Jan-2007 Brian <brian@yutani.localnet.net> Remove if (tObj) conditional so that texture units without a texture image
return black (0,0,0,1) when sampled.
/external/mesa3d/src/mesa/swrast/s_context.c
0bf5dbe002a64e198f55724cc1542602c012490f 20-Dec-2006 Brian <brian@yutani.localnet.net> Overhaul of GLSL API functions, dispatching, etc.
/external/mesa3d/src/mesa/swrast/s_context.c
6d982e53ee079dc6a9a20bd5d80b7f856e943e5d 16-Dec-2006 Brian <brian@yutani.localnet.net> don't allow fog when using a fragment shader (bug 9346)
/external/mesa3d/src/mesa/swrast/s_context.c
49f82803cc6ceaf1ecc3928a5417ef300f73f37d 14-Dec-2006 Brian <brian@yutani.localnet.net> Updated includes.
/external/mesa3d/src/mesa/swrast/s_context.c
12ef1fbefcee964b715783d3ade6b69b2c699ed8 13-Dec-2006 Brian <brian@yutani.localnet.net> Checkpoint for GLSL compiler changes.

In brief:
Check for enabled fragment program by looking at ctx->FragmentProgram._Current.
New code for varying variables.
/external/mesa3d/src/mesa/swrast/s_context.c
6f676f4871b1701ec56298f9d22460677ed0e982 02-Nov-2006 Brian Paul <brian.paul@tungstengraphics.com> always load frag prog state params for now (see comments)
/external/mesa3d/src/mesa/swrast/s_context.c
5050b565deca3cad165cd2f68badc084b9aa5377 31-Oct-2006 Brian Paul <brian.paul@tungstengraphics.com> make use of Parameters->StateFlags in _swrast_update_fragment_program()
/external/mesa3d/src/mesa/swrast/s_context.c
4e9e0aff790656821970ba74d8996718e415ea68 31-Oct-2006 Brian Paul <brian.paul@tungstengraphics.com> We need to call _mesa_load_state_parameters() whenever a fragment program
is enabled and we've changed any GL state that might be referenced by a
fragment program (such as state.fog.params). Do this during swrast
validation, not in _swrast_exec_fragment_program().
/external/mesa3d/src/mesa/swrast/s_context.c
cdb27e8242215271364602995d85607cfc06d441 01-Oct-2006 Brian Paul <brian.paul@tungstengraphics.com> New SWspan and SWspanarrays typedefs.
/external/mesa3d/src/mesa/swrast/s_context.c
d92da49bae30be612efb6ea20bdfda232ee3d01d 29-Sep-2006 Brian Paul <brian.paul@tungstengraphics.com> more changes for runtime renderbuffer depths
/external/mesa3d/src/mesa/swrast/s_context.c
a50b7dbc3ba1db8c92b4bbb4f7f06de8d6c039c4 26-Sep-2006 Brian Paul <brian.paul@tungstengraphics.com> Initial work for supporting different renderbuffer color depths at runtime.
/external/mesa3d/src/mesa/swrast/s_context.c
7e9799ac3d7f3b1b90f098420d413be95916c541 22-Sep-2006 Keith Whitwell <keith@tungstengraphics.com> Use _Enabled rather than _Active when checking for fragment shaders
/external/mesa3d/src/mesa/swrast/s_context.c
8334c8a2169055cd87e55d32403d59b8e46deb59 30-Aug-2006 Brian Paul <brian.paul@tungstengraphics.com> Move call to _swrast_update_rasterflags() since it depends on the
results of _swrast_update_fog_state().
Fixes bug where first frame of progs/samples/fog.c does not show fog.
/external/mesa3d/src/mesa/swrast/s_context.c
122629f27925a9dc50029bebc5079f87f416a7e1 20-Jul-2006 Brian Paul <brian.paul@tungstengraphics.com> Some structure renaming. Prefix vertex/fragment-related structs with
"gl_" to match other structs.
/external/mesa3d/src/mesa/swrast/s_context.c
d9736db6676948e06712d4bcba46b7040452f870 23-May-2006 Brian Paul <brian.paul@tungstengraphics.com> Add const qualifiers in a number of places.
/external/mesa3d/src/mesa/swrast/s_context.c
ee4e75bd6f768b7210436feeb32b4545ed62e025 14-Apr-2006 Brian Paul <brian.paul@tungstengraphics.com> Replace ctx->Const.MaxTextureUnits w/ ctx->Const.MaxTexture[Coord/Image]Units
in various places.
Note that ctx->Texture.CurrentUnit needs to be tested against Coord/Image
limits when referenced, not just in glActiveTexture().
/external/mesa3d/src/mesa/swrast/s_context.c
ea4fe661d7f3a95d9db17e1475076f1badf8e1a6 26-Mar-2006 Brian Paul <brian.paul@tungstengraphics.com> merge from texman branch
/external/mesa3d/src/mesa/swrast/s_context.c
06049e24164fc0bda9dea12fbcbdb827a731badb 25-Mar-2006 Brian Paul <brian.paul@tungstengraphics.com> remove carriage returns
/external/mesa3d/src/mesa/swrast/s_context.c
071357096e682e9af59ad45ea5abc444ab431837 21-Mar-2006 Michal Krol <mjkrol@gmail.org> GLSL fixes:
- generate error on NULL pointers in glShaderSourceARB;
- reinstall program object, if current, in glLinkProgramARB;
- vertex and fragment shaders are optional in program object;
- floor asm was wrongly computed for x86 back-end;
- allow for (void) idiom in function prototypes;
- all fixed-state uniforms are updated;
- local variable initializers are working;
- implement texture* and shadow* functions for vertex processor;
- generate error if too many arguments in general constructor;
- trim unused data in general constructor;
- struct r-value field select was badly relocated;

Changes:
- add derived state gl_fog_attrib::_Scale;
- add derived state gl_light::_CosCutoffNeg;
/external/mesa3d/src/mesa/swrast/s_context.c
3073cf21d2ce13b96c79c4af5ed488ef46a172f9 28-Feb-2006 Brian Paul <brian.paul@tungstengraphics.com> check for active shader, set FRAGPROG_BIT in raster mask
/external/mesa3d/src/mesa/swrast/s_context.c
3a5bb1729d8c229a587e34ccd5ddc86e26811b9f 26-Jan-2006 Brian Paul <brian.paul@tungstengraphics.com> New comments, clean-up of fields related to point/line/triangle validation.
/external/mesa3d/src/mesa/swrast/s_context.c
ba3da6154c324cc916845bc5de3de077d0b59ffc 12-Nov-2005 Brian Paul <brian.paul@tungstengraphics.com> Added OSMesaColorClamp(), bug 4917
/external/mesa3d/src/mesa/swrast/s_context.c
de99760bf3511d05185799c4fb4347f9e5f420f4 12-Nov-2005 Brian Paul <brian.paul@tungstengraphics.com> Move stuff common to vertex/fragment_program into the base class, including:
Instructions, InputsRead, OutputsWritten, and Parameters.
Also, added debug functions: _mesa_print_instruction(),
_mesa_print_program_parameters() and revamp _mesa_print_program().
/external/mesa3d/src/mesa/swrast/s_context.c
41c8b71871d68a4465812130fd2995b9099af838 05-Nov-2005 Brian Paul <brian.paul@tungstengraphics.com> remove unneeded #include
/external/mesa3d/src/mesa/swrast/s_context.c
dcf4c17fb1624af47181c63af4c3ad29f919c17a 31-Oct-2005 Brian Paul <brian.paul@tungstengraphics.com> check swrast->_FogEnabled instead of ctx->Fog.Enabled
/external/mesa3d/src/mesa/swrast/s_context.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_context.c
8885b077ed7180e93a002d93864a8ff7b0bb81f3 16-Sep-2005 Brian Paul <brian.paul@tungstengraphics.com> more GLuint->GLbitfield changes
/external/mesa3d/src/mesa/swrast/s_context.c
e00ac11d4dd05c56584622dc2707bbdcfe4b2707 15-Sep-2005 Brian Paul <brian.paul@tungstengraphics.com> Replace GLuint with GLbitfield where appropriate. Also replace GLuint
with GLboolean in a few places.
/external/mesa3d/src/mesa/swrast/s_context.c
55187ea63e980b32c7a701855571332f4357d634 15-Sep-2005 Brian Paul <brian.paul@tungstengraphics.com> Update includes post-splitting of s_texture.c
/external/mesa3d/src/mesa/swrast/s_context.c
e3c8a0c16d5a2ffdb9d107dbb980427979a541f7 05-Sep-2005 Brian Paul <brian.paul@tungstengraphics.com> remove obsolete CurrentBufferBit
/external/mesa3d/src/mesa/swrast/s_context.c
23ffc3a85d6172f8a98d17d7f23610bab808d84e 27-Aug-2005 Brian Paul <brian.paul@tungstengraphics.com> Rearrange the code related to GL_ARB_occlusion_object to generalize query
objects for future types of queries.
/external/mesa3d/src/mesa/swrast/s_context.c
6e4f594a02fc384b17d5732be652d7d28618aec2 25-Aug-2005 Brian Paul <brian.paul@tungstengraphics.com> removed GL_HP_occlusion_test extension
/external/mesa3d/src/mesa/swrast/s_context.c
bb5c84fcbc22b4fef28cf4589d6410eb3c35a496 01-Jul-2005 Brian Paul <brian.paul@tungstengraphics.com> Remove NEW_RENDERBUFFER stuff.
Now, OLD_RENDERBUFFER marks code that needs to eventually be removed when
all the drivers are updated to no longer need the SetBuffer() function.
/external/mesa3d/src/mesa/swrast/s_context.c
1e5772f0ba7300e19d1980c0e30e358e71c5c685 11-May-2005 Keith Whitwell <keith@tungstengraphics.com> Don't let FragmentProgram._Active influence choice of vertex vs pixel
fog.
/external/mesa3d/src/mesa/swrast/s_context.c
e4b2356c07d31fbeeabb13b2fb47db703b473080 04-May-2005 Brian Paul <brian.paul@tungstengraphics.com> Major check-in of changes for GL_EXT_framebuffer_object extension.
Main driver impacts:
- new code for creating the Mesa GLframebuffer
- new span/pixel read/write code
Some drivers not yet updated/tested.
/external/mesa3d/src/mesa/swrast/s_context.c
47b29f511a8e917c65536fde90397d54d2ad23d3 04-May-2005 Keith Whitwell <keith@tungstengraphics.com> Add a facility to route all rasterization through a fragment program
which is automatically generated to match the current texture environment
state. Introduces a new value ctx->FragmentProgram._Active which is
true when either _Enabled is true or there is such a fragment program
ready to run.

To test out on a driver running the software rasterizer, set
MESA_TEX_PROG=t in the environment. It goes without saying that performance
is lower for the software rasterizer in this mode.
/external/mesa3d/src/mesa/swrast/s_context.c
7f752fed993e5e9423abac200dd59141edbada56 19-Dec-2004 Dave Airlie <airliedfreedesktop.org> Implement software ATI_fragment_shader

no error detection, slow, may not be 100% correct but a good start
/external/mesa3d/src/mesa/swrast/s_context.c
a803b0c891404dcd7c376e91f6a033cd4e42abc3 18-Dec-2004 Brian Paul <brian.paul@tungstengraphics.com> Consolidate _swrast_write_texture_span() into _swrast_write_rgba_span().
/external/mesa3d/src/mesa/swrast/s_context.c
ba164c4614288f1642fc8e2f83d2895991b22d70 31-Oct-2004 Brian Paul <brian.paul@tungstengraphics.com> Removed _swrast_validate_pbo_access().
In x11 driver, map/unmap PBO as needed in DrawPixels functions.
/external/mesa3d/src/mesa/swrast/s_context.c
dfe508ca7af1a6d1099cd65e257512ed1e17d893 13-Oct-2004 Brian Paul <brian.paul@tungstengraphics.com> Fix minor fog / fragment program state bug.
Don't add diffuse and specular colors when using fragment program.
/external/mesa3d/src/mesa/swrast/s_context.c
53f82c5aadbb15585754bfacf3237093eccdb2ce 02-Oct-2004 Brian Paul <brian.paul@tungstengraphics.com> added support for GL_ARB_draw_buffers
/external/mesa3d/src/mesa/swrast/s_context.c
a6c423d95663cfd8601cf84e10e8e1b12fa6ef15 25-Aug-2004 Brian Paul <brian.paul@tungstengraphics.com> Silence gcc 3.4 warnings on ReactOS. Mostly unused var warnings. (patch 1015696)
/external/mesa3d/src/mesa/swrast/s_context.c
de67b3ea18c68f69e0303f1ba88dbb26066049de 24-Jun-2004 Brian Paul <brian.paul@tungstengraphics.com> fix capitalization, new comments, etc
/external/mesa3d/src/mesa/swrast/s_context.c
d203091d204ea2e543cd41ea85d0fc57aa794a4b 02-Jun-2004 Brian Paul <brian.paul@tungstengraphics.com> Check for NULL texture object when choosing texture sampler. Fixes segfault when fragment program references an incomplete texture
/external/mesa3d/src/mesa/swrast/s_context.c
6d460af6af77a0d5a5b568bcd6094b98e249ba93 23-Apr-2004 Brian Paul <brian.paul@tungstengraphics.com> Added ctx->Vertex/FragmentProgram._Enable flags. Set when vertex/fragment
program is enabled AND the currently bound program is valid.
Check _Enable instead of Enable to prevent things from blowing up
when someone calls glEnable(GL_VERTEX_PROGRAM_ARB) without actually
defining a program.
/external/mesa3d/src/mesa/swrast/s_context.c
894844a8d956a0ee5f95836331dc318f49fdb845 21-Mar-2004 Brian Paul <brian.paul@tungstengraphics.com> Implemented support for software-based AUX color buffers.
Only available with Xlib driver for now.
Assorted clean-ups related to Draw/ReadBuffer().
Renamed FRONT_LEFT_BIT -> DD_FRONT_LEFT_BIT, etc.
/external/mesa3d/src/mesa/swrast/s_context.c
7a6b71ef2944bae1718e8167b2faaceb8422071c 13-Mar-2004 Brian Paul <brian.paul@tungstengraphics.com> Implementation of GL_EXT_pixel_buffer_object extension.
Note: extension may not be finalized yet - subject to change!
Note: implementation not fully suitable for h/w implementation yet.
/external/mesa3d/src/mesa/swrast/s_context.c
db79b5683cfc3f2ea3f9b0aca8c4d149bf9a63f7 27-Feb-2004 Brian Paul <brian.paul@tungstengraphics.com> move _mesa_load_state_parameters() to state validation stage
/external/mesa3d/src/mesa/swrast/s_context.c
09da0b8e6621a831e3eeb9381430f2bed18a22ad 17-Feb-2004 Brian Paul <brian.paul@tungstengraphics.com> A bit of an overhaul of the fog code.
glFogCoord didn't always work reliably.
ARB fragment program fog options work now.
Per-fragment fog computations are now perspective corrected.
/external/mesa3d/src/mesa/swrast/s_context.c
853bda3e7c4dfa7d8cc462729f6a3dce89e44963 09-Dec-2003 Brian Paul <brian.paul@tungstengraphics.com> Update NEED_SECONDARY_COLOR macro to test if either vertex/fragment
programs are enabled and if they need secondary color input register.
Patch by Karl Rasche, with tweaks by Brian.
/external/mesa3d/src/mesa/swrast/s_context.c
57857ca0925116d6d254fef7e705cfe0b650d77f 12-Nov-2003 Brian Paul <brian.paul@tungstengraphics.com> Ville Syrjala's logic op patch
/external/mesa3d/src/mesa/swrast/s_context.c
15c37348a5d47ece17ffef38978aa8253363e6ee 22-Oct-2003 Kendall Bennett <KendallB@scitechsoft.com> More SciTech SNAP updates. Some of these files didn't really change, but
they show up in the list (GLU stuff) for some reason. The major change
here is the addition of code in the glx86asm.py file to generate assembler
stub entry points with the correct name decorations for _stdcall calling
conventions so this can be used on Windows boxes.
/external/mesa3d/src/mesa/swrast/s_context.c
c329e5a3d81a56437de4e19fec1de3eca2a1afb7 22-Oct-2003 Kendall Bennett <KendallB@scitechsoft.com> Updates to SSE assembler support for Open Watcom
/external/mesa3d/src/mesa/swrast/s_context.c
db40aec48c3db8164968df24184750a41be6e99f 10-Oct-2003 Brian Paul <brian.paul@tungstengraphics.com> remove bogus _swrast_texture_table_lookup() call (Eric Plante)
/external/mesa3d/src/mesa/swrast/s_context.c
29b4076f9acff96a867760fc885f5eaeb7586977 19-Sep-2003 Brian Paul <brian.paul@tungstengraphics.com> Move away from using the ctx->_TriangleCaps bitfield.
New macros in context.h for testing state: NEED_SECONDARY_COLOR
and NEED_TWO_SIDED_LIGHTING.
/external/mesa3d/src/mesa/swrast/s_context.c
87f858dd7cbca2280c983c77a239013a187c3e9a 19-Sep-2003 Brian Paul <brian.paul@tungstengraphics.com> s/_backface_sign/_BackfaceSign/
/external/mesa3d/src/mesa/swrast/s_context.c
b17a722ca3989e8563ee04cb2939f4835f8a171e 13-Jun-2003 Brian Paul <brian.paul@tungstengraphics.com> Implemented GL_ARB_occlusion_query (not 100% finalized).
/external/mesa3d/src/mesa/swrast/s_context.c
92f9785c727ea10ff5f8dc9770f0e8f388fcea70 02-May-2003 Brian Paul <brian.paul@tungstengraphics.com> Use ctx->Const.MaxTextureImageUnits and MaxTextureCoordUnits in more places.
Misc vertex array / vertex program changes.
/external/mesa3d/src/mesa/swrast/s_context.c
36a0a3252e1e20df69b53f70ba93bc74c4a4bf0e 08-Apr-2003 Brian Paul <brian.paul@tungstengraphics.com> Added ctx->Texture._EnabledCoordUnits bitfield.
Fixed some vertex array / vertex program glitches with glDrawElements.
Fixed some fragment program runtime bugs.
Non-trivial Cg programs are running now.
/external/mesa3d/src/mesa/swrast/s_context.c
45bc887da226403f2c41077e40ca38b6f60f1359 25-Mar-2003 Brian Paul <brian.paul@tungstengraphics.com> replace _mesa_ prefix with _swrast_, remove s_histogram.[ch]
/external/mesa3d/src/mesa/swrast/s_context.c
350353adcd75f94fda63c787c86961716114e0bf 15-Mar-2003 Brian Paul <brian.paul@tungstengraphics.com> Fix up some fragment program texture enable issues.
Implemented TXD instruction.
/external/mesa3d/src/mesa/swrast/s_context.c
f386f73f9e4054a750d453fa2f5449c2f1d2e242 14-Mar-2003 Brian Paul <brian.paul@tungstengraphics.com> Clean-up of parser error handling/reporting.
Basic fragment program texture instructions are limping along.
/external/mesa3d/src/mesa/swrast/s_context.c
b8d6607acd3b6d18dab0c7247d5e0fc72e98ceae 23-Feb-2003 Brian Paul <brian.paul@tungstengraphics.com> Move span stuff from swrast.h to s_context.h (it's private).
Implemented remaining fragment program instructions.
Initial changes to implement fragment program texture sampling.
/external/mesa3d/src/mesa/swrast/s_context.c
45b47d079f6a749c15498a6cef78d891f8acb665 26-Jan-2003 Brian Paul <brian.paul@tungstengraphics.com> Make GL_SGI_texture_color_table work per-texture unit.
Clean-up and optimize _swrast_texture_table_lookup().
/external/mesa3d/src/mesa/swrast/s_context.c
610d59981a9f43fefe29b34ef19c184d28e2bef5 14-Jan-2003 Brian Paul <brian.paul@tungstengraphics.com> First batch of code for GL_NV_fragment_program.
Re-org of some GL_NV_vertex_program code.
Replace MAX_TEXTURE_UNITS with MAX_TEXTURE_COORD_UNITS and MAX_TEXTURE_IMAGE_UNITS.
/external/mesa3d/src/mesa/swrast/s_context.c
05a4b37707d2c598ea68c05d07a3d65bcbf5a076 29-Oct-2002 Brian Paul <brian.paul@tungstengraphics.com> updated email addresses
/external/mesa3d/src/mesa/swrast/s_context.c
3c63452e64df7e10aa073c6c3b9492b1d7dabbb8 25-Oct-2002 Brian Paul <brian.paul@tungstengraphics.com> Header file clean-up:
1. Remove all.h and PC_HEADER junk.
2. Rolled mem.c and mem.h into imports.c and imports.h
3. Include imports.h instead of mem.h
Restore _mesa_create/initialize_context() to be like they were in 4.0.4
New wrappers for a few std C functions: _mesa_atoi(), _mesa_strstr(), etc.
/external/mesa3d/src/mesa/swrast/s_context.c
32d0d5aec4f905fe443ffdfdfae20c5b92ffb0db 11-Oct-2002 Brian Paul <brian.paul@tungstengraphics.com> init swrast->CurrentBuffer
/external/mesa3d/src/mesa/swrast/s_context.c
f782b8189e718974a40d72ac4f6b8d213ca99e1e 04-Oct-2002 Brian Paul <brian.paul@tungstengraphics.com> multiple GL_POINTS can now be rendered together into one fragment span
/external/mesa3d/src/mesa/swrast/s_context.c
a9be374f82ace523c126c661399030c869201dab 17-Sep-2002 Brian Paul <brian.paul@tungstengraphics.com> pull-in changes from DRI/Mesa-4.0.4
/external/mesa3d/src/mesa/swrast/s_context.c
77df88727cb0a423dd5cb41498c2302d9df4fce7 07-Aug-2002 Brian Paul <brian.paul@tungstengraphics.com> struct sw_span is again allocated on the stack, but the arrays of span
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.
/external/mesa3d/src/mesa/swrast/s_context.c
3b4fbbc129c711a5aec8d653d5c6eb2e195f947c 09-Jul-2002 Brian Paul <brian.paul@tungstengraphics.com> Overhaul of glRead/DrawBuffer() code. Now, swrast->Driver.SetBuffer()
indicates the read AND draw color buffer for all software rasterization.
Lots of related clean-ups. See RELNOTES-4.1 for details.
/external/mesa3d/src/mesa/swrast/s_context.c
8afe7de8deaf3c9613fd68b344de8c52b02b1879 15-Jun-2002 Brian Paul <brian.paul@tungstengraphics.com> Implemented GL_NV_texture_rectangle extension.
Replace struct gl_texure_object's Dimension w/ Target field.
Added _EnabledUnits to struct gl_texture_attrib - the _ReallyEnabled
field is obsolete, but still present for now. This effectively
removes the 8-texture units limit, 32 units now possible, but unlikely!
New TEXTURE_1D/2D/3D/CUBE/RECT_BIT tokens for unit->_ReallyEnabled field.
Updated device drivers to use ctx->Texture._EnabledUnits.
/external/mesa3d/src/mesa/swrast/s_context.c
4753d60dd070bb08d0116076bcc08025c86ce857 15-Jun-2002 Brian Paul <brian.paul@tungstengraphics.com> Added ctx parameter to _mesa_debug()
Added _mesa_printf()
Updated SetDrawBuffer() function in all drivers (ala 4.0.3)
Import 4.0.3/DRI changes.
/external/mesa3d/src/mesa/swrast/s_context.c
d09a1d8b29ae5841ae39b5c24c3f4693dd750559 13-Jun-2002 Brian Paul <brian.paul@tungstengraphics.com> more removal of fprintf() calls
/external/mesa3d/src/mesa/swrast/s_context.c
f595212336ae63c981f0f39f4ea1dec67ff7fe25 02-May-2002 Brian Paul <brian.paul@tungstengraphics.com> Implemented GL_ARB_texture_env_crossbar.
Simplification of some of the texture application code.
/external/mesa3d/src/mesa/swrast/s_context.c
bf80e1ed620836e2ca0dd3f7d2d4cb187d17563d 19-Apr-2002 Brian Paul <brian.paul@tungstengraphics.com> Allocate a sw_span struct in the swrast context instead of allocating it
on the stack frame in the point/line/triangle functions. (Klaus Niederkrueger)
This should solve the performance problem Karl found on Windows.
/external/mesa3d/src/mesa/swrast/s_context.c
a670c1280b78e6da3b298b61f623e4c733c6be94 19-Apr-2002 Brian Paul <brian.paul@tungstengraphics.com> casts to fix GLint/GLuint mismatches
/external/mesa3d/src/mesa/swrast/s_context.c
b37a084357dd08573b86d6d8c5ba43d65bdc1bd7 02-Feb-2002 Brian Paul <brian.paul@tungstengraphics.com> Converted line drawing over to new span code, pb no longer used.
Big clean-up of line drawing code.
Removed many obsolete span processing functions.
/external/mesa3d/src/mesa/swrast/s_context.c
733a4b602bbbfda83ee03b7ae4f3737bbe659034 02-Feb-2002 Brian Paul <brian.paul@tungstengraphics.com> sw_span can now hold x/y arrays of fragment positions - getting ready to
ditch the pb (pixel buffer) code.
Converted point drawing, bitmaps and aa lines to use new span functions.
/external/mesa3d/src/mesa/swrast/s_context.c
9927f1978da8530416f699d084dda099720e43e6 10-Jan-2002 Brian Paul <brian.paul@tungstengraphics.com> Klaus's latest patches: change texcoord[3] to texcoord[4] everywhere
/external/mesa3d/src/mesa/swrast/s_context.c
10f30eb43835c57c00783390a02d72daf4f78e26 17-Dec-2001 Brian Paul <brian.paul@tungstengraphics.com> first checkpoint commit of Klaus's new span code (struct sw_span)
/external/mesa3d/src/mesa/swrast/s_context.c
46af1f87c897ef03470d205e9fd147e93911cbce 28-Jul-2001 Keith Whitwell <keith@tungstengraphics.com> Remove _BaseAlpha, fix reflect lighting bug.
/external/mesa3d/src/mesa/swrast/s_context.c
53560311294814ae0daa8457307a2b25077bf4e9 17-Jul-2001 Keith Whitwell <keith@tungstengraphics.com> Lighting now emits colors as CHAN_TYPE, as it used to. This will require
minor adjustments in the dri drivers for twosided lighting to work again.
/external/mesa3d/src/mesa/swrast/s_context.c
f431a3fb4dc1bf860203d79e54657e3a62bc50df 13-Jul-2001 Brian Paul <brian.paul@tungstengraphics.com> assorted changes for supporting GLfloat color channels (not done)
/external/mesa3d/src/mesa/swrast/s_context.c
1182ffeec39bf419928ba862c225e80a439fee7a 13-Jul-2001 Keith Whitwell <keith@tungstengraphics.com> Rename some of the tnl->Driver.* functions to tnl->Driver.Render.*, to make it
clear that these are owned by t_vb_render.c.

Make swrast_setup opaque - it now hooks itself directly into
tnl->Driver.Render.*. Add a _swsetup_Wakeup() call that does this.

Update X11 (tested), osmesa and FX drivers for this change.

FX compiles but is probably broken as the changes there are large. It was the
only remaining driver that used the internal _swsetup_ functions for
interp and copy_pv. This usage has been replaced with code from the DRI
tdfx driver.
/external/mesa3d/src/mesa/swrast/s_context.c
89dae684aa1d74b06a4f70cb76b33671d0cef9e6 17-May-2001 Keith Whitwell <keith@tungstengraphics.com> Fix order of decomposition of quad.
Remove 'swrast->_MultiTexEnabled' derived value.
/external/mesa3d/src/mesa/swrast/s_context.c
3d5815f4636be0aa9f1788ca80908d5809d26481 29-Mar-2001 Keith Whitwell <keith@tungstengraphics.com> Removed DD_STENCIL, DD_FEEDBACK, DD_SELECT.
Added some switchable debug to s_context.c
/external/mesa3d/src/mesa/swrast/s_context.c
ee403ff0ba272f5be539ddc921d3fffb3d250cc4 29-Mar-2001 Brian Paul <brian.paul@tungstengraphics.com> Removed DD_Z_NEVER.
Replaced SEPERATE with SEPARATE.
Renumbered _NEW_ flags.
Removed _NEW_COLORTABLE.
/external/mesa3d/src/mesa/swrast/s_context.c
709892459922a32096fe9dd8261d0d92337bb02f 19-Mar-2001 Keith Whitwell <keith@tungstengraphics.com> Split driver struct into swrast/tnl/core components.
/external/mesa3d/src/mesa/swrast/s_context.c
22144ab7552f0799bcfca506bf4ffa7f70a06649 12-Mar-2001 Gareth Hughes <gareth@valinux.com> Consistent copyright info (version number, date) across all files.
/external/mesa3d/src/mesa/swrast/s_context.c
08836341788a9f9d638d9dc8328510ccd18ddeb5 03-Mar-2001 Brian Paul <brian.paul@tungstengraphics.com> lots of gl_*() to _mesa_*() namespace clean-up
/external/mesa3d/src/mesa/swrast/s_context.c
feca368c2995e5c861e71253f3c53ebb231919b2 24-Feb-2001 Keith Whitwell <keith@tungstengraphics.com> Template work
/external/mesa3d/src/mesa/swrast/s_context.c
4539e9195d2711fb977fbb6589427e0456102214 16-Feb-2001 Keith Whitwell <keith@tungstengraphics.com> Fix state bitmasks for invalidating line,tri,point functions. (won't fix
the fog problem, I don't think)
/external/mesa3d/src/mesa/swrast/s_context.c
46b0988c673b28e072fd0cbf477632a9ab6f9f18 16-Feb-2001 Keith Whitwell <keith@tungstengraphics.com> Allow swrast to cope (fairly) cleanly with GL_SEPERATE_SPECULAR when
texturing is not enabled, and without requiring the two colors be
added externally.

As a part of this, collapsed the decomposition of quads into triangles
inside swrast to be hardwired into _swrast_Quad; removed s_quads.[ch].

Removed checks on texture state from t_vb_light.c, which was previously
required by swrast.

Moved the t_dd_ templates to a new directory.
/external/mesa3d/src/mesa/swrast/s_context.c
407b487017a5c5a213f399ec1667fe2aa7ed340d 29-Jan-2001 Brian Paul <brian.paul@tungstengraphics.com> fixed computation of _MultiTextureEnabled (again)
/external/mesa3d/src/mesa/swrast/s_context.c
b6bcae5698df88f7730d40004ce7ce0462e97a20 24-Jan-2001 Brian Paul <brian.paul@tungstengraphics.com> Replaced struct gl_visual with struct __GLcontextModesRec from glcore.h.
Replace "RGBAMode" with "rgbMode", etc.
Other minor clean-ups.
/external/mesa3d/src/mesa/swrast/s_context.c
8415686ea22bc9165720590261581ff997f2eb7a 13-Jan-2001 Keith Whitwell <keith@tungstengraphics.com> Use correct pv in swrast lines routines
/external/mesa3d/src/mesa/swrast/s_context.c
719344b23ed7b1947af1db9281389f3fc74c3fc5 27-Dec-2000 Keith Whitwell <keith@tungstengraphics.com> Fixes for compiling assembly (disable unused 'masked' versions)
Fixes for compiling without debug.
Fix line clipping
Fix unfilled polygon clipping (should be correct now).
/external/mesa3d/src/mesa/swrast/s_context.c
cab974cf6c2dbfbf5dd5d291e1aae0f8eeb34290 26-Dec-2000 Keith Whitwell <keith@tungstengraphics.com> Major rework of tnl module
New array_cache module
Support 8 texture units in core mesa (now support 8 everywhere)
Rework core mesa statechange operations to avoid flushing on many
noop statechanges.
/external/mesa3d/src/mesa/swrast/s_context.c
8aa019d2efcf0295beae51989fe4b419ca50ca17 09-Dec-2000 Brian Paul <brian.paul@tungstengraphics.com> _MultiTextureEnabled was being computed incorrectly
/external/mesa3d/src/mesa/swrast/s_context.c
5e3bc0c2a2bcdf59949410f94c9b705fc1281ce8 22-Nov-2000 Jouk Jansen <joukj@hrem.stm.tudelft.nl> Committing in .

Modified Files:
Mesa/macos/gli_api/gliapi1.h Mesa/macos/gli_api/gliapi2.h
Mesa/macos/gli_api/gliapiext.h Mesa/macos/src-gli/fxgli.c
Mesa/macos/src-gli/fxgli.h Mesa/macos/src-gli/fxgli2.c
Mesa/macos/src-gli/fxgli_tridebug.c Mesa/src/accum.c
Mesa/src/accum.h Mesa/src/all.h Mesa/src/alpha.c
Mesa/src/alpha.h Mesa/src/attrib.c Mesa/src/attrib.h
Mesa/src/bitmap.c Mesa/src/bitmap.h Mesa/src/blend.c
Mesa/src/blend.h Mesa/src/buffers.c Mesa/src/buffers.h
Mesa/src/clip.c Mesa/src/clip.h Mesa/src/colortab.h
Mesa/src/config.c Mesa/src/context.c Mesa/src/context.h
Mesa/src/convolve.c Mesa/src/convolve.h Mesa/src/copypix.c
Mesa/src/copypix.h Mesa/src/debug.c Mesa/src/depth.c
Mesa/src/depth.h Mesa/src/dlist.c Mesa/src/dlist.h
Mesa/src/drawpix.c Mesa/src/drawpix.h Mesa/src/enable.c
Mesa/src/enable.h Mesa/src/eval.c Mesa/src/eval.h
Mesa/src/extensions.c Mesa/src/extensions.h
Mesa/src/feedback.c Mesa/src/feedback.h Mesa/src/fog.c
Mesa/src/fog.h Mesa/src/get.c Mesa/src/get.h Mesa/src/glapi.c
Mesa/src/glthread.h Mesa/src/highpc.c Mesa/src/hint.h
Mesa/src/histogram.h Mesa/src/image.c Mesa/src/image.h
Mesa/src/imports.c Mesa/src/light.c Mesa/src/light.h
Mesa/src/lines.c Mesa/src/lines.h Mesa/src/logic.c
Mesa/src/logic.h Mesa/src/masking.c Mesa/src/masking.h
Mesa/src/matrix.c Mesa/src/matrix.h Mesa/src/pixel.c
Mesa/src/pixel.h Mesa/src/points.c Mesa/src/points.h
Mesa/src/polygon.c Mesa/src/polygon.h Mesa/src/rastpos.c
Mesa/src/readpix.c Mesa/src/scissor.c Mesa/src/scissor.h
Mesa/src/state.c Mesa/src/state.h Mesa/src/stencil.c
Mesa/src/stencil.h Mesa/src/teximage.c Mesa/src/teximage.h
Mesa/src/texobj.c Mesa/src/texobj.h Mesa/src/texstate.c
Mesa/src/texstate.h Mesa/src/texture.c Mesa/src/texture.h
Mesa/src/texutil.c Mesa/src/texutil.h Mesa/src/varray.c
Mesa/src/varray.h Mesa/src/X/fakeglx.c Mesa/src/X/xm_api.c
Mesa/src/X/xm_dd.c Mesa/src/X/xm_line.c Mesa/src/X/xm_span.c
Mesa/src/X/xm_tri.c Mesa/src/swrast/s_aaline.c
Mesa/src/swrast/s_aaline.h Mesa/src/swrast/s_aatriangle.h
Mesa/src/swrast/s_accum.h Mesa/src/swrast/s_alpha.h
Mesa/src/swrast/s_alphabuf.h Mesa/src/swrast/s_blend.h
Mesa/src/swrast/s_context.c Mesa/src/swrast/s_context.h
Mesa/src/swrast/s_depth.h Mesa/src/swrast/s_drawpix.h
Mesa/src/swrast/s_feedback.h Mesa/src/swrast/s_fog.h
Mesa/src/swrast/s_histogram.h Mesa/src/swrast/s_lines.h
Mesa/src/swrast/s_logic.h Mesa/src/swrast/s_masking.h
Mesa/src/swrast/s_pb.h Mesa/src/swrast/s_pixeltex.h
Mesa/src/swrast/s_points.h Mesa/src/swrast/s_quads.c
Mesa/src/swrast/s_quads.h Mesa/src/swrast/s_scissor.h
Mesa/src/swrast/s_span.h Mesa/src/swrast/s_stencil.h
Mesa/src/swrast/s_texture.h Mesa/src/swrast/s_triangle.h
Mesa/src/swrast/s_zoom.h Mesa/src/swrast/swrast.h
Mesa/src/swrast_setup/ss_context.h
Mesa/src/swrast_setup/ss_triangle.c
Mesa/src/swrast_setup/ss_triangle.h
Mesa/src/swrast_setup/ss_vb.h Mesa/src/tnl/t_clip.c
Mesa/src/tnl/t_clip.h Mesa/src/tnl/t_context.c
Mesa/src/tnl/t_context.h Mesa/src/tnl/t_cva.c
Mesa/src/tnl/t_cva.h Mesa/src/tnl/t_debug.c
Mesa/src/tnl/t_debug.h Mesa/src/tnl/t_dlist.h
Mesa/src/tnl/t_eval.c Mesa/src/tnl/t_eval.h
Mesa/src/tnl/t_fog.c Mesa/src/tnl/t_fog.h
Mesa/src/tnl/t_light.c Mesa/src/tnl/t_light.h
Mesa/src/tnl/t_pipeline.c Mesa/src/tnl/t_pipeline.h
Mesa/src/tnl/t_shade.c Mesa/src/tnl/t_shade.h
Mesa/src/tnl/t_stages.c Mesa/src/tnl/t_stages.h
Mesa/src/tnl/t_texture.c Mesa/src/tnl/t_texture.h
Mesa/src/tnl/t_trans_elt.c Mesa/src/tnl/t_trans_elt.h
Mesa/src/tnl/t_varray.c Mesa/src/tnl/t_varray.h
Mesa/src/tnl/t_vb.c Mesa/src/tnl/t_vb.h
Mesa/src/tnl/t_vbcull.c Mesa/src/tnl/t_vbcull.h
Mesa/src/tnl/t_vbfill.c Mesa/src/tnl/t_vbfill.h
Mesa/src/tnl/t_vbindirect.c Mesa/src/tnl/t_vbindirect.h
Mesa/src/tnl/t_vbrender.c Mesa/src/tnl/t_vbrender.h
Mesa/src/tnl/t_vbxform.c Mesa/src/tnl/t_vbxform.h
Mesa/src/tnl/tnl.h
Added Files:
Mesa/src/mtypes.h
Removed Files:
Mesa/src/types.h

Changed Mesa/src/types to Mesa/src/mtypes.h to avoid conflicts while
compiling on a VMS system.

----------------------------------------------------------------------
/external/mesa3d/src/mesa/swrast/s_context.c
a852378a6289d154364dde440f89a39bbfc33e2d 20-Nov-2000 Brian Paul <brian.paul@tungstengraphics.com> Replaced Texture.CurrentD[] with separate Texture.Current1/2/3D vars.
Completely removed the dirty texture object list. Set texObj->Complete
to GL_FALSE to indicate dirty.
Made point/line/triangle/quad SWvertex parameters const.
Minor code clean-ups.
/external/mesa3d/src/mesa/swrast/s_context.c
1e1aac034c986a08248861363c0baa27dc2ae2d5 13-Nov-2000 Keith Whitwell <keith@tungstengraphics.com> Cleanup of derived state calculation prior to seperating software T&L
into a new directory. Specifically the handling of changes to lighting
lighting space (light in model vs. light in eye) have been revamped.

Moved several derived values used only by swrast into that directory.

Removed direct calls to swrast_flush() from vbrender.c -- pushed into
ctx->Driver.RenderFinish.

Optimized flat-shading case in swrast_setup.
/external/mesa3d/src/mesa/swrast/s_context.c
ba41b8afb1b40b967cf5c0e604bbf09793eb8fee 10-Nov-2000 Brian Paul <brian.paul@tungstengraphics.com> minor changes to silence compiler warnings
/external/mesa3d/src/mesa/swrast/s_context.c
cd03ed4f54444d96e4e47cdb118a3dfd94d92bb0 05-Nov-2000 Keith Whitwell <keith@tungstengraphics.com> Reorganized software rasterizer as a module which manages its own state,
with tighter interfaces with the rest of the world.

Proper documentation to come.
/external/mesa3d/src/mesa/swrast/s_context.c
e3a051e0538a605551f4d58294c94f5eb00ed07f 31-Oct-2000 Keith Whitwell <keith@tungstengraphics.com> Moved software rasterizer functionality to new directory.
/external/mesa3d/src/mesa/swrast/s_context.c