diff options
| author | marha <marha@users.sourceforge.net> | 2015-03-22 13:30:59 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-03-22 13:30:59 +0100 |
| commit | 82c8df11062f72a7d467e26cedbbd8b322ff7a70 (patch) | |
| tree | 7e7a3e408d09d3e50ff0d2f9befeb5b7ab5617a5 /mesalib/src/gallium | |
| parent | 8574eba804031f6b19713f0b02952280730bf62e (diff) | |
| download | vcxsrv-82c8df11062f72a7d467e26cedbbd8b322ff7a70.tar.gz vcxsrv-82c8df11062f72a7d467e26cedbbd8b322ff7a70.tar.bz2 vcxsrv-82c8df11062f72a7d467e26cedbbd8b322ff7a70.zip | |
randrproto fontconfig libX11 libXdmcp libxcb mesa xkbcomp xserver git update 22 Mar 2015
xserver commit 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56
libxcb commit a90be9955d2c5a635f791d44db1154633b9d3322
libX11 commit 5a499ca7b064bf7e6a4fcc169f22862dce0c60c5
libXdmcp commit 0c09444d276fbf46a0e8b427a4f6a325d0625742
xkbcomp commit fc3e6ddb2c8e922ea80f2dc5cbc1df2102e30d99
randrproto commit b1ba68df8a5fc113a387123ec2f312195e28e47f
fontconfig commit 69ff6b6e260584e383c38b1b7034ddcbb23d214f
mesa commit 397b491173f0d2df4deb44d21c170bf16840d507
Diffstat (limited to 'mesalib/src/gallium')
| -rw-r--r-- | mesalib/src/gallium/Makefile.am | 11 | ||||
| -rw-r--r-- | mesalib/src/gallium/SConscript | 1 | ||||
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_slab.h | 13 |
3 files changed, 11 insertions, 14 deletions
diff --git a/mesalib/src/gallium/Makefile.am b/mesalib/src/gallium/Makefile.am index 652cb1310..ede6e2123 100644 --- a/mesalib/src/gallium/Makefile.am +++ b/mesalib/src/gallium/Makefile.am @@ -11,7 +11,6 @@ SUBDIRS += auxiliary ## SUBDIRS += \ - drivers/galahad \ drivers/noop \ drivers/trace \ drivers/rbug @@ -96,14 +95,6 @@ if HAVE_DRI2 SUBDIRS += winsys/sw/kms-dri endif -if HAVE_EGL_PLATFORM_FBDEV -SUBDIRS += winsys/sw/fbdev -endif - -if HAVE_EGL_PLATFORM_WAYLAND -SUBDIRS += winsys/sw/wayland -endif - SUBDIRS += winsys/sw/wrapper ## @@ -114,8 +105,6 @@ EXTRA_DIST = \ docs \ README.portability \ SConscript \ - state_trackers/gbm \ - targets/gbm \ winsys/sw/gdi \ winsys/sw/hgl diff --git a/mesalib/src/gallium/SConscript b/mesalib/src/gallium/SConscript index 9b9011f7f..680ad925f 100644 --- a/mesalib/src/gallium/SConscript +++ b/mesalib/src/gallium/SConscript @@ -12,7 +12,6 @@ SConscript('auxiliary/SConscript') # These are common and work across all platforms SConscript([ - 'drivers/galahad/SConscript', 'drivers/llvmpipe/SConscript', 'drivers/rbug/SConscript', 'drivers/softpipe/SConscript', diff --git a/mesalib/src/gallium/auxiliary/util/u_slab.h b/mesalib/src/gallium/auxiliary/util/u_slab.h index 29d0252ba..0df039bcd 100644 --- a/mesalib/src/gallium/auxiliary/util/u_slab.h +++ b/mesalib/src/gallium/auxiliary/util/u_slab.h @@ -81,7 +81,16 @@ void util_slab_destroy(struct util_slab_mempool *pool); void util_slab_set_thread_safety(struct util_slab_mempool *pool, enum util_slab_threading threading); -#define util_slab_alloc(pool) (pool)->alloc(pool) -#define util_slab_free(pool, ptr) (pool)->free(pool, ptr) +static inline void * +util_slab_alloc(struct util_slab_mempool *pool) +{ + return pool->alloc(pool); +} + +static inline void +util_slab_free(struct util_slab_mempool *pool, void *ptr) +{ + pool->free(pool, ptr); +} #endif |