diff options
| author | Eric Anholt <eric@anholt.net> | 2013-11-12 16:08:44 -0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2013-11-15 12:28:33 -0800 |
| commit | 47139b02335dee675fdcf14b9a766c4cdcec890f (patch) | |
| tree | aea6d1f3210e1feaebf6185972b5dfadf7b7e151 /src | |
| parent | 94251281b4e914ec7b29e811ed6a565128745d0c (diff) | |
glx: Back DRI3 enablement out of the stable branch.
After more testing (everyone else trying to build the stack is having as
much trouble as I had, even after the problems I had were fixed), it
really feels like dri3 is not something we're ready to support in this
stable branch. The .c/.h code will remain here to enable easier
cherry-picking from master, and everything stays on master so we can ship
a solid DRI3 in 3 months.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/glx/Makefile.am | 2 | ||||
| -rw-r--r-- | src/glx/glxext.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am index ae296b92236..f66c4bd59ad 100644 --- a/src/glx/Makefile.am +++ b/src/glx/Makefile.am @@ -94,8 +94,6 @@ libglx_la_SOURCES = \ dri2_glx.c \ dri2.c \ dri2_query_renderer.c \ - dri3_glx.c \ - dri3_common.c \ applegl_glx.c GL_LIBS = \ diff --git a/src/glx/glxext.c b/src/glx/glxext.c index c6e4d9f5738..b31d8fe93ba 100644 --- a/src/glx/glxext.c +++ b/src/glx/glxext.c @@ -865,8 +865,6 @@ __glXInitialize(Display * dpy) ** (e.g., those called in AllocAndFetchScreenConfigs). */ if (glx_direct && glx_accel) { - if (!getenv("LIBGL_DRI3_DISABLE")) - dpyPriv->dri3Display = dri3_create_display(dpy); dpyPriv->dri2Display = dri2CreateDisplay(dpy); dpyPriv->driDisplay = driCreateDisplay(dpy); } |