KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa/format_info: use designated initialiser list 

Also, make that table const, since no-one is supposed to modify it anyway.

Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Eric Engestrom 2017-06-19 11:33:51 +01:00
parent 45b0172693
commit cb3e01ca71
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/mesa/main/format_info.py
View File

@ -165,34 +165,37 @@ print '''
* manually or commit it into version control. * manually or commit it into version control.
*/ */
static struct gl_format_info format_info[MESA_FORMAT_COUNT] = static const struct gl_format_info format_info[MESA_FORMAT_COUNT] =
{ {
''' '''
def format_channel_bits(fmat, tuple_list):
return ['.%s = %s' % (field, str(get_channel_bits(fmat, name))) for (field, name) in tuple_list]
for fmat in formats: for fmat in formats:
print ' {' print ' {'
print ' {0},'.format(fmat.name) print ' .Name = {0},'.format(fmat.name)
print ' "{0}",'.format(fmat.name) print ' .StrName = "{0}",'.format(fmat.name)
print ' {0},'.format('MESA_FORMAT_LAYOUT_' + fmat.layout.upper()) print ' .Layout = {0},'.format('MESA_FORMAT_LAYOUT_' + fmat.layout.upper())
print ' {0},'.format(get_gl_base_format(fmat)) print ' .BaseFormat = {0},'.format(get_gl_base_format(fmat))
print ' {0},'.format(get_gl_data_type(fmat)) print ' .DataType = {0},'.format(get_gl_data_type(fmat))
bits = [ get_channel_bits(fmat, name) for name in ['r', 'g', 'b', 'a']] bits = [('RedBits', 'r'), ('GreenBits', 'g'), ('BlueBits', 'b'), ('AlphaBits', 'a')]
print ' {0},'.format(', '.join(map(str, bits))) print ' {0},'.format(', '.join(format_channel_bits(fmat, bits)))
bits = [ get_channel_bits(fmat, name) for name in ['l', 'i', 'z', 's']] bits = [('LuminanceBits', 'l'), ('IntensityBits', 'i'), ('DepthBits', 'z'), ('StencilBits', 's')]
print ' {0},'.format(', '.join(map(str, bits))) print ' {0},'.format(', '.join(format_channel_bits(fmat, bits)))
print ' {0:d},'.format(fmat.colorspace == 'srgb') print ' .IsSRGBFormat = {0:d},'.format(fmat.colorspace == 'srgb')
print ' {0}, {1}, {2}, {3},'.format(fmat.block_width, fmat.block_height, print ' .BlockWidth = {0}, .BlockHeight = {1}, .BlockDepth = {2},'.format(fmat.block_width, fmat.block_height, fmat.block_depth)
fmat.block_depth, print ' .BytesPerBlock = {0},'.format(int(fmat.block_size() / 8))
int(fmat.block_size() / 8))
print ' {{ {0} }},'.format(', '.join(map(str, fmat.swizzle))) print ' .Swizzle = {{ {0} }},'.format(', '.join(map(str, fmat.swizzle)))
if fmat.is_array(): if fmat.is_array():
chan = fmat.array_element() chan = fmat.array_element()
norm = chan.norm or chan.type == parser.FLOAT norm = chan.norm or chan.type == parser.FLOAT
print ' MESA_ARRAY_FORMAT({0}),'.format(', '.join([ print ' .ArrayFormat = MESA_ARRAY_FORMAT({0}),'.format(', '.join([
str(chan.size / 8), str(chan.size / 8),
str(int(chan.sign)), str(int(chan.sign)),
str(int(chan.type == parser.FLOAT)), str(int(chan.type == parser.FLOAT)),
@ -204,7 +207,7 @@ for fmat in formats:
str(fmat.swizzle[3]), str(fmat.swizzle[3]),
])) ]))
else: else:
print ' 0,' print ' .ArrayFormat = 0,'
print ' },' print ' },'
print '};' print '};'