OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa/st: move program new/delete into mesa

Browse Source 
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14700>
This commit is contained in:
Dave Airlie
2021-12-20 16:20:48 +10:00
committed by Marge Bot
parent afce8654df
commit 8dfe3c83b6
5 changed files with 36 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/mesa/program/program.c
View File

@@ -44,7 +44,9 @@
#include "util/ralloc.h"
#include "util/u_atomic.h"
#include "state_tracker/st_cb_program.h"
#include "state_tracker/st_program.h"
#include "state_tracker/st_glsl_to_tgsi.h"
#include "state_tracker/st_context.h"
/**
* A pointer to this dummy program is put into the hash table when
@@ -217,6 +219,24 @@ _mesa_init_gl_program(struct gl_program *prog, gl_shader_stage stage,
return prog;
}
struct gl_program *
_mesa_new_program(struct gl_context *ctx, gl_shader_stage stage, GLuint id,
bool is_arb_asm)
{
struct gl_program *prog;
switch (stage) {
case MESA_SHADER_VERTEX:
prog = (struct gl_program*)rzalloc(NULL, struct gl_vertex_program);
break;
default:
prog = rzalloc(NULL, struct gl_program);
break;
}
return _mesa_init_gl_program(prog, stage, id, is_arb_asm);
}
/**
* Delete a program and remove it from the hash table, ignoring the
* reference count.
@@ -224,10 +244,17 @@ _mesa_init_gl_program(struct gl_program *prog, gl_shader_stage stage,
void
_mesa_delete_program(struct gl_context *ctx, struct gl_program *prog)
{
(void) ctx;
struct st_context *st = st_context(ctx);
assert(prog);
assert(prog->RefCount==0);
st_release_variants(st, prog);
if (prog->glsl_to_tgsi)
free_glsl_to_tgsi_visitor(prog->glsl_to_tgsi);
free(prog->serialized_nir);
if (prog == &_mesa_DummyProgram)
return;
@@ -302,7 +329,7 @@ _mesa_reference_program_(struct gl_context *ctx,
if (p_atomic_dec_zero(&oldProg->RefCount)) {
assert(ctx);
_mesa_reference_shader_program_data(&oldProg->sh.data, NULL);
st_delete_program(ctx, oldProg);
_mesa_delete_program(ctx, oldProg);
}
*ptr = NULL;