fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 22:49:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: fix glTexPageCommitmentARB and glTexturePageCommitmentEXT level check

Browse source 
gl_texture_object._MaxLevel is not set at this point. Follow the level
check of texsubimage_error_check() now.

Fixes: 90415c1a3a ("mesa: implement glTexPageCommitmentARB/glTexturePageCommitmentEXT")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13730
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36865>
(cherry picked from commit c1b9396403)
This commit is contained in:
Qiang Yu 2025-08-20 12:21:54 +08:00 • committed by Eric Engestrom
parent 064b477536
commit 07278f5621
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1624,7 +1624,7 @@
"description": "mesa: fix glTexPageCommitmentARB and glTexturePageCommitmentEXT level check",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "90415c1a3a4b987a9cf38a44a094eea9f27d0b9c",
"notes": null

8
src/mesa/main/texobj.c
View file

@ -2413,13 +2413,17 @@ texture_page_commitment(struct gl_context *ctx, GLenum target,
return;
}
if (level < 0 || level > tex_obj->_MaxLevel) {
if (level < 0 || level >= _mesa_max_texture_levels(ctx, target)) {
/* Not in error list of ARB_sparse_texture. */
_mesa_error(ctx, GL_INVALID_VALUE, "%s(level %d)", func, level);
return;
}
struct gl_texture_image *image = tex_obj->Image[0][level];
struct gl_texture_image *image = _mesa_select_tex_image(tex_obj, target, level);
if (!image) {
_mesa_error(ctx, GL_INVALID_OPERATION, "%s(no image for level %d)", func, level);
return;
}
int max_depth = image->Depth;
if (target == GL_TEXTURE_CUBE_MAP)