diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-02-10 12:59:38 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-02-10 13:01:41 +0100 |
commit | 490c1bfb99066c0b2da421462542cd5577ffbbf0 (patch) | |
tree | faba6483c484f6ca369ce8aea5157ff51ed86618 /tools | |
parent | 9720188a0560451156dbe18e4e27e4faac047ebf (diff) |
etna: alpha blending
In a bizarre twist of fate, alpha blending now works. Interpretation of
bit 16 of PE_COLOR_FORMAT was the wrong way around.
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/asm.py | 5 | ||||
-rw-r--r-- | tools/data/viv_gallium_state.txt | 6 | ||||
-rwxr-xr-x | tools/disasm.py | 5 | ||||
-rwxr-xr-x | tools/dump_separate_cmdbuf.py | 5 |
4 files changed, 15 insertions, 6 deletions
diff --git a/tools/asm.py b/tools/asm.py index 5d14c3b..df613d7 100755 --- a/tools/asm.py +++ b/tools/asm.py @@ -283,8 +283,9 @@ def compare_inst(a,b,warnings): def parse_arguments(): parser = argparse.ArgumentParser(description='Disassemble shader') - parser.add_argument('isa_file', metavar='ISAFILE', type=str, - help='Shader ISA definition file (rules-ng-ng)') + parser.add_argument('--isa-file', metavar='ISAFILE', type=str, + help='Shader ISA definition file (rules-ng-ng)', + default='../rnndb/isa.xml') parser.add_argument('input', metavar='INFILE', type=str, help='Shader assembly file') #parser.add_argument('output', metavar='OUTFILE', type=str, diff --git a/tools/data/viv_gallium_state.txt b/tools/data/viv_gallium_state.txt index cdc5a50..09ef27f 100644 --- a/tools/data/viv_gallium_state.txt +++ b/tools/data/viv_gallium_state.txt @@ -1,5 +1,11 @@ # group and sort these by address # <struct_name> <source_spec> <dirtybit> + +base_setup_state base_setup. ETNA_STATE_BASE + PA.W_CLIP_LIMIT + PA.SYSTEM_MODE + GL.VERTEX_ELEMENT_CONFIG + rasterizer_state rasterizer-> ETNA_STATE_RASTERIZER PA.CONFIG PA.LINE_WIDTH diff --git a/tools/disasm.py b/tools/disasm.py index 2a402f7..25e7866 100755 --- a/tools/disasm.py +++ b/tools/disasm.py @@ -35,8 +35,9 @@ from etnaviv.asm_common import format_instruction, disassemble def parse_arguments(): parser = argparse.ArgumentParser(description='Disassemble shader') - parser.add_argument('isa_file', metavar='ISAFILE', type=str, - help='Shader ISA definition file (rules-ng-ng)') + parser.add_argument('--isa-file', metavar='ISAFILE', type=str, + help='Shader ISA definition file (rules-ng-ng)', + default='../rnndb/isa.xml') parser.add_argument('input', metavar='INFILE', type=str, help='Binary shader file') parser.add_argument('-a', dest='addr', diff --git a/tools/dump_separate_cmdbuf.py b/tools/dump_separate_cmdbuf.py index 677cf20..e577e98 100755 --- a/tools/dump_separate_cmdbuf.py +++ b/tools/dump_separate_cmdbuf.py @@ -156,8 +156,9 @@ def parse_arguments(): parser = argparse.ArgumentParser(description='Parse execution data log stream.') parser.add_argument('input_file', metavar='INFILE', type=str, help='FDR file') - parser.add_argument('rules_file', metavar='RULESFILE', type=str, - help='State map definition file (rules-ng-ng)') + parser.add_argument('--rules-file', metavar='RULESFILE', type=str, + help='State map definition file (rules-ng-ng)', + default='../rnndb/state.xml') parser.add_argument('-l', '--hide-load-state', dest='hide_load_state', default=False, action='store_const', const=True, help='Hide "LOAD_STATE" entries, this can make command stream a bit easier to read') |