#include "st_program.h"
#include "st_mesa_to_tgsi.h"
#include "st_cb_program.h"
-#include "st_glsl_to_tgsi.h"
+#include "st_glsl_to_ir.h"
#include "st_atifs_to_tgsi.h"
+#include "st_util.h"
/**
* fragment program.
*/
static struct gl_program *
-st_new_program(struct gl_context *ctx, GLenum target, GLuint id,
+st_new_program(struct gl_context *ctx, gl_shader_stage stage, GLuint id,
bool is_arb_asm)
{
- 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);
- }
- case GL_GEOMETRY_PROGRAM_NV: {
- struct st_geometry_program *prog = rzalloc(NULL,
- struct st_geometry_program);
- return _mesa_init_gl_program(&prog->Base, target, id, is_arb_asm);
- }
- case GL_TESS_CONTROL_PROGRAM_NV: {
- struct st_tessctrl_program *prog = rzalloc(NULL,
- struct st_tessctrl_program);
- return _mesa_init_gl_program(&prog->Base, target, id, is_arb_asm);
- }
- case GL_TESS_EVALUATION_PROGRAM_NV: {
- struct st_tesseval_program *prog = rzalloc(NULL,
- struct st_tesseval_program);
- return _mesa_init_gl_program(&prog->Base, target, id, is_arb_asm);
- }
- case GL_COMPUTE_PROGRAM_NV: {
- struct st_compute_program *prog = rzalloc(NULL,
- struct st_compute_program);
- return _mesa_init_gl_program(&prog->Base, target, id, is_arb_asm);
- }
+ struct st_program *prog;
+
+ switch (stage) {
+ case MESA_SHADER_VERTEX:
+ prog = (struct st_program*)rzalloc(NULL, struct st_vertex_program);
+ break;
default:
- assert(0);
- return NULL;
+ prog = rzalloc(NULL, struct st_program);
+ break;
}
+
+ return _mesa_init_gl_program(&prog->Base, stage, id, is_arb_asm);
}
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_GEOMETRY_PROGRAM_NV:
- {
- struct st_geometry_program *stgp =
- (struct st_geometry_program *) prog;
-
- st_release_basic_variants(st, stgp->Base.Target, &stgp->variants,
- &stgp->tgsi);
-
- if (stgp->glsl_to_tgsi)
- free_glsl_to_tgsi_visitor(stgp->glsl_to_tgsi);
- }
- break;
- case GL_FRAGMENT_PROGRAM_ARB:
- {
- struct st_fragment_program *stfp =
- (struct st_fragment_program *) prog;
-
- st_release_fp_variants(st, stfp);
-
- if (stfp->glsl_to_tgsi)
- free_glsl_to_tgsi_visitor(stfp->glsl_to_tgsi);
- }
- break;
- case GL_TESS_CONTROL_PROGRAM_NV:
- {
- struct st_tessctrl_program *sttcp =
- (struct st_tessctrl_program *) prog;
+ st_release_variants(st, stp);
- st_release_basic_variants(st, sttcp->Base.Target, &sttcp->variants,
- &sttcp->tgsi);
+ if (stp->glsl_to_tgsi)
+ free_glsl_to_tgsi_visitor(stp->glsl_to_tgsi);
- if (sttcp->glsl_to_tgsi)
- free_glsl_to_tgsi_visitor(sttcp->glsl_to_tgsi);
- }
- break;
- case GL_TESS_EVALUATION_PROGRAM_NV:
- {
- struct st_tesseval_program *sttep =
- (struct st_tesseval_program *) prog;
-
- st_release_basic_variants(st, sttep->Base.Target,
- &sttep->variants, &sttep->tgsi);
-
- if (sttep->glsl_to_tgsi)
- free_glsl_to_tgsi_visitor(sttep->glsl_to_tgsi);
- }
- break;
- case GL_COMPUTE_PROGRAM_NV:
- {
- struct st_compute_program *stcp =
- (struct st_compute_program *) prog;
-
- st_release_cp_variants(st, stcp);
-
- if (stcp->glsl_to_tgsi)
- free_glsl_to_tgsi_visitor(stcp->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);
-
- if (target == GL_FRAGMENT_PROGRAM_ARB) {
- struct st_fragment_program *stfp = (struct st_fragment_program *) prog;
-
- st_release_fp_variants(st, stfp);
- if (!st_translate_fragment_program(st, stfp))
- return false;
+ struct st_program *stp = (struct st_program *) prog;
- if (st->fp == stfp)
- st->dirty |= stfp->affected_states;
- }
- else if (target == GL_GEOMETRY_PROGRAM_NV) {
- struct st_geometry_program *stgp = (struct st_geometry_program *) prog;
+ /* GLSL-to-NIR should not end up here. */
+ assert(!stp->shader_program);
- st_release_basic_variants(st, stgp->Base.Target, &stgp->variants,
- &stgp->tgsi);
- if (!st_translate_geometry_program(st, stgp))
- return false;
+ st_release_variants(st, stp);
- 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;
+ if (target == GL_FRAGMENT_PROGRAM_ARB ||
+ target == GL_FRAGMENT_SHADER_ATI) {
+ if (target == GL_FRAGMENT_SHADER_ATI) {
+ assert(stp->ati_fs);
+ assert(stp->ati_fs->Program == prog);
- st_release_vp_variants(st, stvp);
- if (!st_translate_vertex_program(st, stvp))
- return false;
-
- if (st->vp == stvp)
- st->dirty |= ST_NEW_VERTEX_PROGRAM(st, stvp);
- }
- else if (target == GL_TESS_CONTROL_PROGRAM_NV) {
- struct st_tessctrl_program *sttcp =
- (struct st_tessctrl_program *) prog;
+ st_init_atifs_prog(ctx, prog);
+ }
- st_release_basic_variants(st, sttcp->Base.Target, &sttcp->variants,
- &sttcp->tgsi);
- if (!st_translate_tessctrl_program(st, sttcp))
+ if (!st_translate_fragment_program(st, stp))
return false;
-
- if (st->tcp == sttcp)
- st->dirty |= sttcp->affected_states;
- }
- else if (target == GL_TESS_EVALUATION_PROGRAM_NV) {
- struct st_tesseval_program *sttep =
- (struct st_tesseval_program *) prog;
-
- st_release_basic_variants(st, sttep->Base.Target, &sttep->variants,
- &sttep->tgsi);
- if (!st_translate_tesseval_program(st, sttep))
+ } else if (target == GL_VERTEX_PROGRAM_ARB) {
+ if (!st_translate_vertex_program(st, stp))
return false;
-
- if (st->tep == sttep)
- st->dirty |= sttep->affected_states;
- }
- else if (target == GL_COMPUTE_PROGRAM_NV) {
- struct st_compute_program *stcp =
- (struct st_compute_program *) prog;
-
- st_release_cp_variants(st, stcp);
- if (!st_translate_compute_program(st, stcp))
- return false;
-
- if (st->cp == stcp)
- st->dirty |= stcp->affected_states;
- }
- else if (target == GL_FRAGMENT_SHADER_ATI) {
- assert(prog);
-
- struct st_fragment_program *stfp = (struct st_fragment_program *) prog;
- assert(stfp->ati_fs);
- assert(stfp->ati_fs->Program == prog);
-
- st_init_atifs_prog(ctx, prog);
-
- st_release_fp_variants(st, stfp);
- if (!st_translate_fragment_program(st, stfp))
+ } else {
+ if (!st_translate_common_program(st, stp))
return false;
-
- if (st->fp == stfp)
- st->dirty |= stfp->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;
}
static struct gl_program *
st_new_ati_fs(struct gl_context *ctx, struct ati_fragment_shader *curProg)
{
- struct gl_program *prog = ctx->Driver.NewProgram(ctx, GL_FRAGMENT_PROGRAM_ARB,
+ struct gl_program *prog = ctx->Driver.NewProgram(ctx, MESA_SHADER_FRAGMENT,
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;
}
+static void
+st_max_shader_compiler_threads(struct gl_context *ctx, unsigned count)
+{
+ struct pipe_screen *screen = st_context(ctx)->pipe->screen;
+
+ if (screen->set_max_shader_compiler_threads)
+ screen->set_max_shader_compiler_threads(screen, count);
+}
+
+static bool
+st_get_shader_program_completion_status(struct gl_context *ctx,
+ struct gl_shader_program *shprog)
+{
+ struct pipe_screen *screen = st_context(ctx)->pipe->screen;
+
+ if (!screen->is_parallel_shader_compilation_finished)
+ return true;
+
+ for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) {
+ struct gl_linked_shader *linked = shprog->_LinkedShaders[i];
+ void *sh = NULL;
+
+ if (!linked || !linked->Program)
+ continue;
+
+ if (st_program(linked->Program)->variants)
+ sh = st_program(linked->Program)->variants->driver_shader;
+
+ unsigned type = pipe_shader_type_from_mesa(i);
+
+ if (sh &&
+ !screen->is_parallel_shader_compilation_finished(screen, sh, type))
+ return false;
+ }
+ return true;
+}
+
/**
* Plug in the program and shader-related device driver functions.
*/
functions->DeleteProgram = st_delete_program;
functions->ProgramStringNotify = st_program_string_notify;
functions->NewATIfs = st_new_ati_fs;
-
functions->LinkShader = st_link_shader;
+ functions->SetMaxShaderCompilerThreads = st_max_shader_compiler_threads;
+ functions->GetShaderProgramCompletionStatus =
+ st_get_shader_program_completion_status;
}
projects / mesa.git / blobdiff