X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglwrap.c;h=10bfc77fcb12cd56f21149444593f8df57de8d52;hb=fab9ed5163a8f4ef5314bc67e48d1690d1126649;hp=68351143d31aca0567dca79c1d7051a885ced85c;hpb=27a82684df128955f6c4e1467935be14ff9bb816;p=gldbg.git

diff --git a/source/glwrap.c b/source/glwrap.c
index 6835114..10bfc77 100644
--- a/source/glwrap.c
+++ b/source/glwrap.c
@@ -1,260 +1,104 @@
 /* $Id$
 
 This file is part of gldbg
-Copyright © 2009  Mikko Rasa, Mikkosoft Productions
+Copyright © 2009-2010  Mikko Rasa, Mikkosoft Productions
 Distributed under the GPL
 */
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <errno.h>
 #include <dlfcn.h>
-#include <sys/uio.h>
-#include <X11/Xlib.h>
-#include <GL/gl.h>
-#include <GL/glx.h>
-#include "arraysize.h"
-#include "functions.h"
+#include <fcntl.h>
 
-static inline void *glsym(const char *sym)
+static const char *get_lib_names(void)
 {
-	static void *libgl = NULL;
-	if(!libgl)
-	{
-		const char *libgl_name = getenv("GLWRAP_LIBGL");
-		if(!libgl_name)
-			libgl_name = "libGL.so";
-		libgl = dlopen(libgl_name, RTLD_NOW);
-		if(!libgl)
-		{
-			fprintf(stderr, "Could not open %s: %s\n", libgl_name, dlerror());
-			abort();
-		}
-	}
-
-	return dlsym(libgl, sym);
-}
-
-static char *buffer = 0;
-static char *write_pos;
-static struct iovec *iovecs = 0;
-static struct iovec *cur_vec;
-static unsigned length;
-
-static inline void next_vec()
-{
-	if(write_pos!=cur_vec->iov_base)
-	{
-		cur_vec->iov_len = write_pos-(char *)cur_vec->iov_base;
-		length += cur_vec->iov_len;
-		++cur_vec;
-		cur_vec->iov_base = write_pos;
-	}
+	const char *env = getenv("GLWRAP_LIBS");
+	if(env)
+		return env;
+	return "libGL.so.1";
 }
 
-static inline void write_bytes(const char *ptr, unsigned size)
+void *glsym(const char *name)
 {
+	static void **gl_libs = NULL;
 	unsigned i;
-	for(i=0; i<size; ++i)
-		*write_pos++ = *ptr++;
-}
 
-static inline void write_char(char v)
-{
-	*write_pos++ = v;
-}
-
-static inline void write_short(short v)
-{
-	write_bytes((char *)&v, sizeof(short));
-}
-
-static inline void write_int(int v)
-{
-	write_bytes((char *)&v, sizeof(int));
-}
-
-static inline void write_long(long v)
-{
-	write_bytes((char *)&v, sizeof(long));
-}
-
-static inline void write_long_long(long long v)
-{
-	write_bytes((char *)&v, sizeof(long long));
-}
-
-static inline void write_float(float v)
-{
-	write_bytes((char *)&v, sizeof(float));
-}
-
-static inline void write_double(double v)
-{
-	write_bytes((char *)&v, sizeof(double));
-}
+	if(!gl_libs)
+	{
+		char *lib_names = strdup(get_lib_names());
+		unsigned n_libs = 1;
+		unsigned j;
+
+		for(i=0; lib_names[i]; ++i)
+			if(lib_names[i]==':')
+				++n_libs;
+
+		gl_libs = (void **)malloc((n_libs+1)*sizeof(void *));
+		i = 0;
+		n_libs = 0;
+		for(j=0;; ++j)
+		{
+			if(lib_names[j]==':' || lib_names[j]==0)
+			{
+				int at_end = (lib_names[j]==0);
+				lib_names[j] = 0;
+
+				gl_libs[n_libs] = dlopen(lib_names+i, RTLD_NOW);
+				if(!gl_libs[n_libs])
+				{
+					fprintf(stderr, "Could not open %s: %s\n", lib_names+i, dlerror());
+					abort();
+				}
+
+				i = j+1;
+				++n_libs;
+
+				if(at_end)
+					break;
+			}
+		}
 
-static inline void write_pointer(const void *p)
-{
-	write_bytes((char *)&p, sizeof(void *));
-}
+		gl_libs[n_libs] = 0;
+		free(lib_names);
+	}
 
-static inline void write_data(const void *data, unsigned size)
-{
-	if(data)
+	for(i=0; gl_libs[i]; ++i)
 	{
-		write_int(size);
-		next_vec();
-		cur_vec->iov_base = (void *)data;
-		cur_vec->iov_len = size;
-		length += size;
-		++cur_vec;
-		cur_vec->iov_base = write_pos;
+		void *sym = dlsym(gl_libs[i], name);
+		if(sym)
+			return sym;
 	}
-	else
-		write_int(0);
-}
-
-static inline void write_string(const char *s)
-{
-	write_data(s, strlen(s)+1);
-}
-
-static inline void write_string_array(const char **sa, unsigned size)
-{
-	unsigned i;
-	size /= sizeof(const char *);
-	write_int(size);
-	for(i=0; i<size; ++i)
-		write_string(sa[i]);
-}
 
-static inline void begin_packet(int func)
-{
-	if(!buffer)
-		buffer = (char *)malloc(1024);
-	if(!iovecs)
-		iovecs = (struct iovec *)malloc(16*sizeof(struct iovec));
-	write_pos = buffer;
-	cur_vec = iovecs;
-	cur_vec->iov_base = write_pos;
-	length = 0;
-	write_int(0);
-	write_short(func);
+	return NULL;
 }
 
-static inline void send_packet()
+int get_out_fd(void)
 {
 	static int fd = -1;
+
 	if(fd<0)
 	{
 		const char *var = getenv("GLWRAP_FD");
 		if(var)
 			fd = strtol(var, NULL, 0);
 		else
-			fd = 2;
-	}
-	next_vec();
-	write_pos = buffer;
-	write_int(length);
-	writev(fd, iovecs, cur_vec-iovecs);
-}
-
-int in_begin_block = 0;
-GLenum cur_error = GL_NO_ERROR;
-
-static void check_error()
-{
-	GLenum (*orig_glGetError)() = 0;
-	GLenum code;
-
-	if(in_begin_block)
-		return;
-
-	if(!orig_glGetError)
-		orig_glGetError = glsym("glGetError");
-
-	code = orig_glGetError();
-	if(code!=GL_NO_ERROR)
-	{
-		begin_packet(FUNC_GLDERROR);
-		write_int(code);
-		send_packet();
-
-		if(cur_error==GL_NO_ERROR)
-			cur_error = code;
-	}
-}
-
-void APIENTRY glBegin(GLenum mode)
-{
-	static void (*orig)(GLenum);
-	if(!orig)
-		orig = glsym("glBegin");
-	orig(mode);
-
-	begin_packet(FUNC_GLBEGIN);
-	write_int(mode);
-	send_packet();
-
-	in_begin_block = 1;
-}
-
-void APIENTRY glEnd()
-{
-	static void (*orig)();
-	if(!orig)
-		orig = glsym("glEnd");
-	orig();
-
-	begin_packet(FUNC_GLEND);
-	send_packet();
-
-	in_begin_block = 0;
-	check_error();
-}
-
-GLenum APIENTRY glGetError()
-{
-	GLenum ret = GL_NO_ERROR;
-
-	if(in_begin_block)
-	{
-		if(cur_error==GL_NO_ERROR)
-			cur_error = GL_INVALID_OPERATION;
-	}
-	else
-	{
-		ret = cur_error;
-		cur_error = GL_NO_ERROR;
-	}
-
-	begin_packet(FUNC_GLGETERROR);
-	write_int(ret);
-	send_packet();
-
-	return ret;
-}
-
-void (*glXGetProcAddress(const GLubyte *procname))(void)
-{
-	void *handle = 0;
-	void (*ret)() = 0;
-
-	if(glsym((const char *)procname))
-	{
-		handle = dlopen(NULL, RTLD_LAZY);
-		ret = dlsym(handle, (const char *)procname);
+		{
+			var = getenv("GLWRAP_FILE");
+			if(var)
+			{
+				fd = open(var, O_WRONLY|O_CREAT|O_TRUNC, 0644);
+				if(fd==-1)
+				{
+					fprintf(stderr, "Couldn't open dumpfile %s for output: %s", var, strerror(errno));
+					abort();
+				}
+			}
+			else
+				fd = 2;
+		}
 	}
 
-	begin_packet(FUNC_GLXGETPROCADDRESS);
-	write_pointer(ret);
-	write_string((const char *)procname);
-	send_packet();
-
-	return ret;
+	return fd;
 }
-
-void (*glXGetProcAddressARB(const GLubyte *))(void) __attribute__((alias("glXGetProcAddress")));
-
-#include "glwrap.funcs"