glx: Fix build and warnings with -Dglx=dri -Dglx-direct=false

[mesa.git] / src / mapi / glapi / gen / glX_proto_send.py

diff --git a/src/mapi/glapi/gen/glX_proto_send.py b/src/mapi/glapi/gen/glX_proto_send.py
index c389872044cb6ab04423ddc2334511da1b3e5202..a55c737d03e1ab87925f3cf3d39f7f2ecaa5650f 100644 (file)
--- a/src/mapi/glapi/gen/glX_proto_send.py
+++ b/src/mapi/glapi/gen/glX_proto_send.py
@@ -26,7 +26,7 @@
 #    Ian Romanick <idr@us.ibm.com>
 #    Jeremy Kolb <jkolb@brandeis.edu>
 
-from __future__ import print_function
+from __future__ import division, print_function
 
 import argparse
 
@@ -391,9 +391,8 @@ static const struct proc_pair
    const char *name;
    _glapi_proc proc;
 } proc_pairs[%d] = {""" % len(procs))
-        names = procs.keys()
-        names.sort()
-        for i in xrange(len(names)):
+        names = sorted(procs.keys())
+        for i in range(len(names)):
             comma = ',' if i < len(names) - 1 else ''
             print('   { "%s", (_glapi_proc) gl%s }%s' % (names[i], procs[names[i]], comma))
         print("""};
@@ -442,10 +441,8 @@ __indirect_get_proc_address(const char *name)
                 print('#define %s %d' % (func.opcode_vendor_name(name), func.glx_vendorpriv))
                 print('%s gl%s(%s)' % (func.return_type, func_name, func.get_parameter_string()))
                 print('{')
-                print('    struct glx_context * const gc = __glXGetCurrentContext();')
-                print('')
                 print('#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)')
-                print('    if (gc->isDirect) {')
+                print('    if (((struct glx_context *)__glXGetCurrentContext())->isDirect) {')
                 print('        const _glapi_proc *const disp_table = (_glapi_proc *)GET_DISPATCH();')
                 print('        PFNGL%sPROC p =' % (name.upper()))
                 print('            (PFNGL%sPROC) disp_table[%d];' % (name.upper(), func.offset))
@@ -574,7 +571,7 @@ generic_%u_byte( GLint rop, const void * ptr )
                         condition = 'compsize > 0'
 
                     print('if (%s) {' % (condition))
-                    print('    gc->fillImage(gc, %s, %s, %s, %s, %s, %s, %s, %s, %s);' % (dim_str, width, height, depth, param.img_format, param.img_type, param.name, pcPtr, pixHeaderPtr))
+                    print('    __glFillImage(gc, %s, %s, %s, %s, %s, %s, %s, %s, %s);' % (dim_str, width, height, depth, param.img_format, param.img_type, param.name, pcPtr, pixHeaderPtr))
                     print('} else {')
                     print('    (void) memcpy( %s, default_pixel_store_%uD, default_pixel_store_%uD_size );' % (pixHeaderPtr, dim, dim))
                     print('}')
@@ -810,7 +807,7 @@ generic_%u_byte( GLint rop, const void * ptr )
                     # Dividing by the array size (1 for
                     # non-arrays) gives us this.
 
-                    s = p.size() / p.get_element_count()
+                    s = p.size() // p.get_element_count()
                     print("       %s __glXReadReply(dpy, %s, %s, %s);" % (return_str, s, p.name, aa))
                     got_reply = 1