On 27/09/12 22:12, Adam Jackson wrote:
This used to work in 1.12, but the extension rework broke things.
Signed-off-by: Adam Jackson <[email protected]>
---
hw/vfb/InitOutput.c | 16 ++++++++++++++++
hw/vfb/Makefile.am | 10 ++++++++--
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index 955624f..8c73ef2 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -66,6 +66,10 @@ from The Open Group.
#endif /* HAS_SHM */
#include "dix.h"
#include "miline.h"
+#ifdef GLXEXT
+#include "glxserver.h"
+#include "glx_extinit.h"
+#endif
#define VFB_DEFAULT_WIDTH 1280
#define VFB_DEFAULT_HEIGHT 1024
@@ -885,12 +889,24 @@ vfbScreenInit(ScreenPtr pScreen, int argc, char **argv)
} /* end vfbScreenInit */
+#ifdef GLXEXT
+static ExtensionModule vfb_glx_ext = {
+ GlxExtensionInit,
+ "GLX",
+ &noGlxExtension
+};
+#endif
+
void
InitOutput(ScreenInfo * screenInfo, int argc, char **argv)
{
int i;
int NumFormats = 0;
+#ifdef GLXEXT
+ LoadExtension(&vfb_glx_ext, TRUE);
+#endif
I think this probably needs an 'if (serverGeneration == 1)' as I
mentioned at [1]
[1] http://lists.x.org/archives/xorg-devel/2012-August/033140.html
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
