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

Fix segfault in pipes by dealing with stride == 0 case in generic_interp_extras

Browse Source
This commit is contained in:
Keith Whitwell
2005-01-10 12:30:08 +00:00
parent 8c231d2e28
commit a887a44b2d
1 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/mesa/tnl/t_vertex.c
View File

@@ -1031,22 +1031,30 @@ static void generic_interp_extras( GLcontext *ctx,
{ {
struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb; struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
if (VB->ColorPtr[1]) { /* If stride is zero, ColorPtr[1] is constant across the VB, so
* there is no point interpolating between two values as they will
* be identical. In all other cases, this value is generated by
* t_vb_lighttmp.h and has a stride of 4 dwords.
*/
if (VB->ColorPtr[1] && VB->ColorPtr[1]->stride) {
assert(VB->ColorPtr[1]->stride == 4 * sizeof(GLfloat)); assert(VB->ColorPtr[1]->stride == 4 * sizeof(GLfloat));
INTERP_4F( t, INTERP_4F( t,
VB->ColorPtr[1]->data[dst], VB->ColorPtr[1]->data[dst],
VB->ColorPtr[1]->data[out], VB->ColorPtr[1]->data[out],
VB->ColorPtr[1]->data[in] ); VB->ColorPtr[1]->data[in] );
if (VB->SecondaryColorPtr[1]) {
INTERP_3F( t,
VB->SecondaryColorPtr[1]->data[dst],
VB->SecondaryColorPtr[1]->data[out],
VB->SecondaryColorPtr[1]->data[in] );
}
} }
else if (VB->IndexPtr[1]) {
if (VB->SecondaryColorPtr[1]) {
assert(VB->SecondaryColorPtr[1]->stride == 4 * sizeof(GLfloat));
INTERP_3F( t,
VB->SecondaryColorPtr[1]->data[dst],
VB->SecondaryColorPtr[1]->data[out],
VB->SecondaryColorPtr[1]->data[in] );
}
if (VB->IndexPtr[1]) {
VB->IndexPtr[1]->data[dst][0] = LINTERP( t, VB->IndexPtr[1]->data[dst][0] = LINTERP( t,
VB->IndexPtr[1]->data[out][0], VB->IndexPtr[1]->data[out][0],
VB->IndexPtr[1]->data[in][0] ); VB->IndexPtr[1]->data[in][0] );
@@ -1064,16 +1072,19 @@ static void generic_copy_pv_extras( GLcontext *ctx,
{ {
struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb; struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
if (VB->ColorPtr[1]) { /* See above comment:
*/
if (VB->ColorPtr[1] && VB->ColorPtr[1]->stride) {
COPY_4FV( VB->ColorPtr[1]->data[dst], COPY_4FV( VB->ColorPtr[1]->data[dst],
VB->ColorPtr[1]->data[src] ); VB->ColorPtr[1]->data[src] );
if (VB->SecondaryColorPtr[1]) {
COPY_4FV( VB->SecondaryColorPtr[1]->data[dst],
VB->SecondaryColorPtr[1]->data[src] );
}
} }
else if (VB->IndexPtr[1]) {
if (VB->SecondaryColorPtr[1]) {
COPY_4FV( VB->SecondaryColorPtr[1]->data[dst],
VB->SecondaryColorPtr[1]->data[src] );
}
if (VB->IndexPtr[1]) {
VB->IndexPtr[1]->data[dst][0] = VB->IndexPtr[1]->data[src][0]; VB->IndexPtr[1]->data[dst][0] = VB->IndexPtr[1]->data[src][0];
} }