X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fstate_tracker%2Fst_atom_stipple.c;h=86a4247f3269d4327b8c52c3f015b4912ba999f9;hb=6fe20ebaaa933ddd17b655e61ba3fe3d358b8513;hp=f395930ab40343bc2e89f9686bf194300a69ad96;hpb=33d9e213ee47aab32f662caf3e7c07c2697befbe;p=mesa.git

diff --git a/src/mesa/state_tracker/st_atom_stipple.c b/src/mesa/state_tracker/st_atom_stipple.c
index f395930ab40..86a4247f326 100644
--- a/src/mesa/state_tracker/st_atom_stipple.c
+++ b/src/mesa/state_tracker/st_atom_stipple.c
@@ -1,6 +1,6 @@
 /**************************************************************************
  * 
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2007 VMware, Inc.
  * All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -18,7 +18,7 @@
  * 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
+ * IN NO EVENT SHALL VMWARE 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.
@@ -33,31 +33,54 @@
   */
  
 
+#include <assert.h>
+
 #include "st_context.h"
 #include "st_atom.h"
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 
 
-static void 
-update_stipple( struct st_context *st )
+/**
+ * OpenGL's polygon stipple is indexed with window coordinates in which
+ * the origin (0,0) is the lower-left corner of the window.
+ * With Gallium, the origin is the upper-left corner of the window.
+ * To convert GL's polygon stipple to what gallium expects we need to
+ * invert the pattern vertically and rotate the stipple rows according
+ * to the window height.
+ */
+static void
+invert_stipple(GLuint dest[32], const GLuint src[32], GLuint winHeight)
 {
-   const GLuint sz = sizeof(st->state.poly_stipple.stipple);
-   assert(sz == sizeof(st->ctx->PolygonStipple));
+   GLuint i;
 
-   if (memcmp(&st->state.poly_stipple.stipple, st->ctx->PolygonStipple, sz)) {
-      /* state has changed */
-      memcpy(st->state.poly_stipple.stipple, st->ctx->PolygonStipple, sz);
-      st->pipe->set_polygon_stipple(st->pipe, &st->state.poly_stipple);
+   for (i = 0; i < 32; i++) {
+      dest[i] = src[(winHeight - 1 - i) & 0x1f];
    }
 }
 
 
-const struct st_tracked_state st_update_polygon_stipple = {
-   "st_update_polygon_stipple",				/* name */
-   {							/* dirty */
-      (_NEW_POLYGONSTIPPLE),				/* mesa */
-      0,						/* st */
-   },
-   update_stipple					/* update */
-};
+/** Update the stipple when the pattern or window height changes */
+void
+st_update_polygon_stipple( struct st_context *st )
+{
+   const struct gl_context *ctx = st->ctx;
+   const GLuint sz = sizeof(st->state.poly_stipple);
+   assert(sz == sizeof(ctx->PolygonStipple));
+
+   if (memcmp(st->state.poly_stipple, ctx->PolygonStipple, sz)) {
+      /* state has changed */
+      struct pipe_poly_stipple newStipple;
+
+      memcpy(st->state.poly_stipple, ctx->PolygonStipple, sz);
+
+      if (!ctx->DrawBuffer->FlipY) {
+         memcpy(newStipple.stipple, ctx->PolygonStipple, sizeof(newStipple.stipple));
+      } else {
+         invert_stipple(newStipple.stipple, ctx->PolygonStipple,
+                        ctx->DrawBuffer->Height);
+      }
+
+      st->pipe->set_polygon_stipple(st->pipe, &newStipple);
+   }
+}