From beaba530102b7e48eb263e70f6e23b8db2cdbfa5 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Tue, 3 Dec 2024 14:17:12 +0200 Subject: [PATCH] brw: make intel_shader_enums.h opencl importable Signed-off-by: Lionel Landwerlin Reviewed-by: Caio Oliveira Part-of: --- src/intel/compiler/intel_shader_enums.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/intel/compiler/intel_shader_enums.h b/src/intel/compiler/intel_shader_enums.h index 60e6b607803..73008587ec9 100644 --- a/src/intel/compiler/intel_shader_enums.h +++ b/src/intel/compiler/intel_shader_enums.h @@ -5,7 +5,10 @@ #pragma once +#ifndef __OPENCL_VERSION__ #include +#include "util/bitscan.h" +#endif #include "compiler/shader_enums.h" #include "util/enum_operators.h" @@ -199,7 +202,7 @@ struct intel_cs_dispatch_info { uint32_t right_mask; }; -enum PACKED intel_compute_walk_order { +enum intel_compute_walk_order { INTEL_WALK_ORDER_XYZ = 0, INTEL_WALK_ORDER_XZY = 1, INTEL_WALK_ORDER_YXZ = 2, @@ -331,10 +334,9 @@ intel_fs_is_coarse(enum intel_sometimes shader_coarse_pixel_dispatch, assert(pushed_msaa_flags & INTEL_MSAA_FLAG_ENABLE_DYNAMIC); - if (pushed_msaa_flags & INTEL_MSAA_FLAG_COARSE_RT_WRITES) - assert(shader_coarse_pixel_dispatch != INTEL_NEVER); - else - assert(shader_coarse_pixel_dispatch != INTEL_ALWAYS); + assert((pushed_msaa_flags & INTEL_MSAA_FLAG_COARSE_RT_WRITES) ? + shader_coarse_pixel_dispatch != INTEL_NEVER : + shader_coarse_pixel_dispatch != INTEL_ALWAYS); return (pushed_msaa_flags & INTEL_MSAA_FLAG_COARSE_RT_WRITES) != 0; }