projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vulkan/wsi: include builddir for generated headers
[mesa.git]
/
src
/
mesa
/
main
/
format_info.py
diff --git
a/src/mesa/main/format_info.py
b/src/mesa/main/format_info.py
index 22eb5a734a66be0120ade20c652114be0f102d58..780dc0bec7d702b47d1d11df6db746c4950cded1 100644
(file)
--- a/
src/mesa/main/format_info.py
+++ b/
src/mesa/main/format_info.py
@@
-1,4
+1,3
@@
-#!/usr/bin/env python
#
# Copyright 2014 Intel Corporation
#
#
# Copyright 2014 Intel Corporation
#
@@
-111,7
+110,7
@@
def get_channel_bits(fmat, chan_name):
return 1 if fmat.has_channel('a') else 0
else:
return 0
return 1 if fmat.has_channel('a') else 0
else:
return 0
- elif fmat.layout
== 'rgtc'
:
+ elif fmat.layout
in ('rgtc', 'latc')
:
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 8 if fmat.has_channel(chan_name) else 0
elif fmat.layout in ('etc1', 'etc2'):
if fmat.name.endswith('_ALPHA1') and chan_name == 'a':
@@
-185,8
+184,9
@@
for fmat in formats:
print ' {0:d},'.format(fmat.colorspace == 'srgb')
print ' {0:d},'.format(fmat.colorspace == 'srgb')
- print ' {0}, {1}, {2},'.format(fmat.block_width, fmat.block_height,
- int(fmat.block_size() / 8))
+ print ' {0}, {1}, {2}, {3},'.format(fmat.block_width, fmat.block_height,
+ fmat.block_depth,
+ int(fmat.block_size() / 8))
print ' {{ {0} }},'.format(', '.join(map(str, fmat.swizzle)))
if fmat.is_array():
print ' {{ {0} }},'.format(', '.join(map(str, fmat.swizzle)))
if fmat.is_array():