aboutsummaryrefslogtreecommitdiff
path: root/mesalib
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-10-11 10:23:20 +0200
committermarha <marha@users.sourceforge.net>2012-10-11 10:23:20 +0200
commitd863340171e4d6c19e9ef9fdc986ddc1b5e1e63e (patch)
treea19e7aa18e01c62649f214a4294bd24340152c9a /mesalib
parent30c05ead4fe1b6a341d5b585e3a6b5d255edf650 (diff)
downloadvcxsrv-d863340171e4d6c19e9ef9fdc986ddc1b5e1e63e.tar.gz
vcxsrv-d863340171e4d6c19e9ef9fdc986ddc1b5e1e63e.tar.bz2
vcxsrv-d863340171e4d6c19e9ef9fdc986ddc1b5e1e63e.zip
Solved problems introduced in merge
Diffstat (limited to 'mesalib')
-rw-r--r--mesalib/src/mapi/glapi/gen/glX_proto_recv.py24
-rw-r--r--mesalib/src/mapi/glapi/gen/glX_proto_size.py16
-rw-r--r--mesalib/src/mapi/glapi/gen/glX_server_table.py8
-rw-r--r--mesalib/src/mapi/glapi/gen/gl_table.py10
4 files changed, 29 insertions, 29 deletions
diff --git a/mesalib/src/mapi/glapi/gen/glX_proto_recv.py b/mesalib/src/mapi/glapi/gen/glX_proto_recv.py
index f7ea3b4d7..b5f2c5482 100644
--- a/mesalib/src/mapi/glapi/gen/glX_proto_recv.py
+++ b/mesalib/src/mapi/glapi/gen/glX_proto_recv.py
@@ -78,14 +78,14 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto):
def printRealHeader(self):
- print '#ifdef HAVE_DIX_CONFIG_H'
- print '#include <dix-config.h>'
- print '#else'
- print ''
- print '#include "glheader.h"'
- print ''
- print '#endif'
- print ''
+ print '#ifdef HAVE_DIX_CONFIG_H'
+ print '#include <dix-config.h>'
+ print '#else'
+ print ''
+ print '#include "glheader.h"'
+ print ''
+ print '#endif'
+ print ''
print '#include <X11/Xmd.h>'
print '#include <GL/gl.h>'
print '#include <GL/glxproto.h>'
@@ -286,10 +286,10 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto):
if param.is_image():
offset = f.offset_of( param.name )
- if cond:
- print '%s %s const %s = (%s) (%s(pc + %s));' % (indent, type_string, param.name, type_string, cond, offset)
- else:
- print '%s %s const %s = (%s) (pc + %s);' % (indent, type_string, param.name, type_string, offset)
+ if cond:
+ print '%s %s const %s = (%s) (%s(pc + %s));' % (indent, type_string, param.name, type_string, cond, offset)
+ else:
+ print '%s %s const %s = (%s) (pc + %s);' % (indent, type_string, param.name, type_string, offset)
if param.depth:
print '%s __GLXpixel3DHeader * const hdr = (__GLXpixel3DHeader *)(pc);' % (indent)
diff --git a/mesalib/src/mapi/glapi/gen/glX_proto_size.py b/mesalib/src/mapi/glapi/gen/glX_proto_size.py
index cd25223a1..fa966ed40 100644
--- a/mesalib/src/mapi/glapi/gen/glX_proto_size.py
+++ b/mesalib/src/mapi/glapi/gen/glX_proto_size.py
@@ -450,14 +450,14 @@ class PrintGlxReqSize_c(PrintGlxReqSize_common):
def printRealHeader(self):
- print ''
- print '#ifdef HAVE_DIX_CONFIG_H'
- print '#include <dix-config.h>'
- print '#else'
- print ''
- print '#include "glheader.h"'
- print ''
- print '#endif'
+ print ''
+ print '#ifdef HAVE_DIX_CONFIG_H'
+ print '#include <dix-config.h>'
+ print '#else'
+ print ''
+ print '#include "glheader.h"'
+ print ''
+ print '#endif'
print ''
print '#include <GL/gl.h>'
print '#include "glxserver.h"'
diff --git a/mesalib/src/mapi/glapi/gen/glX_server_table.py b/mesalib/src/mapi/glapi/gen/glX_server_table.py
index dd59867d0..fa2036ffa 100644
--- a/mesalib/src/mapi/glapi/gen/glX_server_table.py
+++ b/mesalib/src/mapi/glapi/gen/glX_server_table.py
@@ -357,10 +357,10 @@ class PrintGlxDispatchTables(glX_proto_common.glx_print_proto):
def printRealHeader(self):
- print '#ifndef HAVE_DIX_CONFIG_H'
- print '#include "glheader.h"'
- print '#endif'
- print ''
+ print '#ifndef HAVE_DIX_CONFIG_H'
+ print '#include "glheader.h"'
+ print '#endif'
+ print ''
print '#include <inttypes.h>'
print '#include "glxserver.h"'
print '#include "glxext.h"'
diff --git a/mesalib/src/mapi/glapi/gen/gl_table.py b/mesalib/src/mapi/glapi/gen/gl_table.py
index 5b7a5564c..83b6a5bd8 100644
--- a/mesalib/src/mapi/glapi/gen/gl_table.py
+++ b/mesalib/src/mapi/glapi/gen/gl_table.py
@@ -108,11 +108,11 @@ class PrintRemapTable(gl_XML.gl_print_base):
return
def printBody(self, api):
- print '#ifdef _MSC_VER'
- print '#ifndef INLINE'
- print '#define INLINE __inline'
- print '#endif'
- print '#endif'
+ print '#ifdef _MSC_VER'
+ print '#ifndef INLINE'
+ print '#define INLINE __inline'
+ print '#endif'
+ print '#endif'
print '#define CALL_by_offset(disp, cast, offset, parameters) \\'
print ' (*(cast (GET_by_offset(disp, offset)))) parameters'
print '#define GET_by_offset(disp, offset) \\'