diff options
author | Maciej Cencora <m.cencora@gmail.com> | 2009-07-05 02:32:51 +0200 |
---|---|---|
committer | Maciej Cencora <m.cencora@gmail.com> | 2009-07-13 19:25:59 +0200 |
commit | f79ef95df4f19124c24e59583bf9fb1e347d8f2b (patch) | |
tree | bcaa77b10d6cd1810072e02daebd748e8dc1eec9 /src/mesa/drivers/dri/r300/r300_context.h | |
parent | df5fe747fa08f63b949ba0fd6628060831b562ec (diff) |
r300: rewrite FOGC and HPOS attribs handling
Rewrite vertex and fragment programs so that we don't have to do any hacks on lower level.
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_context.h')
-rw-r--r-- | src/mesa/drivers/dri/r300/r300_context.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h index 6f99e49050..32104b8158 100644 --- a/src/mesa/drivers/dri/r300/r300_context.h +++ b/src/mesa/drivers/dri/r300/r300_context.h @@ -410,6 +410,8 @@ struct r300_vertex_program { struct r300_vertex_program_key { GLuint FpReads; + GLuint FogAttr; + GLuint WPosAttr; } key; struct r300_vertex_shader_hw_code { @@ -425,7 +427,6 @@ struct r300_vertex_program { int pos_end; int num_temporaries; /* Number of temp vars used by program */ - int wpos_idx; int inputs[VERT_ATTRIB_MAX]; int outputs[VERT_RESULT_MAX]; }; @@ -560,6 +561,11 @@ struct r300_fragment_program { GLuint optimization; struct r300_fragment_program *next; + + /* attribute that we are sending the WPOS in */ + gl_frag_attrib wpos_attr; + /* attribute that we are sending the fog coordinate in */ + gl_frag_attrib fog_attr; }; struct r300_fragment_program_cont { |