glapi: Include headers with directory prefixes.

[mesa.git] / src / mesa / glapi / glX_proto_recv.py

diff --git a/src/mesa/glapi/glX_proto_recv.py b/src/mesa/glapi/glX_proto_recv.py
index 20f75575cf1d8e13e1c5e42377b8eb3b3b0b4325..f423c6db08476aa4f97f4758bb2c774b7d202fbe 100644 (file)
--- a/src/mesa/glapi/glX_proto_recv.py
+++ b/src/mesa/glapi/glX_proto_recv.py
@@ -89,8 +89,8 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto):
                print '#include "glxbyteorder.h"'
                print '#include "indirect_util.h"'
                print '#include "singlesize.h"'
-               print '#include "glapitable.h"'
                print '#include "glapi.h"'
+               print '#include "glapitable.h"'
                print '#include "glthread.h"'
                print '#include "dispatch.h"'
                print ''
@@ -225,6 +225,8 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto):
                list = []
 
                for param in f.parameterIterator():
+                       if param.is_padding:
+                               continue
 
                        if param.is_counter or param.is_image() or param.is_output or param.name in f.count_parameter_list or len(param.count_parameter_list):
                                location = param.name
@@ -275,7 +277,7 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto):
                        if param.is_image():
                                offset = f.offset_of( param.name )
 
-                               print '%s    %s const %s = (%s) %s(pc + %s);' % (indent, type_string, param.name, type_string, cond, offset)
+                               print '%s    %s const %s = (%s) (%s(pc + %s));' % (indent, type_string, param.name, type_string, cond, offset)
                                
                                if param.depth:
                                        print '%s    __GLXpixel3DHeader * const hdr = (__GLXpixel3DHeader *)(pc);' % (indent)