[PATCH xserver] glx: Drop references to <GL/internal/glcore.h>

Adam Jackson ajax at redhat.com
Mon Nov 6 21:41:14 UTC 2017


This header is a truly ancient remnant of the SGI SI code, which used
the same struct for visual/fbconfig state on both sides of the wire.
We're not using this struct ourselves so let's stop depending on the
header.

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 hw/dmx/glxProxy/glxcontext.h   | 2 --
 hw/dmx/glxProxy/glxscreens.h   | 2 --
 hw/xquartz/GL/glcontextmodes.h | 2 --
 hw/xquartz/GL/visualConfigs.c  | 1 -
 4 files changed, 7 deletions(-)

diff --git a/hw/dmx/glxProxy/glxcontext.h b/hw/dmx/glxProxy/glxcontext.h
index ac8c0573d..479186ca5 100644
--- a/hw/dmx/glxProxy/glxcontext.h
+++ b/hw/dmx/glxProxy/glxcontext.h
@@ -33,8 +33,6 @@
 
 typedef struct __GLXcontextRec __GLXcontext;
 
-#include "GL/internal/glcore.h"
-
 struct __GLXcontextRec {
     /*
      ** list of context structs
diff --git a/hw/dmx/glxProxy/glxscreens.h b/hw/dmx/glxProxy/glxscreens.h
index bb7477bc7..5f36b8158 100644
--- a/hw/dmx/glxProxy/glxscreens.h
+++ b/hw/dmx/glxProxy/glxscreens.h
@@ -31,8 +31,6 @@
  * Silicon Graphics, Inc.
  */
 
-#include "GL/internal/glcore.h"
-
 typedef struct {
 
     __GLXvisualConfig *pGlxVisual;
diff --git a/hw/xquartz/GL/glcontextmodes.h b/hw/xquartz/GL/glcontextmodes.h
index 7237ccc06..5b64add29 100644
--- a/hw/xquartz/GL/glcontextmodes.h
+++ b/hw/xquartz/GL/glcontextmodes.h
@@ -30,8 +30,6 @@
 #ifndef GLCONTEXTMODES_H
 #define GLCONTEXTMODES_H
 
-#include "GL/internal/glcore.h"
-
 #if !defined(IN_MINI_GLX)
 extern GLint
 _gl_convert_from_x_visual_type(int visualType);
diff --git a/hw/xquartz/GL/visualConfigs.c b/hw/xquartz/GL/visualConfigs.c
index ce68663cd..69b18f6a0 100644
--- a/hw/xquartz/GL/visualConfigs.c
+++ b/hw/xquartz/GL/visualConfigs.c
@@ -51,7 +51,6 @@
 #include <glxcontext.h>
 #include <glxext.h>
 #include <glxutil.h>
-#include <GL/internal/glcore.h>
 
 #include "capabilities.h"
 #include "visualConfigs.h"
-- 
2.14.3



More information about the xorg-devel mailing list