diff options
author | Eduardo Lima Mitev <[email protected]> | 2017-11-13 19:44:47 +0100 |
---|---|---|
committer | Alejandro PiƱeiro <[email protected]> | 2018-03-30 09:14:56 +0200 |
commit | 22b6b3d0a75406f577dcb6d554c96ed42ee35aff (patch) | |
tree | 9f8cab2634db5ca37fe69443d7276e79b47f180a | |
parent | ba975140d3c99b60c63846c3c08bd158f7c95d42 (diff) |
mesa: Add a reference to gl_shader_spirv_data to gl_linked_shader
This is a reference to the spirv_data object stored in gl_shader, which
stores shader SPIR-V data that is needed during linking too.
Reviewed-by: Timothy Arceri <[email protected]>
-rw-r--r-- | src/mesa/main/mtypes.h | 8 | ||||
-rw-r--r-- | src/mesa/main/shaderobj.c | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 9ded02500d8..801bd17666f 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2651,6 +2651,14 @@ struct gl_linked_shader struct exec_list *packed_varyings; struct exec_list *fragdata_arrays; struct glsl_symbol_table *symbols; + + /** + * ARB_gl_spirv related data. + * + * This is actually a reference to the gl_shader::spirv_data, which + * stores information that is also needed during linking. + */ + struct gl_shader_spirv_data *spirv_data; }; diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c index 5c1cdd6b27a..834e2a92ec4 100644 --- a/src/mesa/main/shaderobj.c +++ b/src/mesa/main/shaderobj.c @@ -137,6 +137,7 @@ void _mesa_delete_linked_shader(struct gl_context *ctx, struct gl_linked_shader *sh) { + _mesa_shader_spirv_data_reference(&sh->spirv_data, NULL); _mesa_reference_program(ctx, &sh->Program, NULL); ralloc_free(sh); } |