OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/isl/format: Get rid of the ALPHA colorspace

Browse Source 
Alpha-only formats are just linear.  There's no need to specially
deliminate them as being in their own colorspace.

Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
This commit is contained in:
Jason Ekstrand
2017-06-22 23:18:06 -07:00
parent 8ab73790ef
commit 8152c60e01
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/intel/isl/gen_format_layout.py
View File

@@ -182,7 +182,7 @@ class Format(object):
# alpha doesn't have a colorspace of it's own.
self.colorspace = line[13].strip().upper()
if self.colorspace in ['', 'ALPHA']:
if self.colorspace in ['']:
self.colorspace = 'NONE'
# This sets it to the line value, or if it's an empty string 'NONE'

14
src/intel/isl/isl_format_layout.csv
View File

@@ -99,7 +99,7 @@ R32G32_SNORM , 64, 1, 1, 1, sn32, sn32, , , ,
R64_FLOAT , 64, 1, 1, 1, sf64, , , , , , , r, linear,
R16G16B16X16_UNORM , 64, 1, 1, 1, un16, un16, un16, x16, , , , rgba, linear,
R16G16B16X16_FLOAT , 64, 1, 1, 1, sf16, sf16, sf16, x16, , , , rgba, linear,
A32X32_FLOAT , 64, 1, 1, 1, , , , sf32, x32, , , al, alpha,
A32X32_FLOAT , 64, 1, 1, 1, , , , sf32, x32, , , al, linear,
L32X32_FLOAT , 64, 1, 1, 1, , , , x32, sf32, , , la, linear,
I32X32_FLOAT , 64, 1, 1, 1, , , , x32, , sf32, , ia, linear,
R16G16B16A16_SSCALED , 64, 1, 1, 1, ss16, ss16, ss16, ss16, , , , rgba, linear,
@@ -134,14 +134,14 @@ R32_FLOAT , 32, 1, 1, 1, sf32, , , , ,
R24_UNORM_X8_TYPELESS , 32, 1, 1, 1, un24, x8, , , , , , rg, linear,
X24_TYPELESS_G8_UINT , 32, 1, 1, 1, x24, ui8, , , , , , rg, linear,
L32_UNORM , 32, 1, 1, 1, , , , , un32, , , l, linear,
A32_UNORM , 32, 1, 1, 1, , , , un32, , , , a, alpha,
A32_UNORM , 32, 1, 1, 1, , , , un32, , , , a, linear,
L16A16_UNORM , 32, 1, 1, 1, , , , un16, un16, , , la, linear,
I24X8_UNORM , 32, 1, 1, 1, , , , x8, , un24, , ia, linear,
L24X8_UNORM , 32, 1, 1, 1, , , , x8, un24, , , la, linear,
A24X8_UNORM , 32, 1, 1, 1, , , , un24, x8, , , al, alpha,
A24X8_UNORM , 32, 1, 1, 1, , , , un24, x8, , , al, linear,
I32_FLOAT , 32, 1, 1, 1, , , , , , sf32, , i, linear,
L32_FLOAT , 32, 1, 1, 1, , , , , sf32, , , l, linear,
A32_FLOAT , 32, 1, 1, 1, , , , sf32, , , , a, alpha,
A32_FLOAT , 32, 1, 1, 1, , , , sf32, , , , a, linear,
X8B8_UNORM_G8R8_SNORM , 32, 1, 1, 1, sn8, sn8, un8, x8, , , , abgr, linear,
A8X8_UNORM_G8R8_SNORM , 32, 1, 1, 1, sn8, sn8, x8, un8, , , , abgr, linear,
B8X8_UNORM_G8R8_SNORM , 32, 1, 1, 1, sn8, sn8, un8, x8, , , , bagr, linear,
@@ -180,11 +180,11 @@ A8P8_UNORM_PALETTE0 , 16, 1, 1, 1, , , , un8, ,
A8P8_UNORM_PALETTE1 , 16, 1, 1, 1, , , , un8, , , un8, ap, linear,
I16_UNORM , 16, 1, 1, 1, , , , , , un16, , i, linear,
L16_UNORM , 16, 1, 1, 1, , , , , un16, , , l, linear,
A16_UNORM , 16, 1, 1, 1, , , , un16, , , , a, alpha,
A16_UNORM , 16, 1, 1, 1, , , , un16, , , , a, linear,
L8A8_UNORM , 16, 1, 1, 1, , , , un8, un8, , , la, linear,
I16_FLOAT , 16, 1, 1, 1, , , , , , sf16, , i, linear,
L16_FLOAT , 16, 1, 1, 1, , , , , sf16, , , l, linear,
A16_FLOAT , 16, 1, 1, 1, , , , sf16, , , , a, alpha,
A16_FLOAT , 16, 1, 1, 1, , , , sf16, , , , a, linear,
L8A8_UNORM_SRGB , 16, 1, 1, 1, , , , un8, un8, , , la, srgb,
R5G5_SNORM_B6_UNORM , 16, 1, 1, 1, sn5, sn5, un6, , , , , rgb, linear,
B5G5R5X1_UNORM , 16, 1, 1, 1, un5, un5, un5, x1, , , , bgra, linear,
@@ -203,7 +203,7 @@ R8_UNORM , 8, 1, 1, 1, un8, , , , ,
R8_SNORM , 8, 1, 1, 1, sn8, , , , , , , r, linear,
R8_SINT , 8, 1, 1, 1, si8, , , , , , , r, linear,
R8_UINT , 8, 1, 1, 1, ui8, , , , , , , r, linear,
A8_UNORM , 8, 1, 1, 1, , , , un8, , , , a, alpha,
A8_UNORM , 8, 1, 1, 1, , , , un8, , , , a, linear,
I8_UNORM , 8, 1, 1, 1, , , , , , un8, , i, linear,
L8_UNORM , 8, 1, 1, 1, , , , , un8, , , l, linear,
P4A4_UNORM_PALETTE0 , 8, 1, 1, 1, , , , un4, , , un4, pa, linear,
Can't render this file because it contains an unexpected character in line 4 and column 65.