diff --git a/external/bsd/llvm/Makefile.inc b/external/bsd/llvm/Makefile.inc index 5e9d89ef87a4..d920282a1576 100644 --- a/external/bsd/llvm/Makefile.inc +++ b/external/bsd/llvm/Makefile.inc @@ -69,7 +69,7 @@ CPPFLAGS+= -I${LLVM_INCLUDE_OBJDIR} -I${LLVM_INCLUDE_CONFIG} \ LLVM_PLATFORM=${MACHINE_GNU_ARCH}--netbsd LLVM_CONFIGURE_ARGS= \ - --enable-targets=x86,powerpc,sparc,aarch64,arm,mips \ + --enable-targets=x86,powerpc,sparc,aarch64,arm,mips,amdgpu \ --with-c-include-dirs=/usr/include/clang-${CLANG_VERSION:R}:/usr/include \ --disable-timestamps --prefix=/usr --sysconfdir=/etc/llvm \ --with-clang-default-openmp-runtime=libomp \ diff --git a/external/bsd/llvm/bin/clang/Makefile b/external/bsd/llvm/bin/clang/Makefile index 8d1dbc25fcbf..7bf5515b892d 100644 --- a/external/bsd/llvm/bin/clang/Makefile +++ b/external/bsd/llvm/bin/clang/Makefile @@ -53,6 +53,13 @@ LLVM_LIBS+= \ AsmParser \ BitReader \ BitWriter \ + AMDGPUAsmParser \ + AMDGPUCodeGen \ + AMDGPUDisassembler \ + AMDGPUMCTargetDesc \ + AMDGPUTargetInfo \ + AMDGPUAsmPrinter \ + AMDGPUUtils \ AArch64CodeGen \ AArch64TargetInfo \ AArch64AsmParser \ diff --git a/external/mit/xorg/lib/Makefile b/external/mit/xorg/lib/Makefile index c6a4152bec55..136888d57977 100644 --- a/external/mit/xorg/lib/Makefile +++ b/external/mit/xorg/lib/Makefile @@ -10,7 +10,8 @@ SUBDIR= libfontenc freetype libFS libICE libglapi \ SUBDIR+=libdrm_intel libdrm_amdgpu .endif .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm" -SUBDIR+=libdrm_nouveau libvdpau +SUBDIR+=libdrm_nouveau +# libvdpau .endif SUBDIR+=libdrm_radeon pixman .if !defined(MLIBDIR) diff --git a/external/mit/xorg/lib/gallium/Makefile b/external/mit/xorg/lib/gallium/Makefile index 2a2a61861651..1c3900f725b6 100644 --- a/external/mit/xorg/lib/gallium/Makefile +++ b/external/mit/xorg/lib/gallium/Makefile @@ -26,7 +26,9 @@ GALLIUM_SUBDIRS= \ auxiliary \ auxiliary/cso_cache \ auxiliary/draw \ + auxiliary/driver_ddebug \ auxiliary/driver_noop \ + auxiliary/driver_rbug \ auxiliary/driver_trace \ auxiliary/gallivm \ auxiliary/hud \ @@ -48,6 +50,7 @@ GALLIUM_SUBDIRS= \ winsys/sw/dri \ winsys/sw/kms-dri \ winsys/sw/null \ + winsys/sw/wrapper \ state_trackers/dri GALLIUM_SUBDIRS_ATI= \ @@ -109,7 +112,6 @@ GALLIUM_SOURCES.auxiliary/draw= \ draw_pipe_wide_line.c \ draw_pipe_wide_point.c \ draw_prim_assembler.c \ - draw_prim_assembler.h \ draw_pt.c \ draw_pt_emit.c \ draw_pt_fetch.c \ @@ -135,6 +137,10 @@ GALLIUM_SOURCES.auxiliary/hud= \ font.c \ hud_context.c \ hud_cpu.c \ + hud_nic.c \ + hud_cpufreq.c \ + hud_diskstat.c \ + hud_sensors_temp.c \ hud_fps.c \ hud_driver_query.c GALLIUM_SOURCES.auxiliary/indices= \ @@ -335,6 +341,11 @@ CPPFLAGS.${_f} += -I${X11SRCDIR.MesaLib}/src/gallium/auxiliary/util .endfor +GALLIUM_SOURCES.auxiliary/driver_ddebug = \ + dd_context.c \ + dd_draw.c \ + dd_screen.c + GALLIUM_SOURCES.auxiliary/driver_noop = \ noop_pipe.c \ noop_state.c @@ -368,6 +379,8 @@ BUILDSYMLINKS+= ${X11SRCDIR.MesaLib}/src/gallium/drivers/r600/radeon_vce.c r600_ BUILDSYMLINKS+= ${X11SRCDIR.MesaLib}/src/gallium/drivers/radeon/radeon_vce.c radeon_radeon_vce.c BUILDSYMLINKS+= ${X11SRCDIR.MesaLib}/src/gallium/drivers/r600/r600_perfcounter.c r600_r600_perfcounter.c BUILDSYMLINKS+= ${X11SRCDIR.MesaLib}/src/gallium/drivers/radeon/r600_perfcounter.c radeon_r600_perfcounter.c +BUILDSYMLINKS+= ${X11SRCDIR.MesaLib}/src/gallium/drivers/r600/radeon_uvd.c r600_radeon_uvd.c +BUILDSYMLINKS+= ${X11SRCDIR.MesaLib}/src/gallium/drivers/radeon/radeon_uvd.c radeon_radeon_uvd.c GALLIUM_SOURCES.drivers/radeon = \ cayman_msaa.c \ @@ -376,14 +389,19 @@ GALLIUM_SOURCES.drivers/radeon = \ r600_query.c \ r600_streamout.c \ r600_texture.c \ - radeon_radeon_video.c \ - radeon_uvd.c \ + radeon_r600_perfcounter.c \ + radeon_radeon_uvd.c \ radeon_uvd_enc.c \ radeon_uvd_enc_1_1.c \ - radeon_radeon_vce.c \ - radeon_vce_52.c \ radeon_vce_40_2_2.c \ - radeon_r600_perfcounter.c + radeon_vce_50.c \ + radeon_vce_52.c \ + radeon_vcn_dec.c \ + radeon_vcn_dec_jpeg.c \ + radeon_vcn_enc.c \ + radeon_vcn_enc_1_2.c \ + radeon_radeon_vce.c \ + radeon_radeon_video.c \ GALLIUM_SOURCES.drivers/r600 = \ eg_debug.c \ @@ -406,6 +424,8 @@ GALLIUM_SOURCES.drivers/r600 = \ r600_state.c \ r600_state_common.c \ r600_uvd.c \ + r600_radeon_uvd.c \ + r600_test_dma.c \ r700_asm.c GALLIUM_SOURCES.drivers/r600/sb = \ sb_bc_builder.cpp \ @@ -472,6 +492,10 @@ GALLIUM_SOURCES.drivers/radeonsi = \ si_texture.c \ si_uvd.c +.for _f in ${GALLIUM_SOURCES.drivers/radeon} +CPPFLAGS.${_f} += -I${X11SRCDIR.MesaLib}/src/gallium/drivers/radeon +.endfor + .for _f in ${GALLIUM_SOURCES.drivers/r600} ${GALLIUM_SOURCES.drivers/r600/sb} ${GALLIUM_SOURCES.drivers/radeonsi} CPPFLAGS.${_f} += -I${X11SRCDIR.MesaLib}/src/gallium/drivers/r600 CPPFLAGS.${_f} += -I${X11SRCDIR.MesaLib}/../src/gallium/drivers/r600 @@ -652,6 +676,9 @@ GALLIUM_SOURCES.drivers/softpipe = \ GALLIUM_SOURCES.winsys/sw/null = \ null_sw_winsys.c +GALLIUM_SOURCES.winsys/sw/wrapper = \ + wrapper_sw_winsys.c + GALLIUM_SOURCES.winsys/sw/dri = \ dri_sw_winsys.c diff --git a/external/mit/xorg/lib/libmesa.mk b/external/mit/xorg/lib/libmesa.mk index 55558c10dee0..7180402323a0 100644 --- a/external/mit/xorg/lib/libmesa.mk +++ b/external/mit/xorg/lib/libmesa.mk @@ -16,6 +16,7 @@ SRCS.main= \ accum.c \ api_arrayelt.c \ api_loopback.c \ + api_exec.c \ arbprogram.c \ arrayobj.c \ atifragshader.c \ @@ -57,6 +58,7 @@ SRCS.main= \ ff_fragment_shader.cpp \ ffvertex_prog.c \ fog.c \ + format_fallback.c \ format_pack.c \ format_unpack.c \ format_utils.c \ @@ -137,11 +139,11 @@ SRCS.main= \ uniform_query.cpp \ uniforms.c \ varray.c \ + vdpau.c \ version.c \ viewport.c \ vtxfmt.c \ es1_conversion.c - # vdpau.c \ XXX galliumvl # AMD common code PATHS.amd= amd/common amd/addrlib amd/addrlib/core \ @@ -172,11 +174,6 @@ SRCS.amd+= \ ac_surface.c \ ac_debug.c -# Build files -.PATH: ${X11SRCDIR.MesaLib}/../src/mesa/main -SRCS.main+= \ - api_exec.c - # XXX avoid source name clashes with glx .PATH: ${X11SRCDIR.MesaLib}/src/mesa/main BUILDSYMLINKS+= ${X11SRCDIR.MesaLib}/src/mesa/main/pixel.c MESApixel.c \ @@ -329,9 +326,17 @@ SRCS.asm_s= \ sse_xform4.S \ sse_normal.S \ read_rgba_span_x86.S + streaming-load-memcpy.c \ + sse_minmax.c CPPFLAGS+= -I${X11SRCDIR.MesaLib}/../src/arch/i386 .endif +.if ${MACHINE} == "amd64" || ${MACHINE} == "i386" +SRCS.asm_s+= \ + streaming-load-memcpy.c \ + sse_minmax.c +COPTS.sse_minmax.c+= -msse4.1 +.endif # State tracker sources PATHS.state_tracker= mesa/state_tracker @@ -387,6 +392,7 @@ SRCS.state_tracker= \ st_cb_texturebarrier.c \ st_cb_viewport.c \ st_cb_xformfb.c \ + st_context.c \ st_copytex.c \ st_debug.c \ st_draw.c \ @@ -412,8 +418,7 @@ SRCS.state_tracker= \ st_shader_cache.c \ st_texture.c \ st_tgsi_lower_yuv.c \ - st_vdpau.c \ - st_context.c + st_vdpau.c # Program sources PATHS.program= mesa/program @@ -433,8 +438,8 @@ SRCS.program= \ prog_statevars.c \ prog_to_nir.c \ program.c \ - program_parse.tab.c \ programopt.c \ + program_parse.tab.c \ program_parse_extra.c \ symbol_table.c \ program_lexer.l