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/glx/glxdri2.c | |
| 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/glx/glxdri2.c')
| -rw-r--r-- | xorg-server/glx/glxdri2.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/xorg-server/glx/glxdri2.c b/xorg-server/glx/glxdri2.c index f662b2188..1d74c8f5a 100644 --- a/xorg-server/glx/glxdri2.c +++ b/xorg-server/glx/glxdri2.c @@ -49,10 +49,6 @@ #include "glxdricommon.h" #include <GL/glxtokens.h> -#include "glapitable.h" -#include "glapi.h" -#include "glthread.h" -#include "dispatch.h" #include "extension_string.h" typedef struct __GLXDRIscreen __GLXDRIscreen; @@ -845,6 +841,11 @@ glxDRILeaveVT(ScrnInfoPtr scrn) scrn->LeaveVT = glxDRILeaveVT; } +/** + * Initialize extension flags in glx_enable_bits when a new screen is created + * + * @param screen The screen where glx_enable_bits are to be set. + */ static void initializeExtensions(__GLXDRIscreen * screen) { @@ -889,6 +890,12 @@ initializeExtensions(__GLXDRIscreen * screen) LogMessage(X_INFO, "AIGLX: enabled GLX_EXT_framebuffer_sRGB\n"); } + /* enable ARB_fbconfig_float extension (even if there are no float fbconfigs) */ + { + __glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_fbconfig_float"); + LogMessage(X_INFO, "AIGLX: enabled GLX_ARB_fbconfig_float\n"); + } + for (i = 0; extensions[i]; i++) { #ifdef __DRI_READ_DRAWABLE if (strcmp(extensions[i]->name, __DRI_READ_DRAWABLE) == 0) { |