mesa: improve error messaging for format CSV parser

Patch adds 2 error messages that point user directly to fix
mispelled or impossible swizzle field for a format.

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
This commit is contained in:
Tapani Pälli
2015-01-26 12:35:23 +02:00
parent 6ee5effac1
commit 291d7ef84d
2 changed files with 7 additions and 2 deletions
+1 -1
View File
@@ -58,7 +58,7 @@ def get_gl_base_format(fmat):
elif fmat.has_channel('i') and fmat.num_channels() == 1:
return 'GL_INTENSITY'
else:
assert False
sys.exit("error, could not determine base format for {0}, check swizzle".format(fmat.name));
def get_gl_data_type(fmat):
if fmat.is_compressed():
+6 -1
View File
@@ -24,6 +24,8 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
import sys
VOID = 'x'
UNSIGNED = 'u'
SIGNED = 's'
@@ -562,7 +564,10 @@ def parse(filename):
block_height = int(fields[3])
colorspace = fields[9]
swizzle = Swizzle(fields[8])
try:
swizzle = Swizzle(fields[8])
except:
sys.exit("error parsing swizzle for format " + name)
channels = _parse_channels(fields[4:8], layout, colorspace, swizzle)
yield Format(name, layout, block_width, block_height, channels, swizzle, colorspace)