mesa9-port.patch revision 1366
1366N/A--- src/mesa/drivers/dri/intel/intel_screen.c Mon Mar 25 09:22:16 2013
1366N/A+++ src/mesa/drivers/dri/intel/intel_screen.c Mon Mar 25 10:14:00 2013
1366N/A@@ -36,6 +36,7 @@
1366N/A #include "main/mfeatures.h"
1366N/A #include "main/version.h"
1366N/A #include "swrast/s_renderbuffer.h"
1366N/A+#include "../../../../../include/GL/internal/dri_interface.h"
1366N/A
1366N/A #include "utils.h"
1366N/A #include "xmlpool.h"
1366N/A--- src/mesa/drivers/dri/i965/brw_context.c Mon Mar 25 10:57:00 2013
1366N/A+++ src/mesa/drivers/dri/i965/brw_context.c Mon Mar 25 10:58:40 2013
1366N/A@@ -395,8 +395,10 @@
1366N/A if ((flags & __DRI_CTX_FLAG_FORWARD_COMPATIBLE) != 0)
1366N/A ctx->Const.ContextFlags |= GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT;
1366N/A
1366N/A+#ifdef GL_VERSION_4_3
1366N/A if ((flags & __DRI_CTX_FLAG_DEBUG) != 0)
1366N/A ctx->Const.ContextFlags |= GL_CONTEXT_FLAG_DEBUG_BIT;
1366N/A+#endif
1366N/A
1366N/A return true;
1366N/A }
1366N/A--- src/glx/dri2_glx.c Thu Feb 21 06:25:41 2013
1366N/A+++ src/glx/dri2_glx.c Mon Mar 25 13:48:18 2013
1366N/A@@ -54,6 +54,11 @@
1366N/A #define DRI_CONF_VBLANK_DEF_INTERVAL_1 2
1366N/A #define DRI_CONF_VBLANK_ALWAYS_SYNC 3
1366N/A
1366N/A+#define __DRI_CTX_RESET_NO_NOTIFICATION 0
1366N/A+#define __DRI_CTX_ATTRIB_RESET_STRATEGY 3
1366N/A+#define __DRI2_ROBUSTNESS "DRI_Robustness"
1366N/A+
1366N/A+
1366N/A #undef DRI2_MINOR
1366N/A #define DRI2_MINOR 1
1366N/A
1366N/A--- src/glx/dri_common.c Thu Feb 21 01:25:29 2013
1366N/A+++ src/glx/dri_common.c Mon Mar 25 13:45:06 2013
1366N/A@@ -48,6 +48,11 @@
1366N/A #define RTLD_GLOBAL 0
1366N/A #endif
1366N/A
1366N/A+#define __DRI_CTX_RESET_NO_NOTIFICATION 0
1366N/A+#define __DRI_CTX_RESET_LOSE_CONTEXT 1
1366N/A+#define __DRI_CTX_FLAG_ROBUST_BUFFER_ACCESS 0x00000004
1366N/A+
1366N/A+
1366N/A /**
1366N/A * Print informational message to stderr if LIBGL_DEBUG is set to
1366N/A * "verbose".
1366N/A--- src/glx/drisw_glx.c Thu Feb 21 01:25:29 2013
1366N/A+++ src/glx/drisw_glx.c Mon Mar 25 13:40:31 2013
1366N/A@@ -28,6 +28,9 @@
1366N/A #include <dlfcn.h>
1366N/A #include "dri_common.h"
1366N/A
1366N/A+#define __DRI_CTX_RESET_NO_NOTIFICATION 0
1366N/A+
1366N/A+
1366N/A struct drisw_display
1366N/A {
1366N/A __GLXDRIdisplay base;
1366N/A
1366N/A--- src/mesa/drivers/dri/i915/Makefile.am Tue Jun 18 13:26:19 2013
1366N/A+++ src/mesa/drivers/dri/i915/Makefile.am Tue Jun 18 13:26:34 2013
1366N/A@@ -53,6 +53,7 @@
1366N/A i915_dri_la_LDFLAGS = -module -avoid-version -shared
1366N/A i915_dri_la_LIBADD = \
1366N/A ../common/libdricommon.la \
1366N/A+ ../../../../mapi/shared-glapi/libglapi.la \
1366N/A $(DRI_LIB_DEPS) \
1366N/A $(INTEL_LIBS)
1366N/A
1366N/A--- src/mesa/drivers/dri/radeon/Makefile.am Tue Jun 18 13:27:05 2013
1366N/A+++ src/mesa/drivers/dri/radeon/Makefile.am Tue Jun 18 13:27:22 2013
1366N/A@@ -51,6 +51,7 @@
1366N/A radeon_dri_la_LDFLAGS = -module -avoid-version -shared
1366N/A radeon_dri_la_LIBADD = \
1366N/A ../common/libdricommon.la \
1366N/A+ ../../../../mapi/shared-glapi/libglapi.la \
1366N/A $(DRI_LIB_DEPS) \
1366N/A $(RADEON_LIBS)
1366N/A
1366N/A--- src/mesa/drivers/dri/swrast/Makefile.am Tue Jun 18 13:27:34 2013
1366N/A+++ src/mesa/drivers/dri/swrast/Makefile.am Tue Jun 18 13:27:52 2013
1366N/A@@ -48,6 +48,7 @@
1366N/A
1366N/A swrast_dri_la_LDFLAGS = -module -avoid-version -shared
1366N/A swrast_dri_la_LIBADD = \
1366N/A+ ../../../../mapi/shared-glapi/libglapi.la \
1366N/A $(DRI_LIB_DEPS)
1366N/A
1366N/A # Provide compatibility with scripts for the old Mesa build system for
1366N/A--- src/mesa/drivers/dri/r200/Makefile.am Tue Jun 18 13:27:56 2013
1366N/A+++ src/mesa/drivers/dri/r200/Makefile.am Tue Jun 18 13:28:03 2013
1366N/A@@ -51,6 +51,7 @@
1366N/A r200_dri_la_LDFLAGS = -module -avoid-version -shared
1366N/A r200_dri_la_LIBADD = \
1366N/A ../common/libdricommon.la \
1366N/A+ ../../../../mapi/shared-glapi/libglapi.la \
1366N/A $(DRI_LIB_DEPS) \
1366N/A $(RADEON_LIBS)
1366N/A
1366N/A--- src/mesa/drivers/dri/i965/Makefile.am Tue Jun 18 13:45:59 2013
1366N/A+++ src/mesa/drivers/dri/i965/Makefile.am Tue Jun 18 13:39:37 2013
1366N/A@@ -54,6 +54,7 @@
1366N/A i965_dri_la_LDFLAGS = -module -avoid-version -shared
1366N/A i965_dri_la_LIBADD = \
1366N/A ../common/libdricommon.la \
1366N/A+ ../../../../mapi/shared-glapi/libglapi.la \
1366N/A $(DRI_LIB_DEPS) \
1366N/A $(INTEL_LIBS)
1366N/A
1366N/Adiff -rupN Mesa-9.0.3.ori/src/mesa/libdricore/Makefile.am Mesa-9.0.3/src/mesa/libdricore/Makefile.am
1366N/A--- src/mesa/libdricore/Makefile.am 2013-03-21 23:26:42.497508661 +0800
1366N/A+++ src/mesa/libdricore/Makefile.am 2013-03-22 00:23:31.688844257 +0800
1366N/A@@ -45,8 +45,9 @@ libdricore@VERSION@_la_SOURCES = \
1366N/A $(LIBGLSL_CXX_FILES) \
1366N/A $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
1366N/A $(top_builddir)/src/glsl/builtin_function.cpp
1366N/A-libdricore@VERSION@_la_LDFLAGS = -version-number 1:0
1366N/A-libdricore@VERSION@_la_LIBADD = libdricore-asm.la
1366N/A+libdricore@VERSION@_la_LDFLAGS = ../../mapi/shared-glapi/libglapi.la -version-number 1:0
1366N/A+#libdricore@VERSION@_la_LIBADD = libdricore-asm.la
1366N/A+libdricore@VERSION@_la_LIBADD =
1366N/A
1366N/A # This is separated from libdricore to avoid conflics in object
1366N/A # outputs between main/clip.c and sparc/clip.c. The documented way to
1366N/A--- configure.ac Thu Aug 1 09:21:32 2013
1366N/A+++ configure.ac Mon Aug 12 15:50:47 2013
1366N/A@@ -1064,7 +1064,7 @@
1366N/A DEFINES="$DEFINES -DHAVE_ALIAS"
1366N/A ;;
1366N/A solaris*)
1366N/A- DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"
1366N/A+ DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=0 -DIN_DRI_DRIVER"
1366N/A ;;
1366N/A cygwin*)
1366N/A DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"
1366N/A