OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: make nir_const_value scalar

Browse Source 
v2: remove & operator in a couple of memsets
    add some memsets
v3: fixup lima

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net> (v2)
This commit is contained in:
Karol Herbst
2019-03-27 00:59:03 +01:00
parent 73d883037d
commit 14531d676b
43 changed files with 470 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/compiler/nir/nir_builder.h
View File

@@ -194,14 +194,14 @@ nir_ssa_undef(nir_builder *build, unsigned num_components, unsigned bit_size)
static inline nir_ssa_def *
nir_build_imm(nir_builder *build, unsigned num_components,
unsigned bit_size, nir_const_value value)
unsigned bit_size, const nir_const_value *value)
{
nir_load_const_instr *load_const =
nir_load_const_instr_create(build->shader, num_components, bit_size);
if (!load_const)
return NULL;
load_const->value = value;
memcpy(load_const->value, value, sizeof(nir_const_value) * num_components);
nir_builder_instr_insert(build, &load_const->instr);
@@ -227,9 +227,9 @@ nir_imm_bool(nir_builder *build, bool x)
nir_const_value v;
memset(&v, 0, sizeof(v));
v.b[0] = x;
v.b = x;
return nir_build_imm(build, 1, 1, v);
return nir_build_imm(build, 1, 1, &v);
}
static inline nir_ssa_def *
@@ -250,9 +250,9 @@ nir_imm_float16(nir_builder *build, float x)
nir_const_value v;
memset(&v, 0, sizeof(v));
v.u16[0] = _mesa_float_to_half(x);
v.u16 = _mesa_float_to_half(x);
return nir_build_imm(build, 1, 16, v);
return nir_build_imm(build, 1, 16, &v);
}
static inline nir_ssa_def *
@@ -261,9 +261,9 @@ nir_imm_float(nir_builder *build, float x)
nir_const_value v;
memset(&v, 0, sizeof(v));
v.f32[0] = x;
v.f32 = x;
return nir_build_imm(build, 1, 32, v);
return nir_build_imm(build, 1, 32, &v);
}
static inline nir_ssa_def *
@@ -272,9 +272,9 @@ nir_imm_double(nir_builder *build, double x)
nir_const_value v;
memset(&v, 0, sizeof(v));
v.f64[0] = x;
v.f64 = x;
return nir_build_imm(build, 1, 64, v);
return nir_build_imm(build, 1, 64, &v);
}
static inline nir_ssa_def *
@@ -295,11 +295,11 @@ nir_imm_floatN_t(nir_builder *build, double x, unsigned bit_size)
static inline nir_ssa_def *
nir_imm_vec2(nir_builder *build, float x, float y)
{
nir_const_value v;
nir_const_value v[2];
memset(&v, 0, sizeof(v));
v.f32[0] = x;
v.f32[1] = y;
memset(v, 0, sizeof(v));
v[0].f32 = x;
v[1].f32 = y;
return nir_build_imm(build, 2, 32, v);
}
@@ -307,13 +307,13 @@ nir_imm_vec2(nir_builder *build, float x, float y)
static inline nir_ssa_def *
nir_imm_vec4(nir_builder *build, float x, float y, float z, float w)
{
nir_const_value v;
nir_const_value v[4];
memset(&v, 0, sizeof(v));
v.f32[0] = x;
v.f32[1] = y;
v.f32[2] = z;
v.f32[3] = w;
memset(v, 0, sizeof(v));
v[0].f32 = x;
v[1].f32 = y;
v[2].f32 = z;
v[3].f32 = w;
return nir_build_imm(build, 4, 32, v);
}
@@ -321,11 +321,11 @@ nir_imm_vec4(nir_builder *build, float x, float y, float z, float w)
static inline nir_ssa_def *
nir_imm_ivec2(nir_builder *build, int x, int y)
{
nir_const_value v;
nir_const_value v[2];
memset(&v, 0, sizeof(v));
v.i32[0] = x;
v.i32[1] = y;
memset(v, 0, sizeof(v));
v[0].i32 = x;
v[1].i32 = y;
return nir_build_imm(build, 2, 32, v);
}
@@ -336,9 +336,9 @@ nir_imm_int(nir_builder *build, int x)
nir_const_value v;
memset(&v, 0, sizeof(v));
v.i32[0] = x;
v.i32 = x;
return nir_build_imm(build, 1, 32, v);
return nir_build_imm(build, 1, 32, &v);
}
static inline nir_ssa_def *
@@ -347,9 +347,9 @@ nir_imm_int64(nir_builder *build, int64_t x)
nir_const_value v;
memset(&v, 0, sizeof(v));
v.i64[0] = x;
v.i64 = x;
return nir_build_imm(build, 1, 64, v);
return nir_build_imm(build, 1, 64, &v);
}
static inline nir_ssa_def *
@@ -360,23 +360,23 @@ nir_imm_intN_t(nir_builder *build, uint64_t x, unsigned bit_size)
memset(&v, 0, sizeof(v));
assert(bit_size <= 64);
if (bit_size == 1)
v.b[0] = x & 1;
v.b = x & 1;
else
v.i64[0] = x & (~0ull >> (64 - bit_size));
v.i64 = x & (~0ull >> (64 - bit_size));
return nir_build_imm(build, 1, bit_size, v);
return nir_build_imm(build, 1, bit_size, &v);
}
static inline nir_ssa_def *
nir_imm_ivec4(nir_builder *build, int x, int y, int z, int w)
{
nir_const_value v;
nir_const_value v[4];
memset(&v, 0, sizeof(v));
v.i32[0] = x;
v.i32[1] = y;
v.i32[2] = z;
v.i32[3] = w;
memset(v, 0, sizeof(v));
v[0].i32 = x;
v[1].i32 = y;
v[2].i32 = z;
v[3].i32 = w;
return nir_build_imm(build, 4, 32, v);
}