diff options
author | Mathias Froehlich <Mathias.Froehlich@web.de> | 2015-03-29 18:57:45 +0200 |
---|---|---|
committer | Mathias Froehlich <Mathias.Froehlich@gmx.net> | 2015-04-05 08:01:46 +0200 |
commit | a8ceb8e450354083b0b4141cd7fa0174a4d18f72 (patch) | |
tree | 1d7cc684d3bbfd591d1f10e8d1a70e5d8e22862a /src/mesa/drivers/dri/i965/gen7_viewport_state.c | |
parent | ba353935a392d2a43422f1d258456336b40b60ea (diff) | |
download | external_mesa3d-a8ceb8e450354083b0b4141cd7fa0174a4d18f72.zip external_mesa3d-a8ceb8e450354083b0b4141cd7fa0174a4d18f72.tar.gz external_mesa3d-a8ceb8e450354083b0b4141cd7fa0174a4d18f72.tar.bz2 |
i965: Make use of _mesa_get_viewport_xform.
Instead of _WindowMap just use the translation and scale
of the viewport transform directly. Thereby avoid dividing by
_DepthMaxF again.
Reviewed-by: Brian Paul <brianp@vmware.com>
Signed-off-by: Mathias Froehlich <Mathias.Froehlich@web.de>
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen7_viewport_state.c')
-rw-r--r-- | src/mesa/drivers/dri/i965/gen7_viewport_state.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/i965/gen7_viewport_state.c b/src/mesa/drivers/dri/i965/gen7_viewport_state.c index bd11c3a..eb59684 100644 --- a/src/mesa/drivers/dri/i965/gen7_viewport_state.c +++ b/src/mesa/drivers/dri/i965/gen7_viewport_state.c @@ -26,12 +26,12 @@ #include "brw_defines.h" #include "intel_batchbuffer.h" #include "main/fbobject.h" +#include "main/viewport.h" static void gen7_upload_sf_clip_viewport(struct brw_context *brw) { struct gl_context *ctx = &brw->ctx; - const GLfloat depth_scale = 1.0F / ctx->DrawBuffer->_DepthMaxF; GLfloat y_scale, y_bias; const bool render_to_fbo = _mesa_is_user_fbo(ctx->DrawBuffer); struct gen7_sf_clip_viewport *vp; @@ -52,7 +52,8 @@ gen7_upload_sf_clip_viewport(struct brw_context *brw) } for (unsigned i = 0; i < ctx->Const.MaxViewports; i++) { - const GLfloat *const v = ctx->ViewportArray[i]._WindowMap.m; + double scale[3], translate[3]; + _mesa_get_viewport_xform(ctx, i, scale, translate); /* According to the "Vertex X,Y Clamping and Quantization" section of * the Strips and Fans documentation, objects must not have a @@ -76,12 +77,12 @@ gen7_upload_sf_clip_viewport(struct brw_context *brw) vp[i].guardband.ymax = gby; /* _NEW_VIEWPORT */ - vp[i].viewport.m00 = v[MAT_SX]; - vp[i].viewport.m11 = v[MAT_SY] * y_scale; - vp[i].viewport.m22 = v[MAT_SZ] * depth_scale; - vp[i].viewport.m30 = v[MAT_TX]; - vp[i].viewport.m31 = v[MAT_TY] * y_scale + y_bias; - vp[i].viewport.m32 = v[MAT_TZ] * depth_scale; + vp[i].viewport.m00 = scale[0]; + vp[i].viewport.m11 = scale[1] * y_scale; + vp[i].viewport.m22 = scale[2]; + vp[i].viewport.m30 = translate[0]; + vp[i].viewport.m31 = translate[1] * y_scale + y_bias; + vp[i].viewport.m32 = translate[2]; } BEGIN_BATCH(2); |