summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudio Ciccani <klan@users.sourceforge.net>2006-12-01 14:12:05 +0000
committerJosé Fonseca <jfonseca@vmware.com>2011-07-11 20:03:35 +0100
commitd0612fafc4d6e7986aa87d7f2e13718e826f5266 (patch)
tree35dea91301e0b15f892ea3ca9576778431e7593d
parent26ed181adf32bfc6d70692ea01210b63644cc79a (diff)
downloadglut-d0612fafc4d6e7986aa87d7f2e13718e826f5266.tar.gz
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()).
-rw-r--r--src/glut/directfb/ext.c7
-rw-r--r--src/glut/directfb/internal.h3
2 files changed, 9 insertions, 1 deletions
diff --git a/src/glut/directfb/ext.c b/src/glut/directfb/ext.c
index d7338ce..e37ecf5 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 2e986c9..bc3e20e 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)))