| 1 |
From 44518d07398d663448d79e4f546736b40752630c Mon Sep 17 00:00:00 2001 |
| 2 |
From: Ulrich Sibiller <[email protected]> |
| 3 |
Date: Wed, 16 Mar 2016 14:40:08 +0100 |
| 4 |
Subject: [PATCH] Fix non-working GLX in 64bit Xorg 7.0 |
| 5 |
|
| 6 |
Found the needed patch in debian bugtracker at |
| 7 |
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=364233 |
| 8 |
--- |
| 9 |
src/glx/x11/indirect_vertex_array.c | 2 +- |
| 10 |
src/mesa/drivers/dri/common/glcontextmodes.c | 3 +++ |
| 11 |
src/mesa/main/glheader.h | 3 +++ |
| 12 |
3 files changed, 7 insertions(+), 1 deletion(-) |
| 13 |
|
| 14 |
Index: Mesa/src/glx/x11/indirect_vertex_array.c |
| 15 |
=================================================================== |
| 16 |
--- Mesa.orig/src/glx/x11/indirect_vertex_array.c |
| 17 |
+++ Mesa/src/glx/x11/indirect_vertex_array.c |
| 18 |
@@ -530,7 +530,7 @@ static GLubyte * |
| 19 |
emit_DrawArrays_header_old( __GLXcontext * gc, |
| 20 |
struct array_state_vector * arrays, |
| 21 |
size_t * elements_per_request, |
| 22 |
- size_t * total_requests, |
| 23 |
+ unsigned int * total_requests, |
| 24 |
GLenum mode, GLsizei count ) |
| 25 |
{ |
| 26 |
size_t command_size; |
| 27 |
Index: Mesa/src/mesa/main/glheader.h |
| 28 |
=================================================================== |
| 29 |
--- Mesa.orig/src/mesa/main/glheader.h |
| 30 |
+++ Mesa/src/mesa/main/glheader.h |
| 31 |
@@ -46,6 +46,9 @@ |
| 32 |
#ifndef GLHEADER_H |
| 33 |
#define GLHEADER_H |
| 34 |
|
| 35 |
+#ifdef HAVE_DIX_CONFIG_H |
| 36 |
+#include "dix-config.h" |
| 37 |
+#endif |
| 38 |
|
| 39 |
#if defined(XFree86LOADER) && defined(IN_MODULE) |
| 40 |
#include "xf86_ansic.h" |
| 41 |
Index: Mesa/src/mesa/drivers/dri/common/glcontextmodes.c |
| 42 |
=================================================================== |
| 43 |
--- Mesa.orig/src/mesa/drivers/dri/common/glcontextmodes.c |
| 44 |
+++ Mesa/src/mesa/drivers/dri/common/glcontextmodes.c |
| 45 |
@@ -39,6 +39,9 @@ |
| 46 |
# include "imports.h" |
| 47 |
# define __glXMemset memset |
| 48 |
#else |
| 49 |
+# if defined (HAVE_DIX_CONFIG_H) |
| 50 |
+# include <dix-config.h> |
| 51 |
+# endif |
| 52 |
# include <X11/X.h> |
| 53 |
# include <GL/glx.h> |
| 54 |
# include "GL/glxint.h" |