summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2016-01-25 11:07:02 -0800
committerMatt Turner <[email protected]>2016-02-01 10:43:57 -0800
commit955d0520585f6f774b132647519b1ffaa152f8e8 (patch)
treed96073ecf1004dfce0777b770321bdb4c615712f /src
parent9b8786eba95532d53c45d52059a44abd7ee93530 (diff)
nir: Add lowering support for unpacking opcodes.
Reviewed-by: Iago Toral Quiroga <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/compiler/nir/nir.h4
-rw-r--r--src/compiler/nir/nir_opt_algebraic.py28
2 files changed, 32 insertions, 0 deletions
diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index da55affe388..4968460834f 100644
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -1474,6 +1474,10 @@ typedef struct nir_shader_compiler_options {
bool lower_pack_unorm_4x8;
bool lower_pack_snorm_4x8;
bool lower_unpack_half_2x16;
+ bool lower_unpack_unorm_2x16;
+ bool lower_unpack_snorm_2x16;
+ bool lower_unpack_unorm_4x8;
+ bool lower_unpack_snorm_4x8;
bool lower_extract_byte;
bool lower_extract_word;
diff --git a/src/compiler/nir/nir_opt_algebraic.py b/src/compiler/nir/nir_opt_algebraic.py
index a279fbc482f..e7765faa146 100644
--- a/src/compiler/nir/nir_opt_algebraic.py
+++ b/src/compiler/nir/nir_opt_algebraic.py
@@ -278,6 +278,34 @@ optimizations = [
('pack_uvec4_to_uint',
('f2i', ('fround_even', ('fmul', ('fmin', 1.0, ('fmax', -1.0, 'v')), 127.0)))),
'options->lower_pack_snorm_4x8'),
+
+ (('unpack_unorm_2x16', 'v'),
+ ('fdiv', ('u2f', ('vec2', ('extract_u16', 'v', 0),
+ ('extract_u16', 'v', 1))),
+ 65535.0),
+ 'options->lower_unpack_unorm_2x16'),
+
+ (('unpack_unorm_4x8', 'v'),
+ ('fdiv', ('u2f', ('vec4', ('extract_u8', 'v', 0),
+ ('extract_u8', 'v', 1),
+ ('extract_u8', 'v', 2),
+ ('extract_u8', 'v', 3))),
+ 255.0),
+ 'options->lower_unpack_unorm_4x8'),
+
+ (('unpack_snorm_2x16', 'v'),
+ ('fmin', 1.0, ('fmax', -1.0, ('fdiv', ('i2f', ('vec2', ('extract_i16', 'v', 0),
+ ('extract_i16', 'v', 1))),
+ 32767.0))),
+ 'options->lower_unpack_snorm_2x16'),
+
+ (('unpack_snorm_4x8', 'v'),
+ ('fmin', 1.0, ('fmax', -1.0, ('fdiv', ('i2f', ('vec4', ('extract_i8', 'v', 0),
+ ('extract_i8', 'v', 1),
+ ('extract_i8', 'v', 2),
+ ('extract_i8', 'v', 3))),
+ 127.0))),
+ 'options->lower_unpack_snorm_4x8'),
]
# Add optimizations to handle the case where the result of a ternary is