fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-21 06:30:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

st/mesa: Record shader access qualifiers for images

Browse source 
They're not required to be the same as the access flag on the image
unit.  For hardware that does shader image lowering based on the
qualifier (Intel), it may be required for state setup.

v2: (by Kenneth Graunke, incorporating feedback from Marek Olšák)
 - Reduce both access and shader_access to uint16_t to avoid making
   the pipe_image_view structure larger.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Jason Ekstrand 2018-10-01 22:16:59 -05:00 • committed by Kenneth Graunke
parent bf441d22a7
commit 8b626a22b2
5 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/include/pipe/p_state.h
View file

@ -484,7 +484,8 @@ struct pipe_image_view
{
struct pipe_resource *resource; /**< resource into which this is a view */
enum pipe_format format; /**< typed PIPE_FORMAT_x */
unsigned access; /**< PIPE_IMAGE_ACCESS_x */
uint16_t access; /**< PIPE_IMAGE_ACCESS_x */
uint16_t shader_access; /**< PIPE_IMAGE_ACCESS_x */
union {
struct {

27
src/mesa/state_tracker/st_atom_image.c
View file

@ -50,7 +50,7 @@
*/
void
st_convert_image(const struct st_context *st, const struct gl_image_unit *u,
struct pipe_image_view *img)
struct pipe_image_view *img, unsigned shader_access)
{
struct st_texture_object *stObj = st_texture_object(u->TexObj);
@ -70,6 +70,23 @@ st_convert_image(const struct st_context *st, const struct gl_image_unit *u,
unreachable("bad gl_image_unit::Access");
}
switch (shader_access) {
case GL_NONE:
img->shader_access = 0;
break;
case GL_READ_ONLY:
img->shader_access = PIPE_IMAGE_ACCESS_READ;
break;
case GL_WRITE_ONLY:
img->shader_access = PIPE_IMAGE_ACCESS_WRITE;
break;
case GL_READ_WRITE:
img->shader_access = PIPE_IMAGE_ACCESS_READ_WRITE;
break;
default:
unreachable("bad gl_image_unit::Access");
}
if (stObj->base.Target == GL_TEXTURE_BUFFER) {
struct st_buffer_object *stbuf =
st_buffer_object(stObj->base.BufferObject);
@ -125,7 +142,8 @@ st_convert_image(const struct st_context *st, const struct gl_image_unit *u,
void
st_convert_image_from_unit(const struct st_context *st,
struct pipe_image_view *img,
GLuint imgUnit)
GLuint imgUnit,
unsigned shader_access)
{
struct gl_image_unit *u = &st->ctx->ImageUnits[imgUnit];
@ -134,7 +152,7 @@ st_convert_image_from_unit(const struct st_context *st,
return;
}
st_convert_image(st, u, img);
st_convert_image(st, u, img, shader_access);
}
static void
@ -153,7 +171,8 @@ st_bind_images(struct st_context *st, struct gl_program *prog,
for (i = 0; i < prog->info.num_images; i++) {
struct pipe_image_view *img = &images[i];
st_convert_image_from_unit(st, img, prog->sh.ImageUnits[i]);
st_convert_image_from_unit(st, img, prog->sh.ImageUnits[i],
prog->sh.ImageAccess[i]);
}
cso_set_shader_images(st->cso_context, shader_type, 0,
prog->info.num_images, images);

2
src/mesa/state_tracker/st_cb_texture.c
View file

@ -3237,7 +3237,7 @@ st_NewImageHandle(struct gl_context *ctx, struct gl_image_unit *imgObj)
struct pipe_context *pipe = st->pipe;
struct pipe_image_view image;
st_convert_image(st, imgObj, &image);
st_convert_image(st, imgObj, &image, GL_READ_WRITE);
return pipe->create_image_handle(pipe, &image);
}

2
src/mesa/state_tracker/st_texture.c
View file

@ -540,7 +540,7 @@ st_create_image_handle_from_unit(struct st_context *st,
struct pipe_context *pipe = st->pipe;
struct pipe_image_view img;
st_convert_image_from_unit(st, &img, imgUnit);
st_convert_image_from_unit(st, &img, imgUnit, GL_READ_WRITE);
return pipe->create_image_handle(pipe, &img);
}

5
src/mesa/state_tracker/st_texture.h
View file

@ -320,12 +320,13 @@ st_compressed_format_fallback(struct st_context *st, mesa_format format);
void
st_convert_image(const struct st_context *st, const struct gl_image_unit *u,
struct pipe_image_view *img);
struct pipe_image_view *img, unsigned shader_access);
void
st_convert_image_from_unit(const struct st_context *st,
struct pipe_image_view *img,
GLuint imgUnit);
GLuint imgUnit,
unsigned shader_access);
void
st_convert_sampler(const struct st_context *st,