From 5d8a4ce3c458dc7faa30cd7c988f5c2ce5e95f83 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 21 Apr 2022 13:11:18 -0400 Subject: [PATCH] mesa/st: clamp GL_RENDERBUFFER to GL_TEXTURE_2D for sparse queries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit this is a legal query that cts uses, so don't just abort Fixes: b1c32a6c8c2 ("mesa: add ARB_sparse_texture query in glGetInternalformativ") Reviewed-by: Marek Olšák Reviewed-by: Qiang Yu Part-of: (cherry picked from commit 272f6ede0d828f95549f26c0c47c24f08d6a6174) --- .pick_status.json | 2 +- src/mesa/state_tracker/st_format.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 3718ec99977..5052759b4bb 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -22,7 +22,7 @@ "description": "mesa/st: clamp GL_RENDERBUFFER to GL_TEXTURE_2D for sparse queries", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "b1c32a6c8c2ffb38627a560bc738ffde2c5e25a4" }, diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c index 794ae63841d..fadd03073aa 100644 --- a/src/mesa/state_tracker/st_format.c +++ b/src/mesa/state_tracker/st_format.c @@ -1491,6 +1491,9 @@ st_QueryInternalFormat(struct gl_context *ctx, GLenum target, case GL_VIRTUAL_PAGE_SIZE_X_ARB: case GL_VIRTUAL_PAGE_SIZE_Y_ARB: case GL_VIRTUAL_PAGE_SIZE_Z_ARB: { + /* this is used only for passing CTS */ + if (target == GL_RENDERBUFFER) + target = GL_TEXTURE_2D; mesa_format format = st_ChooseTextureFormat(ctx, target, internalFormat, GL_NONE, GL_NONE); enum pipe_format pformat = st_mesa_format_to_pipe_format(st, format);