X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glaze-gl.c;h=e7dd728c058b53f31b2ba2f0f73fdb128781512d;hb=acb1372fca12d1df8bead92eb2ab16dbc98b9c6c;hp=7248876b75da4940ee83e71430b9647f41ef801d;hpb=6cfcdb728c0a088cc12bb3eb93d78b2a9915969b;p=glaze

diff --git a/glaze-gl.c b/glaze-gl.c
index 7248876..e7dd728 100644
--- a/glaze-gl.c
+++ b/glaze-gl.c
@@ -80,7 +80,7 @@ open_wrapper_handle (void)
 
 	path = getenv ("GLAZE_WRAPPER");
 	if (path == NULL) {
-		fprintf (stderr, "GLAZE_WRAPPER unset. Please set to path of real libGL.so under glaze.\n");
+		fprintf (stderr, "GLAZE_WRAPPER unset. Please set to path of Glaze-using wrapper library.\n");
 		exit (1);
 	}
 
@@ -137,6 +137,84 @@ resolve (const char *name)
 	return dlsym (libgl_handle, name);
 }
 
+void
+(*glXGetProcAddress (const unsigned char *name))(void);
+
+void
+(*glXGetProcAddress (const unsigned char *name))(void)
+{
+	static int first_call = 1;
+	static typeof (&glXGetProcAddress) wrapper_glXGetProcAddress;
+	static typeof (&glXGetProcAddress) libgl_glXGetProcAddress;
+	void *symbol;
+
+	/* On the first call, check if the wrapper provides an
+	 * implementation of this function. */
+	if (first_call) {
+		wrapper_glXGetProcAddress = dlsym (wrapper_handle,
+						   "glXGetProcAddress");
+		libgl_glXGetProcAddress = dlsym (libgl_handle,
+						 "glXGetProcAddress");
+		first_call = 0;
+	}
+
+	/* If the wrapper implements glXGetProcAddress itself, then it
+	 * had better know best what to do. Just let it. */
+	if (wrapper_glXGetProcAddress)
+		return wrapper_glXGetProcAddress (name);
+
+	/* Otherwise, we need to resolve the name.
+	 *
+	 * The wrapper gets first choice on all symbols. */
+	symbol = dlsym (wrapper_handle, (char *) name);
+	if (symbol)
+		return symbol;
+
+	/* The wrapper doesn't care, so defer to the underlying
+	 * glXGetProcAddress */
+	return libgl_glXGetProcAddress (name);
+
+}
+
+void
+(*glXGetProcAddressARB (const unsigned char *name))(void);
+
+void
+(*glXGetProcAddressARB (const unsigned char *name))(void)
+{
+	static int first_call = 1;
+	static typeof (&glXGetProcAddressARB) wrapper_glXGetProcAddressARB;
+	static typeof (&glXGetProcAddressARB) libgl_glXGetProcAddressARB;
+	void *symbol;
+
+	/* On the first call, check if the wrapper provides an
+	 * implementation of this function. */
+	if (first_call) {
+		wrapper_glXGetProcAddressARB = dlsym (wrapper_handle,
+						      "glXGetProcAddressARB");
+		libgl_glXGetProcAddressARB = dlsym (libgl_handle,
+						    "glXGetProcAddressARB");
+		first_call = 0;
+	}
+
+	/* If the wrapper implements glXGetProcAddressARB itself, then
+	 * it had better know best what to do. Just let it. */
+	if (wrapper_glXGetProcAddressARB)
+		return wrapper_glXGetProcAddressARB (name);
+
+	/* Otherwise, we need to resolve the name.
+	 *
+	 * The wrapper gets first choice on all symbols. */
+	symbol = dlsym (wrapper_handle, (char *) name);
+	if (symbol)
+		return symbol;
+
+	/* The wrapper doesn't care, so defer to the underlying
+	 * glXGetProcAddressARB */
+	return libgl_glXGetProcAddressARB (name);
+
+}
+
 #define GLAZE_API(name)							\
 void * name() __attribute__((ifunc(#name "_resolver")));		\
 static void *								\