From 97bbb7b6a3afadc22ef956f507f70998629fe99a Mon Sep 17 00:00:00 2001 From: Bruce Cherniak Date: Wed, 12 Apr 2017 18:43:25 -0500 Subject: [PATCH] swr: Align swr_context allocation to SIMD alignment. The context now contains SIMD vectors which must be aligned (specifically samplePositions in the rastState in the derived state). Failure to align can result in segv crash on unaligned memory access in vector instructions. Reviewed-by: Tim Rowley --- src/gallium/drivers/swr/swr_context.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/swr/swr_context.cpp b/src/gallium/drivers/swr/swr_context.cpp index 8c5a2692db7..6f46d666ac5 100644 --- a/src/gallium/drivers/swr/swr_context.cpp +++ b/src/gallium/drivers/swr/swr_context.cpp @@ -386,7 +386,7 @@ swr_destroy(struct pipe_context *pipe) if (screen->pipe == pipe) screen->pipe = NULL; - FREE(ctx); + AlignedFree(ctx); } @@ -452,7 +452,10 @@ swr_UpdateStatsFE(HANDLE hPrivateContext, const SWR_STATS_FE *pStats) struct pipe_context * swr_create_context(struct pipe_screen *p_screen, void *priv, unsigned flags) { - struct swr_context *ctx = CALLOC_STRUCT(swr_context); + struct swr_context *ctx = (struct swr_context *) + AlignedMalloc(sizeof(struct swr_context), KNOB_SIMD_BYTES); + memset(ctx, 0, sizeof(struct swr_context)); + ctx->blendJIT = new std::unordered_map; -- 2.30.2