diff options
| author | Alyssa Rosenzweig <[email protected]> | 2019-04-13 00:04:52 +0000 |
|---|---|---|
| committer | Alyssa Rosenzweig <[email protected]> | 2019-04-14 15:25:46 +0000 |
| commit | 74b17b9a9ff9515c6bf3e2a4ab5bbbbe9c98ccff (patch) | |
| tree | 380be677fb7ccdf5c9530e1789b0f6b475b74f20 /src/gallium | |
| parent | 1af7701666bea2d6f4d0d226f5efc2fa65103872 (diff) | |
panfrost/midgard: Drop dependence on mesa/st
This was used as a workaround for uniform sizing which was fixed in
771adffe ("st: Lower uniforms in st in the...")
Signed-off-by: Alyssa Rosenzweig <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/panfrost/meson.build | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/panfrost/midgard/midgard_compile.c | 9 |
2 files changed, 1 insertions, 9 deletions
diff --git a/src/gallium/drivers/panfrost/meson.build b/src/gallium/drivers/panfrost/meson.build index b7e7d0c5808..371a11a934b 100644 --- a/src/gallium/drivers/panfrost/meson.build +++ b/src/gallium/drivers/panfrost/meson.build @@ -109,7 +109,6 @@ midgard_compiler = executable( link_with : [ libgallium, libglsl_standalone, - libmesa_gallium, # for st_glsl_storage_type_size libmesa_util ], build_by_default : true diff --git a/src/gallium/drivers/panfrost/midgard/midgard_compile.c b/src/gallium/drivers/panfrost/midgard/midgard_compile.c index 09eaea10294..0d948209d6f 100644 --- a/src/gallium/drivers/panfrost/midgard/midgard_compile.c +++ b/src/gallium/drivers/panfrost/midgard/midgard_compile.c @@ -32,7 +32,6 @@ #include "main/mtypes.h" #include "compiler/glsl/glsl_to_nir.h" -#include "mesa/state_tracker/st_glsl_types.h" #include "compiler/nir_types.h" #include "main/imports.h" #include "compiler/nir/nir_builder.h" @@ -645,12 +644,6 @@ glsl_type_size(const struct glsl_type *type, bool bindless) return glsl_count_attribute_slots(type, false); } -static int -uniform_type_size(const struct glsl_type *type, bool bindless) -{ - return st_glsl_storage_type_size(type, bindless); -} - /* Lower fdot2 to a vector multiplication followed by channel addition */ static void midgard_nir_lower_fdot2_body(nir_builder *b, nir_alu_instr *alu) @@ -3500,7 +3493,7 @@ midgard_compile_shader_nir(nir_shader *nir, midgard_program *program, bool is_bl nir_assign_var_locations(&nir->outputs, &nir->num_outputs, glsl_type_size); nir_assign_var_locations(&nir->inputs, &nir->num_inputs, glsl_type_size); - nir_assign_var_locations(&nir->uniforms, &nir->num_uniforms, uniform_type_size); + nir_assign_var_locations(&nir->uniforms, &nir->num_uniforms, glsl_type_size); /* Initialize at a global (not block) level hash tables */ |