diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-04 12:11:17 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-04 12:11:17 +0100 |
| commit | d79b6645eb21ca82d506ef038b8ea71a1e431f3f (patch) | |
| tree | 8f96f2c0492c134147a32e124ea5d0a7337b2242 /xorg-server/hw/xwin | |
| parent | feb35c5e0724010fc4431e4e4fb24720fcdffe80 (diff) | |
| parent | e4ef724e06621be9325fc41ed886fd404467fdc0 (diff) | |
| download | vcxsrv-d79b6645eb21ca82d506ef038b8ea71a1e431f3f.tar.gz vcxsrv-d79b6645eb21ca82d506ef038b8ea71a1e431f3f.tar.bz2 vcxsrv-d79b6645eb21ca82d506ef038b8ea71a1e431f3f.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig glproto libX11 mesa xserver xkeyboard-config git update 31 oct 2013
Conflicts:
xorg-server/glx/dispatch.h
xorg-server/glx/glapi.c
xorg-server/glx/glapi.h
xorg-server/glx/glapi_gentable.c
xorg-server/glx/glapitable.h
xorg-server/glx/glprocs.h
xorg-server/glx/glxcmdsswap.c
xorg-server/glx/glxdri.c
xorg-server/glx/glxext.c
xorg-server/glx/glxext.h
xorg-server/glx/indirect_dispatch.c
xorg-server/glx/indirect_dispatch.h
xorg-server/glx/indirect_dispatch_swap.c
xorg-server/glx/indirect_reqsize.c
xorg-server/glx/indirect_reqsize.h
xorg-server/glx/indirect_size.h
xorg-server/glx/indirect_size_get.c
xorg-server/glx/indirect_size_get.h
xorg-server/glx/indirect_table.c
xorg-server/glx/indirect_texture_compression.c
xorg-server/glx/render2.c
xorg-server/glx/render2swap.c
Diffstat (limited to 'xorg-server/hw/xwin')
| -rw-r--r-- | xorg-server/hw/xwin/glx/glwrap.c | 2 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/glx/indirect.c | 11 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/swrastwgl_dri/glwrap.c | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/xorg-server/hw/xwin/glx/glwrap.c b/xorg-server/hw/xwin/glx/glwrap.c index 9733e7526..4d2b77343 100644 --- a/xorg-server/hw/xwin/glx/glwrap.c +++ b/xorg-server/hw/xwin/glx/glwrap.c @@ -42,8 +42,6 @@ #include <glx/glheader.h> #include <glx/glxserver.h> #include <glx/glxext.h> -#include <glx/glapi.h> -#include <glx/dispatch.h> #include <glwindows.h> #include <winmsg.h> diff --git a/xorg-server/hw/xwin/glx/indirect.c b/xorg-server/hw/xwin/glx/indirect.c index 1179dc248..85977cc70 100644 --- a/xorg-server/hw/xwin/glx/indirect.c +++ b/xorg-server/hw/xwin/glx/indirect.c @@ -83,9 +83,8 @@ #include <glx/glxserver.h> #include <glx/glxutil.h> #include <glx/extension_string.h> +#include <glx/glxext.h> #include <GL/glxtokens.h> -#include <glx/glapitable.h> -#include <glx/glapi.h> #include <winpriv.h> #include <wgl_ext_api.h> @@ -420,7 +419,9 @@ fbConfigsDump(unsigned int n, __GLXconfig * c) c->accumAlphaBits, c->sampleBuffers, c->samples, (c->drawableType & GLX_WINDOW_BIT) ? "y" : ".", (c->drawableType & GLX_PIXMAP_BIT) ? "y" : ".", - (c->drawableType & GLX_PBUFFER_BIT) ? "y" : ".", ".", + (c->drawableType & GLX_PBUFFER_BIT) ? "y" : ".", + (c->renderType & (GLX_RGBA_FLOAT_BIT_ARB | + GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT)) ? "y" : ".", (c->transparentPixel != GLX_NONE_EXT) ? "y" : ".", c->visualSelectGroup, (c->visualRating == GLX_SLOW_VISUAL_EXT) ? "*" : " "); @@ -1706,7 +1707,7 @@ glxWinContextLoseCurrent(__GLXcontext * base) return FALSE; } - base->isCurrent=FALSE; /* It looks like glx is not doing this */ + base->currentClient=NULL; /* It looks like glx is not doing this */ _glapi_set_dispatch(NULL); return ret; @@ -1799,8 +1800,10 @@ glxWinCreateContext(__GLXscreen * screen, //context->ctx = NULL; already done with memset context->shareContext = shareContext; +/* TODO how to handle the unknown type glapi_table??? context->Dispatch=calloc(sizeof(void*), (sizeof(struct _glapi_table) / sizeof(void *) + MAX_EXTENSION_FUNCS)); _glapi_set_dispatch(context->Dispatch); +*/ glWinSetupDispatchTable(); diff --git a/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c b/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c index 6d794b671..3f8e2091b 100644 --- a/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c +++ b/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c @@ -42,8 +42,6 @@ #include <glx/glheader.h> #include <glx/glxserver.h> #include <glx/glxext.h> -#include <glx/glapi.h> -#include <glx/dispatch.h> #include <glwindows.h> #include <winmsg.h> |