mesa/st: Add VARYING_SLOT_TEX[1-7] to st_translate_geometry_program().

[mesa.git] / src / mesa / state_tracker / st_atom_scissor.c

diff --git a/src/mesa/state_tracker/st_atom_scissor.c b/src/mesa/state_tracker/st_atom_scissor.c
index 05a9f3eed1804423674ac76ef51b0418bc78fb20..19c2cd2fbb39efb9258e7c1988d89fc2bb1b8a51 100644 (file)
--- a/src/mesa/state_tracker/st_atom_scissor.c
+++ b/src/mesa/state_tracker/st_atom_scissor.c
@@ -31,6 +31,7 @@
   */
  
 
+#include "main/macros.h"
 #include "st_context.h"
 #include "pipe/p_context.h"
 #include "st_atom.h"
@@ -43,46 +44,58 @@ static void
 update_scissor( struct st_context *st )
 {
    struct pipe_scissor_state scissor;
-   const struct gl_framebuffer *fb = st->ctx->DrawBuffer;
+   const struct gl_context *ctx = st->ctx;
+   const struct gl_framebuffer *fb = ctx->DrawBuffer;
+   GLint miny, maxy;
 
    scissor.minx = 0;
    scissor.miny = 0;
    scissor.maxx = fb->Width;
    scissor.maxy = fb->Height;
 
-   if (st->ctx->Scissor.Enabled) {
-      if (st->ctx->Scissor.X > scissor.minx)
-         scissor.minx = st->ctx->Scissor.X;
-      if (st->ctx->Scissor.Y > scissor.miny)
-         scissor.miny = st->ctx->Scissor.Y;
+   if (ctx->Scissor.Enabled) {
+      /* need to be careful here with xmax or ymax < 0 */
+      GLint xmax = MAX2(0, ctx->Scissor.X + ctx->Scissor.Width);
+      GLint ymax = MAX2(0, ctx->Scissor.Y + ctx->Scissor.Height);
 
-      if (st->ctx->Scissor.X + st->ctx->Scissor.Width < scissor.maxx)
-         scissor.maxx = st->ctx->Scissor.X + st->ctx->Scissor.Width;
-      if (st->ctx->Scissor.Y + st->ctx->Scissor.Height < scissor.maxy)
-         scissor.maxy = st->ctx->Scissor.Y + st->ctx->Scissor.Height;
+      if (ctx->Scissor.X > (GLint)scissor.minx)
+         scissor.minx = ctx->Scissor.X;
+      if (ctx->Scissor.Y > (GLint)scissor.miny)
+         scissor.miny = ctx->Scissor.Y;
+
+      if (xmax < (GLint) scissor.maxx)
+         scissor.maxx = xmax;
+      if (ymax < (GLint) scissor.maxy)
+         scissor.maxy = ymax;
 
       /* check for null space */
       if (scissor.minx >= scissor.maxx || scissor.miny >= scissor.maxy)
          scissor.minx = scissor.miny = scissor.maxx = scissor.maxy = 0;
    }
 
+   /* Now invert Y if needed.
+    * Gallium drivers use the convention Y=0=top for surfaces.
+    */
+   if (st_fb_orientation(fb) == Y_0_TOP) {
+      miny = fb->Height - scissor.maxy;
+      maxy = fb->Height - scissor.miny;
+      scissor.miny = miny;
+      scissor.maxy = maxy;
+   }
+
    if (memcmp(&scissor, &st->state.scissor, sizeof(scissor)) != 0) {
       /* state has changed */
       st->state.scissor = scissor;  /* struct copy */
-      st->pipe->set_scissor_state(st->pipe, &scissor); /* activate */
+      st->pipe->set_scissor_states(st->pipe, 0, 1, &scissor); /* activate */
    }
 }
 
 
 const struct st_tracked_state 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 */
 };
-
-
-
-
-