summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTilman Sauerbeck <tilman@freedesktop.org>2006-06-29 16:48:45 +0000
committerTilman Sauerbeck <tilman@freedesktop.org>2006-06-29 16:48:45 +0000
commitff3a5b1842bf26783a487674c5ff4cb40f405f25 (patch)
treec2f496c0caabff36e50227dd625f84fa15633cde /src
parent8ca6250d724edb74f1ca980e2dcc8a6dfdf073c4 (diff)
instead of messing with _TNL_LAST_GENERIC and _TNL_FIRST_GENERIC, use _TNL_NUM_GENERIC. this fixes an off-by-one error (we didn't handle the final attribute)
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/r300/r300_context.h2
-rw-r--r--src/mesa/drivers/dri/r300/r300_maos.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h
index 0f3683fc09..e1d5b08580 100644
--- a/src/mesa/drivers/dri/r300/r300_context.h
+++ b/src/mesa/drivers/dri/r300/r300_context.h
@@ -544,7 +544,7 @@ struct r300_vap_reg_state {
int i_color[2];
int i_fog;
int i_tex[R300_MAX_TEXTURE_UNITS];
- int i_attrib[_TNL_LAST_GENERIC-_TNL_FIRST_GENERIC];
+ int i_attrib[_TNL_NUM_GENERIC];
int i_index;
int i_pointsize;
};
diff --git a/src/mesa/drivers/dri/r300/r300_maos.c b/src/mesa/drivers/dri/r300/r300_maos.c
index 9cdcb414be..bea58c9a4f 100644
--- a/src/mesa/drivers/dri/r300/r300_maos.c
+++ b/src/mesa/drivers/dri/r300/r300_maos.c
@@ -368,7 +368,7 @@ void r300EmitArrays(GLcontext * ctx, GLboolean immd)
rmesa->state.aos[nr++].aos_reg = prog->inputs[VERT_ATTRIB_TEX0+i];
}
}
- for (i=0;i<(_TNL_LAST_GENERIC-_TNL_FIRST_GENERIC);i++) {
+ for (i = 0; i < _TNL_NUM_GENERIC; i++) {
if (InputsRead & (1<<(VERT_ATTRIB_GENERIC0+i))) {
RENDERINPUTS_SET( inputs_bitset, _TNL_ATTRIB_GENERIC(i) );
rmesa->state.aos[nr++].aos_reg = prog->inputs[VERT_ATTRIB_GENERIC0+i];
@@ -463,7 +463,8 @@ void r300EmitArrays(GLcontext * ctx, GLboolean immd)
r300->state.texture.tc_count++;
}
}
- for (i = 0; i < (_TNL_LAST_GENERIC-_TNL_FIRST_GENERIC); i++) {
+
+ for (i = 0; i < _TNL_NUM_GENERIC; i++) {
if (RENDERINPUTS_TEST( inputs_bitset, _TNL_ATTRIB_GENERIC(i) )) {
CONFIGURE_AOS(i_attrib[i], AOS_FORMAT_FLOAT,
VB->AttribPtr[VERT_ATTRIB_GENERIC0+i],