fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 17:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa/st: Allocate the gl_context with 16-byte alignment.

Browse source 
The _ModelProjectMatrix matrix embedded inside has members inside of it
marked as 16-byte aligned, and so the context also has to be 16-byte
aligned or access to those members would be invalid.  I believe the
compiler used this to use better 16-byte-aligned load/stores to other
members of the context, breaking when the context's alignment was only 8
(as normal mallocs guarantee).

Fixes: 3175b63a0d ("mesa: don't allocate matrices with malloc")
Tested-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8783>
This commit is contained in:
Eric Anholt 2021-01-29 09:59:34 -08:00 • committed by Marge Bot
parent 25c70a9a1e
commit 55e853d823
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mesa/state_tracker/st_context.c
View file

@ -1026,12 +1026,14 @@ st_create_context(gl_api api, struct pipe_context *pipe,
if (pipe->set_context_param) if (pipe->set_context_param)
funcs.PinDriverToL3Cache = st_pin_driver_to_l3_cache; funcs.PinDriverToL3Cache = st_pin_driver_to_l3_cache;
ctx = calloc(1, sizeof(struct gl_context)); /* gl_context must be 16-byte aligned due to the alignment on GLmatrix. */
ctx = align_malloc(sizeof(struct gl_context), 16);
if (!ctx) if (!ctx)
return NULL; return NULL;
memset(ctx, 0, sizeof(*ctx));
if (!_mesa_initialize_context(ctx, api, visual, shareCtx, &funcs)) { if (!_mesa_initialize_context(ctx, api, visual, shareCtx, &funcs)) {
free(ctx); align_free(ctx);
return NULL; return NULL;
} }
@ -1164,7 +1166,7 @@ st_destroy_context(struct st_context *st)
_mesa_destroy_debug_output(ctx); _mesa_destroy_debug_output(ctx);
free(ctx); align_free(ctx);
if (save_ctx == ctx) { if (save_ctx == ctx) {
/* unbind the context we just deleted */ /* unbind the context we just deleted */