Ticket #121: glew-1.9.0.patch

config/Makefile.haiku

@@ +1 @@
+NAME = $(GLEW_NAME)
+GLEW_DEST = /boot/common
+CC = cc
+CXX = g++
+LD = cc
+ifneq (undefined, $(origin GLEW_MX))
+        CFLAGS.EXTRA = -DGLEW_MX
+endif
+
+LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME)
+LDFLAGS.SO.MX = -shared -Wl,-soname=$(LIB.SONAME.MX)
+
+LDFLAGS.GL = -lGL
+LDFLAGS.STATIC = -Wl,-Bstatic
+LDFLAGS.DYNAMIC = -Wl,-Bdynamic
+
+NAME = GLEW
+WARN = -Wall -W
+POPT = -O2
+
+BIN.SUFFIX =
+
+LIB.SONAME = lib$(NAME).so.$(SO_MAJOR)
+LIB.DEVLNK = lib$(NAME).so
+LIB.SHARED = lib$(NAME).so.$(SO_VERSION)
+LIB.STATIC = lib$(NAME).a
+LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR)
+LIB.DEVLNK.MX = lib$(NAME)mx.so
+LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION)
+LIB.STATIC.MX = lib$(NAME)mx.a
+ No newline at end of file

Makefile

@@ -172 +172 @@
 
 # GLEW utility programs
 
-BIN.LIBS = -Llib $(LDFLAGS.DYNAMIC) -l$(NAME) $(LDFLAGS.EXTRA) $(LDFLAGS.GL)
+BIN.LIBS = -Llib $(LDFLAGS.DYNAMIC) -l$(NAME) $(LDFLAGS.EXTRA) $(LDFLAGS.GL) -lbe
 
 GLEWINFO.BIN       := glewinfo$(BIN.SUFFIX)
 GLEWINFO.BIN.SRC   := src/glewinfo.c
+GLEWINFO.BIN.HAIKU := src/glewinfo_haiku.cpp
 GLEWINFO.BIN.OBJ   := $(addprefix tmp/$(SYSTEM)/default/shared/,$(notdir $(GLEWINFO.BIN.SRC)))
 GLEWINFO.BIN.OBJ   := $(GLEWINFO.BIN.OBJ:.c=.o)
+GLEWINFO.BIN.HAIKU_OBJ   := $(addprefix tmp/$(SYSTEM)/default/shared/,$(notdir $(GLEWINFO.BIN.HAIKU)))
+GLEWINFO.BIN.HAIKU_OBJ   := $(GLEWINFO.BIN.HAIKU_OBJ:.cpp=.o)
 
 VISUALINFO.BIN     := visualinfo$(BIN.SUFFIX)
 VISUALINFO.BIN.SRC := src/visualinfo.c
@@ -189 +192 @@
 bin:
         mkdir bin
 
-bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJ) lib/$(LIB.SHARED)
-        $(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJ) $(BIN.LIBS)
+bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJ) $(GLEWINFO.BIN.HAIKU_OBJ) lib/$(LIB.SHARED)
+        $(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJ) $(GLEWINFO.BIN.HAIKU_OBJ) $(BIN.LIBS)
 ifneq ($(STRIP),)
         $(STRIP) -x $@
 endif
@@ -205 +208 @@
         @mkdir -p $(dir $@)
         $(CC) -DGLEW_NO_GLU $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
 
+$(GLEWINFO.BIN.HAIKU_OBJ): $(GLEWINFO.BIN.HAIKU) include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
+        @mkdir -p $(dir $@)
+        $(CXX) -DGLEW_NO_GLU $(CXXFLAGS) $(CXXFLAGS.SO) -o $@ -c $<
+
 $(VISUALINFO.BIN.OBJ): $(VISUALINFO.BIN.SRC) include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
         @mkdir -p $(dir $@)
         $(CC) -DGLEW_NO_GLU $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<

src/glew.c

@@ -33 +33 @@
 
 #if defined(_WIN32)
 #  include <GL/wglew.h>
-#elif !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))
+#elif !defined(__HAIKU__) && !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))
 #  include <GL/glxew.h>
 #endif
 
@@ -66 +66 @@
 #  define GLXEW_CONTEXT_ARG_DEF_LIST void
 #endif /* GLEW_MX */
 
-#if defined(__sgi) || defined (__sun) || defined(GLEW_APPLE_GLX)
+#if defined(__sgi) || defined (__sun) || defined(GLEW_APPLE_GLX) || defined(__HAIKU__)
 #include <dlfcn.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -162 +162 @@
 #  define glewGetProcAddress(name) wglGetProcAddress((LPCSTR)name)
 #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
 #  define glewGetProcAddress(name) NSGLGetProcAddress(name)
-#elif defined(__sgi) || defined(__sun)
+#elif defined(__sgi) || defined(__sun) || defined(__HAIKU__)
 #  define glewGetProcAddress(name) dlGetProcAddress(name)
 #elif defined(__ANDROID__)
 #  define glewGetProcAddress(name) NULL /* TODO */
@@ -11548 +11548 @@
   return GLEW_OK;
 }
 
-#elif !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))
+#elif !defined(__HAIKU__) && !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))
 
 PFNGLXGETCURRENTDISPLAYPROC __glewXGetCurrentDisplay = NULL;
 
@@ -12620 +12620 @@
   return GLEW_OK;
 }
 
-#endif /* !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) */
+#endif /* !defined(__HAIKU__) && !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) */
 
 /* ------------------------------------------------------------------------ */
 
@@ -12660 +12660 @@
 
 #if defined(_WIN32)
 extern GLenum GLEWAPIENTRY wglewContextInit (void);
-#elif !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))
+#elif !defined(__HAIKU__) && !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))
 extern GLenum GLEWAPIENTRY glxewContextInit (void);
 #endif /* _WIN32 */
 
@@ -12671 +12671 @@
   if ( r != 0 ) return r;
 #if defined(_WIN32)
   return wglewContextInit();
-#elif !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) /* _UNIX */
+#elif !defined(__HAIKU__) && !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) /* _UNIX */
   return glxewContextInit();
 #else
   return r;
@@ -16472 +16472 @@
   return ret;
 }
 
-#elif !defined(__ANDROID__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
+#elif !defined(__HAIKU__) && !defined(__ANDROID__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
 
 #if defined(GLEW_MX)
 GLboolean glxewContextIsSupported (const GLXEWContext* ctx, const char* name)

src/glewinfo_haiku.cpp

@@ +1 @@
+/*
+ * glewinfo Haiku glue code
+ * Copyright 2013 Kacper Kasper <kacperkasper@gmail.com>
+ * All rights reserved. Distributed under the terms of the MIT license.
+ */
+
+#include <Application.h>
+#include <Window.h>
+#include <GLView.h>
+
+class GLEWInfoView : public BGLView {
+public:
+        GLEWInfoView(BRect frame, uint32 type);
+        virtual void AttachedToWindow(void);
+        
+        void ContextInit() { LockGL(); }
+        void ContextDestroy() { UnlockGL(); }
+};
+
+GLEWInfoView::GLEWInfoView(BRect frame, uint32 type)
+        : BGLView(frame, "GLEWInfoView", B_FOLLOW_ALL_SIDES, 0, type)
+{
+}
+
+void GLEWInfoView::AttachedToWindow(void)
+{
+        LockGL();
+        BGLView::AttachedToWindow();
+        UnlockGL();
+}
+
+class GLEWInfoWindow : public BWindow {
+public:
+        GLEWInfoWindow(BRect frame, uint32 type);
+        virtual bool QuitRequested();
+        
+private:
+        GLEWInfoView *view;     
+};
+
+GLEWInfoWindow::GLEWInfoWindow(BRect frame, uint32 type)
+        : BWindow(frame, "GLEWInfoWindow", B_TITLED_WINDOW, B_QUIT_ON_WINDOW_CLOSE)
+{
+        AddChild(view = new GLEWInfoView(Bounds(), type));
+        view->ContextInit();
+}
+
+bool GLEWInfoWindow::QuitRequested()
+{
+        view->ContextDestroy();
+        
+        view->RemoveSelf();
+        
+        delete view;
+        
+        return true;
+}
+
+class GLEWInfoApp : public BApplication
+{
+public:
+        GLEWInfoApp();
+        ~GLEWInfoApp();
+
+private:
+        GLEWInfoWindow *window;
+};
+
+GLEWInfoApp::GLEWInfoApp()
+        : BApplication("application/x-vnd.glew-GLEWInfo")
+{
+        BRect rect = BRect(0, 0, 1, 1);
+        window = new GLEWInfoWindow(rect, BGL_RGB | BGL_DOUBLE);
+}
+
+GLEWInfoApp::~GLEWInfoApp()
+{
+        window->Quit();
+}
+
+GLEWInfoApp *app;
+
+extern "C" GLboolean glewCreateContext ()
+{
+        app = new GLEWInfoApp();
+        
+        return GL_FALSE;
+}
+
+extern "C" void glewDestroyContext ()
+{
+        delete app;
+}

src/glewinfo.c

@@ -35 +35 @@
 #include <GL/glew.h>
 #if defined(_WIN32)
 #include <GL/wglew.h>
-#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
+#elif !defined(__HAIKU__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
 #include <GL/glxew.h>
 #endif
 
@@ -51 +51 @@
 #ifdef _WIN32
 WGLEWContext _wglewctx;
 #define wglewGetContext() (&_wglewctx)
-#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
+#elif !defined(__HAIKU__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
 GLXEWContext _glxewctx;
 #define glxewGetContext() (&_glxewctx)
 #endif
@@ -59 +59 @@
 
 #if defined(_WIN32)
 GLboolean glewCreateContext (int* pixelformat);
-#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
+#elif !defined(__HAIKU__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
 GLboolean glewCreateContext (const char* display, int* visual);
 #else
 GLboolean glewCreateContext ();
 #endif
 
-#if defined(_WIN32) || !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
+#if defined(_WIN32) || !defined(__HAIKU__) || !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
 GLboolean glewParseArgs (int argc, char** argv, char** display, int* visual);
 #endif
 
@@ -9730 +9730 @@
 
 #if defined(_WIN32)
   if (GL_TRUE == glewCreateContext(&visual))
-#elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
+#elif defined(__HAIKU__) || defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
   if (GL_TRUE == glewCreateContext())
 #else
   if (GL_TRUE == glewCreateContext(display, &visual))
@@ -9916 +9916 @@
 
 /* ------------------------------------------------------------------------ */
 
+#elif defined(__HAIKU__)
+
+extern GLboolean glewCreateContext ();
+extern void glewDestroyContext ();
+
+/* ------------------------------------------------------------------------ */
+
 #else /* __UNIX || (__APPLE__ && GLEW_APPLE_GLX) */
 
 Display* dpy = NULL;

src/visualinfo.c

@@ -37 +37 @@
 #include <GL/wglew.h>
 #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
 #include <AGL/agl.h>
+#elif defined(__HAIKU__)
+// nothing here
 #else
 #include <GL/glxew.h>
 #endif
@@ -47 +49 @@
 #  ifdef _WIN32
 WGLEWContext _wglewctx;
 #    define wglewGetContext() (&_wglewctx)
-#  elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
+#  elif !defined(__HAIKU__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
 GLXEWContext _glxewctx;
 #    define glxewGetContext() (&_glxewctx)
 #  endif
@@ -61 +63 @@
   HGLRC rc;
 #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
   AGLContext ctx, octx;
+#elif defined(__HAIKU__)
+  // nothing here (yet)
 #else
   Display* dpy;
   XVisualInfo* vi;
@@ -129 +133 @@
   err = glewContextInit(glewGetContext());
 #  ifdef _WIN32
   err = err || wglewContextInit(wglewGetContext());
-#  elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
+#  elif !defined(__HAIKU__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
   err = err || glxewContextInit(glxewGetContext());
 #  endif
 #else
@@ -181 +185 @@
                     (char*)wglGetExtensionsStringEXT());
   }
 #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
+
+#elif defined(__HAIKU__)
   
 #else
   /* GLX extensions */
@@ -598 +604 @@
 */
 }
 
+#elif defined(__HAIKU__)
+
+void
+VisualInfo (GLContext* ctx)
+{
+  // TODO
+}
+
 #else /* GLX */
 
 void
@@ -1074 +1088 @@
 
 /* ------------------------------------------------------------------------ */
 
+#elif defined(__HAIKU__)
+
+void InitContext (GLContext* ctx)
+{
+  // TODO
+}
+
+GLboolean CreateContext (GLContext* ctx)
+{
+  // TODO
+  
+  return GL_FALSE;
+}
+
+void DestroyContext (GLContext* ctx)
+{
+  // TODO
+}
+
+/* ------------------------------------------------------------------------ */
+
 #else /* __UNIX || (__APPLE__ && GLEW_APPLE_GLX) */
 
 void InitContext (GLContext* ctx)