From a3f73acb9d2cdc62692af7ff93c51f910dff2d0d Mon Sep 17 00:00:00 2001
From: Jonathan Gray <jsg@cvs.openbsd.org>
Date: Tue, 2 Apr 2024 10:42:24 +0000
Subject: Merge Mesa 23.3.6

---
 lib/mesa/mk/libintel_common/Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'lib/mesa/mk/libintel_common')

diff --git a/lib/mesa/mk/libintel_common/Makefile b/lib/mesa/mk/libintel_common/Makefile
index e423ff6c6..a0385eaf1 100644
--- a/lib/mesa/mk/libintel_common/Makefile
+++ b/lib/mesa/mk/libintel_common/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2023/11/02 04:53:31 jsg Exp $
+#	$OpenBSD: Makefile,v 1.5 2024/04/02 10:42:13 jsg Exp $
 
 LIB=	intel_common
 
@@ -16,10 +16,14 @@ SRCS=	i915_intel_engine.c \
 	intel_gem.c \
 	intel_l3_config.c \
 	intel_measure.c \
+	intel_mem.c \
 	intel_sample_positions.c \
 	intel_urb_config.c \
 	intel_uuid.c
 
+SRCS+=	intel_clflushopt.c
+CFLAGS+= -mclflushopt
+
 i915_intel_engine.c:
 	ln -s ${MESA_SRC}/src/intel/common/i915/intel_engine.c $@
 i915_intel_gem.c:
@@ -31,11 +35,8 @@ xe_intel_gem.c:
 
 .include "../Makefile.inc"
 
-CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS}
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} ${C_SSE2_ARGS}
 CPPFLAGS+=	-I${MESA_SRC}/src/intel \
-		-I${MESA_SRC}/src/mesa \
-		-I${MESA_SRC}/src/mapi \
-		-I${MESA_SRC}/src/gallium/include \
 		-I${MESA_SRC}/src/intel/common \
 		-I${MESA_SRC}/generated/src \
 		-I${MESA_SRC}/generated/src/intel
-- 
cgit v1.2.3