From: Patrice Mandin <pmandin@caramail.com>
Date: Sat, 25 Aug 2007 09:39:04 +0000 (+0200)
Subject: nouveau: nv10: properly set viewport and projection
X-Git-Tag: mesa-7.8~5884^2~120
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1a911aad0a31b2d043a524e5d6f766fbb38142d7;p=platform%2Fupstream%2Fmesa.git

nouveau: nv10: properly set viewport and projection
---

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index 5d512b1..6d9ddd5 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -37,8 +37,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 static void nv10ViewportScale(nouveauContextPtr nmesa)
 {
 	GLcontext *ctx = nmesa->glCtx;
-	GLuint w = ((GLfloat) ctx->Viewport.Width) * 0.5;
-	GLuint h = ((GLfloat) ctx->Viewport.Height) * 0.5;
+	GLfloat w = ((GLfloat) ctx->Viewport.Width) * 0.5;
+	GLfloat h = ((GLfloat) ctx->Viewport.Height) * 0.5;
 	GLfloat max_depth = (ctx->Viewport.Near + ctx->Viewport.Far) * 0.5;
 	GLfloat projection[16];
 	int i;
@@ -67,7 +67,7 @@ static void nv10ViewportScale(nouveauContextPtr nmesa)
 
 	memset(projection, 0, sizeof(projection));
 	projection[0*4+0] = w;
-	projection[1*4+1] = h;
+	projection[1*4+1] = -h;
 	projection[2*4+2] = max_depth;
 	projection[3*4+3] = 1.0;
 	BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_PROJECTION_MATRIX(0), 16);