Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/mit/xorg pull across most of the new build infrastr...
details: https://anonhg.NetBSD.org/src/rev/e463f94cb8f5
branches: trunk
changeset: 449534:e463f94cb8f5
user: mrg <mrg%NetBSD.org@localhost>
date: Sun Mar 10 10:51:58 2019 +0000
description:
pull across most of the new build infrastruture for mesa18 from maya's
git tree. this includes may of the changes from the changes below:
commit 52d85e74a1197aace38cc7acb705509e969120e6
Author: coypu <coypu%sdf.org@localhost>
Date: Mon Mar 4 12:25:33 2019 +0200
Make 32bit archs happier.
except i386, which now suffers from locked atomics because we
don't have clever ifunc tricks in libc.
commit ee9b4c19c58127934ed3548ad0d68934cc95ccc7
Author: coypu <coypu%sdf.org@localhost>
Date: Mon Mar 4 09:08:35 2019 +0200
Adjust includes, append rather than replace, appease clang ppc builds
commit a5341a3ad42572c78b6a2e6e5545bd323d7f2e4c
Author: coypu <coypu%sdf.org@localhost>
Date: Sun Mar 3 11:52:19 2019 +0200
Resolve i386 atomic issue and set lists.
XXX libGL in i386 is still causing issues
XXX pkgconfig file for vdpau
XXX set lists for arm32
commit 27bffc20bc15186c92cc5b8d5cc08d7299966b34
Author: coypu <coypu%sdf.org@localhost>
Date: Sat Mar 2 21:52:45 2019 +0200
make llvm sources x86 specific
hopefully not breaking non-x86 clang builds, which
have MKLLVM set.
commit f9d34922619cc8f2a224c0138a73985e50daf87f
Author: coypu <coypu%sdf.org@localhost>
Date: Sat Mar 2 21:33:31 2019 +0200
move hack to build llvm libraries soon enough.
add u_process.c to libGL specifically (dri, gallium and libGL all need
it).
Add some missing includes for pipe-loader when it moved to gallium
commit 2b1083d0d538bb5d5dd88ab2ca0ca6c331e5dd5b
Author: coypu <coypu%sdf.org@localhost>
Date: Sat Mar 2 16:47:58 2019 +0200
shuffle around:
some files move from shared driver.mk/loader.mk into gallium.
others move to shared.
add i915 files.
now i965 glxgears works (amd64).
commit 1897a90569b30b294bcbedadb3745092eca0bb33
Author: Maya Rashish <maya%NetBSD.org@localhost>
Date: Sun Feb 24 23:36:26 2019 +0200
Progress towards glxgears on i915
commit 28c9c99a236404de41ae74e88ea6d9578c088b92
Author: Maya Rashish <maya%NetBSD.org@localhost>
Date: Sun Feb 24 21:55:56 2019 +0200
rototill i965/i915 causing it to no longer startx.
Now missing sw_screen_create in the dri driver.
commit 48eb746983a5a7967fba221e7b167808af36f44a
Author: Maya Rashish <maya%NetBSD.org@localhost>
Date: Sun Feb 24 09:31:22 2019 +0200
More of vdpau. Cogs spin.
commit d9fbba8f61a43648d32f160c5fa62626788566ff
Author: Maya Rashish <maya%NetBSD.org@localhost>
Date: Sat Feb 23 22:36:37 2019 +0200
Adjust for MesaLib 18.
Build llvmpipe driver on x86 (the driver itself is x86-only).
build llvm on all x86, even on GCC builds.
galahad driver removed (upstream).
Don't build mesa 7 at all.
diffstat:
external/mit/xorg/include/KHR/Makefile | 13 +
external/mit/xorg/lib/dri/Makefile | 255 ++++++---
external/mit/xorg/lib/driver.mk | 41 +-
external/mit/xorg/lib/gallium/Makefile | 795 +++++++++++++++++++++++++------
external/mit/xorg/lib/libGL/Makefile | 129 +++-
external/mit/xorg/lib/libGL/mesa-ver.mk | 4 +-
external/mit/xorg/lib/libgbm/Makefile | 19 +-
external/mit/xorg/lib/libglapi/Makefile | 95 ++-
external/mit/xorg/lib/libglsl.mk | 182 ++++++-
external/mit/xorg/lib/libloader.mk | 10 +-
external/mit/xorg/lib/libmesa.mk | 248 +++++++--
11 files changed, 1358 insertions(+), 433 deletions(-)
diffs (truncated from 2891 to 300 lines):
diff -r 5cb865bd71c5 -r e463f94cb8f5 external/mit/xorg/include/KHR/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/include/KHR/Makefile Sun Mar 10 10:51:58 2019 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2019/03/10 10:51:59 mrg Exp $
+
+.include <bsd.own.mk>
+
+.PATH: ${X11SRCDIR.Mesa}/include/KHR
+
+INCS= khrplatform.h
+INCSDIR=${X11INCDIR}/KHR
+
+NOOBJ= # defined
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
diff -r 5cb865bd71c5 -r e463f94cb8f5 external/mit/xorg/lib/dri/Makefile
--- a/external/mit/xorg/lib/dri/Makefile Sun Mar 10 10:00:29 2019 +0000
+++ b/external/mit/xorg/lib/dri/Makefile Sun Mar 10 10:51:58 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/03/10 02:29:52 mrg Exp $
+# $NetBSD: Makefile,v 1.30 2019/03/10 10:51:58 mrg Exp $
# Link the mesa_dri_drivers mega driver.
@@ -15,6 +15,8 @@
DRIDIR= ${X11USRLIBDIR}/modules/dri
DRIDEBUGDIR= ${DEBUGDIR}${X11USRLIBDIR}/modules/dri
+LDFLAGS+= -Wl,--build-id=sha1
+
# -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/${MODULE}/server \
CPPFLAGS+= \
@@ -23,6 +25,10 @@
-I${X11SRCDIR.Mesa}/../src/mesa/drivers/dri/common \
-I${DESTDIR}${X11INCDIR}/libdrm
+.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.
@@ -42,48 +48,48 @@
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 +97,232 @@
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
+
+
+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_urb_config.c \
+ gen_l3_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_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_oa_metrics.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_conversions.cpp \
+ brw_fs_lower_pack.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_surface_builder.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_trig_workarounds.c \
+ brw_nir_attribute_workarounds.c \
+ brw_nir_lower_cs_intrinsics.c \
+ brw_nir_lower_image_load_store.c \
+ brw_nir_opt_peephole_ffma.c \
+ brw_nir_tcs_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 \
+ brw_vue_map.c \
brw_wm.c \
brw_wm_iz.cpp \
- brw_wm_state.c \
brw_wm_surface_state.c \
- gen6_blorp.cpp \
- gen6_cc.c \
gen6_clip_state.c \
- gen6_depth_state.c \
- gen6_depthstencil.c \
- gen6_gs_state.c \
+ gen6_constant_state.c \
+ gen6_gs_visitor.cpp \
gen6_multisample_state.c \
gen6_queryobj.c \
Home |
Main Index |
Thread Index |
Old Index