X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fstate_tracker%2Fst_atom_viewport.c;h=4a07b2d0914ef00160fa3f70bbe3d521b02c9c62;hb=b5697c311b6f29dee40b96c48bad3279e3667c1e;hp=d10f1840df6ac3db0210a04d7fc07a2ee8f3c627;hpb=0072acd447dc6be652e63752e50215c3105322c8;p=mesa.git

diff --git a/src/mesa/state_tracker/st_atom_viewport.c b/src/mesa/state_tracker/st_atom_viewport.c
index d10f1840df6..4a07b2d0914 100644
--- a/src/mesa/state_tracker/st_atom_viewport.c
+++ b/src/mesa/state_tracker/st_atom_viewport.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.
@@ -27,8 +27,10 @@
 
 
 #include "main/context.h"
+#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"
 
@@ -38,53 +40,34 @@
  *  - depthrange
  *  - window pos/size or FBO size
  */
-static void
-update_viewport( struct st_context *st )
+void
+st_update_viewport( struct st_context *st )
 {
    struct gl_context *ctx = st->ctx;
-   GLfloat yScale, yBias;
-
-   /* _NEW_BUFFERS
-    */
-   if (st_fb_orientation(ctx->DrawBuffer) == Y_0_TOP) {
-      yScale = -1;
-      yBias = (GLfloat)ctx->DrawBuffer->Height;
-   }
-   else {
-      yScale = 1.0;
-      yBias = 0.0;
-   }
+   unsigned i;
 
    /* _NEW_VIEWPORT 
     */
-   {
-      GLfloat x = (GLfloat)ctx->Viewport.X;
-      GLfloat y = (GLfloat)ctx->Viewport.Y;
-      GLfloat z = ctx->Viewport.Near;
-      GLfloat half_width = (GLfloat)ctx->Viewport.Width * 0.5f;
-      GLfloat half_height = (GLfloat)ctx->Viewport.Height * 0.5f;
-      GLfloat half_depth = (GLfloat)(ctx->Viewport.Far - ctx->Viewport.Near) * 0.5f;
-      
-      st->state.viewport.scale[0] = half_width;
-      st->state.viewport.scale[1] = half_height * yScale;
-      st->state.viewport.scale[2] = half_depth;
-      st->state.viewport.scale[3] = 1.0;
+   for (i = 0; i < st->state.num_viewports; i++) {
+      float *scale = st->state.viewport[i].scale;
+      float *translate = st->state.viewport[i].translate;
 
-      st->state.viewport.translate[0] = half_width + x;
-      st->state.viewport.translate[1] = (half_height + y) * yScale + yBias;
-      st->state.viewport.translate[2] = half_depth + z;
-      st->state.viewport.translate[3] = 0.0;
+      _mesa_get_viewport_xform(ctx, i, scale, translate);
 
-      cso_set_viewport(st->cso_context, &st->state.viewport);
+      /* _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];
+      }
    }
-}
 
+   cso_set_viewport(st->cso_context, &st->state.viewport[0]);
+
+   if (st->state.num_viewports > 1) {
+      struct pipe_context *pipe = st->pipe;
 
-const struct st_tracked_state st_update_viewport = {
-   "st_update_viewport",				/* name */
-   {							/* dirty */
-      _NEW_BUFFERS | _NEW_VIEWPORT,			/* mesa */
-      0,						/* st */
-   },
-   update_viewport					/* update */
-};
+      pipe->set_viewport_states(pipe, 1, st->state.num_viewports - 1,
+                                &st->state.viewport[1]);
+   }
+}