[src/trunk]: src/external/mit/xorg/lib Update build logic for mesa 19.1.7.

[maya <maya%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/51d60402254f
branches:  trunk
changeset: 454677:51d60402254f
user:      maya <maya%NetBSD.org@localhost>
date:      Tue Sep 24 19:29:41 2019 +0000

description:
Update build logic for mesa 19.1.7.

A lot of files are now living outside of dist, since they're not in the
distributed sources: they're generated, usually by python/meson.

The remaining changes are due to files being moved around.

diffstat:

 external/mit/xorg/lib/dri/Makefile      |  47 ++++++++++++++++++++------------
 external/mit/xorg/lib/driver.mk         |   6 +++-
 external/mit/xorg/lib/gallium/Makefile  |  37 ++++++++++++++-----------
 external/mit/xorg/lib/libEGL/Makefile   |   4 +-
 external/mit/xorg/lib/libGL/Makefile    |  46 +++++++++++++++++++++-----------
 external/mit/xorg/lib/libGL/mesa-ver.mk |   4 +-
 external/mit/xorg/lib/libgbm/Makefile   |   4 +-
 external/mit/xorg/lib/libglapi/Makefile |   4 +-
 external/mit/xorg/lib/libglsl.mk        |  47 +++++++++++++++++++++++---------
 external/mit/xorg/lib/libloader.mk      |   5 ++-
 external/mit/xorg/lib/libmesa.mk        |  32 ++++++++++++---------
 11 files changed, 149 insertions(+), 87 deletions(-)

diffs (truncated from 752 to 300 lines):

diff -r a67785839012 -r 51d60402254f external/mit/xorg/lib/dri/Makefile
--- a/external/mit/xorg/lib/dri/Makefile        Tue Sep 24 19:21:45 2019 +0000
+++ b/external/mit/xorg/lib/dri/Makefile        Tue Sep 24 19:29:41 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2019/04/26 18:49:35 christos Exp $
+# $NetBSD: Makefile,v 1.33 2019/09/24 19:29:41 maya Exp $
 
 # Link the mesa_dri_drivers mega driver.
 
@@ -23,7 +23,8 @@
        -I${X11SRCDIR.Mesa}/src/egl/main \
        -I${X11SRCDIR.Mesa}/src/egl/drivers/dri \
        -I${X11SRCDIR.Mesa}/../src/mesa/drivers/dri/common \
-       -I${DESTDIR}${X11INCDIR}/libdrm
+       -I${DESTDIR}${X11INCDIR}/libdrm \
+       -I${X11SRCDIR.Mesa}/../src/util
 
 .if ${MACHINE_ARCH} == "i386"
 CPPFLAGS.brw_disk_cache.c+=    -march=i586
@@ -102,7 +103,9 @@
 .PATH: ${X11SRCDIR.Mesa}/src/intel/compiler
 .PATH: ${X11SRCDIR.Mesa}/src/intel/dev
 .PATH: ${X11SRCDIR.Mesa}/src/intel/isl
-
+.PATH: ${X11SRCDIR.Mesa}/src/intel/perf
+.PATH: ${X11SRCDIR.Mesa}/../src/intel/
+.PATH: ${X11SRCDIR.Mesa}/../src/intel/perf
 
 DRI_SOURCES.i965+= \
        blorp.c \
@@ -113,8 +116,11 @@
        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 \
-       gen_l3_config.c \
        intel_log.c \
        brw_binding_tables.c \
        brw_blorp.c \
@@ -136,6 +142,7 @@
        brw_cs.c \
        brw_curbe.c \
        brw_dead_control_flow.cpp \
+       brw_debug_recompile.c \
        brw_disasm.c \
        brw_disasm_info.c \
        brw_disk_cache.c \
@@ -143,7 +150,6 @@
        brw_draw_upload.c \
        brw_eu.c \
        brw_eu_compact.c \
-       brw_oa_metrics.c \
        brw_eu_emit.c \
        brw_eu_util.c \
        brw_eu_validate.c \
@@ -159,14 +165,13 @@
        brw_fs_dead_code_eliminate.cpp \
        brw_fs_generator.cpp \
        brw_fs_live_variables.cpp \
-       brw_fs_lower_conversions.cpp \
        brw_fs_lower_pack.cpp \
+       brw_fs_lower_regioning.cpp \
        brw_fs_nir.cpp \
        brw_fs_reg_allocate.cpp \
        brw_fs_register_coalesce.cpp \
        brw_fs_saturate_propagation.cpp \
        brw_fs_sel_peephole.cpp \
-       brw_fs_surface_builder.cpp \
        brw_fs_validate.cpp \
        brw_fs_visitor.cpp \
        brw_generate_mipmap.c \
@@ -179,12 +184,14 @@
        brw_nir.c \
        brw_nir_analyze_boolean_resolves.c \
        brw_nir_analyze_ubo_ranges.c \
-       brw_nir_trig_workarounds.c \
        brw_nir_attribute_workarounds.c \
+       brw_nir_lower_conversions.c \
        brw_nir_lower_cs_intrinsics.c \
        brw_nir_lower_image_load_store.c \
+       brw_nir_lower_mem_access_bit_sizes.c \
        brw_nir_opt_peephole_ffma.c \
        brw_nir_tcs_workarounds.c \
+       brw_nir_trig_workarounds.c \
        brw_nir_uniforms.cpp \
        brw_object_purgeable.c \
        brw_packed_float.c \
@@ -257,7 +264,10 @@
        isl_gen7.c \
        isl_gen8.c \
        isl_gen9.c \
-       isl_storage_image.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 \
@@ -279,23 +289,20 @@
        intel_tex_copy.c \
        intel_tex_image.c \
        intel_tex_validate.c \
-       intel_tiled_memcpy.c \
-       intel_tiled_memcpy_normal.c \
-       intel_tiled_memcpy_sse41.c \
        intel_upload.c
 
-CPPFLAGS.i965_intel_tiled_memcpy.c+=           -msse4.1
-CPPFLAGS.i965_intel_tiled_memcpy_sse41.c+=     -msse4.1
 
 INTEL_GENS_BLORP=      40 45 50 60 70 75 80 90 100 110
 
 .for _gen in ${INTEL_GENS_BLORP}
 BUILDSYMLINKS+=                ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/i965/genX_state_upload.c ${_gen}_state_upload.c
 BUILDSYMLINKS+=                ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/i965/genX_blorp_exec.c ${_gen}_blorp_exec.c
-DRI_SOURCES.i965+=     ${_gen}_state_upload.c ${_gen}_blorp_exec.c
+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}
 .endfor
 
 INTEL_GENS_ISL=        40 50 60 70 75 80 90 100 110
@@ -317,7 +324,10 @@
 .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/compiler/nir
+                       -I${X11SRCDIR.Mesa}/src/intel/compiler \
+                       -I${X11SRCDIR.Mesa}/../src/intel \
+                       -I${X11SRCDIR.Mesa}/src/compiler/nir \
+                       -I${X11SRCDIR.Mesa}/../src/compiler/nir
 .endfor
 
 # Needs mfence
@@ -424,7 +434,8 @@
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 SRCS+= streaming-load-memcpy.c
-CPPFLAGS.streaming-load-memcpy.c+= -msse4.1
+CPPFLAGS.streaming-load-memcpy.c+=     -msse4.1
+CPPFLAGS.isl_tiled_memcpy_sse41.c+=    -msse4.1
 .endif
 
 .include "../driver.mk"
@@ -440,7 +451,7 @@
 .endif
 
 PKGCONFIG=     dri
-PKGDIST.dri=   ${X11SRCDIR.Mesa}/src/mesa/drivers/dri
+PKGDIST.dri=   ${X11SRCDIR.Mesa}/../src/pkgconfig
 .include "${.CURDIR}/../libGL/mesa-ver.mk"
 PKGCONFIG_VERSION.dri= ${MESA_VER}
 
diff -r a67785839012 -r 51d60402254f external/mit/xorg/lib/driver.mk
--- a/external/mit/xorg/lib/driver.mk   Tue Sep 24 19:21:45 2019 +0000
+++ b/external/mit/xorg/lib/driver.mk   Tue Sep 24 19:29:41 2019 +0000
@@ -1,9 +1,10 @@
-#      $NetBSD: driver.mk,v 1.3 2019/03/10 10:51:58 mrg Exp $
+#      $NetBSD: driver.mk,v 1.4 2019/09/24 19:29:41 maya Exp $
 
 # stuff both dri and gallium drivers need.
 
 # util
 .PATH:         ${X11SRCDIR.Mesa}/src/util
+.PATH:         ${X11SRCDIR.Mesa}/../src/util
 
 SRCS.util=     \
        hash_table.c \
@@ -49,3 +50,6 @@
 .PATH: ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/common
 SRCS+= utils.c dri_util.c xmlconfig.c
 SRCS+= megadriver_stub.c
+
+CPPFLAGS.dri_util.c+=          -I${X11SRCDIR.Mesa}/../src/util
+
diff -r a67785839012 -r 51d60402254f external/mit/xorg/lib/gallium/Makefile
--- a/external/mit/xorg/lib/gallium/Makefile    Tue Sep 24 19:21:45 2019 +0000
+++ b/external/mit/xorg/lib/gallium/Makefile    Tue Sep 24 19:29:41 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2019/07/07 17:50:34 mrg Exp $
+# $NetBSD: Makefile,v 1.35 2019/09/24 19:29:41 maya Exp $
 
 # Link the gallium mega driver.
 
@@ -204,18 +204,15 @@
                        -DHAVE_PIPE_LOADER_DRI=1 \
                        -DGALLIUM_STATIC_TARGETS=1 \
                        -I${X11SRCDIR.Mesa}/src/gallium/winsys \
-                       -I${X11SRCDIR.Mesa}/src/loader
+                       -I${X11SRCDIR.Mesa}/src/loader \
+                       -I${X11SRCDIR.Mesa}/../src/util
 .endfor
 
 GALLIUM_SOURCES.auxiliary/pipebuffer= \
        pb_buffer_fenced.c \
-       pb_buffer_malloc.c \
-       pb_bufmgr_alt.c \
        pb_bufmgr_cache.c \
        pb_bufmgr_debug.c \
        pb_bufmgr_mm.c \
-       pb_bufmgr_ondemand.c \
-       pb_bufmgr_pool.c \
        pb_bufmgr_slab.c \
        pb_cache.c \
        pb_slab.c \
@@ -329,6 +326,8 @@
 GALLIUM_SOURCES.auxiliary/vl= \
        vl_bicubic_filter.c \
        vl_compositor.c \
+       vl_compositor_cs.c \
+       vl_compositor_gfx.c \
        vl_csc.c \
        vl_decoder.c \
        vl_deint_filter.c \
@@ -370,10 +369,10 @@
        lp_bld_flow.c \
        lp_bld_format_aos_array.c \
        lp_bld_format_aos.c \
-       lp_bld_format_cached.c \
        lp_bld_format_float.c \
        lp_bld_format.c \
        lp_bld_format_soa.c \
+       lp_bld_format_s3tc.c \
        lp_bld_format_srgb.c \
        lp_bld_format_yuv.c \
        lp_bld_gather.c \
@@ -473,8 +472,6 @@
 BUILDSYMLINKS+=        ${X11SRCDIR.Mesa}/src/gallium/drivers/radeon/radeon_video.c radeon_radeon_video.c
 BUILDSYMLINKS+=        ${X11SRCDIR.Mesa}/src/gallium/drivers/r600/radeon_vce.c r600_radeon_vce.c
 BUILDSYMLINKS+=        ${X11SRCDIR.Mesa}/src/gallium/drivers/radeon/radeon_vce.c radeon_radeon_vce.c
-BUILDSYMLINKS+=        ${X11SRCDIR.Mesa}/src/gallium/drivers/r600/r600_perfcounter.c r600_r600_perfcounter.c
-BUILDSYMLINKS+=        ${X11SRCDIR.Mesa}/src/gallium/drivers/radeon/r600_perfcounter.c radeon_r600_perfcounter.c
 BUILDSYMLINKS+=        ${X11SRCDIR.Mesa}/src/gallium/drivers/r600/radeon_uvd.c r600_radeon_uvd.c
 BUILDSYMLINKS+=        ${X11SRCDIR.Mesa}/src/gallium/drivers/radeon/radeon_uvd.c radeon_radeon_uvd.c
 
@@ -485,7 +482,6 @@
         r600_query.c \
         r600_streamout.c \
         r600_texture.c \
-       radeon_r600_perfcounter.c \
         radeon_radeon_uvd.c \
        radeon_uvd_enc.c \
        radeon_uvd_enc_1_1.c \
@@ -502,7 +498,7 @@
 GALLIUM_SOURCES.drivers/r600 = \
        eg_debug.c \
        r600_gpu_load.c \
-       r600_r600_perfcounter.c \
+       r600_perfcounter.c \
        r600_radeon_vce.c \
        r600_radeon_video.c \
         compute_memory_pool.c \
@@ -663,6 +659,7 @@
 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
 .endfor
 
 .for _f in ${GALLIUM_SOURCES.drivers/radeon}
@@ -735,10 +732,18 @@
        nv50_ir.cpp \
        nv50_ir_bb.cpp \
        nv50_ir_build_util.cpp \
+       nv50_ir_emit_gk110.cpp \
+       nv50_ir_emit_gm107.cpp \
        nv50_ir_emit_nv50.cpp \
+       nv50_ir_emit_nvc0.cpp \
+       nv50_ir_from_common.cpp \
+       nv50_ir_from_nir.cpp \
        nv50_ir_from_tgsi.cpp \
        nv50_ir_graph.cpp \
+       nv50_ir_lowering_gm107.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 \
@@ -746,11 +751,6 @@
        nv50_ir_target.cpp \
        nv50_ir_target_nv50.cpp \
        nv50_ir_util.cpp \
-       nv50_ir_emit_gk110.cpp \
-       nv50_ir_emit_gm107.cpp \
-       nv50_ir_emit_nvc0.cpp \
-       nv50_ir_lowering_gm107.cpp \
-       nv50_ir_lowering_nvc0.cpp \
        nv50_ir_target_gm107.cpp \
        nv50_ir_target_nvc0.cpp
 
@@ -1105,6 +1105,9 @@