From: George Kyriazis Date: Mon, 19 Mar 2018 22:46:13 +0000 (-0500) Subject: swr/rast: Simplify #define usage in gen source file X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ffc0aeb4ec90464ac124a4209e0027b34148833c;p=mesa.git swr/rast: Simplify #define usage in gen source file Removed preprocessor defines from structures passed to LLVM jitted code. The python scripts do not understand the preprocessor defines and ignores them. So for fields that are compiled out due to a preprocessor define the LLVM script accounts for them anyway because it doesn't know what the defines are set to. The sanitize defines for open source are fine in that they're safely used. Reviewed-by: Bruce Cherniak --- diff --git a/src/gallium/drivers/swr/rasterizer/core/state.h b/src/gallium/drivers/swr/rasterizer/core/state.h index 47ffacf53ff..084ca548375 100644 --- a/src/gallium/drivers/swr/rasterizer/core/state.h +++ b/src/gallium/drivers/swr/rasterizer/core/state.h @@ -234,13 +234,12 @@ struct SWR_VS_CONTEXT uint32_t InstanceID; // IN: Instance ID, constant across all verts of the SIMD simdscalari VertexID; // IN: Vertex ID simdscalari mask; // IN: Active mask for shader -#if USE_SIMD16_FRONTEND + + // SIMD16 Frontend fields. uint32_t AlternateOffset; // IN: amount to offset for interleaving even/odd simd8 in simd16vertex output -#if USE_SIMD16_VS simd16scalari mask16; // IN: Active mask for shader (16-wide) simd16scalari VertexID16; // IN: Vertex ID (16-wide) -#endif -#endif + SWR_SHADER_STATS stats; // OUT: shader statistics used for archrast. };