meta: Use same vertex coordinates for GLSL and FF clears

   text     data     bss      dec    hex  filename
12243446 1344936 1290748 14879130 e3099a  before/lib64/dri/i965_dri.so
12243286 1344936 1290748 14878970 e308fa  after/lib64/dri/i965_dri.so

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/856>

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index aecc6d10b1ca33eda85b73c9aa01d9fed0d414ca..6d1ad339e575633272d4d281306f2080b41f271d 100644 (file)
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -1679,7 +1679,6 @@ meta_clear(struct gl_context *ctx, GLbitfield buffers, bool glsl)
    GLbitfield metaSave;
    const GLuint stencilMax = (1 << ctx->DrawBuffer->Visual.stencilBits) - 1;
    struct gl_framebuffer *fb = ctx->DrawBuffer;
-   float x0, y0, x1, y1, z;
    struct vertex verts[4];
    int i;
 
@@ -1715,21 +1714,12 @@ meta_clear(struct gl_context *ctx, GLbitfield buffers, bool glsl)
    assert(!fb->_IntegerBuffers);
    if (glsl) {
       meta_glsl_clear_init(ctx, clear);
-
-      x0 = ((float) fb->_Xmin / fb->Width)  * 2.0f - 1.0f;
-      y0 = ((float) fb->_Ymin / fb->Height) * 2.0f - 1.0f;
-      x1 = ((float) fb->_Xmax / fb->Width)  * 2.0f - 1.0f;
-      y1 = ((float) fb->_Ymax / fb->Height) * 2.0f - 1.0f;
-      z = -invert_z(ctx->Depth.Clear);
    } else {
       _mesa_meta_setup_vertex_objects(ctx, &clear->VAO, &clear->buf_obj, false,
                                       3, 0, 4);
 
-      x0 = (float) fb->_Xmin;
-      y0 = (float) fb->_Ymin;
-      x1 = (float) fb->_Xmax;
-      y1 = (float) fb->_Ymax;
-      z = invert_z(ctx->Depth.Clear);
+      /* setup projection matrix */
+      _mesa_load_identity_matrix(ctx, &ctx->ProjectionMatrixStack);
    }
 
    if (glsl) {
@@ -1776,6 +1766,12 @@ meta_clear(struct gl_context *ctx, GLbitfield buffers, bool glsl)
    }
 
    /* vertex positions */
+   const float x0 = ((float) fb->_Xmin / fb->Width)  * 2.0f - 1.0f;
+   const float y0 = ((float) fb->_Ymin / fb->Height) * 2.0f - 1.0f;
+   const float x1 = ((float) fb->_Xmax / fb->Width)  * 2.0f - 1.0f;
+   const float y1 = ((float) fb->_Ymax / fb->Height) * 2.0f - 1.0f;
+   const float z = -invert_z(ctx->Depth.Clear);
+
    verts[0].x = x0;
    verts[0].y = y0;
    verts[0].z = z;