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

fix bad array indexing in _save_current_init() that caused context state to get clobbered

Browse Source
This commit is contained in:
Brian Paul
2004-04-02 22:07:23 +00:00
parent ff1a015ca8
commit ec38d1c22c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mesa/tnl/t_save_api.c
View File

@@ -444,7 +444,6 @@ static void _save_upgrade_vertex( GLcontext *ctx,
tnl->save.counter = ctx->Const.MaxArrayLockSize; tnl->save.counter = ctx->Const.MaxArrayLockSize;
tnl->save.initial_counter = tnl->save.counter; tnl->save.initial_counter = tnl->save.counter;
/* Recalculate all the attrptr[] values: /* Recalculate all the attrptr[] values:
*/ */
for (i = 0, tmp = tnl->save.vertex ; i < _TNL_ATTRIB_MAX ; i++) { for (i = 0, tmp = tnl->save.vertex ; i < _TNL_ATTRIB_MAX ; i++) {
@@ -460,7 +459,6 @@ static void _save_upgrade_vertex( GLcontext *ctx,
*/ */
_save_copy_from_current( ctx ); _save_copy_from_current( ctx );
/* Replay stored vertices to translate them to new format here. /* Replay stored vertices to translate them to new format here.
* *
* If there are copied vertices and the new (upgraded) attribute * If there are copied vertices and the new (upgraded) attribute
@@ -1534,13 +1532,16 @@ static void _save_current_init( GLcontext *ctx )
GLint i; GLint i;
for (i = 0; i < _TNL_ATTRIB_MAT_FRONT_AMBIENT; i++) { for (i = 0; i < _TNL_ATTRIB_MAT_FRONT_AMBIENT; i++) {
ASSERT(i < VERT_ATTRIB_MAX);
tnl->save.currentsz[i] = &ctx->ListState.ActiveAttribSize[i]; tnl->save.currentsz[i] = &ctx->ListState.ActiveAttribSize[i];
tnl->save.current[i] = ctx->ListState.CurrentAttrib[i]; tnl->save.current[i] = ctx->ListState.CurrentAttrib[i];
} }
for (i = _TNL_ATTRIB_MAT_FRONT_AMBIENT; i < _TNL_ATTRIB_INDEX; i++) { for (i = _TNL_ATTRIB_MAT_FRONT_AMBIENT; i < _TNL_ATTRIB_INDEX; i++) {
tnl->save.currentsz[i] = &ctx->ListState.ActiveMaterialSize[i]; const GLuint j = i - _TNL_ATTRIB_MAT_FRONT_AMBIENT;
tnl->save.current[i] = ctx->ListState.CurrentMaterial[i]; ASSERT(j < MAT_ATTRIB_MAX);
tnl->save.currentsz[i] = &ctx->ListState.ActiveMaterialSize[j];
tnl->save.current[i] = ctx->ListState.CurrentMaterial[j];
} }
tnl->save.currentsz[_TNL_ATTRIB_INDEX] = &ctx->ListState.ActiveIndex; tnl->save.currentsz[_TNL_ATTRIB_INDEX] = &ctx->ListState.ActiveIndex;