From 6a09405368a18fb494b92de5f9783b9a625a7235 Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Mon, 19 Aug 2019 17:41:46 +0200 Subject: [PATCH] mesa/program: Take ARB_framebuffers_no_attachments into account in wpos correction MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit If a drawbuffer is an fbo without an attachment then its 'Height' will be zero, and we have to take its 'DefaultGeometry.Height' into account. Fixes on softpipe (with the exception of tests that use multisample): dEQP-GLES31.functional.fbo.no_attachments.* Signed-off-by: Gert Wollny Reviewed-by: Marek Olšák --- src/mesa/program/prog_statevars.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/program/prog_statevars.c b/src/mesa/program/prog_statevars.c index 3bbe451399f..5178b61ec4a 100644 --- a/src/mesa/program/prog_statevars.c +++ b/src/mesa/program/prog_statevars.c @@ -576,11 +576,11 @@ _mesa_fetch_state(struct gl_context *ctx, const gl_state_index16 state[], value[0] = 1.0F; value[1] = 0.0F; value[2] = -1.0F; - value[3] = (GLfloat) ctx->DrawBuffer->Height; + value[3] = _mesa_geometric_height(ctx->DrawBuffer); } else { /* Flipping Y upside down (XY) followed by identity (ZW). */ value[0] = -1.0F; - value[1] = (GLfloat) ctx->DrawBuffer->Height; + value[1] = _mesa_geometric_height(ctx->DrawBuffer); value[2] = 1.0F; value[3] = 0.0F; } -- 2.30.2