}
static inline nir_ssa_def *
-nir_format_bitcast_uint_vec_unmasked(nir_builder *b, nir_ssa_def *src,
- unsigned src_bits, unsigned dst_bits)
+nir_format_bitcast_uvec_unmasked(nir_builder *b, nir_ssa_def *src,
+ unsigned src_bits, unsigned dst_bits)
{
+ assert(src->bit_size >= src_bits && src->bit_size >= dst_bits);
assert(src_bits == 8 || src_bits == 16 || src_bits == 32);
assert(dst_bits == 8 || dst_bits == 16 || dst_bits == 32);
return nir_vec(b, dst_chan, dst_components);
}
+static inline nir_ssa_def *
+_nir_format_norm_factor(nir_builder *b, unsigned *bits,
+ unsigned num_components,
+ bool is_signed)
+{
+ nir_const_value factor;
+ for (unsigned i = 0; i < num_components; i++) {
+ assert(bits[i] < 32);
+ factor.f32[i] = (1ul << (bits[i] - is_signed)) - 1;
+ }
+ return nir_build_imm(b, num_components, 32, factor);
+}
+
+static inline nir_ssa_def *
+nir_format_unorm_to_float(nir_builder *b, nir_ssa_def *u, unsigned *bits)
+{
+ nir_ssa_def *factor =
+ _nir_format_norm_factor(b, bits, u->num_components, false);
+
+ return nir_fdiv(b, nir_u2f32(b, u), factor);
+}
+
+static inline nir_ssa_def *
+nir_format_snorm_to_float(nir_builder *b, nir_ssa_def *s, unsigned *bits)
+{
+ nir_ssa_def *factor =
+ _nir_format_norm_factor(b, bits, s->num_components, true);
+
+ return nir_fmax(b, nir_fdiv(b, nir_i2f32(b, s), factor),
+ nir_imm_float(b, -1.0f));
+}
+
+static inline nir_ssa_def *
+nir_format_float_to_unorm(nir_builder *b, nir_ssa_def *f, unsigned *bits)
+{
+ nir_ssa_def *factor =
+ _nir_format_norm_factor(b, bits, f->num_components, false);
+
+ /* Clamp to the range [0, 1] */
+ f = nir_fsat(b, f);
+
+ return nir_f2u32(b, nir_fround_even(b, nir_fmul(b, f, factor)));
+}
+
+static inline nir_ssa_def *
+nir_format_float_to_snorm(nir_builder *b, nir_ssa_def *f, unsigned *bits)
+{
+ nir_ssa_def *factor =
+ _nir_format_norm_factor(b, bits, f->num_components, true);
+
+ /* Clamp to the range [-1, 1] */
+ f = nir_fmin(b, nir_fmax(b, f, nir_imm_float(b, -1)), nir_imm_float(b, 1));
+
+ return nir_f2i32(b, nir_fround_even(b, nir_fmul(b, f, factor)));
+}
+
static inline nir_ssa_def *
nir_format_linear_to_srgb(nir_builder *b, nir_ssa_def *c)
{
{
nir_ssa_def *chans[3];
chans[0] = nir_mask_shift(b, packed, 0x000007ff, 4);
- chans[1] = nir_mask_shift(b, packed, 0x003ff100, -7);
+ chans[1] = nir_mask_shift(b, packed, 0x003ff800, -7);
chans[2] = nir_mask_shift(b, packed, 0xffc00000, -17);
for (unsigned i = 0; i < 3; i++)
}
static inline nir_ssa_def *
-nir_format_pack_r11g11b10f(nir_builder *b, nir_ssa_def *color)
+nir_format_pack_11f11f10f(nir_builder *b, nir_ssa_def *color)
{
/* 10 and 11-bit floats are unsigned. Clamp to non-negative */
nir_ssa_def *clamped = nir_fmax(b, color, nir_imm_float(b, 0));