diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2018-01-08 05:41:34 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2018-01-08 05:41:34 +0000 |
| commit | c00801de923e125863aaf8180439d59d610b2517 (patch) | |
| tree | e2896aa2785f3cf2151aeeb3c95fb5cc09a2fe02 /lib/mesa/src/glx/Makefile.am | |
| parent | be30e6efb92db21299b936c0e068e7088941e9c9 (diff) | |
Revert to Mesa 13.0.6 again.
Corruption has again been reported on Intel hardware running Xorg with
the modesetting driver (which uses OpenGL based acceleration instead of
SNA acceleration the intel driver defaults to).
Reported in various forms on Sandy Bridge (X220), Ivy Bridge (X230) and
Haswell (X240). Confirmed to not occur with the intel driver but the
xserver was changed to default to the modesetting driver on >= gen4
hardware (except Ironlake).
One means of triggering this is to open a large pdf with xpdf on an
idle machine and highlight a section of the document.
There have been reports of gpu hangs on gen4 intel hardware
(T500 with GM45, X61 with 965GM) when starting Xorg as well.
Diffstat (limited to 'lib/mesa/src/glx/Makefile.am')
| -rw-r--r-- | lib/mesa/src/glx/Makefile.am | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/mesa/src/glx/Makefile.am b/lib/mesa/src/glx/Makefile.am index c3d27a67a..df0acdc30 100644 --- a/lib/mesa/src/glx/Makefile.am +++ b/lib/mesa/src/glx/Makefile.am @@ -20,6 +20,7 @@ # IN THE SOFTWARE. if HAVE_SHARED_GLAPI +SHARED_GLAPI_CFLAGS = -DGLX_SHARED_GLAPI SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la endif @@ -41,6 +42,7 @@ AM_CFLAGS = \ -I$(top_builddir)/src/mapi/glapi \ -I$(top_srcdir)/src/mapi/glapi \ $(VISIBILITY_CFLAGS) \ + $(SHARED_GLAPI_CFLAGS) \ $(EXTRA_DEFINES_XF86VIDMODE) \ -D_REENTRANT \ -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" \ @@ -153,7 +155,7 @@ libglx_la_LIBADD += \ $(builddir)/windows/libwindowsglx.la endif -if USE_LIBGLVND +if USE_LIBGLVND_GLX AM_CFLAGS += \ -DGL_LIB_NAME=\"lib@GL_LIB@.so\" \ $(GLVND_CFLAGS) @@ -172,10 +174,7 @@ AM_CFLAGS += \ GL_LIB_VERSION=1:2 endif -# Push the libdrm furhter up, as due to libtool bug we might end up relinking -# against the system one. GL_LIBS = \ - $(LIBDRM_LIBS) \ libglx.la \ $(top_builddir)/src/mapi/glapi/libglapi.la \ $(SHARED_GLAPI_LIB) \ |