svn merge ^/branches/released .

4 files changed, 2 insertions, 29 deletions

diff --git a/mesalib/src/mesa/main/get.c b/mesalib/src/mesa/main/get.c
index 3f9cf492b..15c808194 100644
--- a/mesalib/src/mesa/main/get.c
+++ b/mesalib/src/mesa/main/get.c
@@ -1163,7 +1163,7 @@ static const struct value_desc values[] = {
 

    /* GL_EXT_provoking_vertex */

    { GL_PROVOKING_VERTEX_EXT,

-     CONTEXT_BOOL(Light.ProvokingVertex), extra_EXT_provoking_vertex },

+     CONTEXT_ENUM(Light.ProvokingVertex), extra_EXT_provoking_vertex },

    { GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT,

      CONTEXT_BOOL(Const.QuadsFollowProvokingVertexConvention),

      extra_EXT_provoking_vertex },

diff --git a/mesalib/src/mesa/main/pack.c b/mesalib/src/mesa/main/pack.c
index e6734bbbc..fcf0f9f53 100644
--- a/mesalib/src/mesa/main/pack.c
+++ b/mesalib/src/mesa/main/pack.c
@@ -2932,7 +2932,6 @@ extract_uint_rgba(GLuint n, GLuint rgba[][4],
    GLint rSrc, gSrc, bSrc, aSrc;

    GLint stride;

    GLint rDst, bDst, gDst, aDst;

-   GLboolean intFormat;

 

    ASSERT(srcFormat == GL_RED ||

           srcFormat == GL_GREEN ||

@@ -2989,8 +2988,6 @@ extract_uint_rgba(GLuint n, GLuint rgba[][4],
 

    stride = _mesa_components_in_format(srcFormat);

 

-   intFormat = _mesa_is_integer_format(srcFormat);

-

 #define PROCESS(SRC_INDEX, DST_INDEX, DEFAULT, TYPE, CONVERSION)	\

    if ((SRC_INDEX) < 0) {						\

       GLuint i;								\

diff --git a/mesalib/src/mesa/main/shaderapi.c b/mesalib/src/mesa/main/shaderapi.c
index 066e8b427..baebb5cd3 100644
--- a/mesalib/src/mesa/main/shaderapi.c
+++ b/mesalib/src/mesa/main/shaderapi.c
@@ -362,7 +362,7 @@ bind_attrib_location(struct gl_context *ctx, GLuint program, GLuint index,
 {

    struct gl_shader_program *shProg;

    const GLint size = -1; /* unknown size */

-   GLint i, oldIndex;

+   GLint i;

    GLenum datatype = GL_FLOAT_VEC4;

 

    shProg = _mesa_lookup_shader_program_err(ctx, program,

@@ -385,14 +385,6 @@ bind_attrib_location(struct gl_context *ctx, GLuint program, GLuint index,
       return;

    }

 

-   if (shProg->LinkStatus) {

-      /* get current index/location for the attribute */

-      oldIndex = get_attrib_location(ctx, program, name);

-   }

-   else {

-      oldIndex = -1;

-   }

-

    /* this will replace the current value if it's already in the list */

    i = _mesa_add_attribute(shProg->Attributes, name, size, datatype, index);

    if (i < 0) {

diff --git a/mesalib/src/mesa/main/texcompress_s3tc.c b/mesalib/src/mesa/main/texcompress_s3tc.c
index 479806eca..c7b27c1a4 100644
--- a/mesalib/src/mesa/main/texcompress_s3tc.c
+++ b/mesalib/src/mesa/main/texcompress_s3tc.c
@@ -167,7 +167,6 @@ GLboolean
 _mesa_texstore_rgb_dxt1(TEXSTORE_PARAMS)

 {

    const GLchan *pixels;

-   GLint srcRowStride;

    GLubyte *dst;

    const GLint texWidth = dstRowStride * 4 / 8; /* a bit of a hack */

    const GLchan *tempImage = NULL;

@@ -194,13 +193,10 @@ _mesa_texstore_rgb_dxt1(TEXSTORE_PARAMS)
       if (!tempImage)

          return GL_FALSE; /* out of memory */

       pixels = tempImage;

-      srcRowStride = 3 * srcWidth;

       srcFormat = GL_RGB;

    }

    else {

       pixels = (const GLchan *) srcAddr;

-      srcRowStride = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat,

-                                            srcType) / sizeof(GLchan);

    }

 

    dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,

@@ -230,7 +226,6 @@ GLboolean
 _mesa_texstore_rgba_dxt1(TEXSTORE_PARAMS)

 {

    const GLchan *pixels;

-   GLint srcRowStride;

    GLubyte *dst;

    const GLint texWidth = dstRowStride * 4 / 8; /* a bit of a hack */

    const GLchan *tempImage = NULL;

@@ -257,13 +252,10 @@ _mesa_texstore_rgba_dxt1(TEXSTORE_PARAMS)
       if (!tempImage)

          return GL_FALSE; /* out of memory */

       pixels = tempImage;

-      srcRowStride = 4 * srcWidth;

       srcFormat = GL_RGBA;

    }

    else {

       pixels = (const GLchan *) srcAddr;

-      srcRowStride = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat,

-                                            srcType) / sizeof(GLchan);

    }

 

    dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,

@@ -292,7 +284,6 @@ GLboolean
 _mesa_texstore_rgba_dxt3(TEXSTORE_PARAMS)

 {

    const GLchan *pixels;

-   GLint srcRowStride;

    GLubyte *dst;

    const GLint texWidth = dstRowStride * 4 / 16; /* a bit of a hack */

    const GLchan *tempImage = NULL;

@@ -319,12 +310,9 @@ _mesa_texstore_rgba_dxt3(TEXSTORE_PARAMS)
       if (!tempImage)

          return GL_FALSE; /* out of memory */

       pixels = tempImage;

-      srcRowStride = 4 * srcWidth;

    }

    else {

       pixels = (const GLchan *) srcAddr;

-      srcRowStride = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat,

-                                            srcType) / sizeof(GLchan);

    }

 

    dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,

@@ -353,7 +341,6 @@ GLboolean
 _mesa_texstore_rgba_dxt5(TEXSTORE_PARAMS)

 {

    const GLchan *pixels;

-   GLint srcRowStride;

    GLubyte *dst;

    const GLint texWidth = dstRowStride * 4 / 16; /* a bit of a hack */

    const GLchan *tempImage = NULL;

@@ -380,12 +367,9 @@ _mesa_texstore_rgba_dxt5(TEXSTORE_PARAMS)
       if (!tempImage)

          return GL_FALSE; /* out of memory */

       pixels = tempImage;

-      srcRowStride = 4 * srcWidth;

    }

    else {

       pixels = (const GLchan *) srcAddr;

-      srcRowStride = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat,

-                                            srcType) / sizeof(GLchan);

    }

 

    dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,