Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/mit/xorg/lib copy the Mesa 19.7.1 build framework i...
details: https://anonhg.NetBSD.org/src/rev/b22a2e0f15d3
branches: trunk
changeset: 984568:b22a2e0f15d3
user: mrg <mrg%NetBSD.org@localhost>
date: Sun Jul 11 20:53:35 2021 +0000
description:
copy the Mesa 19.7.1 build framework into .old.
diffstat:
external/mit/xorg/lib/dri.old/Makefile | 317 ++++--
external/mit/xorg/lib/driver.old.mk | 45 +-
external/mit/xorg/lib/gallium.old/Makefile | 909 +++++++++++++++++----
external/mit/xorg/lib/libGL.old/Makefile | 170 ++-
external/mit/xorg/lib/libGL.old/internal/Makefile | 2 +-
external/mit/xorg/lib/libGL.old/mesa-ver.mk | 4 +-
external/mit/xorg/lib/libGL.old/shlib_version | 2 +-
external/mit/xorg/lib/libgbm.old/Makefile | 30 +-
external/mit/xorg/lib/libgbm.old/shlib_version | 2 +-
external/mit/xorg/lib/libglapi.old/Makefile | 96 +-
external/mit/xorg/lib/libglsl.old.mk | 214 ++++-
external/mit/xorg/lib/libloader.old.mk | 13 +-
external/mit/xorg/lib/libmesa.old.mk | 268 ++++-
13 files changed, 1571 insertions(+), 501 deletions(-)
diffs (truncated from 3297 to 300 lines):
diff -r ed97823a7bed -r b22a2e0f15d3 external/mit/xorg/lib/dri.old/Makefile
--- a/external/mit/xorg/lib/dri.old/Makefile Sun Jul 11 20:52:06 2021 +0000
+++ b/external/mit/xorg/lib/dri.old/Makefile Sun Jul 11 20:53:35 2021 +0000
@@ -1,10 +1,13 @@
-# $NetBSD: Makefile,v 1.1 2019/03/10 02:29:52 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2021/07/11 20:53:35 mrg Exp $
# Link the mesa_dri_drivers mega driver.
.include <bsd.own.mk>
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+.include "../mesa-which.mk"
+
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
+ ${MACHINE} == "evbarm"
LIBISMODULE= yes
LIBISCXX= yes
@@ -15,19 +18,26 @@
DRIDIR= ${X11USRLIBDIR}/modules/dri
DRIDEBUGDIR= ${DEBUGDIR}${X11USRLIBDIR}/modules/dri
+LDFLAGS+= -Wl,--build-id=sha1
+
# -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/${MODULE}/server \
CPPFLAGS+= \
-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
+.endif
#CPPFLAGS+= -D_NETBSD_SOURCE -DPTHREADS
-# We don't actually build this on non-x86 at all, currently.
+# We don't actually build this on non-x86/non-evbarm at all, currently.
# The following if statements are not effective since we only
-# get here for x86
+# get here for x86 and evbarm
.if ${MACHINE_ARCH} == "alpha"
DRIVERS= r200 radeon
.elif ${MACHINE} == "macppc" || ${MACHINE} == "ofppc"
@@ -38,52 +48,54 @@
DRIVERS= i915 i965 r200 radeon
.elif ${MACHINE} == "prep" || ${MACHINE} == "bebox"
DRIVERS= r200 radeon
+.elif ${MACHINE} == "evbarm"
+DRIVERS= r200 radeon
.endif
DRI_SUBDIRS= ${DRIVERS}
-DRI_SOURCES.i915 = \
+DRI_SOURCES.i915+= \
i830_context.c \
i830_state.c \
i830_texblend.c \
i830_texstate.c \
i830_vtbl.c \
- i915_tex_layout.c \
- i915_texstate.c \
i915_context.c \
i915_debug_fp.c \
i915_fragprog.c \
i915_program.c \
i915_state.c \
- i915_vtbl.c
+ i915_texstate.c \
+ i915_vtbl.c \
+ i915_tex_layout.c
I915_INTEL_FILES = \
- intel_render.c \
- intel_regions.c \
+ intel_batchbuffer.c \
+ intel_blit.c \
intel_buffer_objects.c \
- intel_batchbuffer.c \
+ intel_buffers.c \
intel_clear.c \
+ intel_context.c \
intel_extensions.c \
+ intel_fbo.c \
intel_mipmap_tree.c \
- intel_tex_layout.c \
- intel_tex_image.c \
- intel_tex_subimage.c \
- intel_tex_copy.c \
- intel_tex_validate.c \
- intel_tex.c \
intel_pixel.c \
intel_pixel_bitmap.c \
intel_pixel_copy.c \
intel_pixel_draw.c \
intel_pixel_read.c \
- intel_buffers.c \
- intel_blit.c \
- intel_context.c \
+ intel_regions.c \
+ intel_render.c \
intel_screen.c \
intel_state.c \
intel_syncobj.c \
- intel_tris.c \
- intel_fbo.c
+ intel_tex.c \
+ intel_tex_copy.c \
+ intel_tex_image.c \
+ intel_tex_layout.c \
+ intel_tex_subimage.c \
+ intel_tex_validate.c \
+ intel_tris.c
.for _f in ${I915_INTEL_FILES}
BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/i915/${_f} i915_${_f}
@@ -91,179 +103,241 @@
CPPFLAGS.i915_${_f}+= -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/i915
.endfor
-DRI_SOURCES.i965 = \
+.PATH: ${X11SRCDIR.Mesa}/src/intel/blorp
+.PATH: ${X11SRCDIR.Mesa}/src/intel/common
+.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 \
+ 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_blorp.cpp \
- brw_blorp_blit.cpp \
- brw_blorp_blit_eu.cpp \
- brw_cc.c \
+ brw_blorp.c \
+ brw_bufmgr.c \
brw_cfg.cpp \
brw_clear.c \
brw_clip.c \
brw_clip_line.c \
brw_clip_point.c \
- brw_clip_state.c \
brw_clip_tri.c \
brw_clip_unfilled.c \
brw_clip_util.c \
+ brw_compile_clip.c \
+ brw_compile_sf.c \
+ brw_compiler.c \
+ brw_compute.c \
+ brw_conditional_render.c \
brw_context.c \
- brw_cubemap_normalize.cpp \
+ brw_cs.c \
brw_curbe.c \
brw_dead_control_flow.cpp \
- brw_device_info.c \
+ brw_debug_recompile.c \
brw_disasm.c \
+ brw_disasm_info.c \
+ brw_disk_cache.c \
brw_draw.c \
brw_draw_upload.c \
brw_eu.c \
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_fs.cpp \
- brw_fs_channel_expressions.cpp \
+ brw_fs_bank_conflicts.cpp \
+ brw_fs_cmod_propagation.cpp \
+ brw_fs_combine_constants.cpp \
brw_fs_copy_propagation.cpp \
brw_fs_cse.cpp \
brw_fs_dead_code_eliminate.cpp \
- brw_fs_fp.cpp \
brw_fs_generator.cpp \
brw_fs_live_variables.cpp \
- brw_fs_peephole_predicated_break.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_vector_splitting.cpp \
+ brw_fs_validate.cpp \
brw_fs_visitor.cpp \
+ brw_generate_mipmap.c \
brw_gs.c \
- brw_gs_emit.c \
- brw_gs_state.c \
- brw_gs_surface_state.c \
- brw_gs.c \
- brw_gs_emit.c \
- brw_gs_state.c \
brw_gs_surface_state.c \
brw_interpolation_map.c \
- brw_lower_texture_gradients.cpp \
- brw_lower_unnormalized_offset.cpp \
- brw_meta_updownsample.c \
- brw_meta_stencil_blit.c \
+ brw_link.cpp \
brw_meta_util.c \
- brw_meta_fast_clear.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_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_performance_monitor.c \
- brw_program.c \
+ brw_packed_float.c \
+ brw_performance_query.c \
+ brw_performance_query_mdapi.c \
+ brw_pipe_control.c \
+ brw_predicated_break.cpp \
brw_primitive_restart.c \
+ brw_program.c \
+ brw_program_binary.c \
+ brw_program_cache.c \
brw_queryobj.c \
+ brw_reg_type.c \
brw_reset.c \
- brw_sampler_state.c \
brw_schedule_instructions.cpp \
brw_sf.c \
- brw_sf_emit.c \
- brw_sf_state.c \
brw_shader.cpp \
- brw_state_batch.c \
- brw_state_cache.c \
- brw_state_dump.c \
brw_state_upload.c \
brw_surface_formats.c \
- brw_tex.c \
- brw_tex_layout.c \
+ brw_sync.c \
+ brw_tcs.c \
+ brw_tcs_surface_state.c \
+ brw_tes.c \
+ brw_tes_surface_state.c \
brw_urb.c \
brw_util.c \
brw_vec4.cpp \
+ brw_vec4_cmod_propagation.cpp \
brw_vec4_copy_propagation.cpp \
brw_vec4_cse.cpp \
+ brw_vec4_dead_code_eliminate.cpp \
brw_vec4_generator.cpp \
- brw_vec4_gs.c \
+ brw_vec4_gs_nir.cpp \
brw_vec4_gs_visitor.cpp \
brw_vec4_live_variables.cpp \
+ brw_vec4_nir.cpp \
brw_vec4_reg_allocate.cpp \
+ brw_vec4_surface_builder.cpp \
+ brw_vec4_tcs.cpp \
+ brw_vec4_tes.cpp \
brw_vec4_visitor.cpp \
- brw_vec4_vp.cpp \
brw_vec4_vs_visitor.cpp \
brw_vs.c \
- brw_vs_state.c \
brw_vs_surface_state.c \
Home |
Main Index |
Thread Index |
Old Index