fontconfig libxcb mesa xserver xcb-proto git update 13 Apr 2014

xserver          commit 3028ae6c9aa37168e249e0d847b29f8e3efb05b2
libxcb           commit 29e419c5840a1eeda3336a0802686ee723dcaab3
libxcb/xcb-proto commit 70fea02b7d90d86e9d3b0dc5b61406bf4c910999
pixman           commit 4b76bbfda670f9ede67d0449f3640605e1fc4df0
fontconfig       commit f44157c809d280e2a0ce87fb078fc4b278d24a67
mesa             commit 936dda08ee6d7b2be2b016bc06780e401088ec13

1 files changed, 7 insertions, 36 deletions

diff --git a/mesalib/src/mapi/glapi/gen/gl_procs.py b/mesalib/src/mapi/glapi/gen/gl_procs.py
index f139c58ea..b1fffc4ca 100644
--- a/mesalib/src/mapi/glapi/gen/gl_procs.py
+++ b/mesalib/src/mapi/glapi/gen/gl_procs.py
@@ -30,11 +30,10 @@ import gl_XML, glX_XML
 import sys, getopt
 
 class PrintGlProcs(gl_XML.gl_print_base):
-    def __init__(self, long_strings, es=False):
+    def __init__(self, es=False):
         gl_XML.gl_print_base.__init__(self)
 
         self.es = es
-        self.long_strings = long_strings
         self.name = "gl_procs.py (from Mesa)"
         self.license = license.bsd_license_template % ( \
 """Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
@@ -74,22 +73,11 @@ typedef struct {
         return
 
     def printFunctionString(self, name):
-        if self.long_strings:
-            print '    "gl%s\\0"' % (name)
-        else:
-            print "    'g','l',",
-            for c in name:
-                print "'%s'," % (c),
-
-            print "'\\0',"
-
+        print '    "gl%s\\0"' % (name)
 
     def printBody(self, api):
         print ''
-        if self.long_strings:
-            print 'static const char gl_string_table[] ='
-        else:
-            print 'static const char gl_string_table[] = {'
+        print 'static const char gl_string_table[] ='
 
         base_offset = 0
         table = []
@@ -119,11 +107,7 @@ typedef struct {
                     base_offset += len(n) + 3
 
 
-        if self.long_strings:
-            print '    ;'
-        else:
-            print '};'
-
+        print '    ;'
         print ''
         print ''
         print "#ifdef USE_MGL_NAMESPACE"
@@ -178,38 +162,25 @@ typedef struct {
 
 
 def show_usage():
-    print "Usage: %s [-f input_file_name] [-m mode] [-c]" % sys.argv[0]
+    print "Usage: %s [-f input_file_name] [-c]" % sys.argv[0]
     print "-c          Enable compatibility with OpenGL ES."
-    print "-m mode     mode can be one of:"
-    print "    long  - Create code for compilers that can handle very"
-    print "            long string constants. (default)"
-    print "    short - Create code for compilers that can only handle"
-    print "            ANSI C89 string constants."
     sys.exit(1)
 
 if __name__ == '__main__':
     file_name = "gl_API.xml"
 
     try:
-        (args, trail) = getopt.getopt(sys.argv[1:], "f:m:c")
+        (args, trail) = getopt.getopt(sys.argv[1:], "f:c")
     except Exception,e:
         show_usage()
 
-    long_string = 1
     es = False
     for (arg,val) in args:
         if arg == "-f":
             file_name = val
-        elif arg == "-m":
-            if val == "short":
-                long_string = 0
-            elif val == "long":
-                long_string = 1
-            else:
-                show_usage()
         elif arg == "-c":
             es = True
 
     api = gl_XML.parse_GL_API(file_name, glX_XML.glx_item_factory())
-    printer = PrintGlProcs(long_string, es)
+    printer = PrintGlProcs(es)
     printer.Print(api)