summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/i915/intel_state.c
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2005-12-30 13:03:08 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2005-12-30 13:03:08 +0000
commitcabecbd3146bf010bb478c9474b34d77afc7431b (patch)
treedc45586aac95eb17f8c4628981e9541154177337 /src/mesa/drivers/dri/i915/intel_state.c
parent1d43e729ec94217f3b742be481c753a8eaa65ea3 (diff)
recalculate state on drawable changes
Diffstat (limited to 'src/mesa/drivers/dri/i915/intel_state.c')
-rw-r--r--src/mesa/drivers/dri/i915/intel_state.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_state.c b/src/mesa/drivers/dri/i915/intel_state.c
index 2343d061f5..a2f2b20738 100644
--- a/src/mesa/drivers/dri/i915/intel_state.c
+++ b/src/mesa/drivers/dri/i915/intel_state.c
@@ -230,6 +230,10 @@ static void intelCalcViewport( GLcontext *ctx )
intelContextPtr intel = INTEL_CONTEXT(ctx);
const GLfloat *v = ctx->Viewport._WindowMap.m;
GLfloat *m = intel->ViewportMatrix.m;
+ GLint h = 0;
+
+ if (intel->driDrawable)
+ h = intel->driDrawable->h + SUBPIXEL_Y;
/* See also intel_translate_vertex. SUBPIXEL adjustments can be done
* via state vars, too.
@@ -237,7 +241,7 @@ static void intelCalcViewport( GLcontext *ctx )
m[MAT_SX] = v[MAT_SX];
m[MAT_TX] = v[MAT_TX] + SUBPIXEL_X;
m[MAT_SY] = - v[MAT_SY];
- m[MAT_TY] = - v[MAT_TY] + intel->driDrawable->h + SUBPIXEL_Y;
+ m[MAT_TY] = - v[MAT_TY] + h;
m[MAT_SZ] = v[MAT_SZ] * intel->depth_scale;
m[MAT_TZ] = v[MAT_TZ] * intel->depth_scale;
}