diff options
| -rw-r--r-- | src/compiler/glsl/linker.cpp | 2 | ||||
| -rw-r--r-- | src/compiler/glsl/standalone_scaffolding.cpp | 9 | ||||
| -rw-r--r-- | src/compiler/glsl/standalone_scaffolding.h | 5 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 3 | ||||
| -rw-r--r-- | src/mesa/program/program.c | 2 |
5 files changed, 21 insertions, 0 deletions
diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index c6bf3b16736..f4f918a34e7 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -2208,6 +2208,8 @@ link_intrastage_shaders(void *mem_ctx, return NULL; } + _mesa_reference_shader_program_data(ctx, &gl_prog->sh.data, prog->data); + /* Don't use _mesa_reference_program() just take ownership */ linked->Program = gl_prog; diff --git a/src/compiler/glsl/standalone_scaffolding.cpp b/src/compiler/glsl/standalone_scaffolding.cpp index 9160ba03e90..546ba722ed3 100644 --- a/src/compiler/glsl/standalone_scaffolding.cpp +++ b/src/compiler/glsl/standalone_scaffolding.cpp @@ -54,6 +54,15 @@ _mesa_warning(struct gl_context *ctx, const char *fmt, ...) } void +_mesa_reference_shader_program_data(struct gl_context *ctx, + struct gl_shader_program_data **ptr, + struct gl_shader_program_data *data) +{ + (void) ctx; + *ptr = data; +} + +void _mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr, struct gl_shader *sh) { diff --git a/src/compiler/glsl/standalone_scaffolding.h b/src/compiler/glsl/standalone_scaffolding.h index 790ff4a251c..5d179191fbf 100644 --- a/src/compiler/glsl/standalone_scaffolding.h +++ b/src/compiler/glsl/standalone_scaffolding.h @@ -39,6 +39,11 @@ extern "C" void _mesa_warning(struct gl_context *ctx, const char *fmtString, ... ); extern "C" void +_mesa_reference_shader_program_data(struct gl_context *ctx, + struct gl_shader_program_data **ptr, + struct gl_shader_program_data *data); + +extern "C" void _mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr, struct gl_shader *sh); diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 39ae6674614..c7535a37761 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1952,6 +1952,9 @@ struct gl_program struct { /** Fields used by GLSL programs */ struct { + /** Data shared by gl_program and gl_shader_program */ + struct gl_shader_program_data *data; + struct gl_active_atomic_buffer **AtomicBuffers; /** Post-link transform feedback info. */ diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c index 27ae1c6d0ee..b728d862e54 100644 --- a/src/mesa/program/program.c +++ b/src/mesa/program/program.c @@ -34,6 +34,7 @@ #include "main/framebuffer.h" #include "main/hash.h" #include "main/macros.h" +#include "main/shaderobj.h" #include "program.h" #include "prog_cache.h" #include "prog_parameter.h" @@ -313,6 +314,7 @@ _mesa_reference_program_(struct gl_context *ctx, if (deleteFlag) { assert(ctx); + _mesa_reference_shader_program_data(ctx, &oldProg->sh.data, NULL); ctx->Driver.DeleteProgram(ctx, oldProg); } |