Mesa (master): egl/haiku: we don't use src/loader, drop all the references to it

Emil Velikov evelikov at kemper.freedesktop.org
Fri Jun 12 14:43:40 UTC 2015


Module: Mesa
Branch: master
Commit: 667fe2f5e9508a9591eeabdd7a01596006d87e5f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=667fe2f5e9508a9591eeabdd7a01596006d87e5f

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Thu Jun 11 12:20:34 2015 +0100

egl/haiku: we don't use src/loader, drop all the references to it

Cc: Alexander von Gluck IV <kallisti5 at unixzen.com>
Acked-by: Brian Paul <brianp at vmware.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>

---

 src/egl/drivers/haiku/SConscript    |    5 -----
 src/egl/drivers/haiku/egl_haiku.cpp |    3 ---
 2 files changed, 8 deletions(-)

diff --git a/src/egl/drivers/haiku/SConscript b/src/egl/drivers/haiku/SConscript
index 9dd2f70..ec6020e 100644
--- a/src/egl/drivers/haiku/SConscript
+++ b/src/egl/drivers/haiku/SConscript
@@ -9,7 +9,6 @@ env.Append(CPPDEFINES = [
 env.Append(CPPPATH = [
 	'#/include',
 	'#/src/egl/main',
-	'#/src/loader',
 ])
 
 sources = [
@@ -22,10 +21,6 @@ if env['platform'] == 'haiku':
 		'_EGL_NATIVE_PLATFORM=haiku',
 	])
 
-env.Prepend(LIBS = [
-	libloader,
-])
-
 egl_haiku = env.ConvenienceLibrary(
 	target = 'egl_haiku',
 	source = sources,
diff --git a/src/egl/drivers/haiku/egl_haiku.cpp b/src/egl/drivers/haiku/egl_haiku.cpp
index cfe8817..056fafc 100644
--- a/src/egl/drivers/haiku/egl_haiku.cpp
+++ b/src/egl/drivers/haiku/egl_haiku.cpp
@@ -27,7 +27,6 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "loader.h"
 #include "eglconfig.h"
 #include "eglcontext.h"
 #include "egldisplay.h"
@@ -244,8 +243,6 @@ init_haiku(_EGLDriver *drv, _EGLDisplay *dpy)
 
 	_eglSetLogProc(haiku_log);
 
-	loader_set_logger(_eglLog);
-
 	TRACE("Add configs\n");
 	haiku_add_configs_for_visuals(dpy);
 




More information about the mesa-commit mailing list