Sorry, I haven't been paying much attention to X11 for the past year or so, so I missed all of this work until it started failing on my build bot.
glxstubs.c has conflicting availability attributes. How should we resolve this? If I was doing this for just OSX, I'd remove _X_HIDDEN and just tell the linker to not export these symbols, but I'd rather find a more portable solution... --Jeremy glxstubs.c:43:1: error: visibility does not match previous declaration [Semantic Issue] thunk(glSampleMaskSGIS, PFNGLSAMPLEMASKSGISPROC, ^ glxstubs.c:37:5: note: expanded from macro 'thunk' _X_HIDDEN void name(__VA_ARGS__) { \ ^ /opt/local/include/X11/Xfuncproto.h:89:40: note: expanded from macro '_X_HIDDEN' # define _X_HIDDEN __attribute__((visibility("hidden"))) ^ /opt/local/include/GL/glext.h:7966:1: note: previous attribute is here [Semantic Issue] GLAPI void APIENTRY glSampleMaskSGIS (GLclampf value, GLboolean invert); ^ /opt/local/include/GL/gl.h:71:32: note: expanded from macro 'GLAPI' # define GLAPI __attribute__((visibility("default"))) ^ On Oct 29, 2013, at 7:36, Adam Jackson <a...@redhat.com> wrote: > Cosmetic fixes to the dispatch rewrite itself and to the DRI1 AIGLX > removal, otherwise this all matches what's been sent before. Notably > omitted here is the removal of the glx context cache, which I think > wants to be redone after glamor is merged. > > The following changes since commit 7ecfab47eb221dbb996ea6c033348b8eceaeb893: > > glx: Add support for the new DRI loader entrypoint. (2013-10-23 08:12:28 > +0800) > > are available in the git repository at: > > ssh://people.freedesktop.org/~ajax/xserver.git glx-rewrite > > for you to fetch changes up to 551a32a6f90eab2fef65da4fa65c51f280af136e: > > glx: convert to direct GL dispatch (v2) (2013-10-29 10:30:43 -0400) > > ---------------------------------------------------------------- > Adam Jackson (6): > glx: Only take a Pixmap reference if creating the GLXPixmap succeeded > glx: Fix memory leak in context garbage collection (v2) > glx: Fix a corner case in DrawableGone > glx: Simplify glXDestroyContext > glx: Remove DRI1 AIGLX (v2) > glx: convert to direct GL dispatch (v2) > > configure.ac | 6 +- > glx/Makefile.am | 18 +- > glx/createcontext.c | 2 +- > glx/dispatch.h | 19816 ----------------------------------- > glx/glapi.c | 504 - > glx/glapi.h | 135 - > glx/glapi_gentable.c | 10058 ------------------ > glx/glapitable.h | 1016 -- > glx/glprocs.h | 3534 ------- > glx/glthread.h | 234 - > glx/glxcmds.c | 33 +- > glx/glxcmdsswap.c | 4 - > glx/glxcontext.h | 10 +- > glx/glxdri.c | 1172 --- > glx/glxdri2.c | 4 - > glx/glxdriswrast.c | 4 - > glx/glxext.c | 46 +- > glx/glxserver.h | 5 + > glx/glxstubs.c | 50 + > glx/indirect_dispatch.c | 3236 ++---- > glx/indirect_dispatch.h | 602 +- > glx/indirect_dispatch_swap.c | 4016 +++---- > glx/indirect_program.c | 49 +- > glx/indirect_reqsize.c | 77 +- > glx/indirect_reqsize.h | 47 +- > glx/indirect_size.h | 12 +- > glx/indirect_size_get.c | 204 +- > glx/indirect_size_get.h | 16 +- > glx/indirect_table.c | 468 +- > glx/indirect_texture_compression.c | 27 +- > glx/indirect_util.c | 7 +- > glx/render2.c | 69 +- > glx/render2swap.c | 69 +- > glx/renderpix.c | 26 +- > glx/renderpixswap.c | 26 +- > glx/single2.c | 18 +- > glx/single2swap.c | 16 +- > glx/singlepix.c | 87 +- > glx/singlepixswap.c | 88 +- > glx/singlesize.c | 10 +- > glx/swap_interval.c | 4 - > glx/xfont.c | 30 +- > hw/xfree86/dixmods/glxmodule.c | 3 - > 43 files changed, 3361 insertions(+), 42497 deletions(-) > delete mode 100644 glx/dispatch.h > delete mode 100644 glx/glapi.c > delete mode 100644 glx/glapi.h > delete mode 100644 glx/glapi_gentable.c > delete mode 100644 glx/glapitable.h > delete mode 100644 glx/glprocs.h > delete mode 100644 glx/glthread.h > delete mode 100644 glx/glxdri.c > create mode 100644 glx/glxstubs.c > > - ajax > > _______________________________________________ > xorg-devel@lists.x.org: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel >
smime.p7s
Description: S/MIME cryptographic signature
_______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel