Mesa (master): glapi: Use the offsets from static_data.py instead of from the XML

[Ian Romanick]

Module: Mesa
Branch: master
Commit: 2b419e0db92248ca768d2d26aa2f8276c70356e2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2b419e0db92248ca768d2d26aa2f8276c70356e2

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Fri May  8 19:33:13 2015 -0700

glapi: Use the offsets from static_data.py instead of from the XML

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Dylan Baker <baker.dylan.c at gmail.com>

---

 src/mapi/glapi/gen/gl_XML.py |   22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/mapi/glapi/gen/gl_XML.py b/src/mapi/glapi/gen/gl_XML.py
index 89b09f2..67aba81 100644
--- a/src/mapi/glapi/gen/gl_XML.py
+++ b/src/mapi/glapi/gen/gl_XML.py
@@ -626,7 +626,7 @@ class gl_function( gl_item ):
         # Decimal('1.1') }.
         self.api_map = {}
 
-        self.assign_offset = 0
+        self.assign_offset = False
 
         self.static_entry_points = []
 
@@ -685,23 +685,11 @@ class gl_function( gl_item ):
             # Only try to set the offset when a non-alias entry-point
             # is being processed.
 
-            offset = element.get( "offset" )
-            if offset:
-                try:
-                    o = int( offset )
-                    self.offset = o
-                except Exception, e:
-                    self.offset = -1
-                    if offset == "assign":
-                        self.assign_offset = 1
-
-                if self.offset == -1:
-                    assert name not in static_data.offsets
-                else:
-                    assert static_data.offsets[name] == self.offset
+            if name in static_data.offsets:
+                self.offset = static_data.offsets[name]
             else:
-                assert name not in static_data.offsets
-
+                self.offset = -1
+                self.assign_offset = self.exec_flavor != "skip" or name in static_data.unused_functions
 
         if not self.name:
             self.name = true_name