From 9908b13af61f0cfaae4b750dfc90230314c53b7b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolai=20H=C3=A4hnle?= Date: Thu, 10 Mar 2016 15:15:02 -0500 Subject: [PATCH] st/mesa: check that the image unit is valid in st_bind_images MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák --- src/mesa/state_tracker/st_atom_image.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mesa/state_tracker/st_atom_image.c b/src/mesa/state_tracker/st_atom_image.c index d0f0c42a3b3..bf7486b794d 100644 --- a/src/mesa/state_tracker/st_atom_image.c +++ b/src/mesa/state_tracker/st_atom_image.c @@ -25,6 +25,7 @@ **************************************************************************/ #include "main/imports.h" +#include "main/shaderimage.h" #include "program/prog_parameter.h" #include "program/prog_print.h" #include "compiler/glsl/ir_uniform.h" @@ -60,7 +61,7 @@ st_bind_images(struct st_context *st, struct gl_shader *shader, struct st_texture_object *stObj = st_texture_object(u->TexObj); struct pipe_image_view *img = &images[i]; - if (!stObj || + if (!_mesa_is_image_unit_valid(st->ctx, u) || !st_finalize_texture(st->ctx, st->pipe, u->TexObj) || !stObj->pt) { memset(img, 0, sizeof(*img)); -- 2.30.2