This is currently not being checked and e.g a multisample texture image is
passed
down to the driver hook. On i965, it is crashing the driver with an assertion:
intel_mipmap_tree.c:3125: intel_miptree_map: Assertion `mt->num_samples <= 1'
failed.
Similar check exists for GetTextureSubImage.
v2: (Ilia Mirkin) Use legal_getteximage_target() instead.
---
src/mesa/main/texgetimage.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
index d5cb1636605..c9a0ef0b8ac 100644
--- a/src/mesa/main/texgetimage.c
+++ b/src/mesa/main/texgetimage.c
@@ -1465,6 +1465,17 @@ _mesa_GetTextureSubImage(GLuint texture, GLint level,
return;
}
+ if (!legal_getteximage_target(ctx, texObj->Target, true)) {
+ if (texObj->Target == GL_TEXTURE_BUFFER ||
+ texObj->Target == GL_TEXTURE_2D_MULTISAMPLE) {
+ _mesa_error(ctx, GL_INVALID_OPERATION,
+ "%s(buffer/multisample texture)", caller);
+ } else {
+ _mesa_error(ctx, GL_INVALID_ENUM, "%s(target)", caller);
+ }
+ return;
+ }
+
if (getteximage_error_check(ctx, texObj, texObj->Target, level,
xoffset, yoffset, zoffset, width, height, depth,
format, type, bufSize, pixels, caller)) {
--
2.11.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
