aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorNicolai Hähnle <[email protected]>2016-02-07 18:21:35 -0500
committerIlia Mirkin <[email protected]>2016-02-15 22:22:33 -0500
commitf1b0bda6bcac312c42caafbc753e476c64715eea (patch)
treee355366dd614a565313217d77fae1f696e718485 /src/mesa
parent78093167b18ac9cb40e449916e85590d595ab297 (diff)
st/mesa: call st_finalize_texture from image atoms
Reviewed-by: Ilia Mirkin <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/state_tracker/st_atom_image.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_atom_image.c b/src/mesa/state_tracker/st_atom_image.c
index 1025725235c..ff365377ac8 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) {