uint8_t data[0];
};
-static uint32_t
-key_size_for_cache(enum iris_program_cache_id cache_id)
-{
- static const unsigned key_sizes[] = {
- [IRIS_CACHE_VS] = sizeof(struct brw_vs_prog_key),
- [IRIS_CACHE_TCS] = sizeof(struct brw_tcs_prog_key),
- [IRIS_CACHE_TES] = sizeof(struct brw_tes_prog_key),
- [IRIS_CACHE_GS] = sizeof(struct brw_gs_prog_key),
- [IRIS_CACHE_FS] = sizeof(struct brw_wm_prog_key),
- [IRIS_CACHE_CS] = sizeof(struct brw_cs_prog_key),
- };
-
- /* BLORP keys aren't all the same size. */
- assert(cache_id != IRIS_CACHE_BLORP);
-
- return key_sizes[cache_id];
-}
-
static struct keybox *
make_keybox(void *mem_ctx,
enum iris_program_cache_id cache_id,
return memcmp(a->data, b->data, a->size) == 0;
}
-static uint64_t
-dirty_flag_for_cache(enum iris_program_cache_id cache_id)
-{
- assert(cache_id <= MESA_SHADER_STAGES);
-
- uint64_t flags = (IRIS_DIRTY_VS |
- IRIS_DIRTY_BINDINGS_VS |
- IRIS_DIRTY_CONSTANTS_VS) << cache_id;
- // XXX: ugly...
- // XXX: move this flagging out to a higher level, allow comparison of
- // XXX: new and old programs to decide what bits to twiddle
- // XXX: CLIP: toggle if barycentric modes has any NONPERSPECTIVE or not
- if (cache_id == IRIS_CACHE_FS)
- flags |= IRIS_DIRTY_WM | IRIS_DIRTY_CLIP | IRIS_DIRTY_SBE;
- if (cache_id == IRIS_CACHE_VS)
- flags |= IRIS_DIRTY_VF_SGVS;
-
- return flags;
-}
-
static unsigned
get_program_string_id(enum iris_program_cache_id cache_id, const void *key)
{
}
}
-static struct iris_compiled_shader *
+struct iris_compiled_shader *
iris_find_cached_shader(struct iris_context *ice,
enum iris_program_cache_id cache_id,
- const void *key,
- uint32_t key_size)
+ uint32_t key_size,
+ const void *key)
{
struct keybox *keybox =
make_keybox(ice->shaders.cache, cache_id, key, key_size);
return entry ? entry->data : NULL;
}
-/**
- * Looks for a program in the cache and binds it.
- *
- * If no program was found, returns false and leaves the binding alone.
- */
-bool
-iris_bind_cached_shader(struct iris_context *ice,
- enum iris_program_cache_id cache_id,
- const void *key)
-{
- unsigned key_size = key_size_for_cache(cache_id);
- struct iris_compiled_shader *shader =
- iris_find_cached_shader(ice, cache_id, key, key_size);
-
- if (!shader)
- return false;
-
- // XXX: why memcmp?
- if (!ice->shaders.prog[cache_id] ||
- memcmp(shader, ice->shaders.prog[cache_id], sizeof(*shader)) != 0) {
- ice->shaders.prog[cache_id] = shader;
- ice->state.dirty |= dirty_flag_for_cache(cache_id);
- }
-
- return true;
-}
-
-void
-iris_unbind_shader(struct iris_context *ice,
- enum iris_program_cache_id cache_id)
-{
- if (ice->shaders.prog[cache_id]) {
- ice->shaders.prog[cache_id] = NULL;
- ice->state.dirty |= dirty_flag_for_cache(cache_id);
- }
-}
-
const void *
iris_find_previous_compile(const struct iris_context *ice,
enum iris_program_cache_id cache_id,
return NULL;
}
-static struct iris_compiled_shader *
+struct iris_compiled_shader *
iris_upload_shader(struct iris_context *ice,
enum iris_program_cache_id cache_id,
uint32_t key_size,
const void *key,
const void *assembly,
struct brw_stage_prog_data *prog_data,
- uint32_t *streamout)
+ uint32_t *streamout,
+ enum brw_param_builtin *system_values,
+ unsigned num_system_values,
+ unsigned num_cbufs,
+ const struct iris_binding_table *bt)
{
- struct iris_screen *screen = (void *) ice->ctx.screen;
- struct gen_device_info *devinfo = &screen->devinfo;
struct hash_table *cache = ice->shaders.cache;
struct iris_compiled_shader *shader =
rzalloc_size(cache, sizeof(struct iris_compiled_shader) +
shader->prog_data = prog_data;
shader->streamout = streamout;
+ shader->system_values = system_values;
+ shader->num_system_values = num_system_values;
+ shader->num_cbufs = num_cbufs;
+ shader->bt = *bt;
ralloc_steal(shader, shader->prog_data);
ralloc_steal(shader->prog_data, prog_data->param);
ralloc_steal(shader->prog_data, prog_data->pull_param);
ralloc_steal(shader, shader->streamout);
+ ralloc_steal(shader, shader->system_values);
/* Store the 3DSTATE shader packets and other derived state. */
- ice->vtbl.store_derived_program_state(devinfo, cache_id, shader);
+ ice->vtbl.store_derived_program_state(ice, cache_id, shader);
struct keybox *keybox = make_keybox(cache, cache_id, key, key_size);
_mesa_hash_table_insert(ice->shaders.cache, keybox, shader);
return shader;
}
-/**
- * Upload a new shader to the program cache, and bind it for use.
- *
- * \param prog_data must be ralloc'd and will be stolen.
- */
-void
-iris_upload_and_bind_shader(struct iris_context *ice,
- enum iris_program_cache_id cache_id,
- const void *key,
- const void *assembly,
- struct brw_stage_prog_data *prog_data,
- uint32_t *streamout)
-{
- assert(cache_id != IRIS_CACHE_BLORP);
-
- struct iris_compiled_shader *shader =
- iris_upload_shader(ice, cache_id, key_size_for_cache(cache_id), key,
- assembly, prog_data, streamout);
-
- ice->shaders.prog[cache_id] = shader;
- ice->state.dirty |= dirty_flag_for_cache(cache_id);
-}
-
bool
iris_blorp_lookup_shader(struct blorp_batch *blorp_batch,
const void *key, uint32_t key_size,
struct iris_context *ice = blorp->driver_ctx;
struct iris_batch *batch = blorp_batch->driver_batch;
struct iris_compiled_shader *shader =
- iris_find_cached_shader(ice, IRIS_CACHE_BLORP, key, key_size);
+ iris_find_cached_shader(ice, IRIS_CACHE_BLORP, key_size, key);
if (!shader)
return false;
void *prog_data = ralloc_size(NULL, prog_data_size);
memcpy(prog_data, prog_data_templ, prog_data_size);
+ struct iris_binding_table bt;
+ memset(&bt, 0, sizeof(bt));
+
struct iris_compiled_shader *shader =
iris_upload_shader(ice, IRIS_CACHE_BLORP, key_size, key, kernel,
- prog_data, NULL);
+ prog_data, NULL, NULL, 0, 0, &bt);
struct iris_bo *bo = iris_resource_bo(shader->assembly.res);
*kernel_out =
projects / mesa.git / blobdiff