hook up point state

4 files changed, 73 insertions, 1 deletions

diff --git a/src/mesa/state_tracker/st_atom.c b/src/mesa/state_tracker/st_atom.c
index 228e7889b78..8ac435041d0 100644
--- a/src/mesa/state_tracker/st_atom.c
+++ b/src/mesa/state_tracker/st_atom.c
@@ -45,6 +45,7 @@ static const struct st_tracked_state *atoms[] =
    &st_update_framebuffer,
    &st_update_clip,
    &st_update_fs,
+   &st_update_point,
    &st_update_setup,
    &st_update_viewport,
    &st_update_scissor,
diff --git a/src/mesa/state_tracker/st_atom.h b/src/mesa/state_tracker/st_atom.h
index 8a75c9c6d5a..56c33f3076e 100644
--- a/src/mesa/state_tracker/st_atom.h
+++ b/src/mesa/state_tracker/st_atom.h
@@ -48,6 +48,7 @@ const struct st_tracked_state st_update_framebuffer;
 const struct st_tracked_state st_update_clip;
 const struct st_tracked_state st_update_depth;
 const struct st_tracked_state st_update_fs;
+const struct st_tracked_state st_update_point;
 const struct st_tracked_state st_update_setup;
 const struct st_tracked_state st_update_viewport;
 const struct st_tracked_state st_update_constants;
diff --git a/src/mesa/state_tracker/st_atom_point.c b/src/mesa/state_tracker/st_atom_point.c
new file mode 100644
index 00000000000..7299142932a
--- /dev/null
+++ b/src/mesa/state_tracker/st_atom_point.c
@@ -0,0 +1,70 @@
+/**************************************************************************
+ * 
+ * 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 <[email protected]>
+  *   Brian Paul
+  */
+ 
+
+#include "st_context.h"
+#include "st_atom.h"
+#include "pipe/p_context.h"
+#include "pipe/p_defines.h"
+
+
+static void 
+update_point( struct st_context *st )
+{
+   struct pipe_point_state point;
+
+   memset(&point, 0, sizeof(point));
+
+   point.smooth = st->ctx->Point.SmoothFlag;
+   point.size = st->ctx->Point.Size;
+   point.min_size = st->ctx->Point.MinSize;
+   point.max_size = st->ctx->Point.MaxSize;
+   point.attenuation[0] = st->ctx->Point.Params[0];
+   point.attenuation[1] = st->ctx->Point.Params[1];
+   point.attenuation[2] = st->ctx->Point.Params[2];
+
+   if (memcmp(&point, &st->state.point, sizeof(point)) != 0) {
+      /* state has changed */
+      st->state.point = point;  /* struct copy */
+      st->pipe->set_point_state(st->pipe, &point); /* set new state */
+   }
+}
+
+
+const struct st_tracked_state st_update_point = {
+   .dirty = {
+      .mesa = (_NEW_POINT),
+      .st  = 0,
+   },
+   .update = update_point
+};
diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index d98dd3aadae..94388f1aee6 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -71,9 +71,9 @@ struct st_context
       struct pipe_fs_state     fs;
       struct pipe_alpha_test_state  alpha_test;
       struct pipe_blend_state  blend;
-      struct pipe_surface      cbuf;
       struct pipe_clip_state   clip;
       struct pipe_depth_state  depth;
+      struct pipe_point_state  point;
       struct pipe_scissor_rect scissor;
       struct pipe_poly_stipple poly_stipple;
       struct pipe_stencil_state stencil;