X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgldecoder.c;h=863be925aeaaf55eee6961c9114ddaae7e0e3ebf;hb=3c32a221de1435ae7af8d96182560e8b28f1a4c0;hp=e11d13c46d51ef0a064415eecf7933b7cb0e6b10;hpb=c6b2f7585d51164dc32f4dd2a05855913e464c58;p=gldbg.git

diff --git a/source/gldecoder.c b/source/gldecoder.c
index e11d13c..863be92 100644
--- a/source/gldecoder.c
+++ b/source/gldecoder.c
@@ -12,7 +12,8 @@ Distributed under the GPL
 
 static unsigned read_short(short *, const char *);
 static unsigned read_int(int *, const char *);
-static int decode_func(GlDecoder *, short, const char *);
+static int decode_func(GlDecoder *, unsigned short, const char *);
+static int decode_gldfunc(GlDecoder *, unsigned short, const char *);
 
 GlDecoder *gldecoder_new(void *user_data, void (*destroy)(void *))
 {
@@ -37,7 +38,7 @@ int gldecoder_decode(GlDecoder *dec, const char *data, unsigned len)
 {
 	unsigned pos = 0;
 	int pktlen;
-	short func;
+	unsigned short func;
 	int ret;
 
 	if(len<sizeof(int)+sizeof(short))
@@ -48,7 +49,10 @@ int gldecoder_decode(GlDecoder *dec, const char *data, unsigned len)
 	pos += read_short(&func, data+pos);
 	if(dec)
 	{
-		ret = decode_func(dec, func, data+pos);
+		if(func&0x8000)
+			ret = decode_gldfunc(dec, func, data+pos);
+		else
+			ret = decode_func(dec, func, data+pos);
 		if(ret<0)
 			return -1;
 	}
@@ -126,4 +130,35 @@ static unsigned read_string(const unsigned char **v, const char *data)
 	return read_data((const void **)v, data);
 }
 
+static unsigned read_string_array(const unsigned char ***v, const char *data)
+{
+	int count;
+	unsigned pos = 0;
+	int i;
+	pos += read_int(&count, data);
+	*v = (const unsigned char **)tmpalloc(count*sizeof(const unsigned char *));
+	for(i=0; i<count; ++i)
+		pos += read_string(*v+i, data+pos);
+	return pos;
+}
+
 #include "gldecoder.funcs"
+
+static int decode_gldError(GlDecoder *dec, const char *data)
+{
+	unsigned pos = 0;
+	GLenum code;
+	pos += read_int(&code, data);
+	if(dec->gldError)
+		dec->gldError(dec->user_data, code);
+	return pos;
+}
+
+static int decode_gldfunc(GlDecoder *dec, unsigned short func, const char *data)
+{
+	switch(func)
+	{
+	case FUNC_GLDERROR: return decode_gldError(dec, data);
+	default: return -1;
+	}
+}