svn merge ^/branches/released .

4 files changed, 3 insertions, 6 deletions

diff --git a/mesalib/src/mesa/swrast/s_bitmap.c b/mesalib/src/mesa/swrast/s_bitmap.c
index 9b52e9053..af65874fd 100644
--- a/mesalib/src/mesa/swrast/s_bitmap.c
+++ b/mesalib/src/mesa/swrast/s_bitmap.c
@@ -33,6 +33,7 @@
 #include "main/condrender.h"

 #include "main/image.h"

 #include "main/macros.h"

+#include "main/pbo.h"

 

 #include "s_context.h"

 #include "s_span.h"

diff --git a/mesalib/src/mesa/swrast/s_drawpix.c b/mesalib/src/mesa/swrast/s_drawpix.c
index cca75784a..71f998324 100644
--- a/mesalib/src/mesa/swrast/s_drawpix.c
+++ b/mesalib/src/mesa/swrast/s_drawpix.c
@@ -31,6 +31,7 @@
 #include "main/imports.h"

 #include "main/macros.h"

 #include "main/pack.h"

+#include "main/pbo.h"

 #include "main/pixeltransfer.h"

 #include "main/state.h"

 

diff --git a/mesalib/src/mesa/swrast/s_readpix.c b/mesalib/src/mesa/swrast/s_readpix.c
index 61399010b..23da10dab 100644
--- a/mesalib/src/mesa/swrast/s_readpix.c
+++ b/mesalib/src/mesa/swrast/s_readpix.c
@@ -24,7 +24,6 @@
 

 

 #include "main/glheader.h"

-#include "main/bufferobj.h"

 #include "main/colormac.h"

 #include "main/feedback.h"

 #include "main/formats.h"

@@ -32,6 +31,7 @@
 #include "main/imports.h"

 #include "main/macros.h"

 #include "main/pack.h"

+#include "main/pbo.h"

 #include "main/state.h"

 

 #include "s_context.h"

diff --git a/mesalib/src/mesa/swrast/s_texcombine.c b/mesalib/src/mesa/swrast/s_texcombine.c
index 672cd77bf..a7f4fe67d 100644
--- a/mesalib/src/mesa/swrast/s_texcombine.c
+++ b/mesalib/src/mesa/swrast/s_texcombine.c
@@ -713,11 +713,6 @@ _swrast_texture_span( struct gl_context *ctx, SWspan *span )
          swrast->TextureSample[unit]( ctx, texUnit->_Current, span->end,

                                       texcoords, lambda, texels );

 

-         /* GL_SGI_texture_color_table */

-         if (texUnit->ColorTableEnabled) {

-            _mesa_lookup_rgba_float(&texUnit->ColorTable, span->end, texels);

-         }

-

          /* GL_EXT_texture_swizzle */

          if (curObj->_Swizzle != SWIZZLE_NOOP) {

             swizzle_texels(curObj->_Swizzle, span->end, texels);