KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iris: actually set KSP offsets

This commit is contained in:
Kenneth Graunke 2018-01-25 20:12:37 -08:00
parent 6f1c07d7dd
commit b1115799e6
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/iris/iris_context.h
View File

@ -92,7 +92,7 @@ struct iris_compiled_shader {
struct pipe_resource *buffer;
/** Offset where the assembly lives in the BO. */
unsigned prog_offset;
unsigned offset;
/** Pointer to the assembly in the BO's map. */
void *map;

4
src/gallium/drivers/iris/iris_program_cache.c
View File

@ -204,11 +204,11 @@ iris_upload_and_bind_shader(struct iris_context *ice,
* backend.
*/
if (existing) {
shader->prog_offset = existing->prog_offset;
shader->offset = existing->offset;
} else {
shader->buffer = NULL;
u_upload_alloc(ice->shaders.uploader, 0, prog_data->program_size,
64, &shader->prog_offset, &shader->buffer, &shader->map);
64, &shader->offset, &shader->buffer, &shader->map);
memcpy(shader->map, assembly, prog_data->program_size);
}

15
src/gallium/drivers/iris/iris_state.c
View File

@ -1437,8 +1437,15 @@ iris_populate_fs_key(const struct iris_context *ice,
//pkt.PerThreadScratchSpace = prog_data->total_scratch == 0 ? 0 : \
//ffs(stage_state->per_thread_scratch) - 11; \
static uint64_t
KSP(const struct iris_compiled_shader *shader)
{
struct iris_resource *res = (void *) shader->buffer;
return res->bo->gtt_offset + shader->offset;
}
#define INIT_THREAD_DISPATCH_FIELDS(pkt, prefix) \
pkt.KernelStartPointer = shader->prog_offset; \
pkt.KernelStartPointer = KSP(shader); \
pkt.BindingTableEntryCount = prog_data->binding_table.size_bytes / 4; \
pkt.FloatingPointMode = prog_data->use_alt_mode; \
\
@ -1610,11 +1617,11 @@ iris_set_fs_state(const struct gen_device_info *devinfo,
brw_wm_prog_data_dispatch_grf_start_reg(wm_prog_data, ps, 2);
ps.KernelStartPointer0 =
shader->prog_offset + brw_wm_prog_data_prog_offset(wm_prog_data, ps, 0);
KSP(shader) + brw_wm_prog_data_prog_offset(wm_prog_data, ps, 0);
ps.KernelStartPointer1 =
shader->prog_offset + brw_wm_prog_data_prog_offset(wm_prog_data, ps, 1);
KSP(shader) + brw_wm_prog_data_prog_offset(wm_prog_data, ps, 1);
ps.KernelStartPointer2 =
shader->prog_offset + brw_wm_prog_data_prog_offset(wm_prog_data, ps, 2);
KSP(shader) + brw_wm_prog_data_prog_offset(wm_prog_data, ps, 2);
}
iris_pack_command(GENX(3DSTATE_PS_EXTRA), psx_state, psx) {