2 files changed, 14 insertions, 3 deletions
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index da45a5e3213..7d52d1da1b6 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -1161,7 +1161,8 @@ do_copy_texsubimage(GLcontext *ctx,
 
    (void) texImage;
 
-   /* XX need this?   st_flush(ctx->st, PIPE_FLUSH_RENDER_CACHE, NULL);*/
+   /* XX need this?*/
+   st_flush(ctx->st, PIPE_FLUSH_RENDER_CACHE, NULL);
 
    /* determine if copying depth or color data */
    if (baseFormat == GL_DEPTH_COMPONENT) {
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index 5300848ef6a..6867d50c873 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -147,6 +147,14 @@ static GLuint byte_types_scale[4] = {
    PIPE_FORMAT_R8G8B8A8_SSCALED
 };
 
+static GLuint fixed_types[4] = {
+   PIPE_FORMAT_R32_FIXED,
+   PIPE_FORMAT_R32G32_FIXED,
+   PIPE_FORMAT_R32G32B32_FIXED,
+   PIPE_FORMAT_R32G32B32A32_FIXED
+};
+
+
 
 /**
  * Return a PIPE_FORMAT_x for the given GL datatype and size.
@@ -154,8 +162,8 @@ static GLuint byte_types_scale[4] = {
 static GLuint
 pipe_vertex_format(GLenum type, GLuint size, GLboolean normalized)
 {
-   assert(type >= GL_BYTE);
-   assert(type <= GL_DOUBLE);
+   assert((type >= GL_BYTE && type <= GL_DOUBLE) ||
+          type == GL_FIXED);
    assert(size >= 1);
    assert(size <= 4);
 
@@ -169,6 +177,7 @@ pipe_vertex_format(GLenum type, GLuint size, GLboolean normalized)
       case GL_UNSIGNED_INT: return uint_types_norm[size-1];
       case GL_UNSIGNED_SHORT: return ushort_types_norm[size-1];
       case GL_UNSIGNED_BYTE: return ubyte_types_norm[size-1];
+      case GL_FIXED: return fixed_types[size-1];
       default: assert(0); return 0;
       }      
    }
@@ -182,6 +191,7 @@ pipe_vertex_format(GLenum type, GLuint size, GLboolean normalized)
       case GL_UNSIGNED_INT: return uint_types_scale[size-1];
       case GL_UNSIGNED_SHORT: return ushort_types_scale[size-1];
       case GL_UNSIGNED_BYTE: return ubyte_types_scale[size-1];
+      case GL_FIXED: return fixed_types[size-1];
       default: assert(0); return 0;
       }      
    }