Merge branch 'gallium-0.1' into gallium-tex-surfaces

20 files changed, 100 insertions, 137 deletions

diff --git a/src/mesa/state_tracker/st_atom_blend.c b/src/mesa/state_tracker/st_atom_blend.c
index 2a0e922..35c09c3 100644
--- a/src/mesa/state_tracker/st_atom_blend.c
+++ b/src/mesa/state_tracker/st_atom_blend.c
@@ -223,15 +223,10 @@ update_blend( struct st_context *st )
 
 
 const struct st_tracked_state st_update_blend = {
-   .name = "st_update_blend",
-   .dirty = {
-      .mesa = (_NEW_COLOR),  /* XXX _NEW_BLEND someday? */
-      .st  = 0,
+   "st_update_blend",					/* name */
+   {							/* dirty */
+      (_NEW_COLOR),  /* XXX _NEW_BLEND someday? */	/* mesa */
+      0,						/* st */
    },
-   .update = update_blend
+   update_blend,					/* update */
 };
-
-
-
-
-
diff --git a/src/mesa/state_tracker/st_atom_clip.c b/src/mesa/state_tracker/st_atom_clip.c
index a6f0568..23d709b 100644
--- a/src/mesa/state_tracker/st_atom_clip.c
+++ b/src/mesa/state_tracker/st_atom_clip.c
@@ -62,15 +62,10 @@ static void update_clip( struct st_context *st )
 
 
 const struct st_tracked_state st_update_clip = {
-   .name = "st_update_clip",
-   .dirty = {
-      .mesa = (_NEW_TRANSFORM),
-      .st  = 0,
+   "st_update_clip",					/* name */
+   {							/* dirty */
+      (_NEW_TRANSFORM),					/* mesa */
+      0,						/* st */
    },
-   .update = update_clip
+   update_clip						/* update */
 };
-
-
-
-
-
diff --git a/src/mesa/state_tracker/st_atom_constbuf.c b/src/mesa/state_tracker/st_atom_constbuf.c
index 2b659ae..2856e0f 100644
--- a/src/mesa/state_tracker/st_atom_constbuf.c
+++ b/src/mesa/state_tracker/st_atom_constbuf.c
@@ -113,12 +113,12 @@ static void update_vs_constants(struct st_context *st )
 }
 
 const struct st_tracked_state st_update_vs_constants = {
-   .name = "st_update_vs_constants",
-   .dirty = {
-      .mesa  = 0,  /* set dynamically above */
-      .st   = ST_NEW_VERTEX_PROGRAM,
+   "st_update_vs_constants",				/* name */
+   {							/* dirty */
+      0,  /* set dynamically above */			/* mesa */
+      ST_NEW_VERTEX_PROGRAM,				/* st */
    },
-   .update = update_vs_constants
+   update_vs_constants					/* update */
 };
 
 /* Fragment shader:
@@ -132,11 +132,11 @@ static void update_fs_constants(struct st_context *st )
 }
 
 const struct st_tracked_state st_update_fs_constants = {
-   .name = "st_update_fs_constants",
-   .dirty = {
-      .mesa  = 0,  /* set dynamically above */
-      .st   = ST_NEW_FRAGMENT_PROGRAM,
+   "st_update_fs_constants",				/* name */
+   {							/* dirty */
+      0,  /* set dynamically above */			/* mesa */
+      ST_NEW_FRAGMENT_PROGRAM,				/* st */
    },
-   .update = update_fs_constants
+   update_fs_constants					/* update */
 };
 
diff --git a/src/mesa/state_tracker/st_atom_depth.c b/src/mesa/state_tracker/st_atom_depth.c
index ef46758..0e791ce 100644
--- a/src/mesa/state_tracker/st_atom_depth.c
+++ b/src/mesa/state_tracker/st_atom_depth.c
@@ -142,10 +142,10 @@ update_depth_stencil_alpha(struct st_context *st)
 
 
 const struct st_tracked_state st_update_depth_stencil_alpha = {
-   .name = "st_update_depth_stencil",
-   .dirty = {
-      .mesa = (_NEW_DEPTH|_NEW_STENCIL|_NEW_COLOR),
-      .st  = 0,
+   "st_update_depth_stencil",				/* name */
+   {							/* dirty */
+      (_NEW_DEPTH|_NEW_STENCIL|_NEW_COLOR),		/* mesa */
+      0,						/* st */
    },
-   .update = update_depth_stencil_alpha
+   update_depth_stencil_alpha				/* update */
 };
diff --git a/src/mesa/state_tracker/st_atom_fixedfunction.c b/src/mesa/state_tracker/st_atom_fixedfunction.c
index 3f137e1..165567a 100644
--- a/src/mesa/state_tracker/st_atom_fixedfunction.c
+++ b/src/mesa/state_tracker/st_atom_fixedfunction.c
@@ -55,12 +55,12 @@ static void update_tnl( struct st_context *st )
 
 
 const struct st_tracked_state st_update_tnl = {
-   .name = "st_update_tnl",
-   .dirty = {
-      .mesa  = TNL_FIXED_FUNCTION_STATE_FLAGS,
-      .st   = 0
+   "st_update_tnl",					/* name */
+   {							/* dirty */
+      TNL_FIXED_FUNCTION_STATE_FLAGS,			/* mesa */
+      0							/* st */
    },
-   .update = update_tnl
+   update_tnl						/* update */
 };
 
 
diff --git a/src/mesa/state_tracker/st_atom_framebuffer.c b/src/mesa/state_tracker/st_atom_framebuffer.c
index 14eeb58..0a6974d 100644
--- a/src/mesa/state_tracker/st_atom_framebuffer.c
+++ b/src/mesa/state_tracker/st_atom_framebuffer.c
@@ -96,11 +96,11 @@ update_framebuffer_state( struct st_context *st )
 
 
 const struct st_tracked_state st_update_framebuffer = {
-   .name = "st_update_framebuffer",
-   .dirty = {
-      .mesa = _NEW_BUFFERS,
-      .st  = 0,
+   "st_update_framebuffer",				/* name */
+   {							/* dirty */
+      _NEW_BUFFERS,					/* mesa */
+      0,						/* st */
    },
-   .update = update_framebuffer_state
+   update_framebuffer_state				/* update */
 };
 
diff --git a/src/mesa/state_tracker/st_atom_pixeltransfer.c b/src/mesa/state_tracker/st_atom_pixeltransfer.c
index e7186a8..0c32d53 100644
--- a/src/mesa/state_tracker/st_atom_pixeltransfer.c
+++ b/src/mesa/state_tracker/st_atom_pixeltransfer.c
@@ -464,10 +464,10 @@ update_pixel_transfer(struct st_context *st)
 
 
 const struct st_tracked_state st_update_pixel_transfer = {
-   .name = "st_update_pixel_transfer",
-   .dirty = {
-      .mesa = _NEW_PIXEL | _NEW_COLOR_MATRIX,
-      .st  = 0,
+   "st_update_pixel_transfer",				/* name */
+   {							/* dirty */
+      _NEW_PIXEL | _NEW_COLOR_MATRIX,			/* mesa */
+      0,						/* st */
    },
-   .update = update_pixel_transfer
+   update_pixel_transfer				/* update */
 };
diff --git a/src/mesa/state_tracker/st_atom_rasterizer.c b/src/mesa/state_tracker/st_atom_rasterizer.c
index bb14cf9..87a91d5 100644
--- a/src/mesa/state_tracker/st_atom_rasterizer.c
+++ b/src/mesa/state_tracker/st_atom_rasterizer.c
@@ -267,11 +267,11 @@ static void update_raster_state( struct st_context *st )
 }
 
 const struct st_tracked_state st_update_rasterizer = {
-   .name = "st_update_rasterizer",
-   .dirty = {
-      .mesa = (_NEW_LIGHT | _NEW_POLYGON | _NEW_LINE | _NEW_SCISSOR |
-               _NEW_POINT | _NEW_BUFFERS | _NEW_MULTISAMPLE),
-      .st  = 0,
+   "st_update_rasterizer",					/* name */
+   {								/* dirty */
+      (_NEW_LIGHT | _NEW_POLYGON | _NEW_LINE | _NEW_SCISSOR |	/* mesa */
+               _NEW_POINT | _NEW_BUFFERS | _NEW_MULTISAMPLE),	
+      0,							/* st */
    },
-   .update = update_raster_state
+   update_raster_state						/* update */
 };
diff --git a/src/mesa/state_tracker/st_atom_sampler.c b/src/mesa/state_tracker/st_atom_sampler.c
index e1ddb53..7515bb3 100644
--- a/src/mesa/state_tracker/st_atom_sampler.c
+++ b/src/mesa/state_tracker/st_atom_sampler.c
@@ -37,6 +37,7 @@
 #include "st_program.h"
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
+#include "pipe/p_util.h"
 #include "cso_cache/cso_context.h"
 
 
@@ -147,17 +148,8 @@ update_samplers(struct st_context *st)
             sampler->normalized_coords = 1;
 
          sampler->lod_bias = st->ctx->Texture.Unit[su].LodBias;
-#if 1
-         sampler->min_lod = (texobj->MinLod) < 0.0 ? 0.0 : texobj->MinLod;
-         sampler->max_lod = texobj->MaxLod;
-#else
-         /* min/max lod should really be as follows (untested).
-          * Also, calculate_first_last_level() needs to be overhauled
-          * since today's hardware had real support for LOD clamping.
-          */
          sampler->min_lod = MAX2(texobj->BaseLevel, texobj->MinLod);
          sampler->max_lod = MIN2(texobj->MaxLevel, texobj->MaxLod);
-#endif
 
          sampler->border_color[0] = texobj->BorderColor[RCOMP];
          sampler->border_color[1] = texobj->BorderColor[GCOMP];
@@ -193,15 +185,10 @@ update_samplers(struct st_context *st)
 
 
 const struct st_tracked_state st_update_sampler = {
-   .name = "st_update_sampler",
-   .dirty = {
-      .mesa = _NEW_TEXTURE,
-      .st  = 0,
+   "st_update_sampler",					/* name */
+   {							/* dirty */
+      _NEW_TEXTURE,					/* mesa */
+      0,						/* st */
    },
-   .update = update_samplers
+   update_samplers					/* update */
 };
-
-
-
-
-
diff --git a/src/mesa/state_tracker/st_atom_scissor.c b/src/mesa/state_tracker/st_atom_scissor.c
index 59601e9..f5db492 100644
--- a/src/mesa/state_tracker/st_atom_scissor.c
+++ b/src/mesa/state_tracker/st_atom_scissor.c
@@ -83,15 +83,10 @@ update_scissor( struct st_context *st )
 
 
 const struct st_tracked_state st_update_scissor = {
-   .name = "st_update_scissor",
-   .dirty = {
-      .mesa = (_NEW_SCISSOR | _NEW_BUFFERS),
-      .st  = 0,
+   "st_update_scissor",					/* name */
+   {							/* dirty */
+      (_NEW_SCISSOR | _NEW_BUFFERS),			/* mesa */
+      0,						/* st */
    },
-   .update = update_scissor
+   update_scissor					/* update */
 };
-
-
-
-
-
diff --git a/src/mesa/state_tracker/st_atom_shader.c b/src/mesa/state_tracker/st_atom_shader.c
index 3f5ec71..652500f 100644
--- a/src/mesa/state_tracker/st_atom_shader.c
+++ b/src/mesa/state_tracker/st_atom_shader.c
@@ -281,10 +281,10 @@ update_linkage( struct st_context *st )
 
 
 const struct st_tracked_state st_update_shader = {
-   .name = "st_update_shader",
-   .dirty = {
-      .mesa  = 0,
-      .st   = ST_NEW_VERTEX_PROGRAM | ST_NEW_FRAGMENT_PROGRAM
+   "st_update_shader",					/* name */
+   {							/* dirty */
+      0,						/* mesa */
+      ST_NEW_VERTEX_PROGRAM | ST_NEW_FRAGMENT_PROGRAM	/* st */
    },
-   .update = update_linkage
+   update_linkage					/* update */
 };
diff --git a/src/mesa/state_tracker/st_atom_stipple.c b/src/mesa/state_tracker/st_atom_stipple.c
index c912140..f395930 100644
--- a/src/mesa/state_tracker/st_atom_stipple.c
+++ b/src/mesa/state_tracker/st_atom_stipple.c
@@ -54,10 +54,10 @@ update_stipple( struct st_context *st )
 
 
 const struct st_tracked_state st_update_polygon_stipple = {
-   .name = "st_update_polygon_stipple",
-   .dirty = {
-      .mesa = (_NEW_POLYGONSTIPPLE),
-      .st  = 0,
+   "st_update_polygon_stipple",				/* name */
+   {							/* dirty */
+      (_NEW_POLYGONSTIPPLE),				/* mesa */
+      0,						/* st */
    },
-   .update = update_stipple
+   update_stipple					/* update */
 };
diff --git a/src/mesa/state_tracker/st_atom_texture.c b/src/mesa/state_tracker/st_atom_texture.c
index d15da58..f42b2f8 100644
--- a/src/mesa/state_tracker/st_atom_texture.c
+++ b/src/mesa/state_tracker/st_atom_texture.c
@@ -111,15 +111,10 @@ update_textures(struct st_context *st)
 
 
 const struct st_tracked_state st_update_texture = {
-   .name = "st_update_texture",
-   .dirty = {
-      .mesa = _NEW_TEXTURE,
-      .st  = ST_NEW_FRAGMENT_PROGRAM,
+   "st_update_texture",					/* name */
+   {							/* dirty */
+      _NEW_TEXTURE,					/* mesa */
+      ST_NEW_FRAGMENT_PROGRAM,				/* st */
    },
-   .update = update_textures
+   update_textures					/* update */
 };
-
-
-
-
-
diff --git a/src/mesa/state_tracker/st_atom_viewport.c b/src/mesa/state_tracker/st_atom_viewport.c
index eb3f62c..4b51521 100644
--- a/src/mesa/state_tracker/st_atom_viewport.c
+++ b/src/mesa/state_tracker/st_atom_viewport.c
@@ -82,10 +82,10 @@ update_viewport( struct st_context *st )
 
 
 const struct st_tracked_state st_update_viewport = {
-   .name = "st_update_viewport",
-   .dirty = {
-      .mesa = _NEW_BUFFERS | _NEW_VIEWPORT,
-      .st = 0,
+   "st_update_viewport",				/* name */
+   {							/* dirty */
+      _NEW_BUFFERS | _NEW_VIEWPORT,			/* mesa */
+      0,						/* st */
    },
-   .update = update_viewport
+   update_viewport					/* update */
 };
diff --git a/src/mesa/state_tracker/st_cb_clear.c b/src/mesa/state_tracker/st_cb_clear.c
index fe979f1..b7d7204 100644
--- a/src/mesa/state_tracker/st_cb_clear.c
+++ b/src/mesa/state_tracker/st_cb_clear.c
@@ -34,8 +34,8 @@
 #include "main/glheader.h"
 #include "main/macros.h"
 #include "shader/prog_instruction.h"
-#include "st_atom.h"
 #include "st_context.h"
+#include "st_atom.h"
 #include "st_cb_accum.h"
 #include "st_cb_clear.h"
 #include "st_cb_fbo.h"
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 05e0339..4cca336 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -1339,8 +1339,6 @@ static void
 calculate_first_last_level(struct st_texture_object *stObj)
 {
    struct gl_texture_object *tObj = &stObj->base;
-   const struct gl_texture_image *const baseImage =
-      tObj->Image[0][tObj->BaseLevel];
 
    /* These must be signed values.  MinLod and MaxLod can be negative numbers,
     * and having firstLevel and lastLevel as signed prevents the need for
@@ -1363,7 +1361,7 @@ calculate_first_last_level(struct st_texture_object *stObj)
       }
       else {
          firstLevel = 0;
-         lastLevel = MIN2(tObj->MaxLevel - tObj->BaseLevel, baseImage->MaxLog2);
+         lastLevel = MIN2(tObj->MaxLevel, tObj->Image[0][0]->WidthLog2);
       }
       break;
    case GL_TEXTURE_RECTANGLE_NV:
@@ -1486,10 +1484,7 @@ st_finalize_texture(GLcontext *ctx,
        (stObj->pt->target != gl_target_to_pipe(stObj->base.Target) ||
 	stObj->pt->format !=
 	st_mesa_format_to_pipe_format(firstImage->base.TexFormat->MesaFormat) ||
-	stObj->pt->last_level != stObj->lastLevel ||
-	stObj->pt->width[0] != firstImage->base.Width2 ||
-	stObj->pt->height[0] != firstImage->base.Height2 ||
-	stObj->pt->depth[0] != firstImage->base.Depth2 ||
+	stObj->pt->last_level < stObj->lastLevel ||
 	stObj->pt->cpp != cpp ||
 	stObj->pt->compressed != firstImage->base.IsCompressed)) {
       pipe_texture_release(&stObj->pt);
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index 0fe4d19..a3bffbf 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -35,8 +35,8 @@
 
 #include "vbo/vbo.h"
 
-#include "st_atom.h"
 #include "st_context.h"
+#include "st_atom.h"
 #include "st_cb_bufferobjects.h"
 #include "st_draw.h"
 #include "st_program.h"
@@ -549,9 +549,10 @@ st_feedback_draw_vbo(GLcontext *ctx,
       unsigned indexSize;
       struct gl_buffer_object *bufobj = ib->obj;
       struct st_buffer_object *stobj = st_buffer_object(bufobj);
-      index_buffer_handle = stobj->buffer;
       void *map;
 
+      index_buffer_handle = stobj->buffer;
+
       switch (ib->type) {
       case GL_UNSIGNED_INT:
          indexSize = 4;
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 260a2ef..6f94ba3 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -38,17 +38,17 @@
 #include "st_extensions.h"
 
 
-static int min(int a, int b)
+static int _min(int a, int b)
 {
    return (a < b) ? a : b;
 }
 
-static int max(int a, int b)
+static int _max(int a, int b)
 {
    return (a > b) ? a : b;
 }
 
-static int clamp(int a, int min, int max)
+static int _clamp(int a, int min, int max)
 {
    if (a < min)
       return min;
@@ -69,42 +69,42 @@ void st_init_limits(struct st_context *st)
    struct gl_constants *c = &st->ctx->Const;
 
    c->MaxTextureLevels
-      = min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_2D_LEVELS),
+      = _min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_2D_LEVELS),
             MAX_TEXTURE_LEVELS);
 
    c->Max3DTextureLevels
-      = min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_3D_LEVELS),
+      = _min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_3D_LEVELS),
             MAX_3D_TEXTURE_LEVELS);
 
    c->MaxCubeTextureLevels
-      = min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS),
+      = _min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS),
             MAX_CUBE_TEXTURE_LEVELS);
 
    c->MaxTextureRectSize
-      = min(1 << (c->MaxTextureLevels - 1), MAX_TEXTURE_RECT_SIZE);
+      = _min(1 << (c->MaxTextureLevels - 1), MAX_TEXTURE_RECT_SIZE);
 
    c->MaxTextureUnits
       = c->MaxTextureImageUnits
       = c->MaxTextureCoordUnits
-      = min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS),
+      = _min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS),
             MAX_TEXTURE_IMAGE_UNITS);
 
    c->MaxDrawBuffers
-      = clamp(screen->get_param(screen, PIPE_CAP_MAX_RENDER_TARGETS),
+      = _clamp(screen->get_param(screen, PIPE_CAP_MAX_RENDER_TARGETS),
               1, MAX_DRAW_BUFFERS);
 
    c->MaxLineWidth
-      = max(1.0, screen->get_paramf(screen, PIPE_CAP_MAX_LINE_WIDTH));
+      = _max(1.0, screen->get_paramf(screen, PIPE_CAP_MAX_LINE_WIDTH));
    c->MaxLineWidthAA
-      = max(1.0, screen->get_paramf(screen, PIPE_CAP_MAX_LINE_WIDTH_AA));
+      = _max(1.0, screen->get_paramf(screen, PIPE_CAP_MAX_LINE_WIDTH_AA));
 
    c->MaxPointSize
-      = max(1.0, screen->get_paramf(screen, PIPE_CAP_MAX_POINT_WIDTH));
+      = _max(1.0, screen->get_paramf(screen, PIPE_CAP_MAX_POINT_WIDTH));
    c->MaxPointSizeAA
-      = max(1.0, screen->get_paramf(screen, PIPE_CAP_MAX_POINT_WIDTH_AA));
+      = _max(1.0, screen->get_paramf(screen, PIPE_CAP_MAX_POINT_WIDTH_AA));
 
    c->MaxTextureMaxAnisotropy
-      = max(2.0, screen->get_paramf(screen, PIPE_CAP_MAX_TEXTURE_ANISOTROPY));
+      = _max(2.0, screen->get_paramf(screen, PIPE_CAP_MAX_TEXTURE_ANISOTROPY));
 
    c->MaxTextureLodBias
       = screen->get_paramf(screen, PIPE_CAP_MAX_TEXTURE_LOD_BIAS);
diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.c b/src/mesa/state_tracker/st_mesa_to_tgsi.c
index 524b5af..d2be450 100644
--- a/src/mesa/state_tracker/st_mesa_to_tgsi.c
+++ b/src/mesa/state_tracker/st_mesa_to_tgsi.c
@@ -805,7 +805,7 @@ tgsi_translate_mesa_program(
    {
       GLboolean tempsUsed[MAX_PROGRAM_TEMPS + 1];
       GLboolean inside_range = GL_FALSE;
-      GLuint start_range;
+      GLuint start_range = 0;
 
       find_temporaries(program, tempsUsed);
       tempsUsed[MAX_PROGRAM_TEMPS] = GL_FALSE;
diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h
index 1a20621..d8f26da 100644
--- a/src/mesa/state_tracker/st_program.h
+++ b/src/mesa/state_tracker/st_program.h
@@ -101,14 +101,14 @@ struct st_vertex_program
 };
 
 
-static inline struct st_fragment_program *
+static INLINE struct st_fragment_program *
 st_fragment_program( struct gl_fragment_program *fp )
 {
    return (struct st_fragment_program *)fp;
 }
 
 
-static inline struct st_vertex_program *
+static INLINE struct st_vertex_program *
 st_vertex_program( struct gl_vertex_program *vp )
 {
    return (struct st_vertex_program *)vp;