Module Name: src
Committed By: rjs
Date: Sun Jul 16 22:20:54 UTC 2023
Modified Files:
src/external/mit/xorg/lib: driver.mk libglsl.mk libloader.mk libmesa.mk
src/external/mit/xorg/lib/dri: Makefile
src/external/mit/xorg/lib/gallium: Makefile
src/external/mit/xorg/lib/libEGL: Makefile
src/external/mit/xorg/lib/libGL: Makefile mesa-ver.mk
src/external/mit/xorg/lib/libgbm: Makefile
src/external/mit/xorg/lib/libglapi: Makefile
Log Message:
Make most of MesaLib build.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/driver.mk
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libglsl.mk \
src/external/mit/xorg/lib/libloader.mk
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/lib/libmesa.mk
cvs rdiff -u -r1.38 -r1.39 src/external/mit/xorg/lib/dri/Makefile
cvs rdiff -u -r1.49 -r1.50 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libEGL/Makefile
cvs rdiff -u -r1.33 -r1.34 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libGL/mesa-ver.mk
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libgbm/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/libglapi/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/driver.mk
diff -u src/external/mit/xorg/lib/driver.mk:1.4 src/external/mit/xorg/lib/driver.mk:1.5
--- src/external/mit/xorg/lib/driver.mk:1.4 Tue Sep 24 19:29:41 2019
+++ src/external/mit/xorg/lib/driver.mk Sun Jul 16 22:20:54 2023
@@ -1,50 +1,98 @@
-# $NetBSD: driver.mk,v 1.4 2019/09/24 19:29:41 maya Exp $
+# $NetBSD: driver.mk,v 1.5 2023/07/16 22:20:54 rjs Exp $
# stuff both dri and gallium drivers need.
# util
.PATH: ${X11SRCDIR.Mesa}/src/util
.PATH: ${X11SRCDIR.Mesa}/../src/util
+.PATH: ${X11SRCDIR.Mesa}/src/util/format
+.PATH: ${X11SRCDIR.Mesa}/../src/util/format
+.PATH: ${X11SRCDIR.Mesa}/src/util/perf
+.PATH: ${X11SRCDIR.Mesa}/../src/util/perf
SRCS.util= \
- hash_table.c \
+ anon_file.c \
build_id.c \
+ compress.c \
crc32.c \
+ dag.c \
disk_cache.c \
+ disk_cache_os.c \
+ double.c \
+ format_srgb.c \
+ fossilize_db.c \
+ hash_table.c \
fast_idiv_by_const.c \
half_float.c \
- format_srgb.c \
+ memstream.c \
mesa-sha1.c \
+ os_file.c \
+ os_memory_fd.c \
os_time.c \
ralloc.c \
UTILdebug.c \
+ UTILlog.c \
rand_xor.c \
rb_tree.c \
register_allocate.c \
rgtc.c \
set.c \
slab.c \
+ softfloat.c \
string_buffer.c \
strtod.c \
u_atomic.c \
u_cpu_detect.c \
+ u_debug.c \
+ u_hash_table.c \
+ u_idalloc.c \
u_math.c \
+ u_mm.c \
+ u_qsort.cpp \
u_queue.c \
+ u_printf.cpp \
u_process.c \
u_vector.c \
vma.c
-CPPFLAGS.format_srgb.c+= -I${X11SRCDIR.Mesa}/src/util
CPPFLAGS.hash_table.c+= -I${X11SRCDIR.Mesa}/src/util
-CPPFLAGS.MESAralloc.c+= -I${X11SRCDIR.Mesa}/src/util
CPPFLAGS.UTILdebug.c+= -I${X11SRCDIR.Mesa}/src/util \
-I${X11SRCDIR.Mesa}/src/mesa \
-I${X11SRCDIR.Mesa}/src \
-I${X11SRCDIR.Mesa}/src/gallium/include
+CPPFLAGS.format_srgb.c+= -I${X11SRCDIR.Mesa}/src/util
+CPPFLAGS.u_hash_table.c+= -I${X11SRCDIR.Mesa}/src/gallium/auxiliary
BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/util/debug.c UTILdebug.c
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/util/log.c UTILlog.c
+
+SRCS.format= \
+ u_format.c \
+ u_format_bptc.c \
+ u_format_etc.c \
+ u_format_fxt1.c \
+ u_format_latc.c \
+ u_format_other.c \
+ u_format_rgtc.c \
+ u_format_s3tc.c \
+ u_format_unpack_neon.c \
+ u_format_yuv.c \
+ u_format_zs.c \
+ u_format_table.c
+
+.for _f in ${SRCS.format}
+CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/util/format
+CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/../src/util/format
+CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/../src
+.endfor
+
+SRCS.perf= \
+ u_trace.c
+
+CPPFLAGS.u_trace.c+= -I${X11SRCDIR.Mesa}/src/util/perf
+CPPFLAGS.u_trace.c+= -I${X11SRCDIR.Mesa}/src/gallium/auxiliary
-SRCS+= ${SRCS.util}
+SRCS+= ${SRCS.util} ${SRCS.format} ${SRCS.perf}
# also need to pull in libdricommon.la libmegadriver_stub.la
.PATH: ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/common
Index: src/external/mit/xorg/lib/libglsl.mk
diff -u src/external/mit/xorg/lib/libglsl.mk:1.6 src/external/mit/xorg/lib/libglsl.mk:1.7
--- src/external/mit/xorg/lib/libglsl.mk:1.6 Tue Sep 24 19:29:41 2019
+++ src/external/mit/xorg/lib/libglsl.mk Sun Jul 16 22:20:54 2023
@@ -1,4 +1,4 @@
-# $NetBSD: libglsl.mk,v 1.6 2019/09/24 19:29:41 maya Exp $
+# $NetBSD: libglsl.mk,v 1.7 2023/07/16 22:20:54 rjs Exp $
LIBGLSL_GENERATED_CXX_FILES = \
glsl_lexer.cpp \
@@ -15,7 +15,8 @@ CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/compi
-I${X11SRCDIR.Mesa}/../src/compiler/glsl \
-I${X11SRCDIR.Mesa}/src/compiler/glsl/glcpp \
-I${X11SRCDIR.Mesa}/../src/compiler/glsl/glcpp \
- -I${X11SRCDIR.Mesa}/src/compiler/spirv
+ -I${X11SRCDIR.Mesa}/src/compiler/spirv \
+ -I${X11SRCDIR.Mesa}/../src/compiler/spirv
LIBGLSL_FILES = \
ast_array_index.cpp \
@@ -29,12 +30,13 @@ LIBGLSL_FILES = \
generate_ir.cpp \
gl_nir_lower_atomics.c \
gl_nir_link_atomics.c \
+ gl_nir_link_uniform_blocks.c \
gl_nir_link_uniform_initializers.c \
gl_nir_link_uniforms.c \
gl_nir_link_xfb.c \
gl_nir_linker.c \
- gl_nir_lower_bindless_images.c \
gl_nir_lower_buffers.c \
+ gl_nir_lower_images.c \
gl_nir_lower_samplers.c \
gl_nir_lower_samplers_as_deref.c \
glsl_parser_extras.cpp \
@@ -75,6 +77,7 @@ LIBGLSL_FILES = \
loop_unroll.cpp \
lower_blend_equation_advanced.cpp \
lower_buffer_access.cpp \
+ lower_builtins.cpp \
lower_const_arrays_to_uniforms.cpp \
lower_cs_derived.cpp \
lower_discard.cpp \
@@ -85,14 +88,13 @@ LIBGLSL_FILES = \
lower_int64.cpp \
lower_jumps.cpp \
lower_mat_op_to_vec.cpp \
- lower_noise.cpp \
lower_offset_array.cpp \
lower_packed_varyings.cpp \
+ lower_precision.cpp \
lower_named_interface_blocks.cpp \
lower_packing_builtins.cpp \
lower_subroutine.cpp \
lower_tess_level.cpp \
- lower_texture_projection.cpp \
lower_variable_index_to_cond_assign.cpp \
lower_vec_index_to_cond_assign.cpp \
lower_vec_index_to_swizzle.cpp \
@@ -103,6 +105,7 @@ LIBGLSL_FILES = \
lower_output_reads.cpp \
lower_shared_reference.cpp \
lower_ubo_reference.cpp \
+ lower_xfb_varying.cpp \
opt_algebraic.cpp \
opt_array_splitting.cpp \
opt_conditional_discard.cpp \
@@ -156,18 +159,23 @@ NIR_GENERATED_FILES = \
nir_opcodes.c \
nir_opt_algebraic.c
+#BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/compiler/nir/nir.c nir_nir.c
+
NIR_FILES = \
nir.c \
nir_builtin_builder.c \
nir_clone.c \
nir_control_flow.c \
nir_deref.c \
+ nir_divergence_analysis.c \
nir_dominance.c \
nir_from_ssa.c \
nir_gather_info.c \
+ nir_gather_ssa_types.c \
nir_gather_xfb_info.c \
nir_gs_count_vertices.c \
nir_inline_functions.c \
+ nir_inline_uniforms.c \
nir_instr_set.c \
nir_linking_helpers.c \
nir_liveness.c \
@@ -179,18 +187,28 @@ NIR_FILES = \
nir_lower_atomics_to_ssbo.c \
nir_lower_bit_size.c \
nir_lower_bitmap.c \
+ nir_lower_bool_to_float.c \
nir_lower_bool_to_int32.c \
nir_lower_clamp_color_outputs.c \
nir_lower_clip.c \
nir_lower_clip_cull_distance_arrays.c \
- nir_lower_constant_initializers.c \
+ nir_lower_clip_disable.c \
nir_lower_double_ops.c \
+ nir_lower_discard_or_demote.c \
nir_lower_drawpixels.c \
+ nir_lower_flatshade.c \
+ nir_lower_flrp.c \
+ nir_lower_fp16_conv.c \
+ nir_lower_fragcoord_wtrans.c \
+ nir_lower_frexp.c \
nir_lower_global_vars_to_local.c \
+ nir_lower_goto_ifs.c \
nir_lower_gs_intrinsics.c \
nir_lower_idiv.c \
+ nir_lower_image.c \
nir_lower_indirect_derefs.c \
nir_lower_int64.c \
+ nir_lower_int_to_float.c \
nir_lower_io.c \
nir_lower_io_arrays_to_elements.c \
nir_lower_io_to_scalar.c \
@@ -198,27 +216,39 @@ NIR_FILES = \
nir_lower_io_to_temporaries.c \
nir_lower_load_const_to_scalar.c \
nir_lower_locals_to_regs.c \
+ nir_lower_mediump.c \
nir_lower_packing.c \
nir_lower_passthrough_edgeflags.c \
nir_lower_patch_vertices.c \
nir_lower_phis_to_scalar.c \
+ nir_lower_pntc_ytransform.c \
+ nir_lower_point_size.c \
+ nir_lower_point_size_mov.c \
nir_lower_regs_to_ssa.c \
nir_lower_returns.c \
+ nir_lower_samplers.c \
+ nir_lower_scratch.c \
nir_lower_subgroups.c \
nir_lower_system_values.c \
+ nir_lower_sysvals_to_varyings.c \
nir_lower_tex.c \
+ nir_lower_texcoord_replace.c \
nir_lower_to_source_mods.c \
nir_lower_two_sided_color.c \
+ nir_lower_ubo_vec4.c \
nir_lower_uniforms_to_ubo.c \
nir_lower_var_copies.c \
+ nir_lower_variable_initializers.c \
nir_lower_vars_to_ssa.c \
nir_lower_vec_to_movs.c \
+ nir_lower_viewport_transform.c \
nir_lower_wpos_center.c \
nir_lower_wpos_ytransform.c \
nir_metadata.c \
- nir_move_load_const.c \
nir_move_vec_src_uses_to_dest.c \
nir_normalize_cubemap_coords.c \
+ nir_opt_access.c \
+ nir_opt_barriers.c \
nir_opt_combine_stores.c \
nir_opt_comparison_pre.c \
nir_opt_conditional_discard.c \
@@ -230,30 +260,40 @@ NIR_FILES = \
nir_opt_dead_cf.c \
nir_opt_dead_write_vars.c \
nir_opt_find_array_copies.c \
+ nir_opt_fragdepth.c \
nir_opt_gcm.c \
nir_opt_idiv_const.c \
nir_opt_if.c \
nir_opt_intrinsics.c \
nir_opt_large_constants.c \
+ nir_opt_load_store_vectorize.c \
nir_opt_loop_unroll.c \
- nir_opt_move_comparisons.c \
- nir_opt_move_load_ubo.c \
+ nir_opt_memcpy.c \
+ nir_opt_move.c \
+ nir_opt_move_discards_to_top.c \
+ nir_opt_offsets.c \
nir_opt_peephole_select.c \
+ nir_opt_phi_precision.c \
+ nir_opt_rematerialize_compares.c \
nir_opt_remove_phis.c \
- nir_opt_shrink_load.c \
+ nir_opt_shrink_vectors.c \
+ nir_opt_sink.c \
nir_opt_trivial_continues.c \
nir_opt_undef.c \
+ nir_opt_uniform_atomics.c \
+ nir_opt_vectorize.c \
nir_phi_builder.c \
nir_print.c \
nir_propagate_invariant.c \
+ nir_range_analysis.c \
nir_remove_dead_variables.c \
nir_repair_ssa.c \
+ nir_schedule.c \
nir_search.c \
nir_serialize.c \
nir_split_per_member_structs.c \
nir_split_var_copies.c \
nir_split_vars.c \
- nir_strip.c \
nir_sweep.c \
nir_to_lcssa.c \
nir_validate.c \
Index: src/external/mit/xorg/lib/libloader.mk
diff -u src/external/mit/xorg/lib/libloader.mk:1.6 src/external/mit/xorg/lib/libloader.mk:1.7
--- src/external/mit/xorg/lib/libloader.mk:1.6 Sun Mar 29 21:06:03 2020
+++ src/external/mit/xorg/lib/libloader.mk Sun Jul 16 22:20:54 2023
@@ -1,4 +1,4 @@
-# $NetBSD: libloader.mk,v 1.6 2020/03/29 21:06:03 maya Exp $
+# $NetBSD: libloader.mk,v 1.7 2023/07/16 22:20:54 rjs Exp $
# makefile fragment for mesa src/loader
@@ -7,6 +7,7 @@
.PATH: ${X11SRCDIR.Mesa}/src/util
SRCS.loader += \
loader.c \
+ loader_dri_helper.c \
pci_id_driver_map.c \
xmlconfig.c
Index: src/external/mit/xorg/lib/libmesa.mk
diff -u src/external/mit/xorg/lib/libmesa.mk:1.14 src/external/mit/xorg/lib/libmesa.mk:1.15
--- src/external/mit/xorg/lib/libmesa.mk:1.14 Mon Apr 12 03:57:06 2021
+++ src/external/mit/xorg/lib/libmesa.mk Sun Jul 16 22:20:54 2023
@@ -1,4 +1,4 @@
-# $NetBSD: libmesa.mk,v 1.14 2021/04/12 03:57:06 mrg Exp $
+# $NetBSD: libmesa.mk,v 1.15 2023/07/16 22:20:54 rjs Exp $
#
# Consumer of this Makefile should set MESA_SRC_MODULES.
@@ -8,12 +8,13 @@ CPPFLAGS.ac_surface.c+= ${${ACTIVE_CC} =
# Please keep the organization in line with those files.
# Main sources
-PATHS.main= mesa/main ../../src/mesa/main ../../src/mapi/glapi
-INCLUDES.main= glsl mesa/main ../../src/compiler/nir
+PATHS.main= mesa/main mapi/glapi
+PATHS.main+= ../../src/mesa ../../src/mesa/main ../../src/mapi/glapi/gen
+INCLUDES.main= glsl mesa/main ../../src/compiler/nir ../../src/mesa
+INCLUDES.main+= gallium/auxiliary ../../src
SRCS.main= \
accum.c \
api_arrayelt.c \
- api_loopback.c \
api_exec.c \
arbprogram.c \
arrayobj.c \
@@ -57,8 +58,6 @@ SRCS.main= \
ffvertex_prog.c \
fog.c \
format_fallback.c \
- format_pack.c \
- format_unpack.c \
format_utils.c \
formatquery.c \
formats.c \
@@ -69,18 +68,28 @@ SRCS.main= \
glformats.c \
glspirv.c \
glthread.c \
+ glthread_bufferobj.c \
+ glthread_draw.c \
+ glthread_get.c \
+ glthread_list.c \
+ glthread_shaderobj.c \
+ glthread_varray.c \
hash.c \
hint.c \
histogram.c \
image.c \
- imports.c \
light.c \
lines.c \
- marshal.c \
- marshal_generated.c \
+ marshal_generated0.c \
+ marshal_generated1.c \
+ marshal_generated2.c \
+ marshal_generated3.c \
+ marshal_generated4.c \
+ marshal_generated5.c \
+ marshal_generated6.c \
+ marshal_generated7.c \
matrix.c \
mipmap.c \
- mm.c \
multisample.c \
objectlabel.c \
objectpurge.c \
@@ -110,11 +119,11 @@ SRCS.main= \
shaderobj.c \
shader_query.cpp \
shared.c \
+ spirv_extensions.c \
state.c \
stencil.c \
syncobj.c \
texcompress.c \
- texcompress_astc.cpp \
texcompress_bptc.c \
texcompress_cpal.c \
texcompress_etc.c \
@@ -127,6 +136,7 @@ SRCS.main= \
texgetimage.c \
teximage.c \
texobj.c \
+ texcompress_astc.cpp \
texparam.c \
texstate.c \
texstorage.c \
@@ -145,14 +155,18 @@ SRCS.main= \
# AMD common code
PATHS.amd= amd/common amd/addrlib/src amd/addrlib/src/core \
- amd/addrlib/src/gfx9 amd/addrlib/src/r800
+ amd/addrlib/src/gfx9 amd/addrlib/src/r800 \
+ amd/addrlib/src/gfx10 amd/llvm ../../src/amd/common
INCLUDES.amd= amd amd/common ../../src/amd/common \
amd/addrlib amd/addrlib/inc \
amd/addrlib/src amd/addrlib/src/core \
amd/addrlib/src/r800 \
amd/addrlib/src/chip/r800 \
amd/addrlib/src/gfx9 \
- amd/addrlib/src/chip/gfx9
+ amd/addrlib/src/chip/gfx9 \
+ amd/addrlib/src/gfx10 \
+ amd/addrlib/src/chip/gfx10 \
+ amd/llvm ../src/util
SRCS.amd+= \
addrinterface.cpp \
@@ -163,18 +177,30 @@ SRCS.amd+= \
addrobject.cpp \
coord.cpp \
gfx9addrlib.cpp \
+ gfx10addrlib.cpp \
+ gfx10_format_table.c \
ciaddrlib.cpp \
egbaddrlib.cpp \
siaddrlib.cpp \
ac_binary.c \
+ ac_debug.c \
+ ac_gpu_info.c \
ac_llvm_build.c \
+ ac_llvm_cull.c \
ac_llvm_helper.cpp \
ac_llvm_util.c \
- ac_shader_util.c \
+ ac_msgpack.c \
+ ac_nir.c \
ac_nir_to_llvm.c \
- ac_gpu_info.c \
+ ac_perfcounter.c \
+ ac_rgp.c \
+ ac_rgp_elf_object_pack.c \
+ ac_shader_args.c \
+ ac_shader_util.c \
+ ac_shadowed_regs.c \
+ ac_sqtt.c \
ac_surface.c \
- ac_debug.c
+ ac_rtld.c
# XXX avoid source name clashes with glx
.PATH: ${X11SRCDIR.Mesa}/src/mesa/main
@@ -210,7 +236,6 @@ SRCS.vbo= \
vbo_exec_eval.c \
vbo_minmax_index.c \
vbo_noop.c \
- vbo_primitive_restart.c \
vbo_save_api.c \
vbo_save.c \
vbo_save_draw.c \
@@ -345,7 +370,7 @@ COPTS.sse_minmax.c+= -msse4.1
PATHS.state_tracker= mesa/state_tracker
INCLUDES.state_tracker= glsl mesa/main
SRCS.state_tracker= \
- st_atifs_to_tgsi.c \
+ st_atifs_to_nir.c \
st_atom.c \
st_atom_array.c \
st_atom_atomicbuf.c \
@@ -384,6 +409,7 @@ SRCS.state_tracker= \
st_cb_memoryobjects.c \
st_cb_msaa.c \
st_cb_perfmon.c \
+ st_cb_perfquery.c \
st_cb_program.c \
st_cb_queryobj.c \
st_cb_rasterpos.c \
@@ -409,9 +435,7 @@ SRCS.state_tracker= \
st_glsl_to_tgsi_array_merge.cpp \
st_glsl_to_tgsi_private.cpp \
st_glsl_to_tgsi_temprename.cpp \
- st_glsl_types.cpp \
st_manager.c \
- st_mesa_to_tgsi.c \
st_nir_builtins.c \
st_nir_lower_builtin.c \
st_nir_lower_tex_src_plane.c \
@@ -421,6 +445,7 @@ SRCS.state_tracker= \
st_scissor.c \
st_shader_cache.c \
st_texture.c \
+ st_tgsi_lower_depth_clamp.c \
st_tgsi_lower_yuv.c
# Program sources
@@ -514,6 +539,7 @@ CPPFLAGS+= \
-D__STDC_LIMIT_MACROS \
-DUSE_GCC_ATOMIC_BUILTINS \
-DNDEBUG \
+ -DHAVE_COMPRESSION \
-DHAVE_SYS_SYSCTL_H \
-DHAVE_DLFCN_H \
-DHAVE_STRTOF \
@@ -537,9 +563,13 @@ LLVM_VERSION!= cd ${NETBSDSRCDIR}/exter
HAVE_LLVM_VERSION!= expr ${LLVM_VERSION:R:R} \* 256 + ${LLVM_VERSION:R:E} \* 16
CPPFLAGS+= \
-DHAVE_LLVM=${HAVE_LLVM_VERSION}
+CPPFLAGS+= -DLLVM_AVAILABLE -DDRAW_LLVM_AVAILABLE
CXXFLAGS+= -fno-rtti
.endif
+CPPFLAGS+= \
+ -DLITTLEENDIAN_CPU
+
.include "../asm.mk"
CPPFLAGS+= \
Index: src/external/mit/xorg/lib/dri/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.38 src/external/mit/xorg/lib/dri/Makefile:1.39
--- src/external/mit/xorg/lib/dri/Makefile:1.38 Sun Jul 11 20:52:06 2021
+++ src/external/mit/xorg/lib/dri/Makefile Sun Jul 16 22:20:54 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2021/07/11 20:52:06 mrg Exp $
+# $NetBSD: Makefile,v 1.39 2023/07/16 22:20:54 rjs Exp $
# Link the mesa_dri_drivers mega driver.
@@ -54,6 +54,8 @@ DRIVERS= r200 radeon
DRI_SUBDIRS= ${DRIVERS}
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+
DRI_SOURCES.i915+= \
i830_context.c \
i830_state.c \
@@ -107,28 +109,23 @@ CPPFLAGS.i915_${_f}+= -I${X11SRCDIR.Mesa
.PATH: ${X11SRCDIR.Mesa}/src/intel/common
.PATH: ${X11SRCDIR.Mesa}/src/intel/compiler
.PATH: ${X11SRCDIR.Mesa}/src/intel/dev
+.PATH: ${X11SRCDIR.Mesa}/src/intel/ds
.PATH: ${X11SRCDIR.Mesa}/src/intel/isl
.PATH: ${X11SRCDIR.Mesa}/src/intel/perf
.PATH: ${X11SRCDIR.Mesa}/../src/intel/
+.PATH: ${X11SRCDIR.Mesa}/../src/intel/compiler
+.PATH: ${X11SRCDIR.Mesa}/../src/intel/isl
.PATH: ${X11SRCDIR.Mesa}/../src/intel/perf
DRI_SOURCES.i965+= \
blorp.c \
blorp_blit.c \
blorp_clear.c \
- gen_batch_decoder.c \
- gen_debug.c \
- gen_decoder.c \
- gen_device_info.c \
- gen_disasm.c \
- gen_l3_config.c \
- gen_perf.c \
- gen_perf_mdapi.c \
- gen_perf_metrics.c \
- gen_urb_config.c \
- intel_log.c \
brw_binding_tables.c \
+ brw_blit.c \
brw_blorp.c \
+ brw_buffer_objects.c \
+ brw_buffers.c \
brw_bufmgr.c \
brw_cfg.cpp \
brw_clear.c \
@@ -139,11 +136,13 @@ DRI_SOURCES.i965+= \
brw_clip_unfilled.c \
brw_clip_util.c \
brw_compile_clip.c \
+ brw_compile_ff_gs.c \
brw_compile_sf.c \
brw_compiler.c \
brw_compute.c \
brw_conditional_render.c \
brw_context.c \
+ brw_copy_image.c \
brw_cs.c \
brw_curbe.c \
brw_dead_control_flow.cpp \
@@ -153,14 +152,12 @@ DRI_SOURCES.i965+= \
brw_disk_cache.c \
brw_draw.c \
brw_draw_upload.c \
- brw_eu.c \
+ brw_eu.cpp \
brw_eu_compact.c \
brw_eu_emit.c \
brw_eu_util.c \
brw_eu_validate.c \
- brw_ff_gs.c \
- brw_ff_gs_emit.c \
- brw_formatquery.c \
+ brw_extensions.c \
brw_fs.cpp \
brw_fs_bank_conflicts.cpp \
brw_fs_cmod_propagation.cpp \
@@ -176,33 +173,46 @@ DRI_SOURCES.i965+= \
brw_fs_reg_allocate.cpp \
brw_fs_register_coalesce.cpp \
brw_fs_saturate_propagation.cpp \
+ brw_fs_scoreboard.cpp \
brw_fs_sel_peephole.cpp \
brw_fs_validate.cpp \
brw_fs_visitor.cpp \
+ brw_ff_gs.c \
+ brw_formatquery.c \
brw_generate_mipmap.c \
brw_gs.c \
brw_gs_surface_state.c \
brw_interpolation_map.c \
- brw_link.cpp \
+ brw_ir_performance.cpp \
brw_meta_util.c \
brw_misc_state.c \
brw_nir.c \
brw_nir_analyze_boolean_resolves.c \
brw_nir_analyze_ubo_ranges.c \
brw_nir_attribute_workarounds.c \
+ brw_nir_clamp_image_1d_2d_array_sizes.c \
+ brw_nir_lower_alpha_to_coverage.c \
brw_nir_lower_conversions.c \
brw_nir_lower_cs_intrinsics.c \
- brw_nir_lower_image_load_store.c \
+ brw_nir_lower_intersection_shader.c \
brw_nir_lower_mem_access_bit_sizes.c \
+ brw_nir_lower_rt_intrinsics.c \
+ brw_nir_lower_scoped_barriers.c \
+ brw_nir_lower_shader_calls.c \
+ brw_nir_lower_storage_image.c \
brw_nir_opt_peephole_ffma.c \
+ brw_nir_rt.c \
brw_nir_tcs_workarounds.c \
brw_nir_trig_workarounds.c \
- brw_nir_uniforms.cpp \
brw_object_purgeable.c \
brw_packed_float.c \
brw_performance_query.c \
- brw_performance_query_mdapi.c \
brw_pipe_control.c \
+ brw_pixel.c \
+ brw_pixel_bitmap.c \
+ brw_pixel_copy.c \
+ brw_pixel_draw.c \
+ brw_pixel_read.c \
brw_predicated_break.cpp \
brw_primitive_restart.c \
brw_program.c \
@@ -211,9 +221,11 @@ DRI_SOURCES.i965+= \
brw_queryobj.c \
brw_reg_type.c \
brw_reset.c \
- brw_schedule_instructions.cpp \
+ brw_screen.c \
brw_sf.c \
+ brw_schedule_instructions.cpp \
brw_shader.cpp \
+ brw_state.c \
brw_state_upload.c \
brw_surface_formats.c \
brw_sync.c \
@@ -221,6 +233,11 @@ DRI_SOURCES.i965+= \
brw_tcs_surface_state.c \
brw_tes.c \
brw_tes_surface_state.c \
+ brw_tex.c \
+ brw_tex_copy.c \
+ brw_tex_image.c \
+ brw_tex_validate.c \
+ brw_upload.c \
brw_urb.c \
brw_util.c \
brw_vec4.cpp \
@@ -245,59 +262,59 @@ DRI_SOURCES.i965+= \
brw_wm.c \
brw_wm_iz.cpp \
brw_wm_surface_state.c \
- gen6_clip_state.c \
- gen6_constant_state.c \
- gen6_gs_visitor.cpp \
- gen6_multisample_state.c \
- gen6_queryobj.c \
- gen6_sampler_state.c \
- gen6_sol.c \
- gen6_urb.c \
- gen7_l3_state.c \
- gen7_sol_state.c \
- gen7_urb.c \
- gen8_depth_state.c \
- gen8_multisample_state.c \
+ gfx6_clip_state.c \
+ gfx6_constant_state.c \
+ gfx6_gs_visitor.cpp \
+ gfx6_multisample_state.c \
+ gfx6_queryobj.c \
+ gfx6_sampler_state.c \
+ gfx6_sol.c \
+ gfx6_urb.c \
+ gfx7_l3_state.c \
+ gfx7_sol_state.c \
+ gfx7_urb.c \
+ gfx8_depth_state.c \
+ gfx8_multisample_state.c \
hsw_queryobj.c \
hsw_sol.c \
isl.c \
+ isl_aux_info.c \
isl_drm.c \
isl_format.c \
isl_format_layout.c \
- isl_gen4.c \
- isl_gen6.c \
- isl_gen7.c \
- isl_gen8.c \
- isl_gen9.c \
+ isl_gfx4.c \
+ isl_gfx6.c \
+ isl_gfx7.c \
+ isl_gfx8.c \
+ isl_gfx9.c \
+ isl_gfx12.c \
isl_storage_image.c \
isl_tiled_memcpy.c \
isl_tiled_memcpy_normal.c \
isl_tiled_memcpy_sse41.c
-I965_INTEL_FILES = \
- intel_batchbuffer.c \
- intel_blit.c \
- intel_buffer_objects.c \
- intel_buffers.c \
- intel_copy_image.c \
- intel_extensions.c \
- intel_fbo.c \
- intel_mipmap_tree.c \
- intel_pixel.c \
- intel_pixel_bitmap.c \
- intel_pixel_copy.c \
- intel_pixel_draw.c \
- intel_pixel_read.c \
- intel_screen.c \
- intel_state.c \
- intel_tex.c \
- intel_tex_copy.c \
- intel_tex_image.c \
- intel_tex_validate.c \
- intel_upload.c
+I965_INTEL_COMMON_FILES = \
+ intel_aux_map.c \
+ intel_batch_decoder.c \
+ intel_decoder.c \
+ intel_disasm.c \
+ intel_gem.c \
+ intel_l3_config.c \
+ intel_measure.c \
+ intel_sample_positions.c \
+ intel_urb_config.c \
+ intel_uuid.c
+
+I965_INTEL_DEV_FILES = \
+ intel_debug.c \
+ intel_dev_info.c \
+ intel_device_info.c
+
+I965_INTEL_PERF_FILES = \
+ intel_pps_driver.cc \
+ intel_pps_perf.cc
-
-INTEL_GENS_BLORP= 40 45 50 60 70 75 80 90 100 110
+INTEL_GENS_BLORP= 40 45 50 60 70 75 80 90 110
.for _gen in ${INTEL_GENS_BLORP}
BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/i965/genX_state_upload.c ${_gen}_state_upload.c
@@ -305,39 +322,48 @@ BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/m
BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/i965/genX_pipe_control.c ${_gen}_pipe_control.c
DRI_SOURCES.i965+= ${_gen}_state_upload.c ${_gen}_blorp_exec.c ${_gen}_pipe_control.c
-CPPFLAGS.${_gen}_state_upload.c+= -DGEN_VERSIONx10=${_gen}
-CPPFLAGS.${_gen}_blorp_exec.c+= -DGEN_VERSIONx10=${_gen}
-CPPFLAGS.${_gen}_pipe_control.c+= -DGEN_VERSIONx10=${_gen}
+CPPFLAGS.${_gen}_state_upload.c+= -DGFX_VERx10=${_gen}
+CPPFLAGS.${_gen}_blorp_exec.c+= -DGFX_VERx10=${_gen}
+CPPFLAGS.${_gen}_pipe_control.c+= -DGFX_VERx10=${_gen}
.endfor
-INTEL_GENS_ISL= 40 50 60 70 75 80 90 100 110
+INTEL_GENS_ISL= 40 50 60 70 75 80 90 110 120 125
.for _gen in ${INTEL_GENS_ISL}
BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/intel/isl/isl_emit_depth_stencil.c ${_gen}_isl_emit_depth_stencil.c
BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/intel/isl/isl_surface_state.c ${_gen}_isl_surface_state.c
DRI_SOURCES.i965+= ${_gen}_isl_emit_depth_stencil.c ${_gen}_isl_surface_state.c
-CPPFLAGS.${_gen}_isl_emit_depth_stencil.c+= -DGEN_VERSIONx10=${_gen} -I${X11SRCDIR.Mesa}/src/intel/isl/
-CPPFLAGS.${_gen}_isl_surface_state.c+= -DGEN_VERSIONx10=${_gen} -I${X11SRCDIR.Mesa}/src/intel/isl/
+CPPFLAGS.${_gen}_isl_emit_depth_stencil.c+= -DGFX_VERx10=${_gen} -I${X11SRCDIR.Mesa}/src/intel/isl/
+CPPFLAGS.${_gen}_isl_surface_state.c+= -DGFX_VERx10=${_gen} -I${X11SRCDIR.Mesa}/src/intel/isl/
.endfor
-.for _f in ${I965_INTEL_FILES}
-BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/i965/${_f} i965_${_f}
+.for _f in ${I965_INTEL_COMMON_FILES}
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/intel/common/${_f} i965_${_f}
+DRI_SOURCES.i965+= i965_${_f}
+.endfor
+.for _f in ${I965_INTEL_DEV_FILES}
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/intel/dev/${_f} i965_${_f}
DRI_SOURCES.i965+= i965_${_f}
.endfor
.for _f in ${DRI_SOURCES.i965}
CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/i965 \
-I${X11SRCDIR.Mesa}/src/intel \
+ -I${X11SRCDIR.Mesa}/src/intel/common \
-I${X11SRCDIR.Mesa}/src/intel/compiler \
+ -I${X11SRCDIR.Mesa}/src/intel/dev \
-I${X11SRCDIR.Mesa}/../src/intel \
-I${X11SRCDIR.Mesa}/src/compiler/nir \
- -I${X11SRCDIR.Mesa}/../src/compiler/nir
+ -I${X11SRCDIR.Mesa}/../src/compiler/nir \
+ -I${X11SRCDIR.Mesa}/../src
.endfor
# Needs mfence
CPPFLAGS.brw_bufmgr.c+= -msse2
+.endif
+
DRI_SOURCES.r200 = \
r200_context.c \
r200_ioctl.c \
Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.49 src/external/mit/xorg/lib/gallium/Makefile:1.50
--- src/external/mit/xorg/lib/gallium/Makefile:1.49 Tue Feb 7 06:19:03 2023
+++ src/external/mit/xorg/lib/gallium/Makefile Sun Jul 16 22:20:54 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2023/02/07 06:19:03 mrg Exp $
+# $NetBSD: Makefile,v 1.50 2023/07/16 22:20:54 rjs Exp $
# Link the gallium mega driver.
@@ -30,8 +30,8 @@ LDFLAGS+= -pthread
# Reduce debugging for these extremely large objects.
.if ${MKDEBUG:Uno} != "no"
-CXXFLAGS+= -g1
-CFLAGS+= -g1
+#CXXFLAGS+= -g1
+#CFLAGS+= -g1
.endif
GALLIUM_SUBDIRS= \
@@ -52,6 +52,7 @@ GALLIUM_SUBDIRS= \
auxiliary/rbug \
auxiliary/renderonly \
auxiliary/rtasm \
+ auxiliary/tessellator \
auxiliary/tgsi \
auxiliary/translate \
auxiliary/util \
@@ -63,10 +64,10 @@ GALLIUM_SUBDIRS= \
winsys/sw/kms-dri \
winsys/sw/null \
winsys/sw/wrapper \
- state_trackers/dri
+ frontends/dri
GALLIUM_SUBDIRS_VDPAU= \
- state_trackers/vdpau
+ frontends/vdpau
GALLIUM_SUBDIRS_LLVMPIPE= \
auxiliary/gallivm \
@@ -79,6 +80,7 @@ GALLIUM_SUBDIRS_ATI= \
drivers/r300/compiler \
drivers/r600 \
drivers/r600/sb \
+ drivers/r600/sfn \
winsys/radeon/drm \
winsys/amdgpu/drm
@@ -86,6 +88,14 @@ GALLIUM_SUBDIRS_I915= \
drivers/i915 \
winsys/i915/drm
+GALLIUM_SUBDIRS_IRIS= \
+ drivers/iris \
+ winsys/iris/drm
+
+GALLIUM_SUBDIRS_CROCUS= \
+ drivers/crocus \
+ winsys/crocus/drm
+
GALLIUM_SUBDIRS_NOUVEAU= \
drivers/nouveau \
drivers/nouveau/nv30 \
@@ -99,8 +109,12 @@ BUILD_NOUVEAU=0
BUILD_VDPAU=0
BUILD_LLVMPIPE=0
BUILD_I915=0
+BUILD_IRIS=0
+BUILD_CROCUS=0
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
BUILD_I915=1
+#BUILD_IRIS=1
+#BUILD_CROCUS=1
.endif
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
BUILD_NOUVEAU=1
@@ -138,6 +152,12 @@ GALLIUM_SUBDIRS+= ${GALLIUM_SUBDIRS_VDPA
.if ${BUILD_I915} == 1
GALLIUM_SUBDIRS+= ${GALLIUM_SUBDIRS_I915}
.endif
+.if ${BUILD_IRIS} == 1
+GALLIUM_SUBDIRS+= ${GALLIUM_SUBDIRS_IRIS}
+.endif
+.if ${BUILD_CROCUS} == 1
+GALLIUM_SUBDIRS+= ${GALLIUM_SUBDIRS_CROCUS}
+.endif
.if ${BUILD_LLVMPIPE} == 1
GALLIUM_SUBDIRS+= ${GALLIUM_SUBDIRS_LLVMPIPE}
.endif
@@ -162,6 +182,7 @@ GALLIUM_SOURCES.auxiliary/draw= \
draw_pipe_stipple.c \
draw_pipe_twoside.c \
draw_pipe_unfilled.c \
+ draw_pipe_user_cull.c \
draw_pipe_util.c \
draw_pipe_validate.c \
draw_pipe_vbuf.c \
@@ -171,13 +192,13 @@ GALLIUM_SOURCES.auxiliary/draw= \
draw_pt.c \
draw_pt_emit.c \
draw_pt_fetch.c \
- draw_pt_fetch_emit.c \
draw_pt_fetch_shade_emit.c \
draw_pt_fetch_shade_pipeline.c \
draw_pt_post_vs.c \
draw_pt_so_emit.c \
draw_pt_util.c \
draw_pt_vsplit.c \
+ draw_tess.c \
draw_vertex.c \
draw_vs.c \
draw_vs_exec.c \
@@ -246,6 +267,9 @@ GALLIUM_SOURCES.auxiliary/rtasm= \
rtasm_cpu.c \
rtasm_execmem.c \
rtasm_x86sse.c
+GALLIUM_SOURCES.auxiliary/tessellator= \
+ p_tessellator.cpp \
+ tessellator.cpp
GALLIUM_SOURCES.auxiliary/tgsi= \
tgsi_aa_point.c \
tgsi_build.c \
@@ -275,64 +299,50 @@ GALLIUM_SOURCES.auxiliary/util= \
os_misc.c \
u_async_debug.c \
u_bitmask.c \
- u_blit.c \
u_blitter.c \
u_cache.c \
- u_debug.c \
- u_debug_describe.c \
+ u_compute.c \
u_debug_flush.c \
- u_debug_gallium.c \
u_debug_image.c \
- u_debug_memory.c \
- u_debug_refcnt.c \
- u_debug_stack.c \
- u_debug_symbol.c \
u_dl.c \
u_draw.c \
u_draw_quad.c \
+ u_driconf.c \
u_dump_defines.c \
u_dump_state.c \
- u_format.c \
- u_format_bptc.c \
- u_format_etc.c \
- u_format_latc.c \
- u_format_other.c \
- u_format_rgtc.c \
- u_format_s3tc.c \
- u_format_tests.c \
- u_format_yuv.c \
- u_format_zs.c \
u_framebuffer.c \
u_gen_mipmap.c \
u_handle_table.c \
- u_hash_table.c \
u_helpers.c \
- u_idalloc.c \
u_index_modify.c \
u_linear.c \
+ u_live_shader_cache.c \
u_log.c \
- u_mm.c \
u_network.c \
u_prim.c \
u_prim_restart.c \
u_pstipple.c \
u_resource.c \
- u_ringbuffer.c \
u_sampler.c \
u_screen.c \
u_simple_shaders.c \
+ u_split_draw.c \
u_suballoc.c \
u_surface.c \
- u_surfaces.c \
u_tests.c \
u_texture.c \
u_tile.c \
+ u_trace_gallium.c \
u_transfer.c \
u_transfer_helper.c \
u_threaded_context.c \
u_upload_mgr.c \
- u_vbuf.c
+ u_vbuf.c \
+ u_vertex_state_cache.c
GALLIUM_SOURCES.auxiliary/nir = \
+ nir_draw_helpers.c \
+ nir_to_tgsi.c \
+ nir_to_tgsi_info.c \
tgsi_to_nir.c
GALLIUM_SOURCES.auxiliary/vl= \
vl_bicubic_filter.c \
@@ -357,11 +367,14 @@ GALLIUM_SOURCES.auxiliary/vl= \
.PATH: ${X11SRCDIR.Mesa}/../src/gallium/auxiliary
GALLIUM_SOURCES.auxiliary= \
u_indices_gen.c \
- u_unfilled_gen.c \
- u_format_table.c
+ u_tracepoints.c \
+ u_unfilled_gen.c
.for _f in ${GALLIUM_SOURCES.auxiliary/vl}
CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/loader
.endfor
+.for _f in ${GALLIUM_SOURCES.auxiliary/util}
+CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/../src/gallium/auxiliary
+.endfor
.for _f in ${GALLIUM_SOURCES.auxiliary}
CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/gallium/auxiliary/util
CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/util
@@ -377,6 +390,7 @@ GALLIUM_SOURCES.auxiliary/gallivm= \
lp_bld_bitarit.c \
lp_bld_const.c \
lp_bld_conv.c \
+ lp_bld_coro.c \
lp_bld_flow.c \
lp_bld_format_aos_array.c \
lp_bld_format_aos.c \
@@ -389,8 +403,11 @@ GALLIUM_SOURCES.auxiliary/gallivm= \
lp_bld_gather.c \
lp_bld_init.c \
lp_bld_intr.c \
+ lp_bld_ir_common.c \
lp_bld_logic.c \
lp_bld_misc.cpp \
+ lp_bld_nir.c \
+ lp_bld_nir_soa.c \
lp_bld_pack.c \
lp_bld_printf.c \
lp_bld_quad.c \
@@ -411,6 +428,7 @@ GALLIUM_SOURCES.auxiliary/gallivm= \
CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/gallium/auxiliary/util
.endfor
+CPPFLAGS.lp_texture.c += -I${X11SRCDIR.Mesa}/../src
GALLIUM_SOURCES.auxiliary/driver_ddebug = \
dd_context.c \
@@ -455,6 +473,7 @@ GALLIUM_SOURCES.drivers/i915= \
i915_fpc_emit.c \
i915_fpc_optimize.c \
i915_fpc_translate.c \
+ i915_nir.c \
i915_prim_emit.c \
i915_prim_vbuf.c \
i915_query.c \
@@ -478,6 +497,95 @@ GALLIUM_SOURCES.winsys/i915/drm= \
i915_drm_fence.c \
i915_drm_winsys.c
+GALLIUM_SOURCES.drivers/iris= \
+ iris_batch.c \
+ iris_binder.c \
+ iris_blit.c \
+ iris_border_color.c \
+ iris_bufmgr.c \
+ iris_clear.c \
+ iris_context.c \
+ iris_disk_cache.c \
+ iris_draw.c \
+ iris_fence.c \
+ iris_fine_fence.c \
+ iris_formats.c \
+ iris_measure.c \
+ iris_monitor.c \
+ iris_perf.c \
+ iris_performance_query.c \
+ iris_pipe_control.c \
+ iris_program.c \
+ iris_program_cache.c \
+ iris_resolve.c \
+ iris_resource.c \
+ iris_screen.c
+
+GALLIUM_SOURCES.winsys/iris/drm= \
+ iris_drm_winsys.c
+
+IRIS_GENS_BLORP= 80 90 110 120 125
+
+.for _gen in ${IRIS_GENS_BLORP}
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/gallium/drivers/iris/iris_blorp.c ${_gen}_iris_blorp.c
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/gallium/drivers/iris/iris_query.c ${_gen}_iris_query.c
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/gallium/drivers/iris/iris_state.c ${_gen}_iris_state.c
+GALLIIUM_SOURCES.drivers/iris+= ${_gen}_iris_blorp.c ${_gen}_iris_query.c ${_gen}_iris_state.c
+
+CPPFLAGS.${_gen}_iris_blorp.c+= -DGFX_VERx10=${_gen}
+CPPFLAGS.${_gen}_iris_query.c+= -DGFX_VERx10=${_gen}
+CPPFLAGS.${_gen}_iris_state.c+= -DGFX_VERx10=${_gen}
+.endfor
+
+.for _f in ${GALLIUM_SOURCES.drivers/iris}
+CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/intel
+.endfor
+
+GALLIUM_SOURCES.drivers/crocus= \
+ crocus_batch.c \
+ crocus_blit.c \
+ crocus_blorp.c \
+ crocus_blt.c \
+ crocus_bufmgr.c \
+ crocus_clear.c \
+ crocus_context.c \
+ crocus_disk_cache.c \
+ crocus_draw.c \
+ crocus_fence.c \
+ crocus_fine_fence.c \
+ crocus_formats.c \
+ crocus_monitor.c \
+ crocus_pipe_control.c \
+ crocus_program.c \
+ crocus_program_cache.c \
+ crocus_query.c \
+ crocus_resolve.c \
+ crocus_resource.c \
+ crocus_screen.c \
+ crocus_state.c
+
+GALLIUM_SOURCES.winsys/crocus/drm= \
+ crocus_drm_winsys.c
+
+CROCUS_GENS_BLORP= 40 45 50 60 70 75 80
+
+.for _gen in ${CROCUS_GENS_BLORP}
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/gallium/drivers/crocus/crocus_blorp.c ${_gen}_crocus_blorp.c
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/gallium/drivers/crocus/crocus_query.c ${_gen}_crocus_query.c
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/gallium/drivers/crocus/crocus_state.c ${_gen}_crocus_state.c
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/gallium/drivers/crocus/crocus_blt.c ${_gen}_crocus_bltec
+GALLIIUM_SOURCES.drivers/iris+= ${_gen}_crocus_blorp.c ${_gen}_crocus_query.c ${_gen}_crocus_state.c ${_gen}_crocus_blt.c
+
+CPPFLAGS.${_gen}_crocus_blorp.c+= -DGFX_VERx10=${_gen}
+CPPFLAGS.${_gen}_crocus_query.c+= -DGFX_VERx10=${_gen}
+CPPFLAGS.${_gen}_crocus_state.c+= -DGFX_VERx10=${_gen}
+CPPFLAGS.${_gen}_crocus_blt.c+= -DGFX_VERx10=${_gen}
+.endfor
+
+.for _f in ${GALLIUM_SOURCES.drivers/crocus}
+CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/intel
+.endfor
+
# Conflicts with r600/radeon_video.c and radeon/radeon_video.c
BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/gallium/drivers/r600/radeon_video.c r600_radeon_video.c
BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/gallium/drivers/radeon/radeon_video.c radeon_radeon_video.c
@@ -503,6 +611,8 @@ GALLIUM_SOURCES.drivers/radeon = \
radeon_vcn_dec_jpeg.c \
radeon_vcn_enc.c \
radeon_vcn_enc_1_2.c \
+ radeon_vcn_enc_2_0.c \
+ radeon_vcn_enc_3_0.c \
radeon_radeon_vce.c \
radeon_radeon_video.c \
@@ -520,6 +630,7 @@ GALLIUM_SOURCES.drivers/r600 = \
evergreen_state.c \
r600_asm.c \
r600_blit.c \
+ r600_dump.c \
r600_hw_context.c \
r600_isa.c \
r600_pipe.c \
@@ -557,6 +668,47 @@ GALLIUM_SOURCES.drivers/r600/sb = \
sb_shader.cpp \
sb_ssa_builder.cpp \
sb_valtable.cpp
+GALLIUM_SOURCES.drivers/r600/sfn = \
+ sfn_nir_vectorize_vs_inputs.c \
+ sfn_alu_defines.cpp \
+ sfn_liverange.cpp \
+ sfn_callstack.cpp \
+ sfn_nir.cpp \
+ sfn_conditionaljumptracker.cpp \
+ sfn_nir_legalize_image_load_store.cpp \
+ sfn_debug.cpp \
+ sfn_nir_lower_64bit.cpp \
+ sfn_emitaluinstruction.cpp \
+ sfn_nir_lower_alu.cpp \
+ sfn_emitinstruction.cpp \
+ sfn_nir_lower_fs_out_to_vector.cpp \
+ sfn_emitssboinstruction.cpp \
+ sfn_nir_lower_tess_io.cpp \
+ sfn_emittexinstruction.cpp \
+ sfn_instruction_alu.cpp \
+ sfn_shader_base.cpp \
+ sfn_instruction_base.cpp \
+ sfn_shader_compute.cpp \
+ sfn_instruction_block.cpp \
+ sfn_shader_fragment.cpp \
+ sfn_instruction_cf.cpp \
+ sfn_shader_geometry.cpp \
+ sfn_instruction_export.cpp \
+ sfn_shader_tcs.cpp \
+ sfn_instruction_fetch.cpp \
+ sfn_shader_tess_eval.cpp \
+ sfn_instruction_gds.cpp \
+ sfn_shader_vertex.cpp \
+ sfn_instruction_lds.cpp \
+ sfn_shaderio.cpp \
+ sfn_instruction_misc.cpp \
+ sfn_value.cpp \
+ sfn_instruction_tex.cpp \
+ sfn_value_gpr.cpp \
+ sfn_instructionvisitor.cpp \
+ sfn_valuepool.cpp \
+ sfn_ir_to_assembly.cpp \
+ sfn_vertexstageexport.cpp
GALLIUM_SOURCES.drivers/r300 = \
r300_blit.c \
@@ -620,17 +772,17 @@ GALLIUM_SOURCES.drivers/r300/compiler =
radeon_vert_fc.c
GALLIUM_SOURCES.drivers/radeonsi = \
- cik_sdma.c \
+ gfx10_query.c \
+ gfx10_shader_ngg.c \
si_blit.c \
si_buffer.c \
si_clear.c \
si_compute.c \
si_compute_blit.c \
si_cp_dma.c \
+ si_cp_reg_shadowing.c \
si_debug.c \
si_descriptors.c \
- si_dma.c \
- si_dma_cs.c \
si_fence.c \
si_get.c \
si_gfx_cs.c \
@@ -639,24 +791,51 @@ GALLIUM_SOURCES.drivers/radeonsi = \
si_pm4.c \
si_perfcounter.c \
si_query.c \
+ si_nir_optim.c \
si_shader.c \
+ si_sdma_copy_image.c \
+ si_shader_llvm.c \
+ si_shader_llvm_gs.c \
+ si_shader_llvm_ps.c \
+ si_shader_llvm_resources.c \
+ si_shader_llvm_tess.c \
+ si_shader_llvm_vs.c \
si_shader_nir.c \
- si_shader_tgsi_alu.c \
- si_shader_tgsi_mem.c \
- si_shader_tgsi_setup.c \
+ si_shaderlib_nir.c \
si_shaderlib_tgsi.c \
+ si_sqtt.c \
si_state.c \
si_state_binning.c \
- si_state_draw.c \
+ si_state_draw_gfx6.cpp \
+ si_state_draw_gfx7.cpp \
+ si_state_draw_gfx8.cpp \
+ si_state_draw_gfx9.cpp \
+ si_state_draw_gfx10.cpp \
+ si_state_draw_gfx103.cpp \
si_state_msaa.c \
si_state_shaders.c \
si_state_streamout.c \
si_state_viewport.c \
- si_test_dma.c \
+ si_test_blit.c \
si_test_dma_perf.c \
si_texture.c \
si_uvd.c
+.PATH: ${X11SRCDIR.Mesa}/src/gallium/drivers/radeonsi
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/gallium/drivers/radeonsi/si_state_draw.cpp si_state_draw_gfx6.cpp
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/gallium/drivers/radeonsi/si_state_draw.cpp si_state_draw_gfx7.cpp
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/gallium/drivers/radeonsi/si_state_draw.cpp si_state_draw_gfx8.cpp
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/gallium/drivers/radeonsi/si_state_draw.cpp si_state_draw_gfx9.cpp
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/gallium/drivers/radeonsi/si_state_draw.cpp si_state_draw_gfx10.cpp
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/gallium/drivers/radeonsi/si_state_draw.cpp si_state_draw_gfx103.cpp
+
+CPPFLAGS.si_state_draw_gfx6.cpp += -DGFX_VER=6
+CPPFLAGS.si_state_draw_gfx7.cpp += -DGFX_VER=7
+CPPFLAGS.si_state_draw_gfx8.cpp += -DGFX_VER=8
+CPPFLAGS.si_state_draw_gfx9.cpp += -DGFX_VER=9
+CPPFLAGS.si_state_draw_gfx10.cpp += -DGFX_VER=10
+CPPFLAGS.si_state_draw_gfx103.cpp += -DGFX_VER=103
+
.for _f in ${GALLIUM_SOURCES.drivers/radeon}
CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/gallium/drivers/radeon
.endfor
@@ -666,16 +845,18 @@ CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/sr
-I${X11SRCDIR.Mesa}/src/gallium/drivers/r300/compiler
.endfor
-.for _f in ${GALLIUM_SOURCES.drivers/r600} ${GALLIUM_SOURCES.drivers/r600/sb} ${GALLIUM_SOURCES.drivers/radeonsi}
+.for _f in ${GALLIUM_SOURCES.drivers/r600} ${GALLIUM_SOURCES.drivers/r600/sb} ${GALLIUM_SOURCES.drivers/radeonsi} ${GALLIUM_SOURCES.drivers/r600/sfn}
CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/gallium/drivers/r600
CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/../src/gallium/drivers/r600
CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/amd/common
CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/../src/amd/common
+CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/amd/llvm
.endfor
.for _f in ${GALLIUM_SOURCES.drivers/radeon}
CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/gallium/drivers/radeonsi
CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/amd/common
+CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/amd/llvm
.endfor
GALLIUM_SOURCES.drivers/nouveau = \
@@ -745,6 +926,7 @@ GALLIUM_SOURCES.drivers/nouveau/codegen
nv50_ir_build_util.cpp \
nv50_ir_emit_gk110.cpp \
nv50_ir_emit_gm107.cpp \
+ nv50_ir_emit_gv100.cpp \
nv50_ir_emit_nv50.cpp \
nv50_ir_emit_nvc0.cpp \
nv50_ir_from_common.cpp \
@@ -752,14 +934,17 @@ GALLIUM_SOURCES.drivers/nouveau/codegen
nv50_ir_from_tgsi.cpp \
nv50_ir_graph.cpp \
nv50_ir_lowering_gm107.cpp \
+ nv50_ir_lowering_gv100.cpp \
nv50_ir_lowering_helper.cpp \
nv50_ir_lowering_nv50.cpp \
nv50_ir_lowering_nvc0.cpp \
nv50_ir_peephole.cpp \
nv50_ir_print.cpp \
nv50_ir_ra.cpp \
+ nv50_ir_serialize.cpp \
nv50_ir_ssa.cpp \
nv50_ir_target.cpp \
+ nv50_ir_target_gv100.cpp \
nv50_ir_target_nv50.cpp \
nv50_ir_util.cpp \
nv50_ir_target_gm107.cpp \
@@ -792,7 +977,6 @@ GALLIUM_SOURCES.drivers/nouveau/nvc0 = \
nvc0_video_vp.c \
nvc0_video_ppp.c
-
GALLIUM_SOURCES.winsys/nouveau/drm = \
nouveau_drm_winsys.c
@@ -820,9 +1004,12 @@ GALLIUM_SOURCES.winsys/amdgpu/drm = \
.for _f in ${GALLIUM_SOURCES.winsys/amdgpu/drm}
CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/amd
+CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/amd/common
+CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/../src/amd/common
+CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/amd/llvm
.endfor
-GALLIUM_SOURCES.state_trackers/vdpau = \
+GALLIUM_SOURCES.frontends/vdpau = \
bitmap.c \
decode.c \
device.c \
@@ -844,34 +1031,50 @@ GALLIUM_SOURCES.drivers/llvmpipe = \
lp_bld_interp.c \
lp_clear.c \
lp_context.c \
+ lp_cs_tpool.c \
lp_draw_arrays.c \
lp_fence.c \
lp_flush.c \
lp_jit.c \
+ lp_linear.c \
+ lp_linear_fastpath.c \
+ lp_linear_interp.c \
+ lp_linear_sampler.c \
lp_memory.c \
lp_perf.c \
lp_query.c \
lp_rast.c \
lp_rast_debug.c \
+ lp_rast_linear.c \
+ lp_rast_linear_fallback.c \
+ lp_rast_rect.c \
lp_rast_tri.c \
lp_scene.c \
lp_scene_queue.c \
lp_screen.c \
lp_setup.c \
+ lp_setup_analysis.c \
lp_setup_line.c \
lp_setup_point.c \
+ lp_setup_rect.c \
lp_setup_tri.c \
lp_setup_vbuf.c \
lp_state_blend.c \
lp_state_clip.c \
+ lp_state_cs.c \
lp_state_derived.c \
lp_state_fs.c \
+ lp_state_fs_analysis.c \
+ lp_state_fs_fastpath.c \
+ lp_state_fs_linear.c \
+ lp_state_fs_linear_llvm.c \
lp_state_gs.c \
lp_state_rasterizer.c \
lp_state_sampler.c \
lp_state_setup.c \
lp_state_so.c \
lp_state_surface.c \
+ lp_state_tess.c \
lp_state_vertex.c \
lp_state_vs.c \
lp_surface.c \
@@ -925,7 +1128,7 @@ GALLIUM_SOURCES.winsys/sw/dri = \
GALLIUM_SOURCES.winsys/sw/kms-dri = \
kms_dri_sw_winsys.c
-GALLIUM_SOURCES.state_trackers/dri = \
+GALLIUM_SOURCES.frontends/dri = \
dri_context.c \
dri_drawable.c \
dri_helpers.c \
@@ -933,9 +1136,6 @@ GALLIUM_SOURCES.state_trackers/dri = \
dri_screen.c \
drisw.c \
dri2.c
-.for _f in ${GALLIUM_SOURCES.state_trackers/dri}
-CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/gallium/state_trackers/dri/common
-.endfor
# missing
CPPFLAGS+= \
@@ -970,6 +1170,12 @@ LIBDPLIBS+= drm ${.CURDIR}/../libdrm
.if ${BUILD_I915} == 1
LIBDPLIBS+= drm_intel ${.CURDIR}/../libdrm_intel
.endif
+.if ${BUILD_IRIS} == 1
+LIBDPLIBS+= drm_intel ${.CURDIR}/../libdrm_intel
+.endif
+.if ${BUILD_CROCUS} == 1
+LIBDPLIBS+= drm_intel ${.CURDIR}/../libdrm_intel
+.endif
.if ${BUILD_RADEON} == 1
LIBDPLIBS+= drm_radeon ${.CURDIR}/../libdrm_radeon
LIBDPLIBS+= drm_amdgpu ${.CURDIR}/../libdrm_amdgpu
@@ -1004,6 +1210,7 @@ LLVMRT_LIBS+= \
AMDGPUMCTargetDesc \
AMDGPUTargetInfo \
AMDGPUAsmParser \
+ AMDGPUDisassembler \
AMDGPUUtils
.endif
@@ -1129,6 +1336,9 @@ CPPFLAGS+= ${CPPFLAGS.${XORG_MACHINE_ARC
CPPFLAGS.r600_pipe_common.c+= -DMESA_LLVM_VERSION_STRING=\"${LLVM_VERSION}\"
CPPFLAGS.si_get.c+= -DMESA_LLVM_VERSION_STRING=\"${LLVM_VERSION}\"
+CPPFLAGS.lp_screen.c+= -DMESA_LLVM_VERSION_STRING=\"${LLVM_VERSION}\"
+CPPFLAGS.lp_bld_intr.c+= -DMESA_LLVM_VERSION_STRING=\"${LLVM_VERSION}\"
+CPPFLAGS.lp_bld_type.c+= -DMESA_LLVM_VERSION_STRING=\"${LLVM_VERSION}\"
.include "../driver.mk"
@@ -1148,7 +1358,7 @@ CPPFLAGS.target.c += \
-DGALLIUM_RBUG \
-DGALLIUM_TRACE \
-DGALLIUM_SOFTPIPE \
- -I${X11SRCDIR.Mesa}/src/gallium/state_trackers/dri \
+ -I${X11SRCDIR.Mesa}/src/gallium/frontends/dri \
-I${X11SRCDIR.Mesa}/src/loader \
-I${X11SRCDIR.Mesa}/../src/util \
-I${X11SRCDIR.Mesa}/../src/gallium/drivers \
@@ -1165,6 +1375,16 @@ CPPFLAGS.target.c += \
-DGALLIUM_ILO
.endif
+.if ${BUILD_IRIS} == 1
+CPPFLAGS.target.c += \
+ -DGALLIUM_IRIS
+.endif
+
+.if ${BUILD_CROCUS} == 1
+CPPFLAGS.target.c += \
+ -DGALLIUM_CROCUS
+.endif
+
.if ${BUILD_RADEON} == 1
CPPFLAGS.target.c += \
-DGALLIUM_R200 \
Index: src/external/mit/xorg/lib/libEGL/Makefile
diff -u src/external/mit/xorg/lib/libEGL/Makefile:1.7 src/external/mit/xorg/lib/libEGL/Makefile:1.8
--- src/external/mit/xorg/lib/libEGL/Makefile:1.7 Tue Jul 13 05:22:27 2021
+++ src/external/mit/xorg/lib/libEGL/Makefile Sun Jul 16 22:20:54 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/07/13 05:22:27 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2023/07/16 22:20:54 rjs Exp $
.include <bsd.own.mk>
@@ -22,8 +22,6 @@ SRCS.egl= \
eglcurrent.c \
egldevice.c \
egldisplay.c \
- egldriver.c \
- eglfallbacks.c \
eglglobals.c \
eglimage.c \
egllog.c \
@@ -44,6 +42,7 @@ SRCS.drivers/dri2= \
BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/util/debug.c UTILdebug.c
SRCS.util= \
UTILdebug.c \
+ os_file.c \
u_process.c
.for file in ${SRCS.util}
Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.33 src/external/mit/xorg/lib/libGL/Makefile:1.34
--- src/external/mit/xorg/lib/libGL/Makefile:1.33 Sat Jun 3 21:33:02 2023
+++ src/external/mit/xorg/lib/libGL/Makefile Sun Jul 16 22:20:54 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2023/06/03 21:33:02 lukem Exp $
+# $NetBSD: Makefile,v 1.34 2023/07/16 22:20:54 rjs Exp $
.include <bsd.own.mk>
@@ -50,10 +50,11 @@ CPPFLAGS.UTILdebug.c+= -I${X11SRCDIR.Mes
-I${X11SRCDIR.Mesa}/src \
-I${X11SRCDIR.Mesa}/src/gallium/include
-BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/../src/mapi/glapi/indirect_init.c MESAindirect_init.c
+
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/../src/mapi/glapi/gen/indirect_init.c MESAindirect_init.c
BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/glx/indirect_window_pos.c MESAindirect_window_pos.c
-BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/../src/mapi/glapi/indirect.c MESAindirect.c
-BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/../src/mapi/glapi/indirect_size.c MESAindirect_size.c
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/../src/mapi/glapi/gen/indirect.c MESAindirect.c
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/../src/mapi/glapi/gen/indirect_size.c MESAindirect_size.c
BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/util/debug.c UTILdebug.c
# glapi
@@ -90,15 +91,16 @@ SRCS.glx += ${SRCS.${XORG_MACHINE_ARCH:U
SRCS.glapi+= entry.c
.for _f in ${SRCS.glx}
-CPPFLAGS.${_f}= -I${X11SRCDIR.Mesa}/../src/mapi/glapi \
+CPPFLAGS.${_f}= -I${X11SRCDIR.Mesa}/../src/mapi/glapi/gen \
-I${X11SRCDIR.Mesa}/src \
+ -I${X11SRCDIR.Mesa}/src/mesa \
-I${X11SRCDIR.Mesa}/../src/mesa \
-DGLX_SHARED_GLAPI
.endfor
.for _f in ${SRCS.glapi}
CPPFLAGS.${_f}= -DMAPI_MODE_BRIDGE \
- -DMAPI_ABI_HEADER=\"glapi/glapi_mapi_tmp.h\" \
+ -DMAPI_ABI_HEADER=\"glapi/gen/glapi_mapi_tmp.h\" \
-I${X11SRCDIR.Mesa}/src \
-I${X11SRCDIR.Mesa}/../src/mapi
.endfor
@@ -113,9 +115,7 @@ SRCS.dri= \
xfont.c \
drisw_glx.c \
dri2.c \
- dri2_glx.c \
- dri_glx.c \
- XF86dri.c
+ dri2_glx.c
.for fn in ${SRCS.dri}
CPPFLAGS.${fn}= \
@@ -124,15 +124,23 @@ CPPFLAGS.${fn}= \
.endfor
.endif
-SRCS.util+= u_process.c
+SRCS.util+= \
+ ralloc.c \
+ os_file.c \
+ mesa-sha1.c \
+ u_printf.cpp \
+ u_process.c
+
+CPPFLAGS.ralloc.c += -I${X11SRCDIR.Mesa}/src
+CPPFLAGS.u_printf.cpp += -I${X11SRCDIR.Mesa}/src
.include "../libloader.mk"
.PATH: ${X11SRCDIR.Mesa}/src/glw
.PATH: ${X11SRCDIR.Mesa}/include/GL
.PATH: ${X11SRCDIR.Mesa}/src/mesa/drivers/x11
-INCS= gl.h gl_mangle.h glcorearb.h glext.h \
- glx.h glx_mangle.h glxext.h \
+INCS= gl.h glcorearb.h glext.h \
+ glx.h glxext.h \
osmesa.h wglext.h
INCSDIR=${X11INCDIR}/GL
@@ -208,6 +216,7 @@ LIBDPLIBS= Xext ${.CURDIR}/../libXext \
X11-xcb ${.CURDIR}/../libX11/libX11-xcb \
xcb-dri2 ${.CURDIR}/../libxcb/dri2 \
xcb-glx ${.CURDIR}/../libxcb/glx \
+ xcb-shm ${.CURDIR}/../libxcb/shm \
expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat \
m ${NETBSDSRCDIR}/lib/libm \
pthread ${NETBSDSRCDIR}/lib/libpthread
@@ -216,7 +225,7 @@ MKLINT=no
PKGCONFIG= gl
PKGDIST.gl= ${X11SRCDIR.Mesa}/../src/pkgconfig
-.include "${.CURDIR}/../libGL/mesa-ver.mk"
+.include "${.CURDIR}/../libGL${OLD_SUFFIX}/mesa-ver.mk"
PKGCONFIG_VERSION.gl= ${MESA_VER}
# XXX remove these from bsd.x11.mk
Index: src/external/mit/xorg/lib/libGL/mesa-ver.mk
diff -u src/external/mit/xorg/lib/libGL/mesa-ver.mk:1.4 src/external/mit/xorg/lib/libGL/mesa-ver.mk:1.5
--- src/external/mit/xorg/lib/libGL/mesa-ver.mk:1.4 Tue Sep 24 19:29:42 2019
+++ src/external/mit/xorg/lib/libGL/mesa-ver.mk Sun Jul 16 22:20:54 2023
@@ -1,3 +1,3 @@
-# $NetBSD: mesa-ver.mk,v 1.4 2019/09/24 19:29:42 maya Exp $
+# $NetBSD: mesa-ver.mk,v 1.5 2023/07/16 22:20:54 rjs Exp $
-MESA_VER= 19.1.17
+MESA_VER= 21.3.7
Index: src/external/mit/xorg/lib/libgbm/Makefile
diff -u src/external/mit/xorg/lib/libgbm/Makefile:1.8 src/external/mit/xorg/lib/libgbm/Makefile:1.9
--- src/external/mit/xorg/lib/libgbm/Makefile:1.8 Sun Jul 11 20:52:06 2021
+++ src/external/mit/xorg/lib/libgbm/Makefile Sun Jul 16 22:20:54 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2021/07/11 20:52:06 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2023/07/16 22:20:54 rjs Exp $
.include <bsd.own.mk>
@@ -28,7 +28,7 @@ SRCS= ${SRCS.main} ${SRCS.dri} ${SRCS.ut
CPPFLAGS+= -D_OS_UNIX=1
CPPFLAGS+= -DHAVE_PTHREAD=1 -DHAVE_TIMESPEC_GET
-CPPFLAGS+= -DDEFAULT_DRIVER_DIR=\"${X11USRLIBDIR}/modules/dri\"
+CPPFLAGS+= -DDEFAULT_BACKENDS_PATH=\"${X11USRLIBDIR}/modules/dri\"
CPPFLAGS+= -DMODULEDIR=\"${X11USRLIBDIR}/gbm\"
CPPFLAGS+= -I${X11SRCDIR.Mesa}/include
CPPFLAGS+= -I${X11SRCDIR.Mesa}/src
Index: src/external/mit/xorg/lib/libglapi/Makefile
diff -u src/external/mit/xorg/lib/libglapi/Makefile:1.9 src/external/mit/xorg/lib/libglapi/Makefile:1.10
--- src/external/mit/xorg/lib/libglapi/Makefile:1.9 Sat Oct 31 13:28:22 2020
+++ src/external/mit/xorg/lib/libglapi/Makefile Sun Jul 16 22:20:54 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/10/31 13:28:22 nia Exp $
+# $NetBSD: Makefile,v 1.10 2023/07/16 22:20:54 rjs Exp $
.include <bsd.own.mk>
@@ -21,7 +21,7 @@ SRCS.mapi= \
BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/mapi/entry.c shared_entry.c
.for _f in ${SRCS.mapi}
-CPPFLAGS.${_f}= -DMAPI_MODE_GLAPI -DMAPI_ABI_HEADER=\"shared-glapi_glapi_mapi_tmp.h\"
+CPPFLAGS.${_f}= -DMAPI_MODE_GLAPI -DMAPI_ABI_HEADER=\"shared-glapi/glapi_mapi_tmp.h\"
.endfor
# above is shared/libglapi.la
