{
switch (target) {
case GL_VERTEX_PROGRAM_ARB: {
- struct st_vertex_program *prog = rzalloc(NULL,
- struct st_vertex_program);
- return _mesa_init_gl_program(&prog->Base, target, id, is_arb_asm);
- }
- case GL_FRAGMENT_PROGRAM_ARB: {
- struct st_fragment_program *prog = rzalloc(NULL,
- struct st_fragment_program);
- return _mesa_init_gl_program(&prog->Base, target, id, is_arb_asm);
+ struct st_vertex_program *prog = rzalloc(NULL, struct st_vertex_program);
+ return _mesa_init_gl_program(&prog->Base.Base, target, id, is_arb_asm);
}
case GL_TESS_CONTROL_PROGRAM_NV:
case GL_TESS_EVALUATION_PROGRAM_NV:
case GL_GEOMETRY_PROGRAM_NV:
+ case GL_FRAGMENT_PROGRAM_ARB:
case GL_COMPUTE_PROGRAM_NV: {
- struct st_common_program *prog = rzalloc(NULL,
- struct st_common_program);
+ struct st_program *prog = rzalloc(NULL, struct st_program);
return _mesa_init_gl_program(&prog->Base, target, id, is_arb_asm);
}
default:
st_delete_program(struct gl_context *ctx, struct gl_program *prog)
{
struct st_context *st = st_context(ctx);
+ struct st_program *stp = st_program(prog);
- switch( prog->Target ) {
- case GL_VERTEX_PROGRAM_ARB:
- {
- struct st_vertex_program *stvp = (struct st_vertex_program *) prog;
- st_release_vp_variants( st, stvp );
-
- if (stvp->glsl_to_tgsi)
- free_glsl_to_tgsi_visitor(stvp->glsl_to_tgsi);
- }
- break;
- case GL_TESS_CONTROL_PROGRAM_NV:
- case GL_TESS_EVALUATION_PROGRAM_NV:
- case GL_GEOMETRY_PROGRAM_NV:
- case GL_COMPUTE_PROGRAM_NV:
- {
- struct st_common_program *p = st_common_program(prog);
+ st_release_variants(st, stp);
- st_release_basic_variants(st, p);
-
- if (p->glsl_to_tgsi)
- free_glsl_to_tgsi_visitor(p->glsl_to_tgsi);
- }
- break;
- case GL_FRAGMENT_PROGRAM_ARB:
- {
- struct st_fragment_program *stfp =
- (struct st_fragment_program *) prog;
+ if (stp->glsl_to_tgsi)
+ free_glsl_to_tgsi_visitor(stp->glsl_to_tgsi);
- st_release_fp_variants(st, stfp);
-
- if (stfp->glsl_to_tgsi)
- free_glsl_to_tgsi_visitor(stfp->glsl_to_tgsi);
- }
- break;
- default:
- assert(0); /* problem */
- }
+ free(stp->serialized_nir);
/* delete base class */
_mesa_delete_program( ctx, prog );
}
-
/**
* Called via ctx->Driver.ProgramStringNotify()
* Called when the program's text/code is changed. We have to free
struct gl_program *prog )
{
struct st_context *st = st_context(ctx);
- gl_shader_stage stage = _mesa_program_enum_to_shader_stage(target);
+ struct st_program *stp = (struct st_program *) prog;
+
+ /* GLSL-to-NIR should not end up here. */
+ assert(!stp->shader_program);
+
+ st_release_variants(st, stp);
if (target == GL_FRAGMENT_PROGRAM_ARB ||
target == GL_FRAGMENT_SHADER_ATI) {
- struct st_fragment_program *stfp = (struct st_fragment_program *) prog;
-
if (target == GL_FRAGMENT_SHADER_ATI) {
- assert(stfp->ati_fs);
- assert(stfp->ati_fs->Program == prog);
+ assert(stp->ati_fs);
+ assert(stp->ati_fs->Program == prog);
st_init_atifs_prog(ctx, prog);
}
- st_release_fp_variants(st, stfp);
- if (!st_translate_fragment_program(st, stfp))
- return false;
-
- if (st->fp == stfp)
- st->dirty |= stfp->affected_states;
- }
- else if (target == GL_GEOMETRY_PROGRAM_NV) {
- struct st_common_program *stgp = st_common_program(prog);
-
- st_release_basic_variants(st, stgp);
- if (!st_translate_geometry_program(st, stgp))
+ if (!st_translate_fragment_program(st, stp))
return false;
-
- if (st->gp == stgp)
- st->dirty |= stgp->affected_states;
- }
- else if (target == GL_VERTEX_PROGRAM_ARB) {
- struct st_vertex_program *stvp = (struct st_vertex_program *) prog;
-
- st_release_vp_variants(st, stvp);
- if (!st_translate_vertex_program(st, stvp))
+ } else if (target == GL_VERTEX_PROGRAM_ARB) {
+ if (!st_translate_vertex_program(st, stp))
return false;
-
- if (st->vp == stvp)
- st->dirty |= ST_NEW_VERTEX_PROGRAM(st, stvp);
- }
- else if (target == GL_TESS_CONTROL_PROGRAM_NV) {
- struct st_common_program *sttcp =
- st_common_program(prog);
-
- st_release_basic_variants(st, sttcp);
- if (!st_translate_tessctrl_program(st, sttcp))
+ } else {
+ if (!st_translate_common_program(st, stp))
return false;
-
- if (st->tcp == sttcp)
- st->dirty |= sttcp->affected_states;
}
- else if (target == GL_TESS_EVALUATION_PROGRAM_NV) {
- struct st_common_program *sttep =
- st_common_program(prog);
-
- st_release_basic_variants(st, sttep);
- if (!st_translate_tesseval_program(st, sttep))
- return false;
-
- if (st->tep == sttep)
- st->dirty |= sttep->affected_states;
- }
- else if (target == GL_COMPUTE_PROGRAM_NV) {
- struct st_common_program *stcp =
- (struct st_common_program *) prog;
-
- st_release_basic_variants(st, stcp);
- if (!st_translate_compute_program(st, stcp))
- return false;
-
- if (st->cp == stcp)
- st->dirty |= stcp->affected_states;
- }
-
- if (ST_DEBUG & DEBUG_PRECOMPILE ||
- st->shader_has_one_variant[stage])
- st_precompile_shader_variant(st, prog);
+ st_finalize_program(st, prog);
return GL_TRUE;
}
{
struct gl_program *prog = ctx->Driver.NewProgram(ctx, GL_FRAGMENT_PROGRAM_ARB,
curProg->Id, true);
- struct st_fragment_program *stfp = (struct st_fragment_program *)prog;
+ struct st_program *stfp = (struct st_program *)prog;
stfp->ati_fs = curProg;
return prog;
}
if (!linked || !linked->Program)
continue;
- switch (i) {
- case MESA_SHADER_VERTEX:
- if (st_vertex_program(linked->Program)->variants)
- sh = st_vertex_program(linked->Program)->variants->driver_shader;
- break;
- case MESA_SHADER_FRAGMENT:
- if (st_fragment_program(linked->Program)->variants)
- sh = st_fragment_program(linked->Program)->variants->driver_shader;
- break;
- case MESA_SHADER_TESS_CTRL:
- case MESA_SHADER_TESS_EVAL:
- case MESA_SHADER_GEOMETRY:
- case MESA_SHADER_COMPUTE:
- if (st_common_program(linked->Program)->variants)
- sh = st_common_program(linked->Program)->variants->driver_shader;
- break;
- }
+ if (st_program(linked->Program)->variants)
+ sh = st_program(linked->Program)->variants->driver_shader;
unsigned type = pipe_shader_type_from_mesa(i);