| author | Jay Cotton <Jay.Cotton@Oracle.com> |
| Tue, 04 Oct 2016 12:37:42 -0700 | |
| changeset 1665 | d048e72d9d75 |
| permissions | -rw-r--r-- |
|
1665
d048e72d9d75
24797462 GLX extension is no longer initialized by DIX layer
Jay Cotton <Jay.Cotton@Oracle.com>
parents:
diff
changeset
|
1 |
--- ba/unix/xserver/hw/vnc/xvnc.cc 2016-10-03 22:04:56.283365605 -0700 |
|
d048e72d9d75
24797462 GLX extension is no longer initialized by DIX layer
Jay Cotton <Jay.Cotton@Oracle.com>
parents:
diff
changeset
|
2 |
+++ aa/unix/xserver/hw/vnc/xvnc.cc 2016-10-03 22:06:47.633748568 -0700 |
|
d048e72d9d75
24797462 GLX extension is no longer initialized by DIX layer
Jay Cotton <Jay.Cotton@Oracle.com>
parents:
diff
changeset
|
3 |
@@ -1311,9 +1311,13 @@ |
|
d048e72d9d75
24797462 GLX extension is no longer initialized by DIX layer
Jay Cotton <Jay.Cotton@Oracle.com>
parents:
diff
changeset
|
4 |
#if XORG >= 113 |
|
d048e72d9d75
24797462 GLX extension is no longer initialized by DIX layer
Jay Cotton <Jay.Cotton@Oracle.com>
parents:
diff
changeset
|
5 |
#ifdef GLXEXT |
|
d048e72d9d75
24797462 GLX extension is no longer initialized by DIX layer
Jay Cotton <Jay.Cotton@Oracle.com>
parents:
diff
changeset
|
6 |
if (serverGeneration == 1) |
|
d048e72d9d75
24797462 GLX extension is no longer initialized by DIX layer
Jay Cotton <Jay.Cotton@Oracle.com>
parents:
diff
changeset
|
7 |
+#if XORG >= 116 |
|
d048e72d9d75
24797462 GLX extension is no longer initialized by DIX layer
Jay Cotton <Jay.Cotton@Oracle.com>
parents:
diff
changeset
|
8 |
+ LoadExtensionList(&glxExt,1,TRUE); |
|
d048e72d9d75
24797462 GLX extension is no longer initialized by DIX layer
Jay Cotton <Jay.Cotton@Oracle.com>
parents:
diff
changeset
|
9 |
+#else |
|
d048e72d9d75
24797462 GLX extension is no longer initialized by DIX layer
Jay Cotton <Jay.Cotton@Oracle.com>
parents:
diff
changeset
|
10 |
LoadExtension(&glxExt, TRUE); |
|
d048e72d9d75
24797462 GLX extension is no longer initialized by DIX layer
Jay Cotton <Jay.Cotton@Oracle.com>
parents:
diff
changeset
|
11 |
#endif |
|
d048e72d9d75
24797462 GLX extension is no longer initialized by DIX layer
Jay Cotton <Jay.Cotton@Oracle.com>
parents:
diff
changeset
|
12 |
#endif |
|
d048e72d9d75
24797462 GLX extension is no longer initialized by DIX layer
Jay Cotton <Jay.Cotton@Oracle.com>
parents:
diff
changeset
|
13 |
+#endif |
|
d048e72d9d75
24797462 GLX extension is no longer initialized by DIX layer
Jay Cotton <Jay.Cotton@Oracle.com>
parents:
diff
changeset
|
14 |
|
|
d048e72d9d75
24797462 GLX extension is no longer initialized by DIX layer
Jay Cotton <Jay.Cotton@Oracle.com>
parents:
diff
changeset
|
15 |
/* initialize pixmap formats */ |
|
d048e72d9d75
24797462 GLX extension is no longer initialized by DIX layer
Jay Cotton <Jay.Cotton@Oracle.com>
parents:
diff
changeset
|
16 |