head	1.1;
branch	1.1.1;
access;
symbols
	netbsd-11-0-RC4:1.1.1.3.4.1
	xorg-server-21-1-22:1.1.1.4
	netbsd-11-0-RC3:1.1.1.3.4.1
	netbsd-11-0-RC2:1.1.1.3.4.1
	netbsd-11-0-RC1:1.1.1.3.4.1
	xorg-server-21-1-21:1.1.1.4
	xorg-server-21-1-20:1.1.1.4
	netbsd-11:1.1.1.3.0.4
	netbsd-11-base:1.1.1.3
	xorg-server-21-1-18:1.1.1.3
	xorg-server-21-1-16:1.1.1.3
	netbsd-10-1-RELEASE:1.1.1.3
	xorg-server-21-1-14:1.1.1.3
	xorg-server-21-1-13:1.1.1.3
	netbsd-9-4-RELEASE:1.1.1.1
	netbsd-10-0-RELEASE:1.1.1.3
	netbsd-10-0-RC6:1.1.1.3
	netbsd-10-0-RC5:1.1.1.3
	netbsd-10-0-RC4:1.1.1.3
	netbsd-10-0-RC3:1.1.1.3
	netbsd-10-0-RC2:1.1.1.3
	netbsd-10-0-RC1:1.1.1.3
	xorg-server-21-1-9:1.1.1.3
	xorg-server-21-1-8:1.1.1.3
	xorg-server-21-1-7:1.1.1.3
	xorg-server-21-1-6:1.1.1.3
	xorg-server-21-1-5:1.1.1.3
	netbsd-10:1.1.1.3.0.2
	netbsd-10-base:1.1.1.3
	netbsd-9-3-RELEASE:1.1.1.1
	xorg-server-21-1-4:1.1.1.3
	xorg-server-21-1-3:1.1.1.2
	xorg-server-1-20-13:1.1.1.1
	xorg-server-1-20-12:1.1.1.1
	netbsd-9-2-RELEASE:1.1.1.1
	xorg-server-1-20-11:1.1.1.1
	xorg-server-1-20-10:1.1.1.1
	netbsd-9-1-RELEASE:1.1.1.1
	xorg-server-1-20-6:1.1.1.1
	netbsd-9-0-RELEASE:1.1.1.1
	netbsd-9-0-RC2:1.1.1.1
	netbsd-9-0-RC1:1.1.1.1
	netbsd-9:1.1.1.1.0.2
	netbsd-9-base:1.1.1.1
	xorg-server-1-20-5:1.1.1.1
	xorg-server-1-20-4:1.1.1.1
	xorg-server-1-20-3:1.1.1.1
	xorg:1.1.1;
locks; strict;
comment	@# @;


1.1
date	2018.12.31.09.36.08;	author mrg;	state Exp;
branches
	1.1.1.1;
next	;
commitid	Zot71fGCYSdHWV5B;

1.1.1.1
date	2018.12.31.09.36.08;	author mrg;	state Exp;
branches;
next	1.1.1.2;
commitid	Zot71fGCYSdHWV5B;

1.1.1.2
date	2022.07.15.02.12.48;	author mrg;	state Exp;
branches;
next	1.1.1.3;
commitid	gzj6xwMO9FqKXVLD;

1.1.1.3
date	2022.07.15.09.08.58;	author mrg;	state Exp;
branches
	1.1.1.3.2.1
	1.1.1.3.4.1;
next	1.1.1.4;
commitid	nva2CO5ZqMVwgYLD;

1.1.1.4
date	2025.11.12.07.48.01;	author mrg;	state Exp;
branches;
next	;
commitid	2quyYgOcr86oJeiG;

1.1.1.3.2.1
date	2025.12.18.18.51.13;	author martin;	state Exp;
branches;
next	;
commitid	xLUpbQiNIqPAeVmG;

1.1.1.3.4.1
date	2025.11.20.19.03.50;	author martin;	state Exp;
branches;
next	;
commitid	a6YkGTrCzIDQckjG;


desc
@@


1.1
log
@Initial revision
@
text
@simple_xinit = executable(
    'simple-xinit',
    'simple-xinit.c',
    include_directories: inc,
)

piglit_env = environment()
piglit_env.set('XSERVER_DIR', meson.source_root())
piglit_env.set('XSERVER_BUILDDIR', meson.build_root())

if get_option('xvfb')
    test('xvfb-piglit', find_program('scripts/xvfb-piglit.sh'),
        env: piglit_env,
        timeout: 1200,
    )

    if get_option('xephyr') and build_glamor
        test('xephyr-glamor',
            find_program('scripts/xephyr-glamor-piglit.sh'),
            env: piglit_env,
            timeout: 1200,
        )
    endif
endif

subdir('bigreq')
subdir('sync')
@


1.1.1.1
log
@initial import of xorg-server-1.20.3
@
text
@@


1.1.1.2
log
@initial import of xorg-server-21.1.3
@
text
@a10 29
some_ops = ' -o clear,src,dst,over,xor,disjointover'
rendercheck_tests = [
    ['blend/All/a8r8g8b8', '-t blend -f a8r8g8b8'],
    ['blend/All/x8r8g8b8', '-t blend -f a8r8g8b8,x8r8g8b8'],
    ['blend/All/a2r10g10b10', '-t blend -f a8r8g8b8,a2r10g10b10'],
    ['blend/Clear', '-t blend -o clear'],
    ['blend/Src', '-t blend -o src'],
    ['blend/Over', '-t blend -o over'],
    ['composite/Some/a8r8g8b8', '-t composite -f a8r8g8b8' + some_ops],
    ['composite/Some/x8r8g8b8', '-t composite -f a8r8g8b8,x8r8g8b8' + some_ops],
    ['composite/Some/a2r10g10b10', '-t composite -f a8r8g8b8,a2r10g10b10' + some_ops],
    ['ca composite/Some/a8r8g8b8', '-t cacomposite -f a8r8g8b8' + some_ops],
    ['ca composite/Some/a8', '-t cacomposite -f a8r8g8b8,a8' + some_ops],
    ['ca composite/Some/x8r8g8b8', '-t cacomposite -f a8r8g8b8,x8r8g8b8' + some_ops],
    ['ca composite/Some/a2r10g10b10', '-t cacomposite -f a8r8g8b8,a2r10g10b10' + some_ops],
    ['fill', '-t fill'],
    ['bug7366', '-t bug7366'],
    ['destination coordinates', '-t dcoords'],
    ['source coordinates', '-t scoords'],
    ['mask coordinates', '-t mcoords'],
    ['translated source coordinates', '-t tscoords'],
    ['translated mask coordinates', '-t tmcoords'],
    ['triangles', '-t triangles'],
    ['LibreOffice xRGB', '-t libreoffice_xrgb'],
    ['GTK ARGB vs xBGR', '-t gtk_argb_xbgr'],
]

rendercheck = find_program('rendercheck', required:false)

d12 1
a12 9
    xvfb_args = [
        xvfb_server.full_path(),
        '-screen',
        'scrn',
        '1280x1024x24',
    ]

    test('XTS',
        find_program('scripts/xvfb-piglit.sh'),
a14 1
        suite: 'xvfb'
a16 17
    if rendercheck.found()
        foreach rctest: rendercheck_tests
            test(rctest[0],
                 simple_xinit,
                 # Use full_path so people can copy and paste the
                 # command line from testlog.txt easily.
                 args: [
                     rendercheck.path(),
                     rctest[1].split(' '),
                     '--',
                     xvfb_args,
                 ],
                 suite: 'xvfb'
                )
        endforeach
    endif

d18 1
a18 1
        test('XTS',
a21 1
            suite: 'xephr-glamor',
a22 21

        if rendercheck.found()
            foreach rctest: rendercheck_tests
                test(rctest[0],
                     simple_xinit,
                     args: [simple_xinit.full_path(),
                            rendercheck.path(),
                            rctest[1].split(' '),
                            '----',
                            xephyr_server.full_path(),
                            '-glamor',
                            '-glamor-skip-present',
                            '-schedMax', '2000',
                            '--',
                            xvfb_args,
                           ],
                     suite: 'xephr-glamor',
                     timeout: 300,
                    )
            endforeach
        endif
a26 1
subdir('damage')
a27 74

if build_xorg
# Tests that require at least some DDX functions in order to fully link
# For now, requires xf86 ddx, could be adjusted to use another
    unit_sources = [
     '../mi/miinitext.c',
     '../mi/miinitext.h',
     'fixes.c',
     'input.c',
     'list.c',
     'misc.c',
     'signal-logging.c',
     'string.c',
     'test_xkb.c',
     'tests-common.c',
     'tests.c',
     'touch.c',
     'xfree86.c',
     'xtest.c',
    ]
    unit_defines = ['-DXORG_TESTS']
    unit_includes = [inc, xorg_inc]

    if build_res
        unit_sources += ['hashtabletest.c']
        unit_defines += ['-DRES_TESTS']
    endif

    unit_c_args = unit_defines
    if meson.get_compiler('c').has_link_argument('-Wl,-wrap')
       # LTO breaks with -Wl,-wrap on certain configurations
       unit_c_args += ['-fno-lto']
       unit_sources += [
        'xi1/protocol-xchangedevicecontrol.c',
        'xi2/protocol-common.c',
        'xi2/protocol-xiqueryversion.c',
        'xi2/protocol-xiquerydevice.c',
        'xi2/protocol-xiselectevents.c',
        'xi2/protocol-xigetselectedevents.c',
        'xi2/protocol-xisetclientpointer.c',
        'xi2/protocol-xigetclientpointer.c',
        'xi2/protocol-xiquerypointer.c',
        'xi2/protocol-xipassivegrabdevice.c',
        'xi2/protocol-xiwarppointer.c',
        'xi2/protocol-eventconvert.c',
        'xi2/xi2.c',
       ]
       unit_defines += ['-DLDWRAP_TESTS']
       unit_includes += [include_directories('xi1', 'xi2')]
       ldwraps = [
        '-Wl,-wrap,dixLookupWindow',
        '-Wl,-wrap,dixLookupClient',
        '-Wl,-wrap,WriteToClient',
        '-Wl,-wrap,dixLookupWindow',
        '-Wl,-wrap,XISetEventMask',
        '-Wl,-wrap,AddResource',
        '-Wl,-wrap,GrabButton',
       ]
    else
       ldwraps = []
       message('ld -wrap required for xi1 & xi2 unit tests, skipping')
    endif

    unit = executable('tests',
         unit_sources,
         c_args: unit_c_args,
         dependencies: [pixman_dep, randrproto_dep, inputproto_dep, libxcvt_dep],
         include_directories: unit_includes,
         link_args: ldwraps,
         link_with: xorg_link,
    )

    test('unit', unit)
endif
@


1.1.1.3
log
@initial import of xorg-server-21.1.4
@
text
@a112 2
     '../mi/micmap.c',
     '../mi/micmap.h',
@


1.1.1.3.2.1
log
@Pull up the following, requested by mrg in ticket #1210:

	external/mit/xorg-server/dist/test/scripts/xephyr-glamor-gles2-piglit.sh up to 1.1.1.1
	external/mit/xorg-server/dist/test/bugs/bug1354.c up to 1.1.1.1
	external/mit/xorg-server/dist/test/bugs/meson.build up to 1.1.1.1
	external/mit/xorg-server/dist/COPYING           up to 1.1.1.7
	external/mit/xorg-server/dist/ChangeLog         up to 1.1.1.31
	external/mit/xorg-server/dist/Makefile.in       up to 1.1.1.19
	external/mit/xorg-server/dist/aclocal.m4        up to 1.1.1.24
	external/mit/xorg-server/dist/compile           up to 1.1.1.14
	external/mit/xorg-server/dist/configure         up to 1.24
	external/mit/xorg-server/dist/configure.ac      up to 1.26
	external/mit/xorg-server/dist/depcomp           up to 1.1.1.12
	external/mit/xorg-server/dist/install-sh        up to 1.1.1.13
	external/mit/xorg-server/dist/meson.build       up to 1.1.1.21
	external/mit/xorg-server/dist/missing           up to 1.1.1.12
	external/mit/xorg-server/dist/test-driver       up to 1.1.1.10
	external/mit/xorg-server/dist/ylwrap            up to 1.1.1.12
	external/mit/xorg-server/dist/Xext/Makefile.in  up to 1.1.1.19
	external/mit/xorg-server/dist/Xext/panoramiX.c  up to 1.4
	external/mit/xorg-server/dist/Xext/shm.c        up to 1.10
	external/mit/xorg-server/dist/Xext/sync.c       up to 1.15
	external/mit/xorg-server/dist/Xext/vidmode.c    up to 1.5
	external/mit/xorg-server/dist/Xext/xres.c       up to 1.5
	external/mit/xorg-server/dist/Xext/xselinux_ext.c up to 1.1.1.7
	external/mit/xorg-server/dist/Xext/xselinux_label.c up to 1.1.1.4
	external/mit/xorg-server/dist/Xext/xtest.c      up to 1.10
	external/mit/xorg-server/dist/Xi/Makefile.in    up to 1.1.1.19
	external/mit/xorg-server/dist/Xi/exevents.c     up to 1.1.1.15
	external/mit/xorg-server/dist/Xi/getfctl.c      up to 1.1.1.6
	external/mit/xorg-server/dist/Xi/getprop.c      up to 1.1.1.7
	external/mit/xorg-server/dist/Xi/listdev.c      up to 1.1.1.8
	external/mit/xorg-server/dist/Xi/xibarriers.c   up to 1.6
	external/mit/xorg-server/dist/composite/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/config/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/damageext/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/dbe/Makefile.in   up to 1.1.1.19
	external/mit/xorg-server/dist/dix/Makefile.in   up to 1.1.1.20
	external/mit/xorg-server/dist/dix/dixfonts.c    up to 1.7
	external/mit/xorg-server/dist/dix/enterleave.c  up to 1.12
	external/mit/xorg-server/dist/dix/gestures.c    up to 1.1.1.2
	external/mit/xorg-server/dist/dix/property.c    up to 1.1.1.10
	external/mit/xorg-server/dist/dix/swaprep.c     up to 1.1.1.7
	external/mit/xorg-server/dist/dix/touch.c       up to 1.1.1.4
	external/mit/xorg-server/dist/dix/window.c      up to 1.13
	external/mit/xorg-server/dist/doc/Makefile.in   up to 1.1.1.19
	external/mit/xorg-server/dist/doc/dtrace/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/dri3/Makefile.in  up to 1.1.1.13
	external/mit/xorg-server/dist/exa/Makefile.in   up to 1.1.1.19
	external/mit/xorg-server/dist/fb/Makefile.in    up to 1.1.1.19
	external/mit/xorg-server/dist/glamor/Makefile.in up to 1.1.1.14
	external/mit/xorg-server/dist/glamor/glamor.c   up to 1.1.1.9
	external/mit/xorg-server/dist/glamor/glamor_composite_glyphs.c up to 1.1.1.4
	external/mit/xorg-server/dist/glamor/glamor_copy.c up to 1.1.1.4
	external/mit/xorg-server/dist/glamor/glamor_core.c up to 1.1.1.3
	external/mit/xorg-server/dist/glamor/glamor_dash.c up to 1.1.1.3
	external/mit/xorg-server/dist/glamor/glamor_egl.c up to 1.1.1.7
	external/mit/xorg-server/dist/glamor/glamor_glyphblt.c up to 1.1.1.4
	external/mit/xorg-server/dist/glamor/glamor_gradient.c up to 1.1.1.4
	external/mit/xorg-server/dist/glamor/glamor_lines.c up to 1.1.1.3
	external/mit/xorg-server/dist/glamor/glamor_points.c up to 1.1.1.3
	external/mit/xorg-server/dist/glamor/glamor_priv.h up to 1.1.1.7
	external/mit/xorg-server/dist/glamor/glamor_program.c up to 1.1.1.5
	external/mit/xorg-server/dist/glamor/glamor_program.h up to 1.1.1.2
	external/mit/xorg-server/dist/glamor/glamor_rects.c up to 1.1.1.5
	external/mit/xorg-server/dist/glamor/glamor_render.c up to 1.1.1.5
	external/mit/xorg-server/dist/glamor/glamor_segs.c up to 1.1.1.3
	external/mit/xorg-server/dist/glamor/glamor_spans.c up to 1.1.1.4
	external/mit/xorg-server/dist/glamor/glamor_text.c up to 1.1.1.3
	external/mit/xorg-server/dist/glamor/glamor_transfer.c up to 1.1.1.4
	external/mit/xorg-server/dist/glamor/glamor_xv.c up to 1.1.1.4
	external/mit/xorg-server/dist/glx/Makefile.in   up to 1.1.1.18
	external/mit/xorg-server/dist/hw/Makefile.in    up to 1.1.1.19
	external/mit/xorg-server/dist/hw/kdrive/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/kdrive/ephyr/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/kdrive/ephyr/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/kdrive/src/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/vfb/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/vfb/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xfree86/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/common/Makefile.in up to 1.1.1.20
	external/mit/xorg-server/dist/hw/xfree86/common/meson.build up to 1.1.1.3
	external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c up to 1.19
	external/mit/xorg-server/dist/hw/xfree86/ddc/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/dixmods/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/doc/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/dri/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/dri2/Makefile.in up to 1.1.1.18
	external/mit/xorg-server/dist/hw/xfree86/dri2/pci_ids/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/hw/xfree86/drivers/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/hw/xfree86/drivers/inputtest/Makefile.in up to 1.1.1.7
	external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/Makefile.in up to 1.1.1.14
	external/mit/xorg-server/dist/hw/xfree86/exa/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/exa/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xfree86/fbdevhw/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/fbdevhw/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xfree86/glamor_egl/Makefile.in up to 1.1.1.14
	external/mit/xorg-server/dist/hw/xfree86/i2c/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/int10/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/loader/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/man/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/hw/xfree86/man/xorg.conf.man up to 1.1.1.7
	external/mit/xorg-server/dist/hw/xfree86/modes/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/meson.build up to 1.1.1.3
	external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Sbus.c up to 1.4
	external/mit/xorg-server/dist/hw/xfree86/os-support/hurd/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/linux/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/misc/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/solaris/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/solaris/sun_init.c up to 1.1.1.6
	external/mit/xorg-server/dist/hw/xfree86/os-support/stub/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/hw/xfree86/parser/Makefile.in up to 1.1.1.21
	external/mit/xorg-server/dist/hw/xfree86/ramdac/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/shadowfb/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/utils/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/utils/gtf/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/utils/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xfree86/vgahw/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/x86emu/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/xkb/Makefile.in up to 1.1.1.12
	external/mit/xorg-server/dist/hw/xnest/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xnest/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xquartz/Makefile.in up to 1.1.1.20
	external/mit/xorg-server/dist/hw/xquartz/GL/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xquartz/bundle/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xquartz/mach-startup/Makefile.in up to 1.1.1.18
	external/mit/xorg-server/dist/hw/xquartz/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xquartz/pbproxy/Makefile.in up to 1.1.1.18
	external/mit/xorg-server/dist/hw/xquartz/xpr/Makefile.in up to 1.1.1.18
	external/mit/xorg-server/dist/hw/xwin/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xwin/dri/Makefile.in up to 1.1.1.12
	external/mit/xorg-server/dist/hw/xwin/glx/Makefile.in up to 1.1.1.16
	external/mit/xorg-server/dist/hw/xwin/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xwin/winclipboard/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/include/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/include/fourcc.h  up to 1.1.1.2
	external/mit/xorg-server/dist/include/xkbsrv.h  up to 1.1.1.7
	external/mit/xorg-server/dist/man/Makefile.in   up to 1.1.1.13
	external/mit/xorg-server/dist/mi/Makefile.in    up to 1.1.1.19
	external/mit/xorg-server/dist/miext/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/miext/damage/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/miext/rootless/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/miext/shadow/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/miext/sync/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/os/Makefile.in    up to 1.1.1.19
	external/mit/xorg-server/dist/os/log.c          up to 1.1.1.11
	external/mit/xorg-server/dist/os/xsha1.c        up to 1.1.1.4
	external/mit/xorg-server/dist/present/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/present/present_notify.c up to 1.1.1.3
	external/mit/xorg-server/dist/pseudoramiX/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/randr/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/record/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/render/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/render/picture.h  up to 1.4
	external/mit/xorg-server/dist/test/Makefile.am  up to 1.6
	external/mit/xorg-server/dist/test/Makefile.in  up to 1.1.1.16
	external/mit/xorg-server/dist/test/meson.build  up to 1.1.1.4
	external/mit/xorg-server/dist/xfixes/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/xkb/Makefile.in   up to 1.1.1.19
	external/mit/xorg-server/dist/xkb/xkb.c         up to 1.12
	external/mit/xorg-server/dist/xkb/xkbEvents.c   up to 1.1.1.6
	external/mit/xorg-server/include/dix-config.h   up to 1.57
	external/mit/xorg-server/include/version-config.h up to 1.27
	external/mit/xorg-server/include/xorg-config.h  up to 1.37
	external/mit/xorg-server/include/xorg-server.h  up to 1.37

Import xorg-server 21.1.21
@
text
@d12 1
a12 15
gles2_working_formats = ' -f '+ ','.join(['a8',
                                          'a8r8g8b8',
                                          'x8r8g8b8',
                                          'b8g8r8a8',
                                          'b8g8r8x8',
                                          'r8g8b8',
                                          'r5g5b5',
                                          'b5g5r5',
                                          'r5g6b5',
                                          'b5g6r5',
                                          'b8g8r8',
                                          'x8b8g8r8',
                                          'x2r10g10b10',
                                          'x2b10g10r10'])
rendercheck_tests_noblend = [
d16 3
d37 1
a37 13
rendercheck_blend = [
    ['blend/Clear', '-t blend -o clear'],
    ['blend/Src', '-t blend -o src'],
    ['blend/Over', '-t blend -o over'],
]
#Exclude 15bpp for now due to GLES limitation (see glamor.c:470)
rendercheck_blend_gles2 = [
    ['blend/Clear', '-t blend -o clear' + gles2_working_formats],
    ['blend/Src', '-t blend -o src' + gles2_working_formats],
    ['blend/Over', '-t blend -o over' + gles2_working_formats],
]
rendercheck_tests = rendercheck_blend + rendercheck_tests_noblend
rendercheck_tests_gles2 = rendercheck_blend_gles2 + rendercheck_tests_noblend
a78 6
        test('XTS',
            find_program('scripts/xephyr-glamor-gles2-piglit.sh'),
            env: piglit_env,
            timeout: 1200,
            suite: 'xephyr-glamor-gles2',
        )
a98 18
            foreach rctest: rendercheck_tests_gles2
                test(rctest[0],
                     simple_xinit,
                     args: [simple_xinit.full_path(),
                            rendercheck.path(),
                            rctest[1].split(' '),
                            '----',
                            xephyr_server.full_path(),
                            '-glamor_gles2',
                            '-glamor-skip-present',
                            '-schedMax', '2000',
                            '--',
                            xvfb_args,
                           ],
                     suite: 'xephyr-glamor-gles2',
                     timeout: 300,
                    )
            endforeach
a105 1
subdir('bugs')
@


1.1.1.3.4.1
log
@Pullup the following, requested by mrg in ticket #91:

	external/mit/xorg-server/dist/test/scripts/xephyr-glamor-gles2-piglit.sh up to 1.1.1.1
	external/mit/xorg-server/dist/test/bugs/bug1354.c up to 1.1.1.1
	external/mit/xorg-server/dist/test/bugs/meson.build up to 1.1.1.1
	external/mit/xorg-server/dist/glamor/glamor_glx_provider.c up to 1.1.1.1
	external/mit/xorg-server/dist/glamor/glamor_glx_provider.h up to 1.1.1.1
	external/mit/xorg-server/dist/COPYING           up to 1.1.1.7
	external/mit/xorg-server/dist/ChangeLog         up to 1.1.1.30
	external/mit/xorg-server/dist/Makefile.in       up to 1.1.1.19
	external/mit/xorg-server/dist/aclocal.m4        up to 1.1.1.24
	external/mit/xorg-server/dist/compile           up to 1.1.1.14
	external/mit/xorg-server/dist/configure         up to 1.23
	external/mit/xorg-server/dist/configure.ac      up to 1.25
	external/mit/xorg-server/dist/depcomp           up to 1.1.1.12
	external/mit/xorg-server/dist/install-sh        up to 1.1.1.13
	external/mit/xorg-server/dist/meson.build       up to 1.1.1.20
	external/mit/xorg-server/dist/missing           up to 1.1.1.12
	external/mit/xorg-server/dist/test-driver       up to 1.1.1.10
	external/mit/xorg-server/dist/ylwrap            up to 1.1.1.12
	external/mit/xorg-server/dist/Xext/Makefile.in  up to 1.1.1.19
	external/mit/xorg-server/dist/Xext/panoramiX.c  up to 1.4
	external/mit/xorg-server/dist/Xext/shm.c        up to 1.10
	external/mit/xorg-server/dist/Xext/sync.c       up to 1.15
	external/mit/xorg-server/dist/Xext/vidmode.c    up to 1.5
	external/mit/xorg-server/dist/Xext/xres.c       up to 1.5
	external/mit/xorg-server/dist/Xext/xselinux_ext.c up to 1.1.1.7
	external/mit/xorg-server/dist/Xext/xselinux_label.c up to 1.1.1.4
	external/mit/xorg-server/dist/Xext/xtest.c      up to 1.10
	external/mit/xorg-server/dist/Xi/Makefile.in    up to 1.1.1.19
	external/mit/xorg-server/dist/Xi/exevents.c     up to 1.1.1.15
	external/mit/xorg-server/dist/Xi/getfctl.c      up to 1.1.1.6
	external/mit/xorg-server/dist/Xi/getprop.c      up to 1.1.1.7
	external/mit/xorg-server/dist/Xi/listdev.c      up to 1.1.1.8
	external/mit/xorg-server/dist/Xi/xibarriers.c   up to 1.6
	external/mit/xorg-server/dist/composite/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/config/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/damageext/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/dbe/Makefile.in   up to 1.1.1.19
	external/mit/xorg-server/dist/dix/Makefile.in   up to 1.1.1.20
	external/mit/xorg-server/dist/dix/dixfonts.c    up to 1.7
	external/mit/xorg-server/dist/dix/enterleave.c  up to 1.12
	external/mit/xorg-server/dist/dix/gestures.c    up to 1.1.1.2
	external/mit/xorg-server/dist/dix/property.c    up to 1.1.1.10
	external/mit/xorg-server/dist/dix/swaprep.c     up to 1.1.1.7
	external/mit/xorg-server/dist/dix/touch.c       up to 1.1.1.4
	external/mit/xorg-server/dist/dix/window.c      up to 1.13
	external/mit/xorg-server/dist/doc/Makefile.in   up to 1.1.1.19
	external/mit/xorg-server/dist/doc/dtrace/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/dri3/Makefile.in  up to 1.1.1.13
	external/mit/xorg-server/dist/exa/Makefile.in   up to 1.1.1.19
	external/mit/xorg-server/dist/fb/Makefile.in    up to 1.1.1.19
	external/mit/xorg-server/dist/glamor/Makefile.am up to 1.1.1.3
	external/mit/xorg-server/dist/glamor/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/glamor/glamor.c   up to 1.1.1.8
	external/mit/xorg-server/dist/glamor/glamor.h   up to 1.1.1.5
	external/mit/xorg-server/dist/glamor/glamor_composite_glyphs.c up to 1.1.1.4
	external/mit/xorg-server/dist/glamor/glamor_copy.c up to 1.1.1.4
	external/mit/xorg-server/dist/glamor/glamor_core.c up to 1.1.1.3
	external/mit/xorg-server/dist/glamor/glamor_dash.c up to 1.1.1.3
	external/mit/xorg-server/dist/glamor/glamor_egl.c up to 1.1.1.6
	external/mit/xorg-server/dist/glamor/glamor_glyphblt.c up to 1.1.1.4
	external/mit/xorg-server/dist/glamor/glamor_gradient.c up to 1.1.1.4
	external/mit/xorg-server/dist/glamor/glamor_lines.c up to 1.1.1.3
	external/mit/xorg-server/dist/glamor/glamor_points.c up to 1.1.1.3
	external/mit/xorg-server/dist/glamor/glamor_priv.h up to 1.1.1.6
	external/mit/xorg-server/dist/glamor/glamor_program.c up to 1.1.1.5
	external/mit/xorg-server/dist/glamor/glamor_program.h up to 1.1.1.2
	external/mit/xorg-server/dist/glamor/glamor_rects.c up to 1.1.1.5
	external/mit/xorg-server/dist/glamor/glamor_render.c up to 1.1.1.5
	external/mit/xorg-server/dist/glamor/glamor_segs.c up to 1.1.1.3
	external/mit/xorg-server/dist/glamor/glamor_spans.c up to 1.1.1.4
	external/mit/xorg-server/dist/glamor/glamor_text.c up to 1.1.1.3
	external/mit/xorg-server/dist/glamor/glamor_transfer.c up to 1.1.1.4
	external/mit/xorg-server/dist/glamor/glamor_xv.c up to 1.1.1.4
	external/mit/xorg-server/dist/glamor/meson.build up to 1.1.1.2
	external/mit/xorg-server/dist/glx/Makefile.in   up to 1.1.1.18
	external/mit/xorg-server/dist/hw/Makefile.in    up to 1.1.1.19
	external/mit/xorg-server/dist/hw/kdrive/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/kdrive/ephyr/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/kdrive/ephyr/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/kdrive/src/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/vfb/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/vfb/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xfree86/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/common/Makefile.in up to 1.1.1.20
	external/mit/xorg-server/dist/hw/xfree86/common/meson.build up to 1.1.1.3
	external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c up to 1.19
	external/mit/xorg-server/dist/hw/xfree86/ddc/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/dixmods/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/doc/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/dri/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/dri2/Makefile.in up to 1.1.1.18
	external/mit/xorg-server/dist/hw/xfree86/dri2/pci_ids/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/hw/xfree86/drivers/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/hw/xfree86/drivers/inputtest/Makefile.in up to 1.1.1.7
	external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/Makefile.in up to 1.1.1.14
	external/mit/xorg-server/dist/hw/xfree86/exa/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/exa/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xfree86/fbdevhw/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/fbdevhw/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xfree86/glamor_egl/Makefile.am up to 1.1.1.2
	external/mit/xorg-server/dist/hw/xfree86/glamor_egl/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/hw/xfree86/glamor_egl/meson.build up to 1.1.1.2
	external/mit/xorg-server/dist/hw/xfree86/i2c/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/int10/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/loader/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/man/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/hw/xfree86/man/xorg.conf.man up to 1.1.1.7
	external/mit/xorg-server/dist/hw/xfree86/modes/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/meson.build up to 1.1.1.3
	external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Sbus.c up to 1.4
	external/mit/xorg-server/dist/hw/xfree86/os-support/hurd/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/linux/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/misc/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/solaris/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/solaris/sun_init.c up to 1.1.1.6
	external/mit/xorg-server/dist/hw/xfree86/os-support/stub/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/hw/xfree86/parser/Makefile.in up to 1.1.1.21
	external/mit/xorg-server/dist/hw/xfree86/ramdac/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/shadowfb/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/utils/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/utils/gtf/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/utils/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xfree86/vgahw/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/x86emu/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/xkb/Makefile.in up to 1.1.1.12
	external/mit/xorg-server/dist/hw/xnest/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xnest/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xquartz/Makefile.in up to 1.1.1.20
	external/mit/xorg-server/dist/hw/xquartz/GL/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xquartz/bundle/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xquartz/mach-startup/Makefile.in up to 1.1.1.18
	external/mit/xorg-server/dist/hw/xquartz/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xquartz/pbproxy/Makefile.in up to 1.1.1.18
	external/mit/xorg-server/dist/hw/xquartz/xpr/Makefile.in up to 1.1.1.18
	external/mit/xorg-server/dist/hw/xwin/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xwin/dri/Makefile.in up to 1.1.1.12
	external/mit/xorg-server/dist/hw/xwin/glx/Makefile.in up to 1.1.1.16
	external/mit/xorg-server/dist/hw/xwin/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xwin/winclipboard/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/include/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/include/fourcc.h  up to 1.1.1.2
	external/mit/xorg-server/dist/include/xkbsrv.h  up to 1.1.1.7
	external/mit/xorg-server/dist/man/Makefile.in   up to 1.1.1.13
	external/mit/xorg-server/dist/mi/Makefile.in    up to 1.1.1.19
	external/mit/xorg-server/dist/miext/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/miext/damage/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/miext/rootless/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/miext/shadow/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/miext/sync/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/os/Makefile.in    up to 1.1.1.19
	external/mit/xorg-server/dist/os/log.c          up to 1.1.1.11
	external/mit/xorg-server/dist/os/xsha1.c        up to 1.1.1.4
	external/mit/xorg-server/dist/present/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/present/present_notify.c up to 1.1.1.3
	external/mit/xorg-server/dist/pseudoramiX/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/randr/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/record/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/render/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/render/picture.h  up to 1.4
	external/mit/xorg-server/dist/test/Makefile.am  up to 1.6
	external/mit/xorg-server/dist/test/Makefile.in  up to 1.1.1.16
	external/mit/xorg-server/dist/test/meson.build  up to 1.1.1.4
	external/mit/xorg-server/dist/xfixes/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/xkb/Makefile.in   up to 1.1.1.19
	external/mit/xorg-server/dist/xkb/xkb.c         up to 1.12
	external/mit/xorg-server/dist/xkb/xkbEvents.c   up to 1.1.1.6
	external/mit/xorg-server/include/dix-config.h   up to 1.56
	external/mit/xorg-server/include/version-config.h up to 1.26
	external/mit/xorg-server/include/xorg-config.h  up to 1.36
	external/mit/xorg-server/include/xorg-server.h  up to 1.36

import of xorg-server-21.1.20
@
text
@d12 1
a12 15
gles2_working_formats = ' -f '+ ','.join(['a8',
                                          'a8r8g8b8',
                                          'x8r8g8b8',
                                          'b8g8r8a8',
                                          'b8g8r8x8',
                                          'r8g8b8',
                                          'r5g5b5',
                                          'b5g5r5',
                                          'r5g6b5',
                                          'b5g6r5',
                                          'b8g8r8',
                                          'x8b8g8r8',
                                          'x2r10g10b10',
                                          'x2b10g10r10'])
rendercheck_tests_noblend = [
d16 3
d37 1
a37 13
rendercheck_blend = [
    ['blend/Clear', '-t blend -o clear'],
    ['blend/Src', '-t blend -o src'],
    ['blend/Over', '-t blend -o over'],
]
#Exclude 15bpp for now due to GLES limitation (see glamor.c:470)
rendercheck_blend_gles2 = [
    ['blend/Clear', '-t blend -o clear' + gles2_working_formats],
    ['blend/Src', '-t blend -o src' + gles2_working_formats],
    ['blend/Over', '-t blend -o over' + gles2_working_formats],
]
rendercheck_tests = rendercheck_blend + rendercheck_tests_noblend
rendercheck_tests_gles2 = rendercheck_blend_gles2 + rendercheck_tests_noblend
a78 6
        test('XTS',
            find_program('scripts/xephyr-glamor-gles2-piglit.sh'),
            env: piglit_env,
            timeout: 1200,
            suite: 'xephyr-glamor-gles2',
        )
a98 18
            foreach rctest: rendercheck_tests_gles2
                test(rctest[0],
                     simple_xinit,
                     args: [simple_xinit.full_path(),
                            rendercheck.path(),
                            rctest[1].split(' '),
                            '----',
                            xephyr_server.full_path(),
                            '-glamor_gles2',
                            '-glamor-skip-present',
                            '-schedMax', '2000',
                            '--',
                            xvfb_args,
                           ],
                     suite: 'xephyr-glamor-gles2',
                     timeout: 300,
                    )
            endforeach
a105 1
subdir('bugs')
@


1.1.1.4
log
@initial import of xorg-server-21.1.20
@
text
@d12 1
a12 15
gles2_working_formats = ' -f '+ ','.join(['a8',
                                          'a8r8g8b8',
                                          'x8r8g8b8',
                                          'b8g8r8a8',
                                          'b8g8r8x8',
                                          'r8g8b8',
                                          'r5g5b5',
                                          'b5g5r5',
                                          'r5g6b5',
                                          'b5g6r5',
                                          'b8g8r8',
                                          'x8b8g8r8',
                                          'x2r10g10b10',
                                          'x2b10g10r10'])
rendercheck_tests_noblend = [
d16 3
d37 1
a37 13
rendercheck_blend = [
    ['blend/Clear', '-t blend -o clear'],
    ['blend/Src', '-t blend -o src'],
    ['blend/Over', '-t blend -o over'],
]
#Exclude 15bpp for now due to GLES limitation (see glamor.c:470)
rendercheck_blend_gles2 = [
    ['blend/Clear', '-t blend -o clear' + gles2_working_formats],
    ['blend/Src', '-t blend -o src' + gles2_working_formats],
    ['blend/Over', '-t blend -o over' + gles2_working_formats],
]
rendercheck_tests = rendercheck_blend + rendercheck_tests_noblend
rendercheck_tests_gles2 = rendercheck_blend_gles2 + rendercheck_tests_noblend
a78 6
        test('XTS',
            find_program('scripts/xephyr-glamor-gles2-piglit.sh'),
            env: piglit_env,
            timeout: 1200,
            suite: 'xephyr-glamor-gles2',
        )
a98 18
            foreach rctest: rendercheck_tests_gles2
                test(rctest[0],
                     simple_xinit,
                     args: [simple_xinit.full_path(),
                            rendercheck.path(),
                            rctest[1].split(' '),
                            '----',
                            xephyr_server.full_path(),
                            '-glamor_gles2',
                            '-glamor-skip-present',
                            '-schedMax', '2000',
                            '--',
                            xvfb_args,
                           ],
                     suite: 'xephyr-glamor-gles2',
                     timeout: 300,
                    )
            endforeach
a105 1
subdir('bugs')
@