KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st/mesa: set drawpixels swizzle before creating sampler view 

(some) drivers need to have the swizzle set prior to create_sampler_view
being called in order to actually apply it

Fixes: d11fefa961 ("st/mesa: optimize 4-component ubyte glDrawPixels")
Acked-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8107>
This commit is contained in:
Mike Blumenkrantz 2020-12-14 23:35:55 -05:00 committed by Marge Bot
parent ba74e1be22
commit a709d99bfd
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/mesa/state_tracker/st_cb_drawpixels.c
View File

@ -1231,7 +1231,7 @@ setup_sampler_swizzle(struct pipe_sampler_view *sv, GLenum format, GLenum type)
{
if ((format == GL_RGBA || format == GL_BGRA) && type == GL_UNSIGNED_BYTE) {
const struct util_format_description *desc =
util_format_description(sv->texture->format);
util_format_description(sv->format);
unsigned c0, c1, c2, c3;
/* Every gallium driver supports at least one 32-bit packed RGBA format.
@ -1377,17 +1377,22 @@ st_DrawPixels(struct gl_context *ctx, GLint x, GLint y,
st_upload_constants(st, &st->fp->Base);
}
/* create sampler view for the image */
sv[0] = st_create_texture_sampler_view(st->pipe, pt);
{
/* create sampler view for the image */
struct pipe_sampler_view templ;
u_sampler_view_default_template(&templ, pt, pt->format);
/* Set up the sampler view's swizzle */
setup_sampler_swizzle(&templ, format, type);
sv[0] = st->pipe->create_sampler_view(st->pipe, pt, &templ);
}
if (!sv[0]) {
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glDrawPixels");
pipe_resource_reference(&pt, NULL);
return;
}
/* Set up the sampler view's swizzle */
setup_sampler_swizzle(sv[0], format, type);
/* Create a second sampler view to read stencil. The stencil is
* written using the shader stencil export functionality.
*/