Switch fragment/vertex shaders to the new caching semantics.

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

diff --git a/src/mesa/state_tracker/st_atom_viewport.c b/src/mesa/state_tracker/st_atom_viewport.c
index ac91f628aab5f6095bfa45cd2c8a572c7a5b1687..147aa3c51a76517e30319750da4c55e745af5c08 100644 (file)
--- a/src/mesa/state_tracker/st_atom_viewport.c
+++ b/src/mesa/state_tracker/st_atom_viewport.c
@@ -33,61 +33,38 @@
 #include "st_atom.h"
 
 
-
-
-
 /**
  * Update the viewport transformation matrix.  Depends on:
  *  - viewport pos/size
  *  - depthrange
  *  - window pos/size or FBO size
  */
-static void update_viewport( struct st_context *st )
+static void
+update_viewport( struct st_context *st )
 {
    GLcontext *ctx = st->ctx;
-   const GLframebuffer *DrawBuffer = ctx->DrawBuffer;
-   GLfloat yScale = 1.0;
-   GLfloat yBias = 0.0;
+   GLfloat yScale, yBias;
 
    /* _NEW_BUFFERS
     */
-   if (DrawBuffer) {
-
-#if 0
-      if (DrawBuffer->Name) {
-        /* User created FBO */
-        struct st_renderbuffer *irb
-           = st_renderbuffer(DrawBuffer->_ColorDrawBuffers[0][0]);
-        if (irb && !irb->RenderToTexture) {
-           /* y=0=top */
-           yScale = -1.0;
-           yBias = irb->Base.Height;
-        }
-        else {
-           /* y=0=bottom */
-           yScale = 1.0;
-           yBias = 0.0;
-        }
-      }
-      else 
-      {
-        /* window buffer, y=0=top */
-        yScale = -1.0;
-        yBias = DrawBuffer->Height;
-      }
-#endif
+   if (st_fb_orientation(ctx->DrawBuffer) == Y_0_TOP) {
+      yScale = -1;
+      yBias = ctx->DrawBuffer->Height ;
+   }
+   else {
+      yScale = 1.0;
+      yBias = 0.0;
    }
 
+   /* _NEW_VIEWPORT 
+    */
    {
-      /* _NEW_VIEWPORT 
-       */
       GLfloat x = ctx->Viewport.X;
       GLfloat y = ctx->Viewport.Y;
       GLfloat z = ctx->Viewport.Near;
       GLfloat half_width = ctx->Viewport.Width / 2.0;
       GLfloat half_height = ctx->Viewport.Height / 2.0;
       GLfloat half_depth = (ctx->Viewport.Far - ctx->Viewport.Near) / 2.0;
-
       struct pipe_viewport_state vp;
       
       vp.scale[0] = half_width;
@@ -95,9 +72,9 @@ static void update_viewport( struct st_context *st )
       vp.scale[2] = half_depth;
       vp.scale[3] = 1.0;
 
-      vp.translate[0] = (half_width + x);
+      vp.translate[0] = half_width + x;
       vp.translate[1] = (half_height + y) * yScale + yBias;
-      vp.translate[2] = (half_depth + z);
+      vp.translate[2] = half_depth + z;
       vp.translate[3] = 0.0;
 
       if (memcmp(&vp, &st->state.viewport, sizeof(vp)) != 0) {
@@ -109,6 +86,7 @@ static void update_viewport( struct st_context *st )
 
 
 const struct st_tracked_state st_update_viewport = {
+   .name = "st_update_viewport",
    .dirty = {
       .mesa = _NEW_BUFFERS | _NEW_VIEWPORT,
       .st = 0,