[Git][xorg-team/lib/libglvnd][debian-unstable] 17 commits: build: Support meson-0.49.2

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / libglvnd

Commits:

aced60b0

by Philippe Coval at 2020-07-01T17:42:11+02:00

build: Support meson-0.49.2

Ternary operator inside method call crashes the parser,
so it's relocated outside.

This change will help to build project under latest debian:10

Forwarded: https://gitlab.freedesktop.org/glvnd/libglvnd/-/merge_requests
Bug: https://github.com/NVIDIA/libglvnd/issues/198
Relate-to: https://github.com/mesonbuild/meson/issues/5003
Signed-off-by: Philippe Coval <rzr@users.sf.net>
Change-Id: I18b6e8eca7564a6a252fff1ec6299311a3a92669

cad3b523

by Kyle Brenneman at 2020-07-01T15:48:00+00:00

Merge branch 'sandbox/rzr/review/master' into 'master'

build: Support meson-0.49.2

See merge request glvnd/libglvnd!230

3a03fdae

by Kyle Brenneman at 2020-08-06T11:58:26-06:00

configure: Remove an unused $gldispatch_use_tls check

In configure.ac, there's a block that should have been moved to later in the
file, but got copied instead. Remove the leftover duplicate.

8af272f7

by Kyle Brenneman at 2020-08-06T11:58:26-06:00

configure: Consolodate some duplicate code.

Combine the x86/x86-64 and stub type selection branches, since the same code
works for either of them.

6cd95fbf

by Kyle Brenneman at 2020-08-11T12:37:59-06:00

Add .arm directives for the GLX entrypoint stubs.

Add .arm and .thumb directives before and after the ARMv7 GLX dispatch stubs.

The function addresses that get passed around don't take Thumb into account, so
if they're compiled as Thumb, then they'd still get executed as ARM, which
would cause them to crash a SIGILL.

acc65445

by Kyle Brenneman at 2020-08-12T13:59:15+00:00

Merge branch 'fix-configure-tls' into 'master'

Fix some duplicate code in configure.ac

See merge request glvnd/libglvnd!232

a527411d

by Ronan Pigott at 2020-11-18T15:46:53-07:00

egl: use device dispatch if at least one vendor suceeds

Currently, in InitDeviceListInternal if any egl vendor fails to list
its devices for any reason the construction of the device list is
abandoned. That means that even if we have one vendor successfully
serving the application, the failure of another vendor library will
break any api calls related to egl devices.

Instead, if a vendor fails queryDevicesEXT the device mapping logic
should proceed as if it listed no devices. If the relevant device
belongs to the failed vendor then the dispatch will still fail with
EGL_BAD_DEVICE.

1457209a

by Kyle Brenneman at 2020-11-18T23:04:58+00:00

Merge branch 'vendordev' into 'master'

egl: use device dispatch if at least one vendor suceeds

See merge request glvnd/libglvnd!235

dd2d28a0

by Kyle Brenneman at 2020-11-19T11:54:50-07:00

GLX: Fix a potential deadlock in OnDisplayClosed.

In OnDisplayClosed, unlock the __glXDisplayInfoHash lock before locking
glxContextHashLock.

In CommonMakeCurrent, it holds glxContextHashLock while it tries to take the
__glXDisplayInfoHash lock, so if CommonMakeCurrent and OnDisplayClosed run at
the same time, they could deadlock.

To avoid that, OnDisplayClosed will set a new inTeardown flag in the
__GLXdisplayInfoHash, then it will unlock the display hash before calling
__glXDisplayClosed.

After __glXDisplayClosed is finished, OnDisplayClosed will lock
__glXDisplayInfoHash again long enough to remove the display from the
hashtable.

The inTeardown flag tells __glXLookupDisplay to return NULL, since after that
point, nothing should be trying to look up the display. In principle, we could
just remove the display from the hashtable up front, but then if something did
try to look up the display, then __glXLookupDisplay would try to create a new
__GLXdisplayInfo for it.

Fixes https://gitlab.freedesktop.org/glvnd/libglvnd/-/issues/213

178d57f6

by Kyle Brenneman at 2021-02-11T23:32:49+00:00

Merge branch 'fix-glx-armv7-arm-directive' into 'master'

Add .arm directives for the GLX entrypoint stubs.

See merge request glvnd/libglvnd!233

e1a42895

by Kyle Brenneman at 2021-02-22T16:30:59+00:00

Merge branch 'glx-fix-display-close-lock-order' into 'master'

GLX: Fix a potential deadlock in OnDisplayClosed.

Closes #213

See merge request glvnd/libglvnd!236

c1c60ac8

by Kyle Brenneman at 2021-04-21T16:22:39-06:00

GLdispatch: Add a build option to disable entrypoint patching.

Added a --disable-entrypoint-tracking configure option and an
'entrypoint-patching' meson option to disable libGLdispatch's entrypoint
patching at build time.

If entrypoint patching is disabled, then it #ifdef's out the mprotect call, and
acts as if mprotect had failed, which causes libGLdispatch to skip trying to
perform any patching.

Fixes https://gitlab.freedesktop.org/glvnd/libglvnd/-/issues/217

7db4dc0b

by Kyle Brenneman at 2021-04-27T19:19:09+00:00

Merge branch 'entrypoint-patch-build-option' into 'master'

GLdispatch: Add a build option to disable entrypoint patching.

Closes #217

See merge request glvnd/libglvnd!240

0f0d49f0
by Matt Turner at 2021-04-30T15:09:52-04:00
```
Bump the version number to 1.3.3.
```

e7c758d8

by Timo Aaltonen at 2021-05-04T10:58:11+03:00

Merge branch 'upstream-unstable' into debian-unstable

45a1f740
by Timo Aaltonen at 2021-05-04T11:07:35+03:00
```
bump the version
```
bef3d80f
by Timo Aaltonen at 2021-05-04T12:14:43+03:00
```
Restore libglvnd-core-dev. (Closes: #979976)
```

Changes:

configure.ac

@@ -2,7 +2,7 @@ dnl configure.ac
  dnl Process this file with autoconf to produce a configure script.
  AC_PREREQ([2.63])
 -AC_INIT([libglvnd], [1.3.2], [kbrenneman@nvidia.com])
 +AC_INIT([libglvnd], [1.3.3], [kbrenneman@nvidia.com])
  AC_CONFIG_SRCDIR([config.h.in])
  AC_CONFIG_HEADERS([config.h])
@@ -106,6 +106,16 @@ AM_CONDITIONAL([ENABLE_GLX_HEADERS], [test "x$enable_headers" = "xyes" -a "x$ena
  AM_CONDITIONAL([ENABLE_GLES1_HEADERS], [test "x$enable_headers" = "xyes" -a "x$enable_gles1" = "xyes"])
  AM_CONDITIONAL([ENABLE_GLES2_HEADERS], [test "x$enable_headers" = "xyes" -a "x$enable_gles2" = "xyes"])
 +AC_ARG_ENABLE([entrypoint-patching],
 +    [AS_HELP_STRING([--disable-entrypoint-patching],
 +        [Disable OpenGL entrypoint patching optimization @<:@default=enabled@:>@])],
 +    [enable_entrypoint_patching="$enableval"],
 +    [enable_entrypoint_patching=yes]
 +)
 +AS_IF([test "x$enable_entrypoint_patching" = "xyes"],
 +      [AC_DEFINE([GLDISPATCH_ENABLE_PATCHING], 1,
 +      [Define to 1 to enable entrypoint patching in libGLdispatch.])])
++
  dnl
  dnl Arch/platform-specific settings. Copied from mesa
  dnl
@@ -201,10 +211,6 @@ if test "x$enable_glx" = "xyes" ; then
      PKG_CHECK_MODULES([GLPROTO], [glproto])
  fi
 -AS_IF([test "x$gldispatch_use_tls" = "xyes"],
 -      [AC_DEFINE([GLDISPATCH_USE_TLS], 1,
 -      [Define to 1 if libGLdispatch should use a TLS variable for the dispatch table.])])
+-
  dnl Checks for typedefs, structures, and compiler characteristics.
  AC_C_TYPEOF
@@ -236,8 +242,8 @@ AC_MSG_RESULT($HAVE_INIT_TLS)
  AC_MSG_CHECKING([for entrypoint stub type])
  case "x$asm_arch" in
 -xx86 | xx86_64)
 -    # For x86 and x86-64, both the TLS and TSD stubs work.
 +xx86 | xx86_64 | xppc64)
 +    # For x86, x86-64, and ppc64, both the TLS and TSD stubs work.
      if test "x$HAVE_INIT_TLS" = "xyes" ; then
          gldispatch_entry_type=${asm_arch}_tls
          gldispatch_use_tls=yes
@@ -256,16 +262,6 @@ xaarch64)
      gldispatch_entry_type=aarch64_tsd
      gldispatch_use_tls=no
      ;;
 -xppc64)
 -    # For ppc64, allow both the TLS and TSD stubs for now.
 -    if test "x$HAVE_INIT_TLS" = "xyes" ; then
 -        gldispatch_entry_type=ppc64_tls
 -        gldispatch_use_tls=yes
 -    else
 -        gldispatch_entry_type=ppc64_tsd
 -        gldispatch_use_tls=no
 -    fi
 -    ;;
  *)
      # The C stubs will work with either TLS or TSD.
      gldispatch_entry_type=pure_c

debian/changelog

 -libglvnd (1.3.2-2) UNRELEASED; urgency=medium
 +libglvnd (1.3.3-1) UNRELEASED; urgency=medium
 +  [ Debian Janitor ]
    * Use secure copyright file specification URI.
    * debian/copyright: use spaces rather than tabs to start continuation lines.
    * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
      Repository-Browse.
 +  [ Timo Aaltonen ]
 +  * New upstream release.
 +  * Restore libglvnd-core-dev. (Closes: #979976)
++
   -- Debian Janitor <janitor@jelmer.uk>  Sun, 07 Feb 2021 16:51:51 -0000
  libglvnd (1.3.2-1) unstable; urgency=medium

debian/control

@@ -24,16 +24,13 @@ Section: libdevel
  Architecture: any
  Depends:
   libglvnd0 (= ${binary:Version}),
 + libglvnd-core-dev (= ${binary:Version}),
   ${misc:Depends},
   libegl-dev (>= 1.3.0-1),
   libgl-dev (>= 1.3.0-1),
   libgles-dev (>= 1.3.0-1),
   libglx-dev (>= 1.3.0-1),
   libopengl-dev (>= 1.3.0-1),
 -Breaks:
 - libglvnd-core-dev (<< 1.3.0-1),
 -Replaces:
 - libglvnd-core-dev (<< 1.3.0-1),
  Multi-Arch: same
  Description: Vendor neutral GL dispatch library -- development files
   This is an implementation of the vendor-neutral dispatch layer for
@@ -42,14 +39,19 @@ Description: Vendor neutral GL dispatch library -- development files
   This package contains the development files for libglvnd.
  Package: libglvnd-core-dev
 -Section: oldlibs
 +Section: libdevel
  Architecture: any
  Depends:
 - libglvnd-dev,
   ${misc:Depends},
 +Breaks: libglvnd-dev (<< 1.3.3-1)
 +Replaces: libglvnd-dev (<< 1.3.3-1)
  Multi-Arch: same
 -Description: transitional dummy package
 - This is a transitional dummy package, it can be safely removed.
 +Description: Vendor neutral GL dispatch library -- core development files
 + This is an implementation of the vendor-neutral dispatch layer for
 + arbitrating OpenGL API calls between multiple vendors on a per-screen basis.
 + .
 + This package contains the header files for libglvnd split in a separate
 + package for Mesa.
  Package: libglvnd0
  Architecture: any

debian/libglvnd-core-dev.install

	1	+usr/include/glvnd/*.h
	2	+usr/lib/*/pkgconfig/libglvnd.pc

debian/libglvnd-dev.install

 -usr/include/glvnd/*.h
  usr/lib/*/libGLdispatch.so
 -usr/lib/*/pkgconfig/libglvnd.pc

meson.build

@@ -28,7 +28,7 @@
  project(
    'glvnd',
    'c',
 -  version : '1.3.2',
 +  version : '1.3.3',
    meson_version : '>= 0.48',
    default_options : ['c_std=gnu99']
+ )
@@ -132,17 +132,18 @@ endif
  gl_dispatch_type = 'pure_c'
  if use_asm
 +  thread_type = have_tls ? 'tls' : 'tsd'
    if host_machine.cpu_family().startswith('x86')
      gl_dispatch_type = '@0@_@1@'.format(
        host_machine.cpu_family(),
 -      have_tls ? 'tls' : 'tsd',
 +      thread_type,
+     )
    elif host_machine.cpu_family() == 'arm'
      gl_dispatch_type = 'armv7_tsd'
    elif host_machine.cpu_family() == 'aarch64'
      gl_dispatch_type = 'aarch64_tsd'
    elif host_machine.cpu_family() == 'ppc64'
 -    gl_dispatch_type = 'ppc64_@0@'.format(have_tls ? 'tls' : 'tsd')
 +    gl_dispatch_type = 'ppc64_@0@'.format(thread_type)
    endif
  endif
  message('Using dispatch stub type: @0@'.format(gl_dispatch_type))
@@ -190,6 +191,10 @@ if _p != 0
    add_project_arguments('-DGLDISPATCH_PAGE_SIZE=' + _p, language : ['c'])
  endif
 +if not get_option('entrypoint-patching').disabled()
 +  add_project_arguments('-DGLDISPATCH_ENABLE_PATCHING', language : ['c'])
 +endif
++
  # Set EGL_NO_X11 unconditionally, Libglvnd doesn't make any assumptions about
  # native display or drawable types, so we don't need X11-specific typedefs for
  # them

meson_options.txt

@@ -75,3 +75,8 @@ option(
    value : true,
    description : 'Install headers for enabled APIs.'
+ )
 +option(
 +  'entrypoint-patching',
 +  type : 'feature',
 +  description : 'Allow vendor libraries to patch OpenGL entrypoint functions.'
 +)

src/EGL/libeglmapping.c

@@ -276,7 +276,9 @@ static EGLBoolean AddVendorDevices(__EGLvendorInfo *vendor)
+     }
      if (!vendor->staticDispatch.queryDevicesEXT(0, NULL, &count)) {
 -        return EGL_FALSE;
 +        // Even if this vendor fails, we can still return the devices from any
 +        // other vendors
 +        return EGL_TRUE;
+     }
      if (count <= 0) {
          return EGL_TRUE;

src/GLX/glvnd_genentry.c

@@ -126,6 +126,10 @@ __asm__(".globl glx_entrypoint_start\n"
          ".balign " U_STRINGIFY(STUB_SIZE) "\n" \
          "glx_entrypoint_start:\n"
 +#if defined(USE_ARMV7_ASM) && defined(__thumb__)
 +        ".arm\n"
 +#endif
++
  #define GLX_STUBS_ASM
  #include "g_glx_dispatch_stub_list.h"
@@ -133,6 +137,10 @@ __asm__(".globl glx_entrypoint_start\n"
          ".hidden glx_entrypoint_end\n"
          ".balign " U_STRINGIFY(STUB_SIZE) "\n" \
          "glx_entrypoint_end:\n"
++
 +#if defined(USE_ARMV7_ASM) && defined(__thumb__)
 +        ".thumb\n"
 +#endif
  );
  static void *DefaultDispatchFunc(void)

src/GLX/libglxmapping.c

@@ -95,6 +95,7 @@ static DEFINE_INITIALIZED_LKDHASH(__GLXvendorNameHash, __glXVendorNameHash);
  typedef struct __GLXdisplayInfoHashRec {
      __GLXdisplayInfo info;
 +    Bool inTeardown;
      UT_hash_handle hh;
  } __GLXdisplayInfoHash;
@@ -697,15 +698,27 @@ static int OnDisplayClosed(Display *dpy, XExtCodes *codes)
      LKDHASH_WRLOCK(__glXDisplayInfoHash);
 +    // Set the inTeardown flag for this display, but don't remove it from the
 +    // hashtable yet. We shouldn't try to look up this display after this, but
 +    // just in case something does, we don't want to try to set up a new
 +    // __GLXdisplayInfoHash struct for it.
      HASH_FIND_PTR(_LH(__glXDisplayInfoHash), &dpy, pEntry);
      if (pEntry != NULL) {
 -        __glXDisplayClosed(&pEntry->info);
 -        HASH_DEL(_LH(__glXDisplayInfoHash), pEntry);
 +        assert(!pEntry->inTeardown);
 +        pEntry->inTeardown = True;
+     }
      LKDHASH_UNLOCK(__glXDisplayInfoHash);
 -    CleanupDisplayInfoEntry(NULL, pEntry);
 -    free(pEntry);
 +    if (pEntry != NULL) {
 +        __glXDisplayClosed(&pEntry->info);
++
 +        // Now, we can remove the display from the hashtable and free it.
 +        LKDHASH_WRLOCK(__glXDisplayInfoHash);
 +        HASH_DEL(_LH(__glXDisplayInfoHash), pEntry);
 +        LKDHASH_UNLOCK(__glXDisplayInfoHash);
 +        CleanupDisplayInfoEntry(NULL, pEntry);
 +        free(pEntry);
 +    }
      return 0;
+ }
@@ -724,6 +737,12 @@ __GLXdisplayInfo *__glXLookupDisplay(Display *dpy)
      LKDHASH_UNLOCK(__glXDisplayInfoHash);
      if (pEntry != NULL) {
 +        if (pEntry->inTeardown) {
 +            // This shouldn't happen: If we're in the process of tearing down a
 +            // display, then we shouldn't be trying to look up the display
 +            // again.
 +            return NULL;
 +        }
          return &pEntry->info;
+     }

src/GLdispatch/vnd-glapi/entry_common.c

@@ -41,6 +41,7 @@
  static int entry_patch_mprotect(int prot)
+ {
 +#if GLDISPATCH_ENABLE_PATCHING
      size_t size;
      size_t pageSize = (size_t) sysconf(_SC_PAGESIZE);
@@ -57,6 +58,9 @@ static int entry_patch_mprotect(int prot)
          return 0;
+     }
      return 1;
 +#else // GLDISPATCH_ENABLE_PATCHING
 +    return 0;
 +#endif
+ }
  int entry_patch_start(void)

tests/testgldispatch.c

@@ -149,6 +149,13 @@ int main(int argc, char **argv)
+     }
  #endif
 +#if !defined(GLDISPATCH_ENABLE_PATCHING)
 +    if (enablePatching)
 +    {
 +        return 77;
 +    }
 +#endif
++
      __glDispatchInit();
      InitDummyVendors();