diff options
| author | Chad Versace <chad.versace@linux.intel.com> | 2013-06-06 13:17:48 -0700 |
|---|---|---|
| committer | Chad Versace <chad.versace@linux.intel.com> | 2013-06-06 14:38:48 -0700 |
| commit | 53deaafb553e5aff355f18da72ed409072f761d0 (patch) | |
| tree | cbab85f78ccf958a9362388becee7cd52e815be3 | |
| parent | 8f778e4c6f28598ad3fc628d34bd0b96a1617f2a (diff) | |
Revert "glx: Query proper extension string for ARB_create_context etc."
This reverts commit 8f778e4c6f28598ad3fc628d34bd0b96a1617f2a.
This patch broke detection of GL_ARB_create_context (and siblings) for
systems where the GLX client extension string included the extension
string but the GLX server extensions string. In this case, Waffle
incorrectly believed that the system supported GL_ARB_create_context.
This broke Piglit on such systems.
This patch was totally bogus because Paul and I failed to understand the
distinction between the GLX server extension string, the GLX client
extension string, and merged GLX extension string. This patch fixed the
use of GLX_ARB_create_context on Paul's system because his system had
a bogus GLX installed.
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
| -rw-r--r-- | src/waffle/glx/glx_display.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/waffle/glx/glx_display.c b/src/waffle/glx/glx_display.c index 15c52ae..a29fb3c 100644 --- a/src/waffle/glx/glx_display.c +++ b/src/waffle/glx/glx_display.c @@ -51,7 +51,8 @@ static bool glx_display_set_extensions(struct glx_display *self) { - const char *s = glXGetClientString(self->x11.xlib, GLX_EXTENSIONS); + const char *s = glXQueryExtensionsString(self->x11.xlib, + self->x11.screen); if (!s) { wcore_errorf(WAFFLE_ERROR_UNKNOWN, "glXQueryExtensionsString failed"); |