<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Jan 26, 2015 at 2:35 AM, Tapani Pälli <span dir="ltr"><<a href="mailto:tapani.palli@intel.com" target="_blank">tapani.palli@intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Patch adds 2 error messages that point user directly to fix<br>
mispelled or impossible swizzle field for a format.<br>
<br>
Signed-off-by: Tapani Pälli <<a href="mailto:tapani.palli@intel.com">tapani.palli@intel.com</a>><br>
---<br>
src/mesa/main/format_info.py | 2 +-<br>
src/mesa/main/format_parser.py | 7 ++++++-<br>
2 files changed, 7 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/src/mesa/main/format_info.py b/src/mesa/main/format_info.py<br>
index fe2063d..99d438d 100644<br>
--- a/src/mesa/main/format_info.py<br>
+++ b/src/mesa/main/format_info.py<br>
@@ -58,7 +58,7 @@ def get_gl_base_format(fmat):<br>
elif fmat.has_channel('i') and fmat.num_channels() == 1:<br>
return 'GL_INTENSITY'<br>
else:<br>
- assert False<br>
+ sys.exit("error, could not determine base format for " + <a href="http://fmat.name" target="_blank">fmat.name</a> + ", check swizzle");<br></blockquote><div><br></div><div>It would be a little nicer to do "... format for {0}, check swizzle".format(<a href="http://fmat.name">fmat.name</a>)<br><br></div><div>Other than that, I like this.<br><br></div><div>Reviewed-by: Jason Ekstrand <<a href="mailto:jason.ekstrand@intel.com">jason.ekstrand@intel.com</a>><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
def get_gl_data_type(fmat):<br>
if fmat.is_compressed():<br>
diff --git a/src/mesa/main/format_parser.py b/src/mesa/main/format_parser.py<br>
index 522bce3..11184f7 100755<br>
--- a/src/mesa/main/format_parser.py<br>
+++ b/src/mesa/main/format_parser.py<br>
@@ -24,6 +24,8 @@<br>
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE<br>
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.<br>
<br>
+import sys<br>
+<br>
VOID = 'x'<br>
UNSIGNED = 'u'<br>
SIGNED = 's'<br>
@@ -562,7 +564,10 @@ def parse(filename):<br>
block_height = int(fields[3])<br>
colorspace = fields[9]<br>
<br>
- swizzle = Swizzle(fields[8])<br>
+ try:<br>
+ swizzle = Swizzle(fields[8])<br>
+ except:<br>
+ sys.exit("error parsing swizzle for format " + name)<br>
channels = _parse_channels(fields[4:8], layout, colorspace, swizzle)<br>
<br>
yield Format(name, layout, block_width, block_height, channels, swizzle, colorspace)<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.1.0<br>
<br>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev" target="_blank">http://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
</font></span></blockquote></div><br></div></div>