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