Checked in the following released items:

xkeyboard-config-1.4.tar.gz
ttf-bitstream-vera-1.10.tar.gz
font-alias-1.0.1.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sony-misc-1.0.0.tar.gz
font-schumacher-misc-1.0.0.tar.gz
font-mutt-misc-1.0.0.tar.gz
font-misc-misc-1.0.0.tar.gz
font-misc-meltho-1.0.0.tar.gz
font-micro-misc-1.0.0.tar.gz
font-jis-misc-1.0.0.tar.gz
font-isas-misc-1.0.0.tar.gz
font-dec-misc-1.0.0.tar.gz
font-daewoo-misc-1.0.0.tar.gz
font-cursor-misc-1.0.0.tar.gz
font-arabic-misc-1.0.0.tar.gz
font-winitzki-cyrillic-1.0.0.tar.gz
font-misc-cyrillic-1.0.0.tar.gz
font-cronyx-cyrillic-1.0.0.tar.gz
font-screen-cyrillic-1.0.1.tar.gz
font-xfree86-type1-1.0.1.tar.gz
font-adobe-utopia-type1-1.0.1.tar.gz
font-ibm-type1-1.0.0.tar.gz
font-bitstream-type1-1.0.0.tar.gz
font-bitstream-speedo-1.0.0.tar.gz
font-bh-ttf-1.0.0.tar.gz
font-bh-type1-1.0.0.tar.gz
font-bitstream-100dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz
font-bh-100dpi-1.0.0.tar.gz
font-adobe-utopia-100dpi-1.0.1.tar.gz
font-adobe-100dpi-1.0.0.tar.gz
font-util-1.0.1.tar.gz
font-bitstream-75dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz
font-adobe-utopia-75dpi-1.0.1.tar.gz
font-bh-75dpi-1.0.0.tar.gz
bdftopcf-1.0.1.tar.gz
font-adobe-75dpi-1.0.0.tar.gz
mkfontscale-1.0.6.tar.gz
openssl-0.9.8k.tar.gz
bigreqsproto-1.0.2.tar.gz
xtrans-1.2.2.tar.gz
resourceproto-1.0.2.tar.gz
inputproto-1.4.4.tar.gz
compositeproto-0.4.tar.gz
damageproto-1.1.0.tar.gz
zlib-1.2.3.tar.gz
xkbcomp-1.0.5.tar.gz
freetype-2.3.9.tar.gz
pthreads-w32-2-8-0-release.tar.gz
pixman-0.12.0.tar.gz
kbproto-1.0.3.tar.gz
evieext-1.0.2.tar.gz
fixesproto-4.0.tar.gz
recordproto-1.13.2.tar.gz
randrproto-1.2.2.tar.gz
scrnsaverproto-1.1.0.tar.gz
renderproto-0.9.3.tar.gz
xcmiscproto-1.1.2.tar.gz
fontsproto-2.0.2.tar.gz
xextproto-7.0.3.tar.gz
xproto-7.0.14.tar.gz
libXdmcp-1.0.2.tar.gz
libxkbfile-1.0.5.tar.gz
libfontenc-1.0.4.tar.gz
libXfont-1.3.4.tar.gz
libX11-1.1.5.tar.gz
libXau-1.0.4.tar.gz
libxcb-1.1.tar.gz
xorg-server-1.5.3.tar.gz

1 files changed, 134 insertions, 0 deletions

diff --git a/xorg-server/hw/xgl/xglhash.c b/xorg-server/hw/xgl/xglhash.c
new file mode 100644
index 000000000..c6c22ad88
--- /dev/null
+++ b/xorg-server/hw/xgl/xglhash.c
@@ -0,0 +1,134 @@
+/*
+ * Copyright © 2005 Novell, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Novell, Inc. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Novell, Inc. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL NOVELL, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: David Reveman <davidr@novell.com>
+ */
+
+#include "xgl.h"
+
+#define SYM(ptr, name) { (void **) &(ptr), (name) }
+
+typedef struct _xglHashFunc {
+    xglHashTablePtr (*NewHashTable)	    (void);
+    void	    (*DeleteHashTable)      (xglHashTablePtr	   pTable);
+    void	    *(*HashLookup)	    (const xglHashTablePtr pTable,
+					     unsigned int	   key);
+    void	    (*HashInsert)	    (xglHashTablePtr	   pTable,
+					     unsigned int	   key,
+					     void		   *data);
+    void	    (*HashRemove)	    (xglHashTablePtr	   pTable,
+					     unsigned int	   key);
+    unsigned int    (*HashFirstEntry)       (xglHashTablePtr	   pTable);
+    unsigned int    (*HashNextEntry)	    (const xglHashTablePtr pTable,
+					     unsigned int	   key);
+    unsigned int    (*HashFindFreeKeyBlock) (xglHashTablePtr	   pTable,
+					     unsigned int	   numKeys);
+} xglHashFuncRec;
+
+static xglHashFuncRec __hashFunc;
+
+static void *hashHandle = 0;
+
+Bool
+xglLoadHashFuncs (void *handle)
+{
+
+#ifdef XGL_MODULAR
+    xglSymbolRec sym[] = {
+	SYM (__hashFunc.NewHashTable,	      "_mesa_NewHashTable"),
+	SYM (__hashFunc.DeleteHashTable,      "_mesa_DeleteHashTable"),
+	SYM (__hashFunc.HashLookup,	      "_mesa_HashLookup"),
+	SYM (__hashFunc.HashInsert,	      "_mesa_HashInsert"),
+	SYM (__hashFunc.HashRemove,	      "_mesa_HashRemove"),
+	SYM (__hashFunc.HashFirstEntry,	      "_mesa_HashFirstEntry"),
+	SYM (__hashFunc.HashNextEntry,	      "_mesa_HashNextEntry"),
+	SYM (__hashFunc.HashFindFreeKeyBlock, "_mesa_HashFindFreeKeyBlock")
+    };
+
+    if (!xglLookupSymbols (handle, sym, sizeof (sym) / sizeof (sym[0])))
+	return FALSE;
+
+    hashHandle = handle;
+
+    return TRUE;
+#else
+    return FALSE;
+#endif
+
+}
+
+xglHashTablePtr
+xglNewHashTable (void)
+{
+    if (!hashHandle)
+	return 0;
+
+    return (*__hashFunc.NewHashTable) ();
+}
+
+void
+xglDeleteHashTable (xglHashTablePtr pTable)
+{
+    (*__hashFunc.DeleteHashTable) (pTable);
+}
+
+void *
+xglHashLookup (const xglHashTablePtr pTable,
+	       unsigned int	     key)
+{
+    return (*__hashFunc.HashLookup) (pTable, key);
+}
+
+void
+xglHashInsert (xglHashTablePtr pTable,
+	       unsigned int    key,
+	       void	       *data)
+{
+    (*__hashFunc.HashInsert) (pTable, key, data);
+}
+
+void
+xglHashRemove (xglHashTablePtr pTable,
+	       unsigned int    key)
+{
+    (*__hashFunc.HashRemove) (pTable, key);
+}
+
+unsigned int
+xglHashFirstEntry (xglHashTablePtr pTable)
+{
+    return (*__hashFunc.HashFirstEntry) (pTable);
+}
+
+unsigned int
+xglHashNextEntry (const xglHashTablePtr pTable,
+		  unsigned int		key)
+{
+    return (*__hashFunc.HashNextEntry) (pTable, key);
+}
+
+unsigned int
+xglHashFindFreeKeyBlock (xglHashTablePtr pTable,
+			 unsigned int	 numKeys)
+{
+    return (*__hashFunc.HashFindFreeKeyBlock) (pTable, numKeys);
+}