From 73fdecca9fdd9e63aa5e57bcd67911fbb761d318 Mon Sep 17 00:00:00 2001
From: Claudio Ciccani <klan@users.sourceforge.net>
Date: Fri, 1 Dec 2006 14:12:05 +0000
Subject: Remove DirectFBGL header from Mesa bacause since 1.0.0 DirectFB
 installs its own header.

Updated to the current DirectFBGL interface (i.e. added GetProcAddress()).
---
 src/glut/directfb/ext.c      | 7 +++++++
 src/glut/directfb/internal.h | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/glut')

diff --git a/src/glut/directfb/ext.c b/src/glut/directfb/ext.c
index d7338ce5f7..e37ecf5afa 100644
--- a/src/glut/directfb/ext.c
+++ b/src/glut/directfb/ext.c
@@ -156,6 +156,13 @@ glutGetProcAddress( const char *name )
                return glut_functions[i].address;
      }
 
+#if DIRECTFBGL_INTERFACE_VERSION >= 1
+     if (g_current) {
+          void *address = NULL;
+          g_current->gl->GetProcAddress( g_current->gl, name, &address );
+          return address;
+     }
+#endif
      return NULL;
 }
 
diff --git a/src/glut/directfb/internal.h b/src/glut/directfb/internal.h
index 2e986c9f28..bc3e20e93e 100644
--- a/src/glut/directfb/internal.h
+++ b/src/glut/directfb/internal.h
@@ -26,8 +26,9 @@
 #include <directfb.h>
 #include <directfb_version.h>
 
+#include <directfbgl.h>
+
 #include "GL/glut.h"
-#include "GL/directfbgl.h"
 
 
 #define VERSION_CODE( M, m, r )  (((M) << 16) | ((m) << 8) | ((r)))
-- 
cgit v1.2.3