aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mesa/state_tracker/st_atom_shader.c6
-rw-r--r--src/mesa/state_tracker/st_cb_program.c18
-rw-r--r--src/mesa/state_tracker/st_context.h6
-rw-r--r--src/mesa/state_tracker/st_program.c204
-rw-r--r--src/mesa/state_tracker/st_program.h88
5 files changed, 108 insertions, 214 deletions
diff --git a/src/mesa/state_tracker/st_atom_shader.c b/src/mesa/state_tracker/st_atom_shader.c
index 0f9ea101889..2d8a3c3fb57 100644
--- a/src/mesa/state_tracker/st_atom_shader.c
+++ b/src/mesa/state_tracker/st_atom_shader.c
@@ -163,7 +163,7 @@ static void
update_gp( struct st_context *st )
{
struct st_geometry_program *stgp;
- struct st_gp_variant_key key;
+ struct st_basic_variant_key key;
if (!st->ctx->GeometryProgram._Current) {
cso_set_geometry_shader_handle(st->cso_context, NULL);
@@ -199,7 +199,7 @@ static void
update_tcp( struct st_context *st )
{
struct st_tessctrl_program *sttcp;
- struct st_tcp_variant_key key;
+ struct st_basic_variant_key key;
if (!st->ctx->TessCtrlProgram._Current) {
cso_set_tessctrl_shader_handle(st->cso_context, NULL);
@@ -235,7 +235,7 @@ static void
update_tep( struct st_context *st )
{
struct st_tesseval_program *sttep;
- struct st_tep_variant_key key;
+ struct st_basic_variant_key key;
if (!st->ctx->TessEvalProgram._Current) {
cso_set_tesseval_shader_handle(st->cso_context, NULL);
diff --git a/src/mesa/state_tracker/st_cb_program.c b/src/mesa/state_tracker/st_cb_program.c
index 2c4eccf1e06..6f9c53efc40 100644
--- a/src/mesa/state_tracker/st_cb_program.c
+++ b/src/mesa/state_tracker/st_cb_program.c
@@ -153,7 +153,8 @@ st_delete_program(struct gl_context *ctx, struct gl_program *prog)
struct st_geometry_program *stgp =
(struct st_geometry_program *) prog;
- st_release_gp_variants(st, stgp);
+ st_release_basic_variants(st, stgp->Base.Base.Target,
+ &stgp->variants, &stgp->tgsi);
if (stgp->glsl_to_tgsi)
free_glsl_to_tgsi_visitor(stgp->glsl_to_tgsi);
@@ -175,7 +176,8 @@ st_delete_program(struct gl_context *ctx, struct gl_program *prog)
struct st_tessctrl_program *sttcp =
(struct st_tessctrl_program *) prog;
- st_release_tcp_variants(st, sttcp);
+ st_release_basic_variants(st, sttcp->Base.Base.Target,
+ &sttcp->variants, &sttcp->tgsi);
if (sttcp->glsl_to_tgsi)
free_glsl_to_tgsi_visitor(sttcp->glsl_to_tgsi);
@@ -186,7 +188,8 @@ st_delete_program(struct gl_context *ctx, struct gl_program *prog)
struct st_tesseval_program *sttep =
(struct st_tesseval_program *) prog;
- st_release_tep_variants(st, sttep);
+ st_release_basic_variants(st, sttep->Base.Base.Target,
+ &sttep->variants, &sttep->tgsi);
if (sttep->glsl_to_tgsi)
free_glsl_to_tgsi_visitor(sttep->glsl_to_tgsi);
@@ -239,7 +242,8 @@ st_program_string_notify( struct gl_context *ctx,
else if (target == GL_GEOMETRY_PROGRAM_NV) {
struct st_geometry_program *stgp = (struct st_geometry_program *) prog;
- st_release_gp_variants(st, stgp);
+ st_release_basic_variants(st, stgp->Base.Base.Target,
+ &stgp->variants, &stgp->tgsi);
if (!st_translate_geometry_program(st, stgp))
return false;
@@ -260,7 +264,8 @@ st_program_string_notify( struct gl_context *ctx,
struct st_tessctrl_program *sttcp =
(struct st_tessctrl_program *) prog;
- st_release_tcp_variants(st, sttcp);
+ st_release_basic_variants(st, sttcp->Base.Base.Target,
+ &sttcp->variants, &sttcp->tgsi);
if (!st_translate_tessctrl_program(st, sttcp))
return false;
@@ -271,7 +276,8 @@ st_program_string_notify( struct gl_context *ctx,
struct st_tesseval_program *sttep =
(struct st_tesseval_program *) prog;
- st_release_tep_variants(st, sttep);
+ st_release_basic_variants(st, sttep->Base.Base.Target,
+ &sttep->variants, &sttep->tgsi);
if (!st_translate_tesseval_program(st, sttep))
return false;
diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index 57076ad0d18..352e795d06a 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -168,9 +168,9 @@ struct st_context
struct st_vp_variant *vp_variant;
struct st_fp_variant *fp_variant;
- struct st_gp_variant *gp_variant;
- struct st_tcp_variant *tcp_variant;
- struct st_tep_variant *tep_variant;
+ struct st_basic_variant *gp_variant;
+ struct st_basic_variant *tcp_variant;
+ struct st_basic_variant *tep_variant;
struct gl_texture_object *default_texture;
diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index b3954547418..133869bc8c4 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -140,112 +140,54 @@ st_release_fp_variants(struct st_context *st, struct st_fragment_program *stfp)
/**
- * Delete a geometry program variant. Note the caller must unlink
+ * Delete a basic program variant. Note the caller must unlink
* the variant from the linked list.
*/
static void
-delete_gp_variant(struct st_context *st, struct st_gp_variant *gpv)
+delete_basic_variant(struct st_context *st, struct st_basic_variant *v,
+ GLenum target)
{
- if (gpv->driver_shader)
- cso_delete_geometry_shader(st->cso_context, gpv->driver_shader);
-
- free(gpv);
-}
-
-
-/**
- * Free all variants of a geometry program.
- */
-void
-st_release_gp_variants(struct st_context *st, struct st_geometry_program *stgp)
-{
- struct st_gp_variant *gpv;
-
- for (gpv = stgp->variants; gpv; ) {
- struct st_gp_variant *next = gpv->next;
- delete_gp_variant(st, gpv);
- gpv = next;
- }
-
- stgp->variants = NULL;
-
- if (stgp->tgsi.tokens) {
- ureg_free_tokens(stgp->tgsi.tokens);
- stgp->tgsi.tokens = NULL;
- }
-}
-
-
-/**
- * Delete a tessellation control program variant. Note the caller must unlink
- * the variant from the linked list.
- */
-static void
-delete_tcp_variant(struct st_context *st, struct st_tcp_variant *tcpv)
-{
- if (tcpv->driver_shader)
- cso_delete_tessctrl_shader(st->cso_context, tcpv->driver_shader);
-
- free(tcpv);
-}
-
-
-/**
- * Free all variants of a tessellation control program.
- */
-void
-st_release_tcp_variants(struct st_context *st, struct st_tessctrl_program *sttcp)
-{
- struct st_tcp_variant *tcpv;
-
- for (tcpv = sttcp->variants; tcpv; ) {
- struct st_tcp_variant *next = tcpv->next;
- delete_tcp_variant(st, tcpv);
- tcpv = next;
- }
-
- sttcp->variants = NULL;
-
- if (sttcp->tgsi.tokens) {
- ureg_free_tokens(sttcp->tgsi.tokens);
- sttcp->tgsi.tokens = NULL;
+ if (v->driver_shader) {
+ switch (target) {
+ case GL_TESS_CONTROL_PROGRAM_NV:
+ cso_delete_tessctrl_shader(st->cso_context, v->driver_shader);
+ break;
+ case GL_TESS_EVALUATION_PROGRAM_NV:
+ cso_delete_tesseval_shader(st->cso_context, v->driver_shader);
+ break;
+ case GL_GEOMETRY_PROGRAM_NV:
+ cso_delete_geometry_shader(st->cso_context, v->driver_shader);
+ break;
+ default:
+ assert(!"this shouldn't occur");
+ }
}
-}
-
-
-/**
- * Delete a tessellation evaluation program variant. Note the caller must
- * unlink the variant from the linked list.
- */
-static void
-delete_tep_variant(struct st_context *st, struct st_tep_variant *tepv)
-{
- if (tepv->driver_shader)
- cso_delete_tesseval_shader(st->cso_context, tepv->driver_shader);
- free(tepv);
+ free(v);
}
/**
- * Free all variants of a tessellation evaluation program.
+ * Free all basic program variants.
*/
void
-st_release_tep_variants(struct st_context *st, struct st_tesseval_program *sttep)
+st_release_basic_variants(struct st_context *st, GLenum target,
+ struct st_basic_variant **variants,
+ struct pipe_shader_state *tgsi)
{
- struct st_tep_variant *tepv;
+ struct st_basic_variant *v;
- for (tepv = sttep->variants; tepv; ) {
- struct st_tep_variant *next = tepv->next;
- delete_tep_variant(st, tepv);
- tepv = next;
+ for (v = *variants; v; ) {
+ struct st_basic_variant *next = v->next;
+ delete_basic_variant(st, v, target);
+ v = next;
}
- sttep->variants = NULL;
+ *variants = NULL;
- if (sttep->tgsi.tokens) {
- ureg_free_tokens(sttep->tgsi.tokens);
- sttep->tgsi.tokens = NULL;
+ if (tgsi->tokens) {
+ ureg_free_tokens(tgsi->tokens);
+ tgsi->tokens = NULL;
}
}
@@ -1324,15 +1266,15 @@ st_translate_geometry_program(struct st_context *st,
}
-static struct st_gp_variant *
+static struct st_basic_variant *
st_create_gp_variant(struct st_context *st,
struct st_geometry_program *stgp,
- const struct st_gp_variant_key *key)
+ const struct st_basic_variant_key *key)
{
struct pipe_context *pipe = st->pipe;
- struct st_gp_variant *gpv;
+ struct st_basic_variant *gpv;
- gpv = CALLOC_STRUCT(st_gp_variant);
+ gpv = CALLOC_STRUCT(st_basic_variant);
if (!gpv)
return NULL;
@@ -1346,12 +1288,12 @@ st_create_gp_variant(struct st_context *st,
/**
* Get/create geometry program variant.
*/
-struct st_gp_variant *
+struct st_basic_variant *
st_get_gp_variant(struct st_context *st,
struct st_geometry_program *stgp,
- const struct st_gp_variant_key *key)
+ const struct st_basic_variant_key *key)
{
- struct st_gp_variant *gpv;
+ struct st_basic_variant *gpv;
/* Search for existing variant */
for (gpv = stgp->variants; gpv; gpv = gpv->next) {
@@ -1399,15 +1341,15 @@ st_translate_tessctrl_program(struct st_context *st,
}
-static struct st_tcp_variant *
+static struct st_basic_variant *
st_create_tcp_variant(struct st_context *st,
struct st_tessctrl_program *sttcp,
- const struct st_tcp_variant_key *key)
+ const struct st_basic_variant_key *key)
{
struct pipe_context *pipe = st->pipe;
- struct st_tcp_variant *tcpv;
+ struct st_basic_variant *tcpv;
- tcpv = CALLOC_STRUCT(st_tcp_variant);
+ tcpv = CALLOC_STRUCT(st_basic_variant);
if (!tcpv)
return NULL;
@@ -1421,12 +1363,12 @@ st_create_tcp_variant(struct st_context *st,
/**
* Get/create tessellation control program variant.
*/
-struct st_tcp_variant *
+struct st_basic_variant *
st_get_tcp_variant(struct st_context *st,
struct st_tessctrl_program *sttcp,
- const struct st_tcp_variant_key *key)
+ const struct st_basic_variant_key *key)
{
- struct st_tcp_variant *tcpv;
+ struct st_basic_variant *tcpv;
/* Search for existing variant */
for (tcpv = sttcp->variants; tcpv; tcpv = tcpv->next) {
@@ -1496,15 +1438,15 @@ st_translate_tesseval_program(struct st_context *st,
}
-static struct st_tep_variant *
+static struct st_basic_variant *
st_create_tep_variant(struct st_context *st,
struct st_tesseval_program *sttep,
- const struct st_tep_variant_key *key)
+ const struct st_basic_variant_key *key)
{
struct pipe_context *pipe = st->pipe;
- struct st_tep_variant *tepv;
+ struct st_basic_variant *tepv;
- tepv = CALLOC_STRUCT(st_tep_variant);
+ tepv = CALLOC_STRUCT(st_basic_variant);
if (!tepv)
return NULL;
@@ -1518,12 +1460,12 @@ st_create_tep_variant(struct st_context *st,
/**
* Get/create tessellation evaluation program variant.
*/
-struct st_tep_variant *
+struct st_basic_variant *
st_get_tep_variant(struct st_context *st,
struct st_tesseval_program *sttep,
- const struct st_tep_variant_key *key)
+ const struct st_basic_variant_key *key)
{
- struct st_tep_variant *tepv;
+ struct st_basic_variant *tepv;
/* Search for existing variant */
for (tepv = sttep->variants; tepv; tepv = tepv->next) {
@@ -1551,15 +1493,15 @@ st_get_tep_variant(struct st_context *st,
* variants attached to the given program which match the given context.
*/
static void
-destroy_program_variants(struct st_context *st, struct gl_program *program)
+destroy_program_variants(struct st_context *st, struct gl_program *target)
{
- if (!program || program == &_mesa_DummyProgram)
+ if (!target || target == &_mesa_DummyProgram)
return;
- switch (program->Target) {
+ switch (target->Target) {
case GL_VERTEX_PROGRAM_ARB:
{
- struct st_vertex_program *stvp = (struct st_vertex_program *) program;
+ struct st_vertex_program *stvp = (struct st_vertex_program *) target;
struct st_vp_variant *vpv, **prevPtr = &stvp->variants;
for (vpv = stvp->variants; vpv; ) {
@@ -1580,7 +1522,7 @@ destroy_program_variants(struct st_context *st, struct gl_program *program)
case GL_FRAGMENT_PROGRAM_ARB:
{
struct st_fragment_program *stfp =
- (struct st_fragment_program *) program;
+ (struct st_fragment_program *) target;
struct st_fp_variant *fpv, **prevPtr = &stfp->variants;
for (fpv = stfp->variants; fpv; ) {
@@ -1601,16 +1543,16 @@ destroy_program_variants(struct st_context *st, struct gl_program *program)
case GL_GEOMETRY_PROGRAM_NV:
{
struct st_geometry_program *stgp =
- (struct st_geometry_program *) program;
- struct st_gp_variant *gpv, **prevPtr = &stgp->variants;
+ (struct st_geometry_program *) target;
+ struct st_basic_variant *gpv, **prevPtr = &stgp->variants;
for (gpv = stgp->variants; gpv; ) {
- struct st_gp_variant *next = gpv->next;
+ struct st_basic_variant *next = gpv->next;
if (gpv->key.st == st) {
/* unlink from list */
*prevPtr = next;
/* destroy this variant */
- delete_gp_variant(st, gpv);
+ delete_basic_variant(st, gpv, stgp->Base.Base.Target);
}
else {
prevPtr = &gpv->next;
@@ -1622,16 +1564,16 @@ destroy_program_variants(struct st_context *st, struct gl_program *program)
case GL_TESS_CONTROL_PROGRAM_NV:
{
struct st_tessctrl_program *sttcp =
- (struct st_tessctrl_program *) program;
- struct st_tcp_variant *tcpv, **prevPtr = &sttcp->variants;
+ (struct st_tessctrl_program *) target;
+ struct st_basic_variant *tcpv, **prevPtr = &sttcp->variants;
for (tcpv = sttcp->variants; tcpv; ) {
- struct st_tcp_variant *next = tcpv->next;
+ struct st_basic_variant *next = tcpv->next;
if (tcpv->key.st == st) {
/* unlink from list */
*prevPtr = next;
/* destroy this variant */
- delete_tcp_variant(st, tcpv);
+ delete_basic_variant(st, tcpv, sttcp->Base.Base.Target);
}
else {
prevPtr = &tcpv->next;
@@ -1643,16 +1585,16 @@ destroy_program_variants(struct st_context *st, struct gl_program *program)
case GL_TESS_EVALUATION_PROGRAM_NV:
{
struct st_tesseval_program *sttep =
- (struct st_tesseval_program *) program;
- struct st_tep_variant *tepv, **prevPtr = &sttep->variants;
+ (struct st_tesseval_program *) target;
+ struct st_basic_variant *tepv, **prevPtr = &sttep->variants;
for (tepv = sttep->variants; tepv; ) {
- struct st_tep_variant *next = tepv->next;
+ struct st_basic_variant *next = tepv->next;
if (tepv->key.st == st) {
/* unlink from list */
*prevPtr = next;
/* destroy this variant */
- delete_tep_variant(st, tepv);
+ delete_basic_variant(st, tepv, sttep->Base.Base.Target);
}
else {
prevPtr = &tepv->next;
@@ -1663,7 +1605,7 @@ destroy_program_variants(struct st_context *st, struct gl_program *program)
break;
default:
_mesa_problem(NULL, "Unexpected program target 0x%x in "
- "destroy_program_variants_cb()", program->Target);
+ "destroy_program_variants_cb()", target->Target);
}
}
@@ -1789,7 +1731,7 @@ st_precompile_shader_variant(struct st_context *st,
case GL_TESS_CONTROL_PROGRAM_NV: {
struct st_tessctrl_program *p = (struct st_tessctrl_program *)prog;
- struct st_tcp_variant_key key;
+ struct st_basic_variant_key key;
memset(&key, 0, sizeof(key));
key.st = st->has_shareable_shaders ? NULL : st;
@@ -1799,7 +1741,7 @@ st_precompile_shader_variant(struct st_context *st,
case GL_TESS_EVALUATION_PROGRAM_NV: {
struct st_tesseval_program *p = (struct st_tesseval_program *)prog;
- struct st_tep_variant_key key;
+ struct st_basic_variant_key key;
memset(&key, 0, sizeof(key));
key.st = st->has_shareable_shaders ? NULL : st;
@@ -1809,7 +1751,7 @@ st_precompile_shader_variant(struct st_context *st,
case GL_GEOMETRY_PROGRAM_NV: {
struct st_geometry_program *p = (struct st_geometry_program *)prog;
- struct st_gp_variant_key key;
+ struct st_basic_variant_key key;
memset(&key, 0, sizeof(key));
key.st = st->has_shareable_shaders ? NULL : st;
diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h
index a74531581b4..80d6f81d267 100644
--- a/src/mesa/state_tracker/st_program.h
+++ b/src/mesa/state_tracker/st_program.h
@@ -171,25 +171,24 @@ struct st_vertex_program
-/** Geometry program variant key */
-struct st_gp_variant_key
+/** Key shared by all shaders except VP, FP */
+struct st_basic_variant_key
{
struct st_context *st; /**< variants are per-context */
- /* no other fields yet */
};
/**
* Geometry program variant.
*/
-struct st_gp_variant
+struct st_basic_variant
{
/* Parameters which generated this variant. */
- struct st_gp_variant_key key;
+ struct st_basic_variant_key key;
void *driver_shader;
- struct st_gp_variant *next;
+ struct st_basic_variant *next;
};
@@ -202,30 +201,7 @@ struct st_geometry_program
struct pipe_shader_state tgsi;
struct glsl_to_tgsi_visitor* glsl_to_tgsi;
- struct st_gp_variant *variants;
-};
-
-
-
-/** Tessellation control program variant key */
-struct st_tcp_variant_key
-{
- struct st_context *st; /**< variants are per-context */
- /* no other fields yet */
-};
-
-
-/**
- * Tessellation control program variant.
- */
-struct st_tcp_variant
-{
- /* Parameters which generated this variant. */
- struct st_tcp_variant_key key;
-
- void *driver_shader;
-
- struct st_tcp_variant *next;
+ struct st_basic_variant *variants;
};
@@ -238,30 +214,7 @@ struct st_tessctrl_program
struct pipe_shader_state tgsi;
struct glsl_to_tgsi_visitor* glsl_to_tgsi;
- struct st_tcp_variant *variants;
-};
-
-
-
-/** Tessellation evaluation program variant key */
-struct st_tep_variant_key
-{
- struct st_context *st; /**< variants are per-context */
- /* no other fields yet */
-};
-
-
-/**
- * Tessellation evaluation program variant.
- */
-struct st_tep_variant
-{
- /* Parameters which generated this variant. */
- struct st_tep_variant_key key;
-
- void *driver_shader;
-
- struct st_tep_variant *next;
+ struct st_basic_variant *variants;
};
@@ -274,7 +227,7 @@ struct st_tesseval_program
struct pipe_shader_state tgsi;
struct glsl_to_tgsi_visitor* glsl_to_tgsi;
- struct st_tep_variant *variants;
+ struct st_basic_variant *variants;
};
@@ -398,20 +351,20 @@ st_get_fp_variant(struct st_context *st,
const struct st_fp_variant_key *key);
-extern struct st_gp_variant *
+extern struct st_basic_variant *
st_get_gp_variant(struct st_context *st,
struct st_geometry_program *stgp,
- const struct st_gp_variant_key *key);
+ const struct st_basic_variant_key *key);
-extern struct st_tcp_variant *
+extern struct st_basic_variant *
st_get_tcp_variant(struct st_context *st,
struct st_tessctrl_program *sttcp,
- const struct st_tcp_variant_key *key);
+ const struct st_basic_variant_key *key);
-extern struct st_tep_variant *
+extern struct st_basic_variant *
st_get_tep_variant(struct st_context *st,
struct st_tesseval_program *sttep,
- const struct st_tep_variant_key *key);
+ const struct st_basic_variant_key *key);
extern void
st_release_vp_variants( struct st_context *st,
@@ -422,16 +375,9 @@ st_release_fp_variants( struct st_context *st,
struct st_fragment_program *stfp );
extern void
-st_release_gp_variants(struct st_context *st,
- struct st_geometry_program *stgp);
-
-extern void
-st_release_tcp_variants(struct st_context *st,
- struct st_tessctrl_program *sttcp);
-
-extern void
-st_release_tep_variants(struct st_context *st,
- struct st_tesseval_program *sttep);
+st_release_basic_variants(struct st_context *st, GLenum target,
+ struct st_basic_variant **variants,
+ struct pipe_shader_state *tgsi);
extern void
st_destroy_program_variants(struct st_context *st);
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-04 23:41:07 +0000