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

st/mesa: inline st_prepare_vertex_program

Browse Source 
No other shader stage has a "prepare" function.
This will allow removing some variables from st_vertex_program.

Also, prepare_fragment_program was a dead prototype.

Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Tested-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Marek Olšák
2015-10-03 22:35:22 +02:00
parent c80c19a9d5
commit 4a21edf067
2 changed files with 11 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/mesa/state_tracker/st_program.c
View File

@@ -228,24 +228,25 @@ st_release_tep_variants(struct st_context *st, struct st_tesseval_program *sttep
/** /**
* Translate a Mesa vertex shader into a TGSI shader. * Translate a vertex program to create a new variant.
* \param outputMapping to map vertex program output registers (VARYING_SLOT_x)
* to TGSI output slots
* \param tokensOut destination for TGSI tokens
* \return pointer to cached pipe_shader object.
*/ */
void static struct st_vp_variant *
st_prepare_vertex_program(struct gl_context *ctx, st_translate_vertex_program(struct st_context *st,
struct st_vertex_program *stvp) struct st_vertex_program *stvp,
const struct st_vp_variant_key *key)
{ {
struct st_context *st = st_context(ctx); struct st_vp_variant *vpv = CALLOC_STRUCT(st_vp_variant);
struct pipe_context *pipe = st->pipe;
struct ureg_program *ureg;
enum pipe_error error;
unsigned num_outputs;
GLuint attr; GLuint attr;
stvp->num_inputs = 0; stvp->num_inputs = 0;
stvp->num_outputs = 0; stvp->num_outputs = 0;
if (stvp->Base.IsPositionInvariant) if (stvp->Base.IsPositionInvariant)
_mesa_insert_mvp_code(ctx, &stvp->Base); _mesa_insert_mvp_code(st->ctx, &stvp->Base);
/* /*
* Determine number of inputs, the mappings between VERT_ATTRIB_x * Determine number of inputs, the mappings between VERT_ATTRIB_x
@@ -361,29 +362,9 @@ st_prepare_vertex_program(struct gl_context *ctx,
stvp->result_to_output[VARYING_SLOT_EDGE] = stvp->num_outputs; stvp->result_to_output[VARYING_SLOT_EDGE] = stvp->num_outputs;
stvp->output_semantic_name[stvp->num_outputs] = TGSI_SEMANTIC_EDGEFLAG; stvp->output_semantic_name[stvp->num_outputs] = TGSI_SEMANTIC_EDGEFLAG;
stvp->output_semantic_index[stvp->num_outputs] = 0; stvp->output_semantic_index[stvp->num_outputs] = 0;
}
/**
* Translate a vertex program to create a new variant.
*/
static struct st_vp_variant *
st_translate_vertex_program(struct st_context *st,
struct st_vertex_program *stvp,
const struct st_vp_variant_key *key)
{
struct st_vp_variant *vpv = CALLOC_STRUCT(st_vp_variant);
struct pipe_context *pipe = st->pipe;
struct ureg_program *ureg;
enum pipe_error error;
unsigned num_outputs;
st_prepare_vertex_program(st->ctx, stvp);
if (!stvp->glsl_to_tgsi) if (!stvp->glsl_to_tgsi)
{
_mesa_remove_output_reads(&stvp->Base.Base, PROGRAM_OUTPUT); _mesa_remove_output_reads(&stvp->Base.Base, PROGRAM_OUTPUT);
}
ureg = ureg_create_with_screen(TGSI_PROCESSOR_VERTEX, st->pipe->screen); ureg = ureg_create_with_screen(TGSI_PROCESSOR_VERTEX, st->pipe->screen);
if (ureg == NULL) { if (ureg == NULL) {

10
src/mesa/state_tracker/st_program.h
View File

@@ -414,16 +414,6 @@ st_get_tep_variant(struct st_context *st,
struct st_tesseval_program *stgp, struct st_tesseval_program *stgp,
const struct st_tep_variant_key *key); const struct st_tep_variant_key *key);
extern void
st_prepare_vertex_program(struct gl_context *ctx,
struct st_vertex_program *stvp);
extern GLboolean
st_prepare_fragment_program(struct gl_context *ctx,
struct st_fragment_program *stfp);
extern void extern void
st_release_vp_variants( struct st_context *st, st_release_vp_variants( struct st_context *st,
struct st_vertex_program *stvp ); struct st_vertex_program *stvp );