Module: Mesa Branch: main Commit: 5f22f35590cede22f9b14a93a5321ac1f1d68b0d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5f22f35590cede22f9b14a93a5321ac1f1d68b0d
Author: Dave Airlie <[email protected]> Date: Fri Aug 26 16:31:43 2022 +1000 lp_jit: use pipe max for the lp_jit texture levels. Align this with draw, so we the structs can be shared. Reviewed-by: Roland Scheidegger <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18265> --- src/gallium/drivers/llvmpipe/lp_jit.c | 2 +- src/gallium/drivers/llvmpipe/lp_jit.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/llvmpipe/lp_jit.c b/src/gallium/drivers/llvmpipe/lp_jit.c index 11ba078de4d..277543d13dc 100644 --- a/src/gallium/drivers/llvmpipe/lp_jit.c +++ b/src/gallium/drivers/llvmpipe/lp_jit.c @@ -61,7 +61,7 @@ create_jit_texture_type(struct gallivm_state *gallivm) elem_types[LP_JIT_TEXTURE_ROW_STRIDE] = elem_types[LP_JIT_TEXTURE_IMG_STRIDE] = elem_types[LP_JIT_TEXTURE_MIP_OFFSETS] = - LLVMArrayType(LLVMInt32TypeInContext(lc), LP_MAX_TEXTURE_LEVELS); + LLVMArrayType(LLVMInt32TypeInContext(lc), PIPE_MAX_TEXTURE_LEVELS); texture_type = LLVMStructTypeInContext(lc, elem_types, ARRAY_SIZE(elem_types), 0); diff --git a/src/gallium/drivers/llvmpipe/lp_jit.h b/src/gallium/drivers/llvmpipe/lp_jit.h index 350e12b21c9..45052315b52 100644 --- a/src/gallium/drivers/llvmpipe/lp_jit.h +++ b/src/gallium/drivers/llvmpipe/lp_jit.h @@ -57,11 +57,11 @@ struct lp_jit_texture uint32_t height; uint32_t depth; /* doubles as array size */ const void *base; - uint32_t row_stride[LP_MAX_TEXTURE_LEVELS]; - uint32_t img_stride[LP_MAX_TEXTURE_LEVELS]; + uint32_t row_stride[PIPE_MAX_TEXTURE_LEVELS]; + uint32_t img_stride[PIPE_MAX_TEXTURE_LEVELS]; uint32_t first_level; uint32_t last_level; - uint32_t mip_offsets[LP_MAX_TEXTURE_LEVELS]; + uint32_t mip_offsets[PIPE_MAX_TEXTURE_LEVELS]; uint32_t num_samples; uint32_t sample_stride; };
