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

gallium: rename st_fragment_program's fs field to cso to match st_vertex_program

Browse Source
This commit is contained in:
Brian
2008-02-12 16:10:11 -07:00
parent 6d53b8f423
commit 9677336845
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,7 +158,7 @@ find_translated_vp(struct st_context *st,
/*
* Translate fragment program if needed.
*/
if (!stfp->fs) {
if (!stfp->cso) {
GLuint inAttr, numIn = 0;
for (inAttr = 0; inAttr < FRAG_ATTRIB_MAX; inAttr++) {
@@ -179,7 +179,7 @@ find_translated_vp(struct st_context *st,
stfp->input_to_slot,
stfp->tokens,
ST_MAX_SHADER_TOKENS);
assert(stfp->fs);
assert(stfp->cso);
}
@@ -227,7 +227,7 @@ find_translated_vp(struct st_context *st,
if (fpInAttrib >= 0) {
GLuint fpInSlot = stfp->input_to_slot[fpInAttrib];
if (fpInSlot != ~0) {
GLuint vpOutSlot = stfp->fs->state.input_map[fpInSlot];
GLuint vpOutSlot = stfp->cso->state.input_map[fpInSlot];
xvp->output_to_slot[outAttr] = vpOutSlot;
numVpOuts++;
}
@@ -300,7 +300,7 @@ update_linkage( struct st_context *st )
st->pipe->bind_vs_state(st->pipe, st->state.vs->cso->data);
st->fp = stfp;
st->state.fs = stfp->fs;
st->state.fs = stfp->cso;
st->pipe->bind_fs_state(st->pipe, st->state.fs->data);
st->vertex_result_to_slot = xvp->output_to_slot;