<div dir="ltr">On Thu, Mar 30, 2017 at 5:37 AM, Samuel Pitoiset <<a href="mailto:samuel.pitoiset@gmail.com" target="_blank">samuel.pitoiset@gmail.com</a>> wrote: <div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Should be used by the state tracker when glGetImageHandleARB() is called in order to create a pipe_image_view template. Signed-off-by: Samuel Pitoiset <<a href="mailto:samuel.pitoiset@gmail.com">samuel.pitoiset@gmail.com</a>> --- src/mesa/state_tracker/st_atom_image.c | 103 ++++++++++++++++++--------------- src/mesa/state_tracker/st_texture.h | 4 ++ 2 files changed, 60 insertions(+), 47 deletions(-) diff --git a/src/mesa/state_tracker/st_atom_image.c b/src/mesa/state_tracker/st_atom_image.c index 5dd2cd64f9..10e1adf412 100644 --- a/src/mesa/state_tracker/st_atom_image.c +++ b/src/mesa/state_tracker/st_atom_image.c @@ -44,6 +44,61 @@ #include "st_program.h" #include "st_format.h" +void +st_convert_image(struct st_context *st, const struct gl_image_unit *u, + struct pipe_image_view *img) </blockquote><div> </div><div>I'd like to see a comment on this function to explain what it does. I think that's especially important for function with a generic name like "convert image". </div><div>Also, can 'st' be const qualified here? </div><div>-Brian </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> +{ + struct st_texture_object *stObj = st_texture_object(u->TexObj); + + img->resource = stObj->pt; + img->format = st_mesa_format_to_pipe_format(st, u->_ActualFormat); + + switch (u->Access) { + case GL_READ_ONLY: + img->access = PIPE_IMAGE_ACCESS_READ; + break; + case GL_WRITE_ONLY: + img->access = PIPE_IMAGE_ACCESS_WRITE; + break; + case GL_READ_WRITE: + img->access = PIPE_IMAGE_ACCESS_READ_WRITE; + break; + default: + unreachable("bad gl_image_unit::Access"); + } + + if (stObj->pt->target == PIPE_BUFFER) { + unsigned base, size; + + base = stObj->base.BufferOffset; + assert(base < stObj->pt->width0); + size = MIN2(stObj->pt->width0 - base, (unsigned)stObj->base.BufferSize); + + img->u.buf.offset = base; + img->u.buf.size = size; + } else { + img->u.tex.level = u->Level + stObj->base.MinLevel; + if (stObj->pt->target == PIPE_TEXTURE_3D) { + if (u->Layered) { + img->u.tex.first_layer = 0; + img->u.tex.last_layer = u_minify(stObj->pt->depth0, img->u.tex.level) - 1; + } else { + img->u.tex.first_layer = u->_Layer; + img->u.tex.last_layer = u->_Layer; + } + } else { + img->u.tex.first_layer = u->_Layer + stObj->base.MinLayer; + img->u.tex.last_layer = u->_Layer + stObj->base.MinLayer; + if (u->Layered && img->resource->array_size > 1) { + if (stObj->base.Immutable) + img->u.tex.last_layer += stObj->base.NumLayers - 1; + else + img->u.tex.last_layer += img->resource->array_size - 1; + } + } + } +} + static void st_bind_images(struct st_context *st, struct gl_program *prog, enum pipe_shader_type shader_type) @@ -70,53 +125,7 @@ st_bind_images(struct st_context *st, struct gl_program *prog, continue; } - img->resource = stObj->pt; - img->format = st_mesa_format_to_pipe_format(st, u->_ActualFormat); - - switch (u->Access) { - case GL_READ_ONLY: - img->access = PIPE_IMAGE_ACCESS_READ; - break; - case GL_WRITE_ONLY: - img->access = PIPE_IMAGE_ACCESS_WRITE; - break; - case GL_READ_WRITE: - img->access = PIPE_IMAGE_ACCESS_READ_WRITE; - break; - default: - unreachable("bad gl_image_unit::Access"); - } - - if (stObj->pt->target == PIPE_BUFFER) { - unsigned base, size; - - base = stObj->base.BufferOffset; - assert(base < stObj->pt->width0); - size = MIN2(stObj->pt->width0 - base, (unsigned)stObj->base.BufferSize); - - img->u.buf.offset = base; - img->u.buf.size = size; - } else { - img->u.tex.level = u->Level + stObj->base.MinLevel; - if (stObj->pt->target == PIPE_TEXTURE_3D) { - if (u->Layered) { - img->u.tex.first_layer = 0; - img->u.tex.last_layer = u_minify(stObj->pt->depth0, img->u.tex.level) - 1; - } else { - img->u.tex.first_layer = u->_Layer; - img->u.tex.last_layer = u->_Layer; - } - } else { - img->u.tex.first_layer = u->_Layer + stObj->base.MinLayer; - img->u.tex.last_layer = u->_Layer + stObj->base.MinLayer; - if (u->Layered && img->resource->array_size > 1) { - if (stObj->base.Immutable) - img->u.tex.last_layer += stObj->base.NumLayers - 1; - else - img->u.tex.last_layer += img->resource->array_size - 1; - } - } - } + st_convert_image(st, u, img); } cso_set_shader_images(st->cso_context, shader_type, 0, prog->info.num_images, images); diff --git a/src/mesa/state_tracker/st_texture.h b/src/mesa/state_tracker/st_texture.h index 0ce7989562..1a07833118 100644 --- a/src/mesa/state_tracker/st_texture.h +++ b/src/mesa/state_tracker/st_texture.h @@ -254,4 +254,8 @@ st_create_color_map_texture(struct gl_context *ctx); bool st_etc_fallback(struct st_context *st, struct gl_texture_image *texImage); +void +st_convert_image(struct st_context *st, const struct gl_image_unit *u, + struct pipe_image_view *img); + #endif -- 2.12.1 _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> </div></div>