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

st/mesa: rename state -> tgsi, updated comments

Browse Source
This commit is contained in:
Brian Paul
2010-02-12 14:46:51 -07:00
parent cd0a32924d
commit b9b4e7724e
6 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/state_tracker/st_atom_shader.c
View File

@@ -59,7 +59,7 @@ static void
translate_fp(struct st_context *st, translate_fp(struct st_context *st,
struct st_fragment_program *stfp) struct st_fragment_program *stfp)
{ {
if (!stfp->state.tokens) { if (!stfp->tgsi.tokens) {
assert(stfp->Base.Base.NumInstructions > 0); assert(stfp->Base.Base.NumInstructions > 0);
st_translate_fragment_program(st, stfp); st_translate_fragment_program(st, stfp);

12
src/mesa/state_tracker/st_cb_program.c
View File

@@ -148,9 +148,9 @@ st_delete_program(GLcontext *ctx, struct gl_program *prog)
stfp->driver_shader = NULL; stfp->driver_shader = NULL;
} }
if (stfp->state.tokens) { if (stfp->tgsi.tokens) {
st_free_tokens(stfp->state.tokens); st_free_tokens(stfp->tgsi.tokens);
stfp->state.tokens = NULL; stfp->tgsi.tokens = NULL;
} }
if (stfp->bitmap_program) { if (stfp->bitmap_program) {
@@ -193,9 +193,9 @@ static GLboolean st_program_string_notify( GLcontext *ctx,
stfp->driver_shader = NULL; stfp->driver_shader = NULL;
} }
if (stfp->state.tokens) { if (stfp->tgsi.tokens) {
st_free_tokens(stfp->state.tokens); st_free_tokens(stfp->tgsi.tokens);
stfp->state.tokens = NULL; stfp->tgsi.tokens = NULL;
} }
if (st->fp == stfp) if (st->fp == stfp)

4
src/mesa/state_tracker/st_debug.c
View File

@@ -87,11 +87,11 @@ st_print_current(void)
#endif #endif
if (st->vp->varients) if (st->vp->varients)
tgsi_dump( st->vp->varients[0].state.tokens, 0 ); tgsi_dump( st->vp->varients[0].tgsi.tokens, 0 );
if (st->vp->Base.Base.Parameters) if (st->vp->Base.Base.Parameters)
_mesa_print_parameter_list(st->vp->Base.Base.Parameters); _mesa_print_parameter_list(st->vp->Base.Base.Parameters);
tgsi_dump( st->fp->state.tokens, 0 ); tgsi_dump( st->fp->tgsi.tokens, 0 );
if (st->fp->Base.Base.Parameters) if (st->fp->Base.Base.Parameters)
_mesa_print_parameter_list(st->fp->Base.Base.Parameters); _mesa_print_parameter_list(st->fp->Base.Base.Parameters);
} }

2
src/mesa/state_tracker/st_draw_feedback.c
View File

@@ -119,7 +119,7 @@ st_feedback_draw_vbo(GLcontext *ctx,
/* must get these after state validation! */ /* must get these after state validation! */
vp = ctx->st->vp; vp = ctx->st->vp;
vs = &st->vp_varient->state; vs = &st->vp_varient->tgsi;
if (!st->vp_varient->draw_shader) { if (!st->vp_varient->draw_shader) {
st->vp_varient->draw_shader = draw_create_vertex_shader(draw, vs); st->vp_varient->draw_shader = draw_create_vertex_shader(draw, vs);

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

@@ -68,8 +68,8 @@ st_vp_release_varients( struct st_context *st,
if (vpv->draw_shader) if (vpv->draw_shader)
draw_delete_vertex_shader( st->draw, vpv->draw_shader ); draw_delete_vertex_shader( st->draw, vpv->draw_shader );
if (vpv->state.tokens) if (vpv->tgsi.tokens)
st_free_tokens(vpv->state.tokens); st_free_tokens(vpv->tgsi.tokens);
FREE( vpv ); FREE( vpv );
@@ -236,13 +236,13 @@ st_translate_vertex_program(struct st_context *st,
if (error) if (error)
goto fail; goto fail;
vpv->state.tokens = ureg_get_tokens( ureg, NULL ); vpv->tgsi.tokens = ureg_get_tokens( ureg, NULL );
if (!vpv->state.tokens) if (!vpv->tgsi.tokens)
goto fail; goto fail;
ureg_destroy( ureg ); ureg_destroy( ureg );
vpv->driver_shader = pipe->create_vs_state(pipe, &vpv->state); vpv->driver_shader = pipe->create_vs_state(pipe, &vpv->tgsi);
if ((ST_DEBUG & DEBUG_TGSI) && (ST_DEBUG & DEBUG_MESA)) { if ((ST_DEBUG & DEBUG_TGSI) && (ST_DEBUG & DEBUG_MESA)) {
_mesa_print_program(&stvp->Base.Base); _mesa_print_program(&stvp->Base.Base);
@@ -250,7 +250,7 @@ st_translate_vertex_program(struct st_context *st,
} }
if (ST_DEBUG & DEBUG_TGSI) { if (ST_DEBUG & DEBUG_TGSI) {
tgsi_dump( vpv->state.tokens, 0 ); tgsi_dump( vpv->tgsi.tokens, 0 );
debug_printf("\n"); debug_printf("\n");
} }
@@ -437,9 +437,9 @@ st_translate_fragment_program(struct st_context *st,
fs_output_semantic_name, fs_output_semantic_name,
fs_output_semantic_index, FALSE ); fs_output_semantic_index, FALSE );
stfp->state.tokens = ureg_get_tokens( ureg, NULL ); stfp->tgsi.tokens = ureg_get_tokens( ureg, NULL );
ureg_destroy( ureg ); ureg_destroy( ureg );
stfp->driver_shader = pipe->create_fs_state(pipe, &stfp->state); stfp->driver_shader = pipe->create_fs_state(pipe, &stfp->tgsi);
if ((ST_DEBUG & DEBUG_TGSI) && (ST_DEBUG & DEBUG_MESA)) { if ((ST_DEBUG & DEBUG_TGSI) && (ST_DEBUG & DEBUG_MESA)) {
_mesa_print_program(&stfp->Base.Base); _mesa_print_program(&stfp->Base.Base);
@@ -447,7 +447,7 @@ st_translate_fragment_program(struct st_context *st,
} }
if (ST_DEBUG & DEBUG_TGSI) { if (ST_DEBUG & DEBUG_TGSI) {
tgsi_dump( stfp->state.tokens, 0/*TGSI_DUMP_VERBOSE*/ ); tgsi_dump( stfp->tgsi.tokens, 0/*TGSI_DUMP_VERBOSE*/ );
debug_printf("\n"); debug_printf("\n");
} }
} }

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

@@ -55,7 +55,7 @@ struct st_fragment_program
ubyte input_semantic_name[PIPE_MAX_SHADER_INPUTS]; ubyte input_semantic_name[PIPE_MAX_SHADER_INPUTS];
ubyte input_semantic_index[PIPE_MAX_SHADER_INPUTS]; ubyte input_semantic_index[PIPE_MAX_SHADER_INPUTS];
struct pipe_shader_state state; struct pipe_shader_state tgsi;
void *driver_shader; void *driver_shader;
/** Program prefixed with glBitmap prologue */ /** Program prefixed with glBitmap prologue */
@@ -82,9 +82,11 @@ struct st_vp_varient
*/ */
struct st_vp_varient_key key; struct st_vp_varient_key key;
/** TGSI tokens -- why? /**
* TGSI tokens (to later generate a 'draw' module shader for
* selection/feedback/rasterpos)
*/ */
struct pipe_shader_state state; struct pipe_shader_state tgsi;
/** Driver's compiled shader */ /** Driver's compiled shader */
void *driver_shader; void *driver_shader;