diff options
| author | Marek Olšák <[email protected]> | 2019-05-21 19:17:34 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2019-06-19 20:30:32 -0400 |
| commit | b64bd5887ee508c5db2aa5636f955974ce0b0ed2 (patch) | |
| tree | a3b72492fed2b4e730e33cbd45ae606db70efadf /src/gallium/drivers/radeonsi/si_shader.c | |
| parent | 1ee0f0d315546766c584f7af3ca1974d18e8f3e4 (diff) | |
ac/rtld: check correct LDS max size
Tested-by: Dieter Nützel <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_shader.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 231cb8c1cd1..eb75e2a77a4 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -28,6 +28,7 @@ #include "tgsi/tgsi_strings.h" #include "tgsi/tgsi_util.h" #include "tgsi/tgsi_dump.h" +#include "tgsi/tgsi_from_mesa.h" #include "ac_binary.h" #include "ac_exp_param.h" @@ -5098,6 +5099,7 @@ static bool si_shader_binary_open(struct si_screen *screen, struct ac_rtld_binary *rtld) { const struct si_shader_selector *sel = shader->selector; + enum pipe_shader_type shader_type = sel ? sel->type : PIPE_SHADER_COMPUTE; const char *part_elfs[5]; size_t part_sizes[5]; unsigned num_parts = 0; @@ -5136,6 +5138,7 @@ static bool si_shader_binary_open(struct si_screen *screen, .options = { .halt_at_entry = screen->options.halt_shaders, }, + .shader_type = tgsi_processor_to_shader_stage(shader_type), .num_parts = num_parts, .elf_ptrs = part_elfs, .elf_sizes = part_sizes, |