From: George Sapountzis <gsapountzis@gmail.com>
Date: Mon, 8 Mar 2010 01:10:30 +0000 (+0200)
Subject: glapi: these two should be ok for add_dispatch ...
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bae31355150f66f7130d76a2ab4d4b735f239c71;p=mesa.git

glapi: these two should be ok for add_dispatch ...

- a function cannot be both static and extension, right ?

- we should be setting the offset only if not already set, right ?
---

diff --git a/src/mesa/glapi/glapi_getproc.c b/src/mesa/glapi/glapi_getproc.c
index 921df262af8..5a8c6953ac2 100644
--- a/src/mesa/glapi/glapi_getproc.c
+++ b/src/mesa/glapi/glapi_getproc.c
@@ -437,6 +437,8 @@ _glapi_add_dispatch( const char * const * function_names,
 	 }
 
 	 offset = static_offset;
+
+	 continue;
       }
 
       /* search added extension functions */
@@ -492,7 +494,9 @@ _glapi_add_dispatch( const char * const * function_names,
 	 }
       }
 
-      set_entry_info( entry[i], real_sig, offset );
+      if (entry[i]->dispatch_offset == ~0) {
+	 set_entry_info( entry[i], real_sig, offset );
+      }
    }
 
    return offset;