fontconfig libX11 libxcb libxcb/xcb-proto mesa xserver xkeyboard-config git update 11 Aug 2014

xserver          commit 3714f5401690b288045090c4bcd9cb01c6e4860e
libxcb           commit 966fba6ba4838949d0727dfa45eeb9392d1f85d9
libxcb/xcb-proto commit 4b384d2a015c50d0e93dcacda4b8260a3fd37640
xkeyboard-config commit 651a00ab656a1754b9183a383970a735209bbb50
libX11           commit 368a6401c6a3275d3497fec38a3dcbc38cd9df60
libXdmcp         commit fe8eab93e9bcdbe8bb8052434bb5e676e3a0ee8f
libXext          commit efdcbb7634501e1117d422636a0a75d7ea84b16b
libfontenc       commit 0037a42107b952c9d903719615747e760e4e7247
libXinerama      commit edd95182b26eb5d576d4878c559e0f17dddaa909
libXau           commit 1e4635be11154dd8262f37b379511bd627defa2a
xkbcomp          commit d4e02a09258063c6d024c3ccd42d6b22212e6e18
pixman           commit 6d2cf40166d81bfc63108504c8022dc4fec37ff5
xextproto        commit 66afec3f49e8eb0d4c2e9af7088fc3116d4bafd7
randrproto       commit a4a6694c059d74247c16527eef4a0ec9f56bbef6
glproto          commit f84853d97d5749308992412a215fa518b6536eb3
mkfontscale      commit 47908fd7a0d061fdcd21e3498da4e223ca9136d9
xwininfo         commit 017b3736489985999d8dcf4d9e473e1fd6dd3647
libXft           commit 214f9b5306d833e2787c75fe41dfdc9228fcb738
libXmu           commit 22d9c590901e121936f50dee97dc60c4f7defb63
libxtrans        commit a57a7f62242e1ea972b81414741729bf3dbae0a4
fontconfig       commit 841753a93f0e5698663b7931b8456e7b96259f54
mesa             commit f24be7340162c6a831b392d46d6637e9656e7a8a

1 files changed, 192 insertions, 0 deletions

diff --git a/mesalib/src/mesa/main/format_info.py b/mesalib/src/mesa/main/format_info.py
new file mode 100644
index 000000000..448bd0055
--- /dev/null
+++ b/mesalib/src/mesa/main/format_info.py
@@ -0,0 +1,192 @@
+#!/usr/bin/env python
+#
+# Copyright 2014 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sub license, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice (including the
+# next paragraph) shall be included in all copies or substantial portions
+# of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+# IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
+# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import format_parser as parser
+import sys
+
+def get_gl_base_format(fmat):
+   if fmat.name == 'MESA_FORMAT_NONE':
+      return 'GL_NONE'
+   elif fmat.name in ['MESA_FORMAT_YCBCR', 'MESA_FORMAT_YCBCR_REV']:
+      return 'GL_YCBCR_MESA'
+   elif fmat.has_channel('r'):
+      if fmat.has_channel('g'):
+         if fmat.has_channel('b'):
+            if fmat.has_channel('a'):
+               return 'GL_RGBA'
+            else:
+               return 'GL_RGB'
+         else:
+            return 'GL_RG'
+      else:
+         return 'GL_RED'
+   elif fmat.has_channel('l'):
+      if fmat.has_channel('a'):
+         return 'GL_LUMINANCE_ALPHA'
+      else:
+         return 'GL_LUMINANCE'
+   elif fmat.has_channel('a') and fmat.num_channels() == 1:
+      return 'GL_ALPHA'
+   elif fmat.has_channel('z'):
+      if fmat.has_channel('s'):
+         return 'GL_DEPTH_STENCIL'
+      else:
+         return 'GL_DEPTH_COMPONENT'
+   elif fmat.has_channel('s'):
+      return 'GL_STENCIL_INDEX'
+   elif fmat.has_channel('i') and fmat.num_channels() == 1:
+      return 'GL_INTENSITY'
+   else:
+      assert False
+
+def get_gl_data_type(fmat):
+   if fmat.is_compressed():
+      if 'SIGNED' in fmat.name or 'SNORM' in fmat.name:
+         return 'GL_SIGNED_NORMALIZED'
+      else:
+         return 'GL_UNSIGNED_NORMALIZED'
+   elif fmat.name in ['MESA_FORMAT_YCBCR', 'MESA_FORMAT_YCBCR_REV']:
+      return 'GL_UNSIGNED_NORMALIZED'
+
+   channel = None
+   for chan in fmat.channels:
+      if chan.type == 'x' and len(fmat.channels) > 1:
+         continue # We can do better
+      elif chan.name == 's' and fmat.has_channel('z'):
+         continue # We'll use the type from the depth instead
+
+      channel = chan
+      break;
+
+   if channel.type == parser.UNSIGNED:
+      if channel.norm:
+         return 'GL_UNSIGNED_NORMALIZED'
+      else:
+         return 'GL_UNSIGNED_INT'
+   elif channel.type == parser.SIGNED:
+      if channel.norm:
+         return 'GL_SIGNED_NORMALIZED'
+      else:
+         return 'GL_INT'
+   elif channel.type == parser.FLOAT:
+      return 'GL_FLOAT'
+   elif channel.type == parser.VOID:
+      return 'GL_NONE'
+   else:
+      assert False
+
+def get_mesa_layout(fmat):
+   if fmat.layout == 'array':
+      return 'MESA_FORMAT_LAYOUT_ARRAY'
+   elif fmat.layout == 'packed':
+      return 'MESA_FORMAT_LAYOUT_PACKED'
+   else:
+      return 'MESA_FORMAT_LAYOUT_OTHER'
+
+def get_channel_bits(fmat, chan_name):
+   if fmat.is_compressed():
+      # These values are pretty-much bogus, but OpenGL requires that we
+      # return an "approximate" number of bits.
+      if fmat.layout == 's3tc':
+         return 4 if fmat.has_channel(chan_name) else 0
+      elif fmat.layout == 'fxt1':
+         if chan_name in 'rgb':
+            return 4
+         elif chan_name == 'a':
+            return 1 if fmat.has_channel('a') else 0
+         else:
+            return 0
+      elif fmat.layout == 'rgtc':
+         return 8 if fmat.has_channel(chan_name) else 0
+      elif fmat.layout in ('etc1', 'etc2'):
+         if fmat.name.endswith('_ALPHA1') and chan_name == 'a':
+            return 1
+
+         bits = 11 if fmat.name.endswith('11_EAC') else 8
+         return bits if fmat.has_channel(chan_name) else 0
+      else:
+         assert False
+   else:
+      # Uncompressed textures
+      for chan in fmat.channels:
+         if chan.name == chan_name:
+            return chan.size
+      return 0
+
+formats = parser.parse(sys.argv[1])
+
+print '''
+/*
+ * Mesa 3-D graphics library
+ *
+ * Copyright (c) 2014 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+ /*
+  * This file is AUTOGENERATED by format_info.py.  Do not edit it
+  * manually or commit it into version control.
+  */
+
+static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
+{
+'''
+
+for fmat in formats:
+   print '   {'
+   print '      {0},'.format(fmat.name)
+   print '      "{0}",'.format(fmat.name)
+   print '      {0},'.format(get_mesa_layout(fmat))
+   print '      {0},'.format(get_gl_base_format(fmat))
+   print '      {0},'.format(get_gl_data_type(fmat))
+
+   bits = [ get_channel_bits(fmat, name) for name in ['r', 'g', 'b', 'a']]
+   print '      {0},'.format(', '.join(map(str, bits)))
+   bits = [ get_channel_bits(fmat, name) for name in ['l', 'i', 'z', 's']]
+   print '      {0},'.format(', '.join(map(str, bits)))
+
+   print '      {0}, {1}, {2},'.format(fmat.block_width, fmat.block_height,
+                                       int(fmat.block_size() / 8))
+
+   print '      {{ {0} }},'.format(', '.join(map(str, fmat.swizzle)))
+   print '   },'
+
+print '};'