From 654e878165a2e336a5537599e7e6b9651ebf4954 Mon Sep 17 00:00:00 2001
From: Oskari Alaranta <oskari.alaranta@bananymous.com>
Date: Wed, 15 Apr 2026 19:22:56 +0300
Subject: [PATCH] Allow compiling with just xorgproto installed

---
 xbanan/ExtGLX.cpp | 98 +++++++++++++++++++++++------------------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/xbanan/ExtGLX.cpp b/xbanan/ExtGLX.cpp
index 9e8b267..effa659 100644
--- a/xbanan/ExtGLX.cpp
+++ b/xbanan/ExtGLX.cpp
@@ -1,63 +1,63 @@
 #include "Extensions.h"
 #include "Utils.h"
 
-#include <GL/glx.h>
 #include <GL/glxproto.h>
+#include <GL/glxtokens.h>
 
 using BOOL32 = CARD32;
 
 CARD32 g_fb_configs[2][24][2] {
 	{
-		{ GLX_FBCONFIG_ID,      1 },
-		{ GLX_VISUAL_ID,        g_visual.visualID },
-		{ GLX_BUFFER_SIZE,      32 },
-		{ GLX_LEVEL,            0 },
-		{ GLX_DOUBLEBUFFER,     True },
-		{ GLX_STEREO,           False },
-		{ GLX_RENDER_TYPE,      GLX_RGBA_BIT },
-		{ GLX_DRAWABLE_TYPE,    GLX_WINDOW_BIT },
-		{ GLX_X_RENDERABLE,     True },
-		{ GLX_X_VISUAL_TYPE,    GLX_TRUE_COLOR },
-		{ GLX_CONFIG_CAVEAT,    GLX_NONE },
-		{ GLX_TRANSPARENT_TYPE, GLX_NONE },
-		{ GLX_RED_SIZE,         8 },
-		{ GLX_GREEN_SIZE,       8 },
-		{ GLX_BLUE_SIZE,        8 },
-		{ GLX_ALPHA_SIZE,       8 },
-		{ GLX_DEPTH_SIZE,       24 },
-		{ GLX_STENCIL_SIZE,     8 },
-		{ GLX_ACCUM_RED_SIZE,   0 },
-		{ GLX_ACCUM_GREEN_SIZE, 0 },
-		{ GLX_ACCUM_BLUE_SIZE,  0 },
-		{ GLX_ACCUM_ALPHA_SIZE, 0 },
-		{ GLX_SAMPLE_BUFFERS,   0 },
-		{ GLX_SAMPLES,          0 },
+		{ GLX_FBCONFIG_ID,         1 },
+		{ GLX_VISUAL_ID,           g_visual.visualID },
+		{ GLX_BUFFER_SIZE,         32 },
+		{ GLX_LEVEL,               0 },
+		{ GLX_DOUBLEBUFFER,        xTrue },
+		{ GLX_STEREO,              xFalse },
+		{ GLX_RENDER_TYPE,         GLX_RGBA_BIT },
+		{ GLX_DRAWABLE_TYPE,       GLX_WINDOW_BIT },
+		{ GLX_X_RENDERABLE,        xTrue },
+		{ GLX_X_VISUAL_TYPE,       GLX_TRUE_COLOR },
+		{ GLX_CONFIG_CAVEAT,       GLX_NONE },
+		{ GLX_TRANSPARENT_TYPE,    GLX_NONE },
+		{ GLX_RED_SIZE,            8 },
+		{ GLX_GREEN_SIZE,          8 },
+		{ GLX_BLUE_SIZE,           8 },
+		{ GLX_ALPHA_SIZE,          8 },
+		{ GLX_DEPTH_SIZE,          24 },
+		{ GLX_STENCIL_SIZE,        8 },
+		{ GLX_ACCUM_RED_SIZE,      0 },
+		{ GLX_ACCUM_GREEN_SIZE,    0 },
+		{ GLX_ACCUM_BLUE_SIZE,     0 },
+		{ GLX_ACCUM_ALPHA_SIZE,    0 },
+		{ GLX_SAMPLE_BUFFERS_SGIS, 0 },
+		{ GLX_SAMPLES_SGIS,        0 },
 	},
 	{
-		{ GLX_FBCONFIG_ID,      2 },
-		{ GLX_VISUAL_ID,        g_visual.visualID },
-		{ GLX_BUFFER_SIZE,      32 },
-		{ GLX_LEVEL,            0 },
-		{ GLX_DOUBLEBUFFER,     False },
-		{ GLX_STEREO,           False },
-		{ GLX_RENDER_TYPE,      GLX_RGBA_BIT },
-		{ GLX_DRAWABLE_TYPE,    GLX_WINDOW_BIT },
-		{ GLX_X_RENDERABLE,     True },
-		{ GLX_X_VISUAL_TYPE,    GLX_TRUE_COLOR },
-		{ GLX_CONFIG_CAVEAT,    GLX_NONE },
-		{ GLX_TRANSPARENT_TYPE, GLX_NONE },
-		{ GLX_RED_SIZE,         8 },
-		{ GLX_GREEN_SIZE,       8 },
-		{ GLX_BLUE_SIZE,        8 },
-		{ GLX_ALPHA_SIZE,       8 },
-		{ GLX_DEPTH_SIZE,       24 },
-		{ GLX_STENCIL_SIZE,     8 },
-		{ GLX_ACCUM_RED_SIZE,   0 },
-		{ GLX_ACCUM_GREEN_SIZE, 0 },
-		{ GLX_ACCUM_BLUE_SIZE,  0 },
-		{ GLX_ACCUM_ALPHA_SIZE, 0 },
-		{ GLX_SAMPLE_BUFFERS,   0 },
-		{ GLX_SAMPLES,          0 },
+		{ GLX_FBCONFIG_ID,         2 },
+		{ GLX_VISUAL_ID,           g_visual.visualID },
+		{ GLX_BUFFER_SIZE,         32 },
+		{ GLX_LEVEL,               0 },
+		{ GLX_DOUBLEBUFFER,        xFalse },
+		{ GLX_STEREO,              xFalse },
+		{ GLX_RENDER_TYPE,         GLX_RGBA_BIT },
+		{ GLX_DRAWABLE_TYPE,       GLX_WINDOW_BIT },
+		{ GLX_X_RENDERABLE,        xTrue },
+		{ GLX_X_VISUAL_TYPE,       GLX_TRUE_COLOR },
+		{ GLX_CONFIG_CAVEAT,       GLX_NONE },
+		{ GLX_TRANSPARENT_TYPE,    GLX_NONE },
+		{ GLX_RED_SIZE,            8 },
+		{ GLX_GREEN_SIZE,          8 },
+		{ GLX_BLUE_SIZE,           8 },
+		{ GLX_ALPHA_SIZE,          8 },
+		{ GLX_DEPTH_SIZE,          24 },
+		{ GLX_STENCIL_SIZE,        8 },
+		{ GLX_ACCUM_RED_SIZE,      0 },
+		{ GLX_ACCUM_GREEN_SIZE,    0 },
+		{ GLX_ACCUM_BLUE_SIZE,     0 },
+		{ GLX_ACCUM_ALPHA_SIZE,    0 },
+		{ GLX_SAMPLE_BUFFERS_SGIS, 0 },
+		{ GLX_SAMPLES_SGIS,        0 },
 	},
 };