|
1 --- src/mesa/drivers/dri/intel/intel_screen.c Mon Mar 25 09:22:16 2013 |
|
2 +++ src/mesa/drivers/dri/intel/intel_screen.c Mon Mar 25 10:14:00 2013 |
|
3 @@ -36,6 +36,7 @@ |
|
4 #include "main/mfeatures.h" |
|
5 #include "main/version.h" |
|
6 #include "swrast/s_renderbuffer.h" |
|
7 +#include "../../../../../include/GL/internal/dri_interface.h" |
|
8 |
|
9 #include "utils.h" |
|
10 #include "xmlpool.h" |
|
11 --- src/mesa/drivers/dri/i965/brw_context.c Mon Mar 25 10:57:00 2013 |
|
12 +++ src/mesa/drivers/dri/i965/brw_context.c Mon Mar 25 10:58:40 2013 |
|
13 @@ -395,8 +395,10 @@ |
|
14 if ((flags & __DRI_CTX_FLAG_FORWARD_COMPATIBLE) != 0) |
|
15 ctx->Const.ContextFlags |= GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT; |
|
16 |
|
17 +#ifdef GL_VERSION_4_3 |
|
18 if ((flags & __DRI_CTX_FLAG_DEBUG) != 0) |
|
19 ctx->Const.ContextFlags |= GL_CONTEXT_FLAG_DEBUG_BIT; |
|
20 +#endif |
|
21 |
|
22 return true; |
|
23 } |
|
24 --- src/glx/dri2_glx.c Thu Feb 21 06:25:41 2013 |
|
25 +++ src/glx/dri2_glx.c Mon Mar 25 13:48:18 2013 |
|
26 @@ -54,6 +54,11 @@ |
|
27 #define DRI_CONF_VBLANK_DEF_INTERVAL_1 2 |
|
28 #define DRI_CONF_VBLANK_ALWAYS_SYNC 3 |
|
29 |
|
30 +#define __DRI_CTX_RESET_NO_NOTIFICATION 0 |
|
31 +#define __DRI_CTX_ATTRIB_RESET_STRATEGY 3 |
|
32 +#define __DRI2_ROBUSTNESS "DRI_Robustness" |
|
33 + |
|
34 + |
|
35 #undef DRI2_MINOR |
|
36 #define DRI2_MINOR 1 |
|
37 |
|
38 --- src/glx/dri_common.c Thu Feb 21 01:25:29 2013 |
|
39 +++ src/glx/dri_common.c Mon Mar 25 13:45:06 2013 |
|
40 @@ -48,6 +48,11 @@ |
|
41 #define RTLD_GLOBAL 0 |
|
42 #endif |
|
43 |
|
44 +#define __DRI_CTX_RESET_NO_NOTIFICATION 0 |
|
45 +#define __DRI_CTX_RESET_LOSE_CONTEXT 1 |
|
46 +#define __DRI_CTX_FLAG_ROBUST_BUFFER_ACCESS 0x00000004 |
|
47 + |
|
48 + |
|
49 /** |
|
50 * Print informational message to stderr if LIBGL_DEBUG is set to |
|
51 * "verbose". |
|
52 --- src/glx/drisw_glx.c Thu Feb 21 01:25:29 2013 |
|
53 +++ src/glx/drisw_glx.c Mon Mar 25 13:40:31 2013 |
|
54 @@ -28,6 +28,9 @@ |
|
55 #include <dlfcn.h> |
|
56 #include "dri_common.h" |
|
57 |
|
58 +#define __DRI_CTX_RESET_NO_NOTIFICATION 0 |
|
59 + |
|
60 + |
|
61 struct drisw_display |
|
62 { |
|
63 __GLXDRIdisplay base; |
|
64 |
|
65 --- src/mesa/drivers/dri/i915/Makefile.am Tue Jun 18 13:26:19 2013 |
|
66 +++ src/mesa/drivers/dri/i915/Makefile.am Tue Jun 18 13:26:34 2013 |
|
67 @@ -53,6 +53,7 @@ |
|
68 i915_dri_la_LDFLAGS = -module -avoid-version -shared |
|
69 i915_dri_la_LIBADD = \ |
|
70 ../common/libdricommon.la \ |
|
71 + ../../../../mapi/shared-glapi/libglapi.la \ |
|
72 $(DRI_LIB_DEPS) \ |
|
73 $(INTEL_LIBS) |
|
74 |
|
75 --- src/mesa/drivers/dri/radeon/Makefile.am Tue Jun 18 13:27:05 2013 |
|
76 +++ src/mesa/drivers/dri/radeon/Makefile.am Tue Jun 18 13:27:22 2013 |
|
77 @@ -51,6 +51,7 @@ |
|
78 radeon_dri_la_LDFLAGS = -module -avoid-version -shared |
|
79 radeon_dri_la_LIBADD = \ |
|
80 ../common/libdricommon.la \ |
|
81 + ../../../../mapi/shared-glapi/libglapi.la \ |
|
82 $(DRI_LIB_DEPS) \ |
|
83 $(RADEON_LIBS) |
|
84 |
|
85 --- src/mesa/drivers/dri/swrast/Makefile.am Tue Jun 18 13:27:34 2013 |
|
86 +++ src/mesa/drivers/dri/swrast/Makefile.am Tue Jun 18 13:27:52 2013 |
|
87 @@ -48,6 +48,7 @@ |
|
88 |
|
89 swrast_dri_la_LDFLAGS = -module -avoid-version -shared |
|
90 swrast_dri_la_LIBADD = \ |
|
91 + ../../../../mapi/shared-glapi/libglapi.la \ |
|
92 $(DRI_LIB_DEPS) |
|
93 |
|
94 # Provide compatibility with scripts for the old Mesa build system for |
|
95 --- src/mesa/drivers/dri/r200/Makefile.am Tue Jun 18 13:27:56 2013 |
|
96 +++ src/mesa/drivers/dri/r200/Makefile.am Tue Jun 18 13:28:03 2013 |
|
97 @@ -51,6 +51,7 @@ |
|
98 r200_dri_la_LDFLAGS = -module -avoid-version -shared |
|
99 r200_dri_la_LIBADD = \ |
|
100 ../common/libdricommon.la \ |
|
101 + ../../../../mapi/shared-glapi/libglapi.la \ |
|
102 $(DRI_LIB_DEPS) \ |
|
103 $(RADEON_LIBS) |
|
104 |
|
105 --- src/mesa/drivers/dri/i965/Makefile.am Tue Jun 18 13:45:59 2013 |
|
106 +++ src/mesa/drivers/dri/i965/Makefile.am Tue Jun 18 13:39:37 2013 |
|
107 @@ -54,6 +54,7 @@ |
|
108 i965_dri_la_LDFLAGS = -module -avoid-version -shared |
|
109 i965_dri_la_LIBADD = \ |
|
110 ../common/libdricommon.la \ |
|
111 + ../../../../mapi/shared-glapi/libglapi.la \ |
|
112 $(DRI_LIB_DEPS) \ |
|
113 $(INTEL_LIBS) |
|
114 |
|
115 diff -rupN Mesa-9.0.3.ori/src/mesa/libdricore/Makefile.am Mesa-9.0.3/src/mesa/libdricore/Makefile.am |
|
116 --- src/mesa/libdricore/Makefile.am 2013-03-21 23:26:42.497508661 +0800 |
|
117 +++ src/mesa/libdricore/Makefile.am 2013-03-22 00:23:31.688844257 +0800 |
|
118 @@ -45,8 +45,9 @@ libdricore@VERSION@_la_SOURCES = \ |
|
119 $(LIBGLSL_CXX_FILES) \ |
|
120 $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \ |
|
121 $(top_builddir)/src/glsl/builtin_function.cpp |
|
122 -libdricore@VERSION@_la_LDFLAGS = -version-number 1:0 |
|
123 -libdricore@VERSION@_la_LIBADD = libdricore-asm.la |
|
124 +libdricore@VERSION@_la_LDFLAGS = ../../mapi/shared-glapi/libglapi.la -version-number 1:0 |
|
125 +#libdricore@VERSION@_la_LIBADD = libdricore-asm.la |
|
126 +libdricore@VERSION@_la_LIBADD = |
|
127 |
|
128 # This is separated from libdricore to avoid conflics in object |
|
129 # outputs between main/clip.c and sparc/clip.c. The documented way to |