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

spirv: Add imageoperands_to_string helper 

Change the information to also include the category, so that the
particulars of BitEnum enumeration can be handled in the template.

Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
This commit is contained in:
Caio Marcelo de Oliveira Filho 2019-10-22 22:25:29 -07:00
parent 06aecb14c0
commit d27b853c08
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/compiler/spirv/spirv_info.h
View File

@ -34,6 +34,7 @@ const char *spirv_dim_to_string(SpvDim dim);
const char *spirv_executionmode_to_string(SpvExecutionMode mode);
const char *spirv_executionmodel_to_string(SpvExecutionModel model);
const char *spirv_imageformat_to_string(SpvImageFormat format);
const char *spirv_imageoperands_to_string(SpvImageOperandsMask op);
const char *spirv_memorymodel_to_string(SpvMemoryModel cap);
const char *spirv_op_to_string(SpvOp op);
const char *spirv_storageclass_to_string(SpvStorageClass sc);

25
src/compiler/spirv/spirv_info_c.py
View File

@ -43,7 +43,7 @@ def collect_data(spirv, kind):
seen.add(x["value"])
values.append(x["enumerant"])
return (kind, values)
return (kind, values, operands["category"])
def collect_opcodes(spirv):
seen = set()
@ -59,7 +59,7 @@ def collect_opcodes(spirv):
values.append(name[2:])
seen.add(opcode)
return ("Op", values)
return ("Op", values, None)
def parse_args():
p = argparse.ArgumentParser()
@ -72,8 +72,25 @@ TEMPLATE = Template("""\
""" + COPYRIGHT + """\
#include "spirv_info.h"
% for kind,values in info:
% for kind,values,category in info:
% if category == "BitEnum":
const char *
spirv_${kind.lower()}_to_string(Spv${kind}Mask v)
{
switch (v) {
% for name in values:
%if name != "None":
case Spv${kind}${name}Mask: return "Spv${kind}${name}";
% else:
case Spv${kind}MaskNone: return "Spv${kind}${name}";
% endif
% endfor
}
return "unknown";
}
% else:
const char *
spirv_${kind.lower()}_to_string(Spv${kind} v)
{
@ -86,6 +103,7 @@ spirv_${kind.lower()}_to_string(Spv${kind} v)
return "unknown";
}
% endif
% endfor
""")
@ -105,6 +123,7 @@ if __name__ == "__main__":
collect_data(spirv_info, "ImageFormat"),
collect_data(spirv_info, "MemoryModel"),
collect_data(spirv_info, "StorageClass"),
collect_data(spirv_info, "ImageOperands"),
collect_opcodes(spirv_info),
]