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

Revert "st/mesa: call nir_serialize only once per shader"

Browse source 
This reverts commit 3a8d686889.

Acked-by: Marek Olšák <maraeo@gmail.com>
This commit is contained in:
Mark Janes 2019-11-20 14:05:41 -08:00
parent 721d82cf06
commit f1f19b6445
3 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/mesa/state_tracker/st_program.c
View file

@ -2068,20 +2068,6 @@ st_precompile_shader_variant(struct st_context *st,
}
}
void
st_serialize_nir(struct st_program *stp)
{
if (!stp->nir_binary) {
struct blob blob;
size_t size;
blob_init(&blob);
nir_serialize(&blob, stp->Base.nir, false);
blob_finish_get_buffer(&blob, &stp->nir_binary, &size);
stp->nir_size = size;
}
}
void
st_finalize_program(struct st_context *st, struct gl_program *prog)
{
@ -2106,7 +2092,14 @@ st_finalize_program(struct st_context *st, struct gl_program *prog)
* to save memory.
*/
if (prog->nir) {
st_serialize_nir(stp);
/* Serialize NIR. */
struct blob blob;
blob_init(&blob);
nir_serialize(&blob, prog->nir, false);
stp->nir_binary = malloc(blob.size);
memcpy(stp->nir_binary, blob.data, blob.size);
stp->nir_size = blob.size;
blob_finish(&blob);
/* Free NIR. */
assert(stp->state.ir.nir == prog->nir);

3
src/mesa/state_tracker/st_program.h
View file

@ -352,9 +352,6 @@ extern bool
st_translate_common_program(struct st_context *st,
struct st_program *stp);
extern void
st_serialize_nir(struct st_program *stp);
extern void
st_finalize_program(struct st_context *st, struct gl_program *prog);

19
src/mesa/state_tracker/st_shader_cache.c
View file

@ -70,13 +70,20 @@ write_tgsi_to_cache(struct blob *blob, const struct tgsi_token *tokens,
static void
write_nir_to_cache(struct blob *blob, struct gl_program *prog)
{
struct st_program *stp = (struct st_program *)prog;
st_serialize_nir(stp);
blob_write_intptr(blob, stp->nir_size);
blob_write_bytes(blob, stp->nir_binary, stp->nir_size);
if (prog->nir) {
/* Reserve intptr_t to store the size. intptr_t is also the alignment
* of NIR in the blob, so the NIR size computation will be trivial.
*/
size_t offset = blob_reserve_intptr(blob);
nir_serialize(blob, prog->nir, false);
unsigned nir_size = blob->size - offset - sizeof(intptr_t);
*(uintptr_t *)(blob->data + offset) = nir_size;
} else {
struct st_program *stp = (struct st_program *)prog;
blob_write_intptr(blob, stp->nir_size);
blob_write_bytes(blob, stp->nir_binary, stp->nir_size);
}
copy_blob_to_driver_cache_blob(blob, prog);
}