[PULL] GLX and Xephyr fixes

[Adam Jackson]

The following changes since commit c1455f76c6b1aa4ecaacb2221a687244285aa44b:

  glx: Add implementation of __GLXContext->loseCurrent for direct ctxts (2014-12-09 14:15:55 -0800)

are available in the git repository at:

  ssh://people.freedesktop.org/~ajax/xserver.git xserver-next

for you to fetch changes up to e774663fa5209ff469d920821934bb1f5964a72f:

  ephyr: Implement per-screen colormaps (2014-12-10 11:04:09 -0500)

----------------------------------------------------------------
Adam Jackson (2):
      glx: Dynamically compute attribute slot in GetDrawableAttributes
      glx: Add hack for GLX-1.2-style naked windows to GetDrawableAttributes

Michele Baldessari (1):
      ephyr: Implement per-screen colormaps

 glx/glxcmds.c           | 71 ++++++++++++++++++++++++++++---------------------
 hw/kdrive/ephyr/ephyr.c |  2 +-
 hw/kdrive/ephyr/ephyr.h |  1 +
 hw/kdrive/ephyr/hostx.c | 11 ++++----
 hw/kdrive/ephyr/hostx.h |  2 +-
 5 files changed, 50 insertions(+), 37 deletions(-)

- ajax