X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fstate_tracker%2Fst_atom_viewport.c;h=ad0ad6bd775caac35cc07c83418c5c4ec9826121;hb=d94bec5c49d926069f97a4b12fb2532611a9080c;hp=1fc8908f9f7c3b05a107fad7d01f73b391eae5c1;hpb=2108b73cf37b103cea51a906711733afbbb5a7af;p=mesa.git

diff --git a/src/mesa/state_tracker/st_atom_viewport.c b/src/mesa/state_tracker/st_atom_viewport.c
index 1fc8908f9f7..ad0ad6bd775 100644
--- a/src/mesa/state_tracker/st_atom_viewport.c
+++ b/src/mesa/state_tracker/st_atom_viewport.c
@@ -30,9 +30,16 @@
 #include "main/viewport.h"
 #include "st_context.h"
 #include "st_atom.h"
+#include "st_util.h"
 #include "pipe/p_context.h"
 #include "cso_cache/cso_context.h"
 
+static enum pipe_viewport_swizzle
+viewport_swizzle_from_glenum(GLenum16 swizzle)
+{
+   return swizzle - GL_VIEWPORT_SWIZZLE_POSITIVE_X_NV;
+}
+
 /**
  * Update the viewport transformation matrix.  Depends on:
  *  - viewport pos/size
@@ -43,40 +50,35 @@ void
 st_update_viewport( struct st_context *st )
 {
    struct gl_context *ctx = st->ctx;
-   GLfloat yScale, yBias;
    unsigned i;
-   /* _NEW_BUFFERS
-    */
-   if (st->state.fb_orientation == Y_0_TOP) {
-      /* Drawing to a window.  The corresponding gallium surface uses
-       * Y=0=TOP but OpenGL is Y=0=BOTTOM.  So we need to invert the viewport.
-       */
-      yScale = -1;
-      yBias = (GLfloat)ctx->DrawBuffer->Height;
-   }
-   else {
-      /* Drawing to an FBO where Y=0=BOTTOM, like OpenGL - don't invert */
-      yScale = 1.0;
-      yBias = 0.0;
-   }
 
    /* _NEW_VIEWPORT 
     */
-   for (i = 0; i < ctx->Const.MaxViewports; i++)
-   {
-      float scale[3], translate[3];
+   for (i = 0; i < st->state.num_viewports; i++) {
+      float *scale = st->state.viewport[i].scale;
+      float *translate = st->state.viewport[i].translate;
+
       _mesa_get_viewport_xform(ctx, i, scale, translate);
 
-      st->state.viewport[i].scale[0] = scale[0];
-      st->state.viewport[i].scale[1] = scale[1] * yScale;
-      st->state.viewport[i].scale[2] = scale[2];
+      /* _NEW_BUFFERS */
+      /* Drawing to a window where the coordinate system is upside down. */
+      if (st->state.fb_orientation == Y_0_TOP) {
+         scale[1] *= -1;
+         translate[1] = st->state.fb_height - translate[1];
+      }
 
-      st->state.viewport[i].translate[0] = translate[0];
-      st->state.viewport[i].translate[1] = translate[1] * yScale + yBias;
-      st->state.viewport[i].translate[2] = translate[2];
+      st->state.viewport[i].swizzle_x = viewport_swizzle_from_glenum(ctx->ViewportArray[i].SwizzleX);
+      st->state.viewport[i].swizzle_y = viewport_swizzle_from_glenum(ctx->ViewportArray[i].SwizzleY);
+      st->state.viewport[i].swizzle_z = viewport_swizzle_from_glenum(ctx->ViewportArray[i].SwizzleZ);
+      st->state.viewport[i].swizzle_w = viewport_swizzle_from_glenum(ctx->ViewportArray[i].SwizzleW);
    }
 
    cso_set_viewport(st->cso_context, &st->state.viewport[0]);
-   if (ctx->Const.MaxViewports > 1)
-      st->pipe->set_viewport_states(st->pipe, 1, ctx->Const.MaxViewports - 1, &st->state.viewport[1]);
+
+   if (st->state.num_viewports > 1) {
+      struct pipe_context *pipe = st->pipe;
+
+      pipe->set_viewport_states(pipe, 1, st->state.num_viewports - 1,
+                                &st->state.viewport[1]);
+   }
 }