Module: Mesa Branch: master Commit: f1b0bda6bcac312c42caafbc753e476c64715eea URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f1b0bda6bcac312c42caafbc753e476c64715eea
Author: Nicolai Hähnle <[email protected]> Date: Sun Feb 7 18:21:35 2016 -0500 st/mesa: call st_finalize_texture from image atoms Reviewed-by: Ilia Mirkin <[email protected]> --- src/mesa/state_tracker/st_atom_image.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mesa/state_tracker/st_atom_image.c b/src/mesa/state_tracker/st_atom_image.c index 1025725..ff36537 100644 --- a/src/mesa/state_tracker/st_atom_image.c +++ b/src/mesa/state_tracker/st_atom_image.c @@ -34,6 +34,7 @@ #include "util/u_inlines.h" #include "util/u_surface.h" +#include "st_cb_texture.h" #include "st_debug.h" #include "st_texture.h" #include "st_context.h" @@ -57,10 +58,13 @@ 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 || !stObj->pt) { + if (!stObj || + !st_finalize_texture(st->ctx, st->pipe, u->TexObj) || + !stObj->pt) { memset(img, 0, sizeof(*img)); continue; } + img->resource = stObj->pt; img->format = st_mesa_format_to_pipe_format(st, u->_ActualFormat); if (stObj->pt->target == PIPE_BUFFER) { _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
