Module Name: src
Committed By: maya
Date: Tue Sep 24 19:29:42 UTC 2019
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:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/driver.mk \
src/external/mit/xorg/lib/libloader.mk
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libglsl.mk
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libmesa.mk
cvs rdiff -u -r1.32 -r1.33 src/external/mit/xorg/lib/dri/Makefile
cvs rdiff -u -r1.34 -r1.35 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libEGL/Makefile
cvs rdiff -u -r1.27 -r1.28 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libGL/mesa-ver.mk
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libgbm/Makefile
cvs rdiff -u -r1.4 -r1.5 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.3 src/external/mit/xorg/lib/driver.mk:1.4
--- src/external/mit/xorg/lib/driver.mk:1.3 Sun Mar 10 10:51:58 2019
+++ src/external/mit/xorg/lib/driver.mk Tue Sep 24 19:29:41 2019
@@ -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 @@ SRCS+= ${SRCS.util}
.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
+
Index: src/external/mit/xorg/lib/libloader.mk
diff -u src/external/mit/xorg/lib/libloader.mk:1.3 src/external/mit/xorg/lib/libloader.mk:1.4
--- src/external/mit/xorg/lib/libloader.mk:1.3 Sun Mar 10 10:51:58 2019
+++ src/external/mit/xorg/lib/libloader.mk Tue Sep 24 19:29:41 2019
@@ -1,4 +1,4 @@
-# $NetBSD: libloader.mk,v 1.3 2019/03/10 10:51:58 mrg Exp $
+# $NetBSD: libloader.mk,v 1.4 2019/09/24 19:29:41 maya Exp $
# makefile fragment for mesa src/loader
@@ -12,8 +12,11 @@ SRCS.loader += \
.for _f in ${SRCS.loader}
CPPFLAGS.${_f}= -I${X11SRCDIR.Mesa}/src/util \
+ -I${X11SRCDIR.Mesa}/../src/util \
-I${X11SRCDIR.Mesa}/src/mesa \
-I${X11SRCDIR.Mesa}/src \
+ -DGL_LIB_NAME=\"libGL.so.3\" \
+ -DDEFAULT_DRIVER_DIR=\"${X11USRLIBDIR}/modules/dri\" \
-DUSE_DRICONF
.endfor
Index: src/external/mit/xorg/lib/libglsl.mk
diff -u src/external/mit/xorg/lib/libglsl.mk:1.5 src/external/mit/xorg/lib/libglsl.mk:1.6
--- src/external/mit/xorg/lib/libglsl.mk:1.5 Sun Apr 7 08:14:20 2019
+++ src/external/mit/xorg/lib/libglsl.mk Tue Sep 24 19:29:41 2019
@@ -1,4 +1,4 @@
-# $NetBSD: libglsl.mk,v 1.5 2019/04/07 08:14:20 maya Exp $
+# $NetBSD: libglsl.mk,v 1.6 2019/09/24 19:29:41 maya Exp $
LIBGLSL_GENERATED_CXX_FILES = \
glsl_lexer.cpp \
@@ -8,7 +8,14 @@ LIBGLSL_GENERATED_CXX_FILES = \
COPTS.vtn_glsl450.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=enum-conversion :}
CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/compiler \
- -I${X11SRCDIR.Mesa}/src/compiler/nir
+ -I${X11SRCDIR.Mesa}/../src/compiler \
+ -I${X11SRCDIR.Mesa}/src/compiler/nir \
+ -I${X11SRCDIR.Mesa}/../src/compiler/nir \
+ -I${X11SRCDIR.Mesa}/src/compiler/glsl \
+ -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
LIBGLSL_FILES = \
ast_array_index.cpp \
@@ -21,28 +28,30 @@ LIBGLSL_FILES = \
builtin_variables.cpp \
generate_ir.cpp \
gl_nir_lower_atomics.c \
- gl_nir_lower_samplers.c \
- gl_nir_lower_samplers_as_deref.c \
gl_nir_link_atomics.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_samplers.c \
+ gl_nir_lower_samplers_as_deref.c \
glsl_parser_extras.cpp \
glsl_symbol_table.cpp \
glsl_to_nir.cpp \
hir_field_selection.cpp \
+ ir.cpp \
ir_array_refcount.cpp \
ir_basic_block.cpp \
ir_builder.cpp \
ir_clone.cpp \
ir_constant_expression.cpp \
- ir.cpp \
ir_equals.cpp \
ir_expression_flattening.cpp \
+ ir_function.cpp \
ir_function_can_inline.cpp \
ir_function_detect_recursion.cpp \
- ir_function.cpp \
ir_hierarchical_visitor.cpp \
ir_hv_accept.cpp \
ir_print_visitor.cpp \
@@ -166,9 +175,11 @@ NIR_FILES = \
nir_lower_alpha_test.c \
nir_lower_alu.c \
nir_lower_alu_to_scalar.c \
+ nir_lower_array_deref_of_vec.c \
nir_lower_atomics_to_ssbo.c \
- nir_lower_bitmap.c \
nir_lower_bit_size.c \
+ nir_lower_bitmap.c \
+ nir_lower_bool_to_int32.c \
nir_lower_clamp_color_outputs.c \
nir_lower_clip.c \
nir_lower_clip_cull_distance_arrays.c \
@@ -177,15 +188,16 @@ NIR_FILES = \
nir_lower_drawpixels.c \
nir_lower_global_vars_to_local.c \
nir_lower_gs_intrinsics.c \
- nir_lower_load_const_to_scalar.c \
- nir_lower_locals_to_regs.c \
nir_lower_idiv.c \
nir_lower_indirect_derefs.c \
nir_lower_int64.c \
nir_lower_io.c \
nir_lower_io_arrays_to_elements.c \
- nir_lower_io_to_temporaries.c \
nir_lower_io_to_scalar.c \
+ nir_lower_io_to_vector.c \
+ nir_lower_io_to_temporaries.c \
+ nir_lower_load_const_to_scalar.c \
+ nir_lower_locals_to_regs.c \
nir_lower_packing.c \
nir_lower_passthrough_edgeflags.c \
nir_lower_patch_vertices.c \
@@ -197,8 +209,9 @@ NIR_FILES = \
nir_lower_tex.c \
nir_lower_to_source_mods.c \
nir_lower_two_sided_color.c \
- nir_lower_vars_to_ssa.c \
+ nir_lower_uniforms_to_ubo.c \
nir_lower_var_copies.c \
+ nir_lower_vars_to_ssa.c \
nir_lower_vec_to_movs.c \
nir_lower_wpos_center.c \
nir_lower_wpos_ytransform.c \
@@ -206,6 +219,8 @@ NIR_FILES = \
nir_move_load_const.c \
nir_move_vec_src_uses_to_dest.c \
nir_normalize_cubemap_coords.c \
+ nir_opt_combine_stores.c \
+ nir_opt_comparison_pre.c \
nir_opt_conditional_discard.c \
nir_opt_constant_folding.c \
nir_opt_copy_prop_vars.c \
@@ -216,11 +231,11 @@ NIR_FILES = \
nir_opt_dead_write_vars.c \
nir_opt_find_array_copies.c \
nir_opt_gcm.c \
- nir_opt_global_to_local.c \
+ nir_opt_idiv_const.c \
nir_opt_if.c \
nir_opt_intrinsics.c \
- nir_opt_loop_unroll.c \
nir_opt_large_constants.c \
+ nir_opt_loop_unroll.c \
nir_opt_move_comparisons.c \
nir_opt_move_load_ubo.c \
nir_opt_peephole_select.c \
@@ -238,6 +253,7 @@ NIR_FILES = \
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 \
@@ -254,15 +270,20 @@ SPIRV_FILES = \
vtn_amd.c \
vtn_cfg.c \
vtn_glsl450.c \
+ vtn_opencl.c \
vtn_subgroup.c \
vtn_variables.c
.PATH: ${X11SRCDIR.Mesa}/src/compiler
.PATH: ${X11SRCDIR.Mesa}/src/compiler/glsl
+.PATH: ${X11SRCDIR.Mesa}/../src/compiler/glsl
.PATH: ${X11SRCDIR.Mesa}/src/compiler/glsl/glcpp
+.PATH: ${X11SRCDIR.Mesa}/../src/compiler/glsl/glcpp
.PATH: ${X11SRCDIR.Mesa}/src/compiler/nir
+.PATH: ${X11SRCDIR.Mesa}/../src/compiler/nir
.PATH: ${X11SRCDIR.Mesa}/src/compiler/spirv
+.PATH: ${X11SRCDIR.Mesa}/../src/compiler/spirv
SRCS+= ${LIBGLSL_GENERATED_CXX_FILES} \
${LIBGLSL_FILES} \
Index: src/external/mit/xorg/lib/libmesa.mk
diff -u src/external/mit/xorg/lib/libmesa.mk:1.7 src/external/mit/xorg/lib/libmesa.mk:1.8
--- src/external/mit/xorg/lib/libmesa.mk:1.7 Tue Jun 18 11:28:30 2019
+++ src/external/mit/xorg/lib/libmesa.mk Tue Sep 24 19:29:41 2019
@@ -1,4 +1,4 @@
-# $NetBSD: libmesa.mk,v 1.7 2019/06/18 11:28:30 maya Exp $
+# $NetBSD: libmesa.mk,v 1.8 2019/09/24 19:29:41 maya Exp $
#
# Consumer of this Makefile should set MESA_SRC_MODULES.
@@ -8,8 +8,8 @@ CPPFLAGS.ac_surface.c+= ${${ACTIVE_CC} =
# Please keep the organization in line with those files.
# Main sources
-PATHS.main= mesa/main
-INCLUDES.main= glsl mesa/main
+PATHS.main= mesa/main ../../src/mesa/main ../../src/mapi/glapi
+INCLUDES.main= glsl mesa/main ../../src/compiler/nir
SRCS.main= \
accum.c \
api_arrayelt.c \
@@ -144,11 +144,15 @@ SRCS.main= \
es1_conversion.c
# AMD common code
-PATHS.amd= amd/common amd/addrlib amd/addrlib/core \
- amd/addrlib/gfx9 amd/addrlib/r800
-INCLUDES.amd= amd/common amd amd/addrlib amd/addrlib/core \
- amd/addrlib/inc/chip/r800 \
- amd/addrlib/inc/chip/gfx9
+PATHS.amd= amd/common amd/addrlib/src amd/addrlib/src/core \
+ amd/addrlib/src/gfx9 amd/addrlib/src/r800
+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
SRCS.amd+= \
addrinterface.cpp \
@@ -301,7 +305,7 @@ PATHS.asm_s= mesa/x86 mesa/x86/rtasm mes
.if ${MACHINE} == "amd64"
SRCS.asm_s= \
xform4.S
-CPPFLAGS+= -I${X11SRCDIR.Mesa}/../src/arch/x86_64
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/../src/mesa
.elif ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
SRCS.asm_s= \
sparc_clip.S \
@@ -327,7 +331,7 @@ SRCS.asm_s= \
read_rgba_span_x86.S \
streaming-load-memcpy.c \
sse_minmax.c
-CPPFLAGS+= -I${X11SRCDIR.Mesa}/../src/arch/i386
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/../src/mesa
.endif
.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
@@ -399,6 +403,7 @@ SRCS.state_tracker= \
st_extensions.c \
st_format.c \
st_gen_mipmap.c \
+ st_glsl_to_ir.cpp \
st_glsl_to_nir.cpp \
st_glsl_to_tgsi.cpp \
st_glsl_to_tgsi_array_merge.cpp \
@@ -407,9 +412,9 @@ SRCS.state_tracker= \
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 \
- st_nir_lower_uniforms_to_ubo.c \
st_pbo.c \
st_program.c \
st_sampler_view.c \
@@ -419,7 +424,7 @@ SRCS.state_tracker= \
st_tgsi_lower_yuv.c
# Program sources
-PATHS.program= mesa/program
+PATHS.program= mesa/program ../../src/mesa/main/program
INCLUDES.program= glsl
SRCS.program= \
arbprogparse.c \
@@ -529,8 +534,7 @@ CPPFLAGS+= \
.if ${MKLLVMRT} != "no"
CPPFLAGS+= \
- -DHAVE_LLVM=0x0700 \
- -DMESA_LLVM_VERSION_PATCH=0
+ -DHAVE_LLVM=0x0700
CXXFLAGS+= -fno-rtti
.endif
Index: src/external/mit/xorg/lib/dri/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.32 src/external/mit/xorg/lib/dri/Makefile:1.33
--- src/external/mit/xorg/lib/dri/Makefile:1.32 Fri Apr 26 18:49:35 2019
+++ src/external/mit/xorg/lib/dri/Makefile Tue Sep 24 19:29:41 2019
@@ -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 @@ 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
@@ -102,7 +103,9 @@ CPPFLAGS.i915_${_f}+= -I${X11SRCDIR.Mesa
.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 @@ DRI_SOURCES.i965+= \
gen_decoder.c \
gen_device_info.c \
gen_disasm.c \
- gen_urb_config.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.c \
@@ -136,6 +142,7 @@ DRI_SOURCES.i965+= \
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 @@ DRI_SOURCES.i965+= \
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 @@ DRI_SOURCES.i965+= \
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 @@ DRI_SOURCES.i965+= \
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 @@ DRI_SOURCES.i965+= \
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 @@ I965_INTEL_FILES = \
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 @@ DRI_SOURCES.i965+= i965_${_f}
.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 @@ MESA_SRC_MODULES= main math math_xform
.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 @@ SYMLINKS+= mesa_dri_drivers.so.${SHLIB_M
.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}
Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.34 src/external/mit/xorg/lib/gallium/Makefile:1.35
--- src/external/mit/xorg/lib/gallium/Makefile:1.34 Sun Jul 7 17:50:34 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Tue Sep 24 19:29:41 2019
@@ -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 @@ CPPFLAGS.${_f} += -DHAVE_PIPE_LOADER_KMS
-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/nir = \
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 @@ GALLIUM_SOURCES.auxiliary/gallivm= \
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/ga
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 @@ GALLIUM_SOURCES.drivers/radeon = \
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/radeon = \
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}/sr
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 @@ GALLIUM_SOURCES.drivers/nouveau/codegen
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 @@ GALLIUM_SOURCES.drivers/nouveau/codegen
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 @@ CPPFLAGS.streaming-load-memcpy.c+= -msse
CPPFLAGS.i386+= -march=i586
CPPFLAGS+= ${CPPFLAGS.${XORG_MACHINE_ARCH:U${MACHINE_ARCH}}}
+CPPFLAGS.r600_pipe_common.c+= -DMESA_LLVM_VERSION_STRING=\"7.0.0\"
+CPPFLAGS.si_get.c+= -DMESA_LLVM_VERSION_STRING=\"7.0.0\"
+
.include "../driver.mk"
@@ -1125,6 +1128,8 @@ CPPFLAGS.target.c += \
-DGALLIUM_SOFTPIPE \
-I${X11SRCDIR.Mesa}/src/gallium/state_trackers/dri \
-I${X11SRCDIR.Mesa}/src/loader \
+ -I${X11SRCDIR.Mesa}/../src/util \
+ -I${X11SRCDIR.Mesa}/../src/gallium/drivers \
-I${X11SRCDIR.Mesa}/src/gallium/winsys
.if ${BUILD_LLVMPIPE} == 1
Index: src/external/mit/xorg/lib/libEGL/Makefile
diff -u src/external/mit/xorg/lib/libEGL/Makefile:1.4 src/external/mit/xorg/lib/libEGL/Makefile:1.5
--- src/external/mit/xorg/lib/libEGL/Makefile:1.4 Fri Apr 26 19:42:27 2019
+++ src/external/mit/xorg/lib/libEGL/Makefile Tue Sep 24 19:29:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/04/26 19:42:27 christos Exp $
+# $NetBSD: Makefile,v 1.5 2019/09/24 19:29:42 maya Exp $
.include <bsd.own.mk>
@@ -115,7 +115,7 @@ LIBDPLIBS= Xext ${.CURDIR}/../libXext \
MKLINT=no
PKGCONFIG= egl
-PKGDIST.egl= ${X11SRCDIR.Mesa}/src/egl/main
+PKGDIST.egl= ${X11SRCDIR.Mesa}/../src/pkgconfig
.include "${.CURDIR}/../libGL/mesa-ver.mk"
PKGCONFIG_VERSION.egl= ${MESA_VER}
Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.27 src/external/mit/xorg/lib/libGL/Makefile:1.28
--- src/external/mit/xorg/lib/libGL/Makefile:1.27 Thu May 16 01:22:36 2019
+++ src/external/mit/xorg/lib/libGL/Makefile Tue Sep 24 19:29:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/05/16 01:22:36 christos Exp $
+# $NetBSD: Makefile,v 1.28 2019/09/24 19:29:42 maya Exp $
.include <bsd.own.mk>
@@ -48,33 +48,49 @@ CPPFLAGS.UTILdebug.c+= -I${X11SRCDIR.Mes
-I${X11SRCDIR.Mesa}/src \
-I${X11SRCDIR.Mesa}/src/gallium/include
-BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/glx/indirect_init.c MESAindirect_init.c
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/../src/mapi/glapi/indirect_init.c MESAindirect_init.c
BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/glx/indirect_window_pos.c MESAindirect_window_pos.c
-BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/glx/indirect.c MESAindirect.c
-BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/glx/indirect_size.c MESAindirect_size.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/util/debug.c UTILdebug.c
# glapi
.PATH: ${X11SRCDIR.Mesa}/src/mapi
.PATH: ${X11SRCDIR.Mesa}/src/mapi/glapi
-SRCS.glapi= glapi_gentable.c
+#SRCS.glapi= glapi_gentable.c
-.PATH: ${X11SRCDIR.Mesa}/src/mapi/glapi
-
-SRCS.i386.glx= glapi_x86.S
-SRCS.x86_64.glx= glapi_x86-64.S
-SRCS.sparc.glx= glapi_sparc.S
+.PATH: ${X11SRCDIR.Mesa}/src/mesa/x86
+.PATH: ${X11SRCDIR.Mesa}/src/mesa/x86-64
+.PATH: ${X11SRCDIR.Mesa}/src/mesa/sparc
+
+SRCS.i386.glx= common_x86_asm.S \
+ x86_xform2.S \
+ x86_xform3.S \
+ x86_xform4.S \
+ x86_cliptest.S \
+ mmx_blend.S \
+ 3dnow_xform1.S \
+ 3dnow_xform2.S \
+ 3dnow_xform3.S \
+ 3dnow_xform4.S \
+ sse_xform1.S \
+ sse_xform2.S \
+ sse_xform3.S \
+ sse_xform4.S \
+ sse_normal.S \
+ read_rgba_span_x86.S
+SRCS.x86_64.glx= xform4.S
+SRCS.sparc.glx= xform.S norm.S sparc_clip.S
.if !empty(SRCS.${MACHINE_ARCH}.glx)
SRCS.glx += ${SRCS.${XORG_MACHINE_ARCH:U${MACHINE_ARCH}}.glx}
-.else
-SRCS.glapi+= entry.c
.endif
+SRCS.glapi+= entry.c
.for _f in ${SRCS.glx}
CPPFLAGS.${_f}= -I${X11SRCDIR.Mesa}/../src/mapi/glapi \
-I${X11SRCDIR.Mesa}/src \
- -I${X11SRCDIR.Mesa}/src/mesa \
+ -I${X11SRCDIR.Mesa}/../src/mesa \
-DGLX_SHARED_GLAPI
.endfor
@@ -82,7 +98,7 @@ CPPFLAGS.${_f}= -I${X11SRCDIR.Mesa}/../s
CPPFLAGS.${_f}= -DMAPI_MODE_BRIDGE \
-DMAPI_ABI_HEADER=\"glapi/glapi_mapi_tmp.h\" \
-I${X11SRCDIR.Mesa}/src \
- -I${X11SRCDIR.Mesa}/src/mesa
+ -I${X11SRCDIR.Mesa}/../src/mapi
.endfor
@@ -101,8 +117,6 @@ SRCS.dri= \
.for fn in ${SRCS.dri}
CPPFLAGS.${fn}= \
- -DGL_LIB_NAME=\"libGL.so.3\" \
- -DDEFAULT_DRIVER_DIR=\"${X11USRLIBDIR}/modules/dri\" \
-I${X11SRCDIR.Mesa}/src
.endfor
.endif
@@ -198,7 +212,7 @@ LIBDPLIBS= Xext ${.CURDIR}/../libXext \
MKLINT=no
PKGCONFIG= gl
-PKGDIST.gl= ${X11SRCDIR.Mesa}/src/mesa
+PKGDIST.gl= ${X11SRCDIR.Mesa}/../src/pkgconfig
.include "${.CURDIR}/../libGL/mesa-ver.mk"
PKGCONFIG_VERSION.gl= ${MESA_VER}
Index: src/external/mit/xorg/lib/libGL/mesa-ver.mk
diff -u src/external/mit/xorg/lib/libGL/mesa-ver.mk:1.3 src/external/mit/xorg/lib/libGL/mesa-ver.mk:1.4
--- src/external/mit/xorg/lib/libGL/mesa-ver.mk:1.3 Sun Mar 10 10:51:58 2019
+++ src/external/mit/xorg/lib/libGL/mesa-ver.mk Tue Sep 24 19:29:42 2019
@@ -1,3 +1,3 @@
-# $NetBSD: mesa-ver.mk,v 1.3 2019/03/10 10:51:58 mrg Exp $
+# $NetBSD: mesa-ver.mk,v 1.4 2019/09/24 19:29:42 maya Exp $
-MESA_VER= 18.3.4
+MESA_VER= 19.1.17
Index: src/external/mit/xorg/lib/libgbm/Makefile
diff -u src/external/mit/xorg/lib/libgbm/Makefile:1.6 src/external/mit/xorg/lib/libgbm/Makefile:1.7
--- src/external/mit/xorg/lib/libgbm/Makefile:1.6 Thu Apr 25 09:03:54 2019
+++ src/external/mit/xorg/lib/libgbm/Makefile Tue Sep 24 19:29:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/04/25 09:03:54 maya Exp $
+# $NetBSD: Makefile,v 1.7 2019/09/24 19:29:42 maya Exp $
.include <bsd.own.mk>
@@ -50,7 +50,7 @@ LIBDPLIBS+= drm ${.CURDIR}/../libdrm
LIBDPLIBS+= expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat
PKGCONFIG= gbm
-PKGDIST.gbm= ${X11SRCDIR.Mesa}/src/gbm/main
+PKGDIST.gbm= ${X11SRCDIR.Mesa}/../src/pkgconfig
.include "${.CURDIR}/../libGL/mesa-ver.mk"
PKGCONFIG_VERSION.gbm= ${MESA_VER}
Index: src/external/mit/xorg/lib/libglapi/Makefile
diff -u src/external/mit/xorg/lib/libglapi/Makefile:1.4 src/external/mit/xorg/lib/libglapi/Makefile:1.5
--- src/external/mit/xorg/lib/libglapi/Makefile:1.4 Sun Mar 10 10:51:58 2019
+++ src/external/mit/xorg/lib/libglapi/Makefile Tue Sep 24 19:29:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/03/10 10:51:58 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2019/09/24 19:29:42 maya 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
