more texture sampler work

9 files changed, 208 insertions, 5 deletions

diff --git a/src/mesa/pipe/p_context.h b/src/mesa/pipe/p_context.h
index 32444343be..7e68699d3e 100644
--- a/src/mesa/pipe/p_context.h
+++ b/src/mesa/pipe/p_context.h
@@ -96,6 +96,10 @@ struct pipe_context {
    void (*set_stencil_state)( struct pipe_context *,
                               const struct pipe_stencil_state * );
 
+   void (*set_sampler_state)( struct pipe_context *,
+                              GLuint unit,
+                              const struct pipe_sampler_state * );
+
    void (*set_viewport)( struct pipe_context *,
 			 const struct pipe_viewport * );
 };
diff --git a/src/mesa/pipe/p_state.h b/src/mesa/pipe/p_state.h
index d1e387ce43..f3723eb87e 100644
--- a/src/mesa/pipe/p_state.h
+++ b/src/mesa/pipe/p_state.h
@@ -41,6 +41,16 @@
 #include "mtypes.h"
 
 
+
+/**
+ * Implementation limits
+ */
+#define PIPE_MAX_SAMPLERS     8
+#define PIPE_MAX_CLIP_PLANES  6
+#define PIPE_MAX_CONSTANT    32
+
+
+
 /**
  * Primitive (point/line/tri) setup info
  */
@@ -84,9 +94,6 @@ struct pipe_scissor_rect {
    GLshort maxy;
 };
 
-
-#define PIPE_MAX_CLIP_PLANES 6
-
 struct pipe_clip_state {
    GLfloat ucp[PIPE_MAX_CLIP_PLANES][4];
    GLuint nr;
@@ -96,8 +103,6 @@ struct pipe_fs_state {
    struct gl_fragment_program *fp;
 };
 
-#define PIPE_MAX_CONSTANT 32
-
 struct pipe_constant_buffer {
    GLfloat constant[PIPE_MAX_CONSTANT][4];
    GLuint nr_constants;
diff --git a/src/mesa/pipe/softpipe/sp_context.c b/src/mesa/pipe/softpipe/sp_context.c
index f27d2dd8bc..07b529fc6e 100644
--- a/src/mesa/pipe/softpipe/sp_context.c
+++ b/src/mesa/pipe/softpipe/sp_context.c
@@ -76,6 +76,7 @@ struct pipe_context *softpipe_create( void )
    softpipe->pipe.set_scissor_rect = softpipe_set_scissor_rect;
    softpipe->pipe.set_fs_state = softpipe_set_fs_state;
    softpipe->pipe.set_polygon_stipple = softpipe_set_polygon_stipple;
+   softpipe->pipe.set_sampler_state = softpipe_set_sampler_state;
    softpipe->pipe.draw_vb = softpipe_draw_vb;
    softpipe->pipe.clear = softpipe_clear;
 
diff --git a/src/mesa/pipe/softpipe/sp_context.h b/src/mesa/pipe/softpipe/sp_context.h
index 329544eb74..d8c0de0ad1 100644
--- a/src/mesa/pipe/softpipe/sp_context.h
+++ b/src/mesa/pipe/softpipe/sp_context.h
@@ -62,6 +62,7 @@ enum interp_mode {
 #define G_NEW_FRAMEBUFFER 0x100
 #define G_NEW_ALPHA_TEST  0x200
 #define G_NEW_DEPTH_TEST  0x400
+#define G_NEW_SAMPLER     0x800
 
 
 #define PIPE_ATTRIB_MAX 32
@@ -84,6 +85,7 @@ struct softpipe_context {
    struct pipe_point_state  point;
    struct pipe_scissor_rect scissor;
    struct pipe_poly_stipple poly_stipple;
+   struct pipe_sampler_state sampler[PIPE_MAX_SAMPLERS];
    GLuint dirty;
 
    /* Clip derived state:
diff --git a/src/mesa/pipe/softpipe/sp_state.h b/src/mesa/pipe/softpipe/sp_state.h
index 6253b9c9e5..faaa043a56 100644
--- a/src/mesa/pipe/softpipe/sp_state.h
+++ b/src/mesa/pipe/softpipe/sp_state.h
@@ -59,6 +59,10 @@ void softpipe_set_viewport( struct pipe_context *,
 void softpipe_set_setup_state( struct pipe_context *,
 			      const struct pipe_setup_state * );
 
+void softpipe_set_sampler_state( struct pipe_context *,
+                                 GLuint unit,
+                                 const struct pipe_sampler_state * );
+
 void softpipe_set_scissor_rect( struct pipe_context *,
 			       const struct pipe_scissor_rect * );
 
diff --git a/src/mesa/pipe/softpipe/sp_state_sampler.c b/src/mesa/pipe/softpipe/sp_state_sampler.c
new file mode 100644
index 0000000000..6b422acfb6
--- /dev/null
+++ b/src/mesa/pipe/softpipe/sp_state_sampler.c
@@ -0,0 +1,49 @@
+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+/* Authors:
+ *  Brian Paul
+ */
+#include "imports.h"
+
+#include "sp_context.h"
+#include "sp_state.h"
+#include "sp_draw.h"
+
+
+
+void
+softpipe_set_sampler_state(struct pipe_context *pipe,
+                           GLuint unit,
+                           const struct pipe_sampler_state *sampler)
+{
+   struct softpipe_context *softpipe = softpipe_context(pipe);
+
+   softpipe->sampler[unit] = *sampler;
+
+   softpipe->dirty |= G_NEW_SAMPLER;
+}
diff --git a/src/mesa/sources b/src/mesa/sources
index fd84ed5826..3887e9f3c2 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -177,6 +177,7 @@ SOFTPIPE_SOURCES = \
 	pipe/softpipe/sp_state_fs.c \
 	pipe/softpipe/sp_state_point.c \
 	pipe/softpipe/sp_state_setup.c \
+	pipe/softpipe/sp_state_sampler.c \
 	pipe/softpipe/sp_state_surface.c
 
 STATETRACKER_SOURCES = \
@@ -189,6 +190,7 @@ STATETRACKER_SOURCES = \
 	state_tracker/st_atom_fs.c \
 	state_tracker/st_atom_framebuffer.c \
 	state_tracker/st_atom_point.c \
+	state_tracker/st_atom_sampler.c \
 	state_tracker/st_atom_scissor.c \
 	state_tracker/st_atom_stencil.c \
 	state_tracker/st_atom_setup.c \
diff --git a/src/mesa/state_tracker/st_atom_sampler.c b/src/mesa/state_tracker/st_atom_sampler.c
new file mode 100644
index 0000000000..1aa9da8484
--- /dev/null
+++ b/src/mesa/state_tracker/st_atom_sampler.c
@@ -0,0 +1,135 @@
+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+ /*
+  * Authors:
+  *   Keith Whitwell <keith@tungstengraphics.com>
+  *   Brian Paul
+  */
+ 
+
+#include "st_context.h"
+#include "st_atom.h"
+#include "pipe/p_context.h"
+#include "pipe/p_defines.h"
+
+
+/**
+ * Convert GLenum texcoord wrap tokens to pipe tokens.
+ */
+static GLuint
+gl_wrap_to_sp(GLenum wrap)
+{
+   switch (wrap) {
+   case GL_REPEAT:
+      return PIPE_TEX_WRAP_REPEAT;
+   case GL_CLAMP:
+      return PIPE_TEX_WRAP_CLAMP;
+   case GL_CLAMP_TO_EDGE:
+      return PIPE_TEX_WRAP_CLAMP_TO_EDGE;
+   case GL_CLAMP_TO_BORDER:
+      return PIPE_TEX_WRAP_CLAMP_TO_BORDER;
+   case GL_MIRRORED_REPEAT:
+      return PIPE_TEX_WRAP_MIRROR_REPEAT;
+   case GL_MIRROR_CLAMP_EXT:
+      return PIPE_TEX_WRAP_MIRROR_CLAMP;
+   case GL_MIRROR_CLAMP_TO_EDGE_EXT:
+      return PIPE_TEX_WRAP_MIRROR_CLAMP_TO_EDGE;
+   case GL_MIRROR_CLAMP_TO_BORDER_EXT:
+      return PIPE_TEX_WRAP_MIRROR_CLAMP_TO_BORDER;
+   default:
+      abort();
+      return 0;
+   }
+}
+
+
+static GLuint
+gl_filter_to_sp(GLenum filter)
+{
+   switch (filter) {
+   case GL_NEAREST:
+      return PIPE_TEX_FILTER_NEAREST;
+   case GL_LINEAR:
+      return PIPE_TEX_FILTER_LINEAR;
+   case GL_NEAREST_MIPMAP_NEAREST:
+      return PIPE_TEX_FILTER_NEAREST_MIPMAP_NEAREST;
+   case GL_NEAREST_MIPMAP_LINEAR:
+      return PIPE_TEX_FILTER_NEAREST_MIPMAP_LINEAR;
+   case GL_LINEAR_MIPMAP_NEAREST:
+      return PIPE_TEX_FILTER_LINEAR_MIPMAP_NEAREST;
+   case GL_LINEAR_MIPMAP_LINEAR:
+      return PIPE_TEX_FILTER_LINEAR_MIPMAP_LINEAR;
+   default:
+      abort();
+      return 0;
+   }
+}
+
+
+static void 
+update_samplers(struct st_context *st)
+{
+   GLuint u;
+
+   for (u = 0; u < st->ctx->Const.MaxTextureImageUnits; u++) {
+      const struct gl_texture_object *texobj
+         = st->ctx->Texture.Unit[u]._Current;
+      struct pipe_sampler_state sampler;
+
+      memset(&sampler, 0, sizeof(sampler));
+
+      sampler.wrap_s = gl_wrap_to_sp(texobj->WrapS);
+      sampler.wrap_t = gl_wrap_to_sp(texobj->WrapT);
+      sampler.wrap_r = gl_wrap_to_sp(texobj->WrapR);
+
+      sampler.min_filter = gl_filter_to_sp(texobj->MinFilter);
+      sampler.mag_filter = gl_filter_to_sp(texobj->MagFilter);
+
+      /* XXX more sampler state here */
+
+      if (memcmp(&sampler, &st->state.sampler[u], sizeof(sampler)) != 0) {
+         /* state has changed */
+         st->state.sampler[u] = sampler;
+         st->pipe->set_sampler_state(st->pipe, u, &sampler);
+      }
+   }
+}
+
+
+const struct st_tracked_state st_update_sampler = {
+   .dirty = {
+      .mesa = _NEW_TEXTURE,
+      .st  = 0,
+   },
+   .update = update_samplers
+};
+
+
+
+
+
diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index 0f1fa2327b..582d586a73 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -75,6 +75,7 @@ struct st_context
       struct pipe_clip_state   clip;
       struct pipe_depth_state  depth;
       struct pipe_point_state  point;
+      struct pipe_sampler_state sampler[PIPE_MAX_SAMPLERS];
       struct pipe_scissor_rect scissor;
       struct pipe_poly_stipple poly_stipple;
       struct pipe_stencil_state stencil;