[PATCH 4/5] hw/xwin/glx: Fix compilation of hw/xwin/glx/indirect.c

Jon TURNEY jon.turney at dronecode.org.uk
Mon Dec 2 06:16:00 PST 2013


/jhbuild/checkout/xorg/xserver/hw/xwin/glx/indirect.c: In function 'fbConfigsDump':
/jhbuild/checkout/xorg/xserver/hw/xwin/glx/indirect.c:390:34: error: 'GLX_RGBA_FLOAT_BIT_ARB' undeclared (first use in this function)
/jhbuild/checkout/xorg/xserver/hw/xwin/glx/indirect.c:391:20: error: 'GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT' undeclared (first use in this function)

This is a compilation fix for hw/xwin/glx/indirect.c, which has a use of those
tokens added in ccc8bb11, but the definitions added in eabb523a are not in
scope.

Possibly the correct fix is to add these tokens to glproto's glxtokens.h, and
require a glproto which has them.

Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
---
 hw/xwin/glx/indirect.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/hw/xwin/glx/indirect.c b/hw/xwin/glx/indirect.c
index 4f09652..4eb88be 100644
--- a/hw/xwin/glx/indirect.c
+++ b/hw/xwin/glx/indirect.c
@@ -90,6 +90,14 @@
 
 #define NUM_ELEMENTS(x) (sizeof(x)/ sizeof(x[1]))
 
+/* should be in glproto's glxtokens.h? */
+#ifndef GLX_RGBA_FLOAT_BIT_ARB
+#define GLX_RGBA_FLOAT_BIT_ARB             0x00000004
+#endif
+#ifndef GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT
+#define GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT    0x00000008
+#endif
+
 /* Not yet in w32api */
 #ifndef PFD_SUPPORT_DIRECTDRAW
 #define PFD_SUPPORT_DIRECTDRAW   0x00002000
-- 
1.8.3.4



More information about the xorg-devel mailing list