diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2022-04-21 13:11:18 -0400 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2022-04-24 21:03:20 -0700 |
| commit | 75ff7478378b56a23e292373ecbd6c1650403851 (patch) | |
| tree | 7cde1951fe191dc37f5d53582528148c8d6107d0 | |
| parent | e03df72217f1746c14a7e89c53ceaeb0052f77d9 (diff) | |
mesa/st: clamp GL_RENDERBUFFER to GL_TEXTURE_2D for sparse queries
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 <marek.olsak@amd.com>
Reviewed-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16097>
(cherry picked from commit 272f6ede0d828f95549f26c0c47c24f08d6a6174)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_format.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index 689aa36836d..dd785a30a74 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -20,7 +20,7 @@ "description": "mesa/st: clamp GL_RENDERBUFFER to GL_TEXTURE_2D for sparse queries", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "because_sha": "b1c32a6c8c2ffb38627a560bc738ffde2c5e25a4" }, { diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c index a2b6625fbba..252e0810d0c 100644 --- a/src/mesa/state_tracker/st_format.c +++ b/src/mesa/state_tracker/st_format.c @@ -1483,6 +1483,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); |