Merge remote-tracking branch 'origin/released'

Conflicts:
	apps/xwininfo/configure.ac
	apps/xwininfo/xwininfo.c
	libX11/configure.ac
	libX11/specs/libX11/AppC.xml
	libX11/specs/libX11/AppD.xml
	libX11/specs/libX11/CH03.xml
	libX11/specs/libX11/CH04.xml
	libX11/specs/libX11/CH05.xml
	libX11/specs/libX11/CH06.xml
	libX11/specs/libX11/CH07.xml
	libX11/specs/libX11/CH08.xml
	libX11/specs/libX11/CH09.xml
	libX11/specs/libX11/CH11.xml
	libX11/specs/libX11/CH12.xml
	libX11/specs/libX11/CH13.xml
	libX11/specs/libX11/CH14.xml
	libX11/specs/libX11/CH15.xml
	libX11/specs/libX11/CH16.xml
	libxcb/configure.ac
	libxcb/src/c_client.py
	libxcb/src/xcb_auth.c
	libxcb/src/xcb_util.c
	mesalib/common.py
	mesalib/configs/linux-dri
	mesalib/docs/GL3.txt
	mesalib/docs/download.html
	mesalib/docs/install.html
	mesalib/include/GL/internal/dri_interface.h
	mesalib/scons/custom.py
	mesalib/scons/gallium.py
	mesalib/src/gallium/auxiliary/util/u_math.h
	mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
	mesalib/src/glsl/ast_function.cpp
	mesalib/src/glsl/ast_to_hir.cpp
	mesalib/src/glsl/glcpp/glcpp-parse.y
	mesalib/src/glsl/glsl_parser_extras.cpp
	mesalib/src/glsl/glsl_parser_extras.h
	mesalib/src/glsl/ir.cpp
	mesalib/src/glsl/ir.h
	mesalib/src/glsl/ir_clone.cpp
	mesalib/src/glsl/ir_print_visitor.cpp
	mesalib/src/glsl/ir_validate.cpp
	mesalib/src/glsl/linker.cpp
	mesalib/src/glsl/main.cpp
	mesalib/src/glsl/opt_tree_grafting.cpp
	mesalib/src/mapi/glapi/gen/Makefile
	mesalib/src/mapi/glapi/gen/gl_XML.py
	mesalib/src/mapi/glapi/gen/gl_table.py
	mesalib/src/mapi/glapi/glapi_mapi_tmp.h
	mesalib/src/mapi/glapi/glapi_sparc.S
	mesalib/src/mapi/glapi/glapi_x86-64.S
	mesalib/src/mapi/glapi/glapi_x86.S
	mesalib/src/mapi/glapi/glapitemp.h
	mesalib/src/mapi/glapi/glprocs.h
	mesalib/src/mapi/mapi/u_thread.c
	mesalib/src/mapi/mapi/u_thread.h
	mesalib/src/mesa/SConscript
	mesalib/src/mesa/drivers/common/driverfuncs.c
	mesalib/src/mesa/drivers/windows/gldirect/dglcontext.c
	mesalib/src/mesa/main/api_arrayelt.c
	mesalib/src/mesa/main/bufferobj.c
	mesalib/src/mesa/main/compiler.h
	mesalib/src/mesa/main/dd.h
	mesalib/src/mesa/main/dlist.c
	mesalib/src/mesa/main/enums.c
	mesalib/src/mesa/main/es_generator.py
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/imports.h
	mesalib/src/mesa/main/mtypes.h
	mesalib/src/mesa/main/pbo.c
	mesalib/src/mesa/main/remap_helper.h
	mesalib/src/mesa/main/shared.c
	mesalib/src/mesa/main/texgetimage.c
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/main/uniforms.c
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/program/prog_optimize.c
	mesalib/src/mesa/program/register_allocate.c
	mesalib/src/mesa/program/register_allocate.h
	mesalib/src/mesa/sources.mak
	mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c
	mesalib/src/mesa/state_tracker/st_texture.h
	mesalib/src/mesa/swrast/s_context.c
	mesalib/src/mesa/tnl/t_draw.c
	mesalib/src/mesa/vbo/vbo_exec_array.c
	mesalib/src/mesa/vbo/vbo_save_api.c
	pixman/pixman/pixman-arm-common.h
	pixman/pixman/pixman-fast-path.c
	pixman/pixman/pixman-inlines.h
	pixman/test/Makefile.am
	pixman/test/utils.c
	pixman/test/utils.h
	xorg-server/configure.ac
	xorg-server/fb/fbblt.c
	xorg-server/hw/xquartz/darwin.c
	xorg-server/xkeyboard-config/symbols/de

1 files changed, 99 insertions, 101 deletions

diff --git a/mesalib/src/mesa/tnl/NOTES b/mesalib/src/mesa/tnl/NOTES
index 9a35e948b..43c469201 100644
--- a/mesalib/src/mesa/tnl/NOTES
+++ b/mesalib/src/mesa/tnl/NOTES
@@ -1,102 +1,100 @@
-INTRODUCTION

-

-A generic, configurable software implementation of GL transformation &

-lighting.

-

-This module provides an implementation of the routines required by the

-'vtxfmt' mechanism of core mesa for tnl functionality in all

-combinations of compile and execute modes.

-

-Most current drivers use the tnl module exclusively to provide this

-functionality, though there is an experimental alternate

-implementation provided by the tnl_dd/t_dd_imm_* files which can

-handle a small subset of GL states in execute mode only.

-

-

-STATE

-

-To create and destroy the module:

-

-	GLboolean _tnl_CreateContext( struct gl_context *ctx );

-	void _tnl_DestroyContext( struct gl_context *ctx );

-

-The module is not active by default, and must be installed by calling

-_tnl_Wakeup().  This function installs internal tnl functions into all

-the vtxfmt dispatch hooks, thus taking over the task of transformation

-and lighting entirely:

-

-        void _tnl_wakeup_exec( struct gl_context *ctx );

-	void _tnl_wakeup_save_exec( struct gl_context *ctx );

-

-   

-This module tracks state changes internally and maintains derived

-values based on the current state.  For this to work, the driver

-ensure the following funciton is called whenever the state changes and

-the swsetup module is 'awake':

-

-	void _tnl_InvalidateState( struct gl_context *ctx, GLuint new_state );

-

-There is no explicit call to put the tnl module to sleep.  Simply

-install other function pointers into all the vtxfmt dispatch slots,

-and (optionally) cease calling _tnl_InvalidateState().

-

-CUSTOMIZATION

-

-The module provides customizability through several mechanisms.  The

-most important is by allowing drivers to specify the pipeline through

-which vertex data is passed, including its eventual transfer to

-rasterization hardware (or software).

-

-The default pipeline is specified in t_pipeline.c, and is usually a

-starting point for driver pipelines.  Some drivers will remove a stage

-where hardware provides support for the implemented operation (for

-instance fog where per-pixel hardware fog is available, as in the dri

-tdfx driver), or add stages to shortcircuit latter operations (for

-example taking advantage of hardware support for strips and other

-higher-level primitives (for example the radeon driver).

-

-In addition, the following functions provide further tweaks:

-

-extern void

-_tnl_need_projected_coords( struct gl_context *ctx, GLboolean flag );

-

-	- Direct the default vertex transformation stage to

-          produce/not produce projected clip coordinates.

-	  

-extern void

-_tnl_need_dlist_loopback( struct gl_context *ctx, GLboolean flag );

-      

-        - Direct the display list component of the tnl module to

-          replay display lists as 'glVertex' type calls, rather than

-          passing the display list data directly into the tnl pipeline

-          mechanism.  

-

-	  This allows display lists to be replayed by the tnl module

-	  even when the module is not strictly active.

-

-

-extern void

-_tnl_need_dlist_norm_lengths( struct gl_context *ctx, GLboolean flag );

-

-	- Direct the display list component to enable/disable caching

-          1/length values for display list normals.  Doing so is

-          ususally helpful when lighting is performed in software, but

-          wasteful otherwise.

-

-

-DRIVER INTERFACE

-

-The module itself offers a minimal driver interface:

-

-	 void (*RunPipeline)( struct gl_context *ctx );

-

-Normally this is set to _tnl_RunPipeline(), however the driver can use

-this hook to wrap checks or other code around this call. 

-

-In addition, the driver interface for the default render pipeline

-stage is housed in the tnl context struct (this could be cleaner).  

-

-

-RENDER DRIVER INTERFACE

-

+INTRODUCTION
+
+A generic, configurable software implementation of GL transformation &
+lighting.
+
+This module provides an implementation of the routines required by the
+'vtxfmt' mechanism of core mesa for tnl functionality in all
+combinations of compile and execute modes.
+
+Most current drivers use the tnl module exclusively to provide this
+functionality.
+
+
+STATE
+
+To create and destroy the module:
+
+	GLboolean _tnl_CreateContext( struct gl_context *ctx );
+	void _tnl_DestroyContext( struct gl_context *ctx );
+
+The module is not active by default, and must be installed by calling
+_tnl_Wakeup().  This function installs internal tnl functions into all
+the vtxfmt dispatch hooks, thus taking over the task of transformation
+and lighting entirely:
+
+        void _tnl_wakeup_exec( struct gl_context *ctx );
+	void _tnl_wakeup_save_exec( struct gl_context *ctx );
+
+   
+This module tracks state changes internally and maintains derived
+values based on the current state.  For this to work, the driver
+ensure the following funciton is called whenever the state changes and
+the swsetup module is 'awake':
+
+	void _tnl_InvalidateState( struct gl_context *ctx, GLuint new_state );
+
+There is no explicit call to put the tnl module to sleep.  Simply
+install other function pointers into all the vtxfmt dispatch slots,
+and (optionally) cease calling _tnl_InvalidateState().
+
+CUSTOMIZATION
+
+The module provides customizability through several mechanisms.  The
+most important is by allowing drivers to specify the pipeline through
+which vertex data is passed, including its eventual transfer to
+rasterization hardware (or software).
+
+The default pipeline is specified in t_pipeline.c, and is usually a
+starting point for driver pipelines.  Some drivers will remove a stage
+where hardware provides support for the implemented operation (for
+instance fog where per-pixel hardware fog is available),
+or add stages to shortcircuit latter operations (for
+example taking advantage of hardware support for strips and other
+higher-level primitives (for example the radeon driver).
+
+In addition, the following functions provide further tweaks:
+
+extern void
+_tnl_need_projected_coords( struct gl_context *ctx, GLboolean flag );
+
+	- Direct the default vertex transformation stage to
+          produce/not produce projected clip coordinates.
+	  
+extern void
+_tnl_need_dlist_loopback( struct gl_context *ctx, GLboolean flag );
+      
+        - Direct the display list component of the tnl module to
+          replay display lists as 'glVertex' type calls, rather than
+          passing the display list data directly into the tnl pipeline
+          mechanism.  
+
+	  This allows display lists to be replayed by the tnl module
+	  even when the module is not strictly active.
+
+
+extern void
+_tnl_need_dlist_norm_lengths( struct gl_context *ctx, GLboolean flag );
+
+	- Direct the display list component to enable/disable caching
+          1/length values for display list normals.  Doing so is
+          ususally helpful when lighting is performed in software, but
+          wasteful otherwise.
+
+
+DRIVER INTERFACE
+
+The module itself offers a minimal driver interface:
+
+	 void (*RunPipeline)( struct gl_context *ctx );
+
+Normally this is set to _tnl_RunPipeline(), however the driver can use
+this hook to wrap checks or other code around this call. 
+
+In addition, the driver interface for the default render pipeline
+stage is housed in the tnl context struct (this could be cleaner).  
+
+
+RENDER DRIVER INTERFACE
+
 See t_context.h for the definition and explanation of this.
\ No newline at end of file