From d9893feb2c9d86345ea561f84d03e89229faa35d Mon Sep 17 00:00:00 2001 From: Nicolai Hähnle Date: Tue, 26 Apr 2016 19:54:41 -0500 Subject: gallium/cso: allow saving the first fragment shader image slot MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Brian Paul Reviewed-by: Marek Olšák --- src/mesa/state_tracker/st_atom_image.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/mesa') diff --git a/src/mesa/state_tracker/st_atom_image.c b/src/mesa/state_tracker/st_atom_image.c index e96d10a196c..9b8f5059ac0 100644 --- a/src/mesa/state_tracker/st_atom_image.c +++ b/src/mesa/state_tracker/st_atom_image.c @@ -34,6 +34,7 @@ #include "pipe/p_defines.h" #include "util/u_inlines.h" #include "util/u_surface.h" +#include "cso_cache/cso_context.h" #include "st_cb_texture.h" #include "st_debug.h" @@ -122,12 +123,12 @@ st_bind_images(struct st_context *st, struct gl_shader *shader, } } } - st->pipe->set_shader_images(st->pipe, shader_type, 0, shader->NumImages, - images); + cso_set_shader_images(st->cso_context, shader_type, 0, shader->NumImages, + images); /* clear out any stale shader images */ if (shader->NumImages < c->MaxImageUniforms) - st->pipe->set_shader_images( - st->pipe, shader_type, + cso_set_shader_images( + st->cso_context, shader_type, shader->NumImages, c->MaxImageUniforms - shader->NumImages, NULL); -- cgit v1.2.3