merge ^/branches/released .

4 files changed, 23 insertions, 23 deletions

diff --git a/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c b/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
index 78e9df033..8a66c2e95 100644
--- a/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
+++ b/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
@@ -581,7 +581,12 @@ static void u_vbuf_mgr_compute_max_index(struct u_vbuf_mgr_priv *mgr)
        * for that when dividing by stride. */

       unused = vb->stride -

                (mgr->ve->ve[i].src_offset + mgr->ve->src_format_size[i]);

-      assert(unused >= 0);

+

+      /* If src_offset is greater than stride (which means it's a buffer

+       * offset rather than a vertex offset)... */

+      if (unused < 0) {

+         unused = 0;

+      }

 

       /* Compute the maximum index for this vertex element. */

       max_index =

diff --git a/mesalib/src/mesa/main/dlist.c b/mesalib/src/mesa/main/dlist.c
index 64ef98509..b9c29cb84 100644
--- a/mesalib/src/mesa/main/dlist.c
+++ b/mesalib/src/mesa/main/dlist.c
@@ -5351,7 +5351,7 @@ save_SetFragmentShaderConstantATI(GLuint dst, const GLfloat *value)
 }

 #endif

 

-static void

+static void GLAPIENTRY

 save_Attr1fNV(GLenum attr, GLfloat x)

 {

    GET_CURRENT_CONTEXT(ctx);

@@ -5372,7 +5372,7 @@ save_Attr1fNV(GLenum attr, GLfloat x)
    }

 }

 

-static void

+static void GLAPIENTRY

 save_Attr2fNV(GLenum attr, GLfloat x, GLfloat y)

 {

    GET_CURRENT_CONTEXT(ctx);

@@ -5394,7 +5394,7 @@ save_Attr2fNV(GLenum attr, GLfloat x, GLfloat y)
    }

 }

 

-static void

+static void GLAPIENTRY

 save_Attr3fNV(GLenum attr, GLfloat x, GLfloat y, GLfloat z)

 {

    GET_CURRENT_CONTEXT(ctx);

@@ -5417,7 +5417,7 @@ save_Attr3fNV(GLenum attr, GLfloat x, GLfloat y, GLfloat z)
    }

 }

 

-static void

+static void GLAPIENTRY

 save_Attr4fNV(GLenum attr, GLfloat x, GLfloat y, GLfloat z, GLfloat w)

 {

    GET_CURRENT_CONTEXT(ctx);

@@ -5442,7 +5442,7 @@ save_Attr4fNV(GLenum attr, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 }

 

 

-static void

+static void GLAPIENTRY

 save_Attr1fARB(GLenum attr, GLfloat x)

 {

    GET_CURRENT_CONTEXT(ctx);

@@ -5463,7 +5463,7 @@ save_Attr1fARB(GLenum attr, GLfloat x)
    }

 }

 

-static void

+static void GLAPIENTRY

 save_Attr2fARB(GLenum attr, GLfloat x, GLfloat y)

 {

    GET_CURRENT_CONTEXT(ctx);

@@ -5485,7 +5485,7 @@ save_Attr2fARB(GLenum attr, GLfloat x, GLfloat y)
    }

 }

 

-static void

+static void GLAPIENTRY

 save_Attr3fARB(GLenum attr, GLfloat x, GLfloat y, GLfloat z)

 {

    GET_CURRENT_CONTEXT(ctx);

@@ -5508,7 +5508,7 @@ save_Attr3fARB(GLenum attr, GLfloat x, GLfloat y, GLfloat z)
    }

 }

 

-static void

+static void GLAPIENTRY

 save_Attr4fARB(GLenum attr, GLfloat x, GLfloat y, GLfloat z, GLfloat w)

 {

    GET_CURRENT_CONTEXT(ctx);

@@ -7040,7 +7040,7 @@ exec_GetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
 

 

 /* GL_ARB_instanced_arrays */

-static void

+static void GLAPIENTRY

 save_VertexAttribDivisor(GLuint index, GLuint divisor)

 {

    GET_CURRENT_CONTEXT(ctx);

@@ -7058,7 +7058,7 @@ save_VertexAttribDivisor(GLuint index, GLuint divisor)
 

 

 /* GL_NV_texture_barrier */

-static void

+static void GLAPIENTRY

 save_TextureBarrierNV(void)

 {

    GET_CURRENT_CONTEXT(ctx);

@@ -7071,7 +7071,7 @@ save_TextureBarrierNV(void)
 

 

 /* GL_ARB_sampler_objects */

-static void

+static void GLAPIENTRY

 save_BindSampler(GLuint unit, GLuint sampler)

 {

    Node *n;

diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c
index 68a141d29..5e54bbdf3 100644
--- a/mesalib/src/mesa/main/fbobject.c
+++ b/mesalib/src/mesa/main/fbobject.c
@@ -418,18 +418,16 @@ _mesa_validate_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb)
          case GL_RG:

             fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED;

             return;

-         case GL_RGB:

+

+         default:

             switch (rb->Format) {

+            /* XXX This list is likely incomplete. */

             case MESA_FORMAT_RGB9_E5_FLOAT:

                fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED;

                return;

             default:;

+               /* render buffer format is supported by software rendering */

             }

-            break;

-

-         default:

-            /* render buffer format is supported by software rendering */

-            ;

          }

       }

    }

diff --git a/mesalib/src/mesa/main/texrender.c b/mesalib/src/mesa/main/texrender.c
index 4bcef9899..2766bd6c5 100644
--- a/mesalib/src/mesa/main/texrender.c
+++ b/mesalib/src/mesa/main/texrender.c
@@ -530,7 +530,6 @@ update_wrapper(struct gl_context *ctx, struct gl_renderbuffer_attachment *att)
 {

    struct texture_renderbuffer *trb

       = (struct texture_renderbuffer *) att->Renderbuffer;

-   GLuint unused;

 

    (void) ctx;

    ASSERT(trb);

@@ -603,10 +602,8 @@ update_wrapper(struct gl_context *ctx, struct gl_renderbuffer_attachment *att)
       trb->Base._BaseFormat = GL_RGBA;

       break;

    default:

-      _mesa_format_to_type_and_comps(trb->TexImage->TexFormat,

-                                     &trb->Base.DataType, &unused);

-      trb->Base._BaseFormat =

-         _mesa_base_fbo_format(ctx, trb->TexImage->InternalFormat);

+      trb->Base.DataType = CHAN_TYPE;

+      trb->Base._BaseFormat = GL_RGBA;

    }

    trb->Base.Data = trb->TexImage->Data;

 }