Merge remote-tracking branch 'origin/released'

Conflicts:
	xorg-server/dix/dispatch.c

3 files changed, 76 insertions, 74 deletions

diff --git a/mesalib/src/mapi/glapi/SConscript b/mesalib/src/mapi/glapi/SConscript
index fdd657900..dad7d5972 100644
--- a/mesalib/src/mapi/glapi/SConscript
+++ b/mesalib/src/mapi/glapi/SConscript
@@ -4,83 +4,81 @@
 
 Import('*')
 
-if env['platform'] != 'winddk':
+env = env.Clone()
 
-    env = env.Clone()
-    
+env.Append(CPPDEFINES = [
+    'MAPI_MODE_UTIL',
+])
+
+if env['platform'] == 'windows':
     env.Append(CPPDEFINES = [
-        'MAPI_MODE_UTIL',
+        '_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers
+        'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
     ])
+    if env['gles']:
+        env.Append(CPPDEFINES = ['_GLAPI_DLL_EXPORTS'])
+    else:
+        # prevent _glapi_* from being declared __declspec(dllimport)
+        env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS'])
+
+env.Append(CPPPATH = [
+    '#/src/mapi',
+    '#/src/mesa',
+])
+
+glapi_sources = [
+    'glapi_dispatch.c',
+    'glapi_entrypoint.c',
+    'glapi_getproc.c',
+    'glapi_nop.c',
+    'glthread.c',
+    'glapi.c',
+]
 
-    if env['platform'] == 'windows':
+mapi_sources = [
+    'u_current.c',
+    'u_execmem.c',
+    'u_thread.c',
+]
+for s in mapi_sources:
+    o = env.SharedObject(s[:-2], '../mapi/' + s)
+    glapi_sources.append(o)
+
+#
+# Assembly sources
+#
+if env['gcc'] and env['platform'] != 'windows':
+    if env['machine'] == 'x86':
         env.Append(CPPDEFINES = [
-            '_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers
-            'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
+            'USE_X86_ASM',
         ])
-        if env['gles']:
-            env.Append(CPPDEFINES = ['_GLAPI_DLL_EXPORTS'])
-        else:
-            # prevent _glapi_* from being declared __declspec(dllimport)
-            env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS'])
-
-    env.Append(CPPPATH = [
-        '#/src/mapi',
-        '#/src/mesa',
-    ])
-    
-    glapi_sources = [
-        'glapi_dispatch.c',
-        'glapi_entrypoint.c',
-        'glapi_getproc.c',
-        'glapi_nop.c',
-        'glthread.c',
-        'glapi.c',
-    ]
-    
-    mapi_sources = [
-        'u_current.c',
-        'u_execmem.c',
-        'u_thread.c',
-    ]
-    for s in mapi_sources:
-        o = env.SharedObject(s[:-2], '../mapi/' + s)
-        glapi_sources.append(o)
+        glapi_sources += [
+            'glapi_x86.S',
+        ]
+    elif env['machine'] == 'x86_64':
+        env.Append(CPPDEFINES = [
+            'USE_X86_64_ASM',
+        ])
+        glapi_sources += [
+            'glapi_x86-64.S'
+        ]
+    elif env['machine'] == 'sparc':
+        env.Append(CPPDEFINES = [
+            'USE_SPARC_ASM',
+        ])
+        glapi_sources += [
+            'glapi_sparc.S'
+        ]
+    else:
+        pass
 
-    #
-    # Assembly sources
-    #
-    if env['gcc'] and env['platform'] != 'windows':
-        if env['machine'] == 'x86':
-            env.Append(CPPDEFINES = [
-                'USE_X86_ASM',
-            ])
-            glapi_sources += [
-                'glapi_x86.S',
-            ]
-        elif env['machine'] == 'x86_64':
-            env.Append(CPPDEFINES = [
-                'USE_X86_64_ASM',
-            ])
-            glapi_sources += [
-                'glapi_x86-64.S'
-            ]
-        elif env['machine'] == 'sparc':
-            env.Append(CPPDEFINES = [
-                'USE_SPARC_ASM',
-            ])
-            glapi_sources += [
-                'glapi_sparc.S'
-            ]
-        else:
-            pass
-    
-    if env['toolchain'] == 'crossmingw':
-        # compile these files without -gstabs option
-        glapi_sources = env.compile_without_gstabs(glapi_sources, "glapi_dispatch.c")
-        glapi_sources = env.compile_without_gstabs(glapi_sources, "glapi_getproc.c")
+if env['toolchain'] == 'crossmingw':
+    # compile these files without -gstabs option
+    glapi_sources = env.compile_without_gstabs(glapi_sources, "glapi_dispatch.c")
+    glapi_sources = env.compile_without_gstabs(glapi_sources, "glapi_getproc.c")
 
-    glapi = env.ConvenienceLibrary(
-        target = 'glapi',
-        source = glapi_sources,
-    )
-    Export('glapi')
+glapi = env.ConvenienceLibrary(
+    target = 'glapi',
+    source = glapi_sources,
+)
+Export('glapi')
diff --git a/mesalib/src/mapi/glapi/gen/es_EXT.xml b/mesalib/src/mapi/glapi/gen/es_EXT.xml
index bc98aee3d..c7e7d07e3 100644
--- a/mesalib/src/mapi/glapi/gen/es_EXT.xml
+++ b/mesalib/src/mapi/glapi/gen/es_EXT.xml
@@ -48,6 +48,10 @@
     <enum name="BYTE"                                     value="0x1400"/>
 </category>
 
+<category name="GL_OES_compressed_ETC1_RGB8_texture" number="5">
+    <enum name="ETC1_RGB8_OES"                            value="0x8D64"/>
+</category>
+
 <category name="GL_OES_compressed_paletted_texture" number="6">
     <enum name="PALETTE4_RGB8_OES"                        value="0x8B90"/>
     <enum name="PALETTE4_RGBA8_OES"                       value="0x8B91"/>
diff --git a/mesalib/src/mapi/glapi/gen/gl_table.py b/mesalib/src/mapi/glapi/gen/gl_table.py
index 762f67c67..b3dd4d8d0 100644
--- a/mesalib/src/mapi/glapi/gen/gl_table.py
+++ b/mesalib/src/mapi/glapi/gen/gl_table.py
@@ -181,11 +181,11 @@ class PrintRemapTable(gl_XML.gl_print_base):
 			print 'typedef %s (GLAPIENTRYP _glptr_%s)(%s);' % (f.return_type, f.name, arg_string)
 			print '#define CALL_%s(disp, parameters) \\' % (f.name)
 			print '    (* GET_%s(disp)) parameters' % (f.name)
-			print 'static INLINE _glptr_%s GET_%s(struct _glapi_table *disp) {' % (f.name, f.name)
+			print 'static inline _glptr_%s GET_%s(struct _glapi_table *disp) {' % (f.name, f.name)
 			print '   return (_glptr_%s) (GET_by_offset(disp, _gloffset_%s));' % (f.name, f.name)
 			print '}'
 			print
-			print 'static INLINE void SET_%s(struct _glapi_table *disp, %s (GLAPIENTRYP fn)(%s)) {' % (f.name, f.return_type, arg_string)
+			print 'static inline void SET_%s(struct _glapi_table *disp, %s (GLAPIENTRYP fn)(%s)) {' % (f.name, f.return_type, arg_string)
 			print '   SET_by_offset(disp, _gloffset_%s, fn);' % (f.name)
 			print '}'
 			print