fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 14:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

anv/lower_push_constants: Stop treating scalar specially

Browse source 
All of the code that did something special based on vec4 vs. scalar is
bogus.  In the backend, everything is now in units of bytes and the vec4
backend can handle full std140 packing so we don't need to do anything
special anymore.

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94998
This commit is contained in:
Jason Ekstrand 2016-04-18 17:17:31 -07:00
parent 3bbe8a09ea
commit 35b758c378
3 changed files with 4 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/intel/vulkan/anv_nir.h
View file

@ -30,7 +30,7 @@
extern "C" {
#endif
void anv_nir_lower_push_constants(nir_shader *shader, bool is_scalar);
void anv_nir_lower_push_constants(nir_shader *shader);
void anv_nir_apply_dynamic_offsets(struct anv_pipeline *pipeline,
nir_shader *shader,

25
src/intel/vulkan/anv_nir_lower_push_constants.c
View file

@ -23,16 +23,9 @@
#include "anv_nir.h"
struct lower_push_constants_state {
nir_shader *shader;
bool is_scalar;
};
static bool
lower_push_constants_block(nir_block *block, void *void_state)
{
struct lower_push_constants_state *state = void_state;
nir_foreach_instr(block, instr) {
if (instr->type != nir_instr_type_intrinsic)
continue;
@ -43,9 +36,6 @@ lower_push_constants_block(nir_block *block, void *void_state)
if (intrin->intrinsic != nir_intrinsic_load_push_constant)
continue;
/* This wont work for vec4 stages. */
assert(state->is_scalar);
assert(intrin->const_index[0] % 4 == 0);
assert(intrin->const_index[1] == 128);
@ -57,21 +47,10 @@ lower_push_constants_block(nir_block *block, void *void_state)
}
void
anv_nir_lower_push_constants(nir_shader *shader, bool is_scalar)
anv_nir_lower_push_constants(nir_shader *shader)
{
struct lower_push_constants_state state = {
.shader = shader,
.is_scalar = is_scalar,
};
nir_foreach_function(shader, function) {
if (function->impl)
nir_foreach_block(function->impl, lower_push_constants_block, &state);
nir_foreach_block(function->impl, lower_push_constants_block, NULL);
}
assert(shader->num_uniforms % 4 == 0);
if (is_scalar)
shader->num_uniforms /= 4;
else
shader->num_uniforms = DIV_ROUND_UP(shader->num_uniforms, 16);
}

5
src/intel/vulkan/anv_pipeline.c
View file

@ -313,16 +313,13 @@ anv_pipeline_compile(struct anv_pipeline *pipeline,
struct brw_stage_prog_data *prog_data,
struct anv_pipeline_bind_map *map)
{
const struct brw_compiler *compiler =
pipeline->device->instance->physicalDevice.compiler;
nir_shader *nir = anv_shader_compile_to_nir(pipeline->device,
module, entrypoint, stage,
spec_info);
if (nir == NULL)
return NULL;
anv_nir_lower_push_constants(nir, compiler->scalar_stage[stage]);
anv_nir_lower_push_constants(nir);
/* Figure out the number of parameters */
prog_data->nr_params = 0;