vasilito
7686729069
Extract protocol-agnostic FenceTimeline from Intel to shared src/drivers/fence.rs — atomic-based fence tracking suitable for Intel, VIRGL, and AMD drivers. Extract protocol-agnostic SyncobjManager from Intel to shared src/drivers/syncobj.rs — syncobj create/destroy/signal/reset/ wait/query and sync_file fd export/import. Wire both into VirtioDriver: - Add FenceTimeline + SyncobjManager fields - Implement all 5 GpuDriver syncobj trait methods (create, destroy, wait, export_fd, import_fd) - Track fence seqnos in virgl_submit_3d (allocate before submit, signal after completion) Intel fence.rs and syncobj.rs converted to thin re-export modules pointing at shared sources — no behavioral change for Intel driver. This gives Mesa VIRGL userspace the standard DRM syncobj API for GPU/compositor synchronization.
156 lines
4.5 KiB
Sed
156 lines
4.5 KiB
Sed
# Rewrite default rules from .c.o: to .c.o: .c
|
|
/^\./s/^\(\.[a-z]*\)\(\.[a-z]*\)\( *: *\)$/\1\2\3 \1/
|
|
|
|
# Change dependency char.
|
|
/::/s/::/ \\Option-f\\Option-f /g
|
|
/:/s/:/ \\Option-f /g
|
|
/^[SU]=/s/ \\Option-f /:/g
|
|
|
|
# Change syntax of Makefile vars.
|
|
/\$/s/\${\([a-zA-Z0-9_]*\)}/{\1}/g
|
|
/\$/s/\$(\([a-zA-Z0-9_]*\))/{\1}/g
|
|
|
|
# Change $@ to {targ}
|
|
/\$@/s/\$@/{targ}/g
|
|
|
|
# Change pathname syntax.
|
|
#
|
|
# If line ends with .. then assume it sets a variable that will
|
|
# be used to prefix something else -- eliminate one colon, assuming
|
|
# that a slash after the ${name} will turn into the missing colon.
|
|
# Mac pathname conventions are IRREGULAR and UGLY!
|
|
/\./s,\.\./\.\.$,::,
|
|
/\./s,\.\.$,:,
|
|
# Same if it ends with . (a single dot); turn it into nothing.
|
|
/\./s,\.$,,g
|
|
# Rules for .. and . elsewhere in the line
|
|
# Convert ../: to ::, recur to get whole paths.
|
|
/\./s,\.\./:,::,g
|
|
# Convert ../../ to :::
|
|
/\./s,\.\./\.\./,:::,g
|
|
/\./s,\.\./,::,g
|
|
/\.\//s,\./,:,g
|
|
/\//s,/,:,g
|
|
|
|
/=/s/ = \.$/ = :/
|
|
|
|
# Comment out any explicit srcdir setting.
|
|
# /srcdir/s/^srcdir/# srcdir/
|
|
|
|
/version/s/^version=/# version=/
|
|
|
|
/BASEDIR/s/^BASEDIR =.*$/BASEDIR = "{srcroot}"/
|
|
/{BASEDIR}:/s/{BASEDIR}:/{BASEDIR}/g
|
|
# The original lines screw up -I$(srcdir)/../des by eliminating a colon.
|
|
# Proposed fix: Eliminate srcdir prefixes totally.
|
|
#/{srcdir}:/s/{srcdir}:/"{srcdir}"/g
|
|
/{srcdir}:/s/{srcdir}://g
|
|
#/"{srcdir}":/s/"{srcdir}":/"{srcdir}"/g
|
|
|
|
# Comment out settings of anything set by mpw host config.
|
|
##/CC/s/^CC *=/#CC =/
|
|
##/CFLAGS/s/^CFLAGS *=/#CFLAGS =/
|
|
##/LDFLAGS/s/^LDFLAGS *=/#LDFLAGS =/
|
|
|
|
# Change -I usage.
|
|
/-I/s/-I\./-i :/g
|
|
/-I/s/-I::bfd/-i ::bfd:/g
|
|
/-I/s/-I::include/-i ::include:/g
|
|
/-I/s/-I/-i /g
|
|
|
|
# Change -D usage.
|
|
/-D/s/\([ =]\)-D\([^ ]*\)/\1-d \2/g
|
|
|
|
# Change continuation char.
|
|
/\\$/s/\\$/\\Option-d/
|
|
|
|
# Change wildcard char.
|
|
/^[^#]/s/\*/\\Option-x/g
|
|
|
|
# Change path of various types of source files.
|
|
#/\.[chly]/s/\([ ><=]\)\([-a-zA-Z0-9_$:"]*\)\.\([chly]\)/\1"{s}"\2.\3/g
|
|
#/\.[chly]/s/^\([-a-zA-Z0-9_${}:"]*\)\.\([chly]\)/"{s}"\1.\2/g
|
|
# Skip the {s} and {o} business for now...
|
|
# Fix some overenthusiasms.
|
|
#/{s}/s/"{s}""{srcdir}"/"{srcdir}"/g
|
|
#/{s}/s/"{s}"{\([a-zA-Z0-9_]*\)dir}/"{\1dir}"/g
|
|
#/{s}/s/"{s}"{\([a-zA-Z0-9_]*\)DIR}/"{\1DIR}"/g
|
|
#/{s}/s/"{s}""{\([a-zA-Z0-9_]*\)dir}"/"{\1dir}"/g
|
|
#/{s}/s/"{s}""{\([a-zA-Z0-9_]*\)DIR}"/"{\1DIR}"/g
|
|
#/{s}/s/"{s}":/:/g
|
|
#/{s}/s/^"{s}"//g
|
|
#/^\./s/"{s}"\././g
|
|
|
|
# Change extension and path of objects, except in the OBJEXT line.
|
|
#/^OBJEXT/!s/\([ =]\)\([-a-zA-Z0-9_${}:"]*\)\.o/\1"{o}"\2.c.o/g
|
|
#/\.o/s/^\([-a-zA-Z0-9_${}:"]*\)\.o/"{o}"\1.c.o/g
|
|
# Skip the {o} stuff for now...
|
|
/^OBJEXT/!s/\([ =]\)\([-a-zA-Z0-9_${}:"]*\)\.o/\1\2.c.o/g
|
|
/\.o/s/^\([-a-zA-Z0-9_${}:"]*\)\.o/\1.c.o/g
|
|
# Clean up.
|
|
#/\.o/s/"{o}""{o}"/"{o}"/g
|
|
#/{o}/s/^"{o}"\([a-zA-Z0-9_]*\)=/\1=/g
|
|
|
|
# Change extension of libs.
|
|
# /\.a/s/lib\([a-z]*\)\.a/lib\1.o/g
|
|
|
|
# Remove non-echo option.
|
|
/^ -/s/^ -/ /
|
|
|
|
# Change cp to duplicate.
|
|
# /cp/s/^\([ ]*\)cp /\1Duplicate -d -y /
|
|
# Change mv to rename.
|
|
# /mv/s/^\([ ]*\)mv /\1Rename -y /
|
|
# /Rename/s/^\([ ]*\)Rename -y -f/\1Rename -y/
|
|
# Change rm to delete.
|
|
/^RM=/s/rm -f/Delete -i -y/
|
|
# /rm/s/^\([ ]*\)rm /\1Delete -y /
|
|
# /Delete/s/^\([ ]*\)Delete -y -f/\1Delete -y/
|
|
# Comment out symlinking.
|
|
# /ln/s/^\([ ]*\)ln /\1# ln /
|
|
|
|
# Remove -c from explicit compiler calls.
|
|
# /-c/s/{CC}\(.*\) -c \(.*\)\([-a-z]*\)\.c/{CC}\1 \2\3.c -o "{o}"\3.c.o/g
|
|
# Don't ask... prev subst seems to omit the second filename.
|
|
# /-o/s/\([-a-z]*\)\.c -o "{o}".c.o/\1\.c -o "{o}"\1.c.o/
|
|
|
|
# Change linking cc to link.
|
|
/LDFLAGS/ s/{CC} \(.*\){CFLAGS}\(.*\){LDFLAGS}/Link \1 \2 {LDFLAGS}/
|
|
/CFLAGS_LINK/s/{CC} \(.*\){CFLAGS_LINK}\(.*\){LDFLAGS}/Link \1 \2 {LDFLAGS}/
|
|
|
|
# Comment out .PHONY rules.
|
|
/\.PHONY/s/^\.PHONY/# \.PHONY/
|
|
# Comment out .SUFFIXES rules.
|
|
/\.SUFFIXES/s/^\.SUFFIXES/# \.SUFFIXES/
|
|
# Comment out .PRECIOUS rules.
|
|
/\.PRECIOUS/s/^\.PRECIOUS/# \.PRECIOUS/
|
|
## Comment out default rules.
|
|
##/^\./s/^\(\.[a-z]*\.[a-z]* \)/# \1/
|
|
|
|
#
|
|
# End of original hack-mf.sed
|
|
#
|
|
# Begin original hack-mf2.sed
|
|
#
|
|
# Transform expressions.
|
|
|
|
# Set the install program appropriate.
|
|
# /INSTALL/s/^INSTALL *= *`.*`:install.sh -c/INSTALL = Duplicate -y/
|
|
|
|
# Include from the extra-include dir.
|
|
# /^INCLUDES = /s/^INCLUDES = /INCLUDES = -i "{srcroot}"extra-include /
|
|
|
|
# Yuck - remove unconverted autoconf things.
|
|
# /@/s/@[^ ]*@//g
|
|
|
|
# Hackery, pure and simple
|
|
# To speed up compiles, remove duplicated -i options.
|
|
/-i/s/\(-i [^ ]*\) \1 /\1 /g
|
|
|
|
# Note! There are 8-bit characters in the three lines below:
|
|
# 0xc4, 0xb6, 0xc5.
|
|
/Option/s/\\Option-f/Ä/g
|
|
/Option/s/\\Option-d/¶/g
|
|
/Option/s/\\Option-x/Å/g
|
|
s/ $//
|