MAINT-7228 Dummy triangle should use map instead of offset (in case of VBO)

Tue, 14 Nov 2017 19:50:17 +0200

author
andreykproductengine <andreykproductengine@lindenlab.com>
date
Tue, 14 Nov 2017 19:50:17 +0200
changeset 53496
47704c90fb0d
parent 53495
8d8e32d54d15
child 53497
40ca7118765b

MAINT-7228 Dummy triangle should use map instead of offset (in case of VBO)

indra/newview/lldrawpoolavatar.cpp file | annotate | diff | revisions
indra/newview/llvoavatar.cpp file | annotate | diff | revisions
indra/newview/llvotree.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/lldrawpoolavatar.cpp	Tue Nov 14 18:55:36 2017 +0200
     1.2 +++ b/indra/newview/lldrawpoolavatar.cpp	Tue Nov 14 19:50:17 2017 +0200
     1.3 @@ -1494,7 +1494,7 @@
     1.4  			// allocate dummy triangle
     1.5  			buffer->allocateBuffer(1, 3, true);
     1.6  			memset((U8*)buffer->getMappedData(), 0, buffer->getSize());
     1.7 -			memset((U8*)buffer->getIndicesPointer(), 0, buffer->getIndicesSize());
     1.8 +			memset((U8*)buffer->getMappedIndices(), 0, buffer->getIndicesSize());
     1.9  		}
    1.10  	}
    1.11  	else
    1.12 @@ -1508,7 +1508,7 @@
    1.13  			// allocate dummy triangle
    1.14  			buffer->resizeBuffer(1, 3);
    1.15  			memset((U8*)buffer->getMappedData(), 0, buffer->getSize());
    1.16 -			memset((U8*)buffer->getIndicesPointer(), 0, buffer->getIndicesSize());
    1.17 +			memset((U8*)buffer->getMappedIndices(), 0, buffer->getIndicesSize());
    1.18  		}
    1.19  	}
    1.20  
     2.1 --- a/indra/newview/llvoavatar.cpp	Tue Nov 14 18:55:36 2017 +0200
     2.2 +++ b/indra/newview/llvoavatar.cpp	Tue Nov 14 19:50:17 2017 +0200
     2.3 @@ -2094,7 +2094,7 @@
     2.4  					facep->setSize(1, 3);
     2.5  					buff->allocateBuffer(1, 3, true);
     2.6  					memset((U8*) buff->getMappedData(), 0, buff->getSize());
     2.7 -					memset((U8*) buff->getIndicesPointer(), 0, buff->getIndicesSize());
     2.8 +					memset((U8*) buff->getMappedIndices(), 0, buff->getIndicesSize());
     2.9  				}
    2.10  				facep->setVertexBuffer(buff);
    2.11  			}
    2.12 @@ -2114,7 +2114,7 @@
    2.13  						facep->setSize(1, 3);
    2.14  						buff->resizeBuffer(1, 3);
    2.15  						memset((U8*) buff->getMappedData(), 0, buff->getSize());
    2.16 -						memset((U8*) buff->getIndicesPointer(), 0, buff->getIndicesSize());
    2.17 +						memset((U8*) buff->getMappedIndices(), 0, buff->getIndicesSize());
    2.18  					}
    2.19  				}
    2.20  			}
     3.1 --- a/indra/newview/llvotree.cpp	Tue Nov 14 18:55:36 2017 +0200
     3.2 +++ b/indra/newview/llvotree.cpp	Tue Nov 14 19:50:17 2017 +0200
     3.3 @@ -897,7 +897,7 @@
     3.4  			<< index_count << " indices" << LL_ENDL;
     3.5  		buff->allocateBuffer(1, 3, true);
     3.6  		memset((U8*)buff->getMappedData(), 0, buff->getSize());
     3.7 -		memset((U8*)buff->getIndicesPointer(), 0, buff->getIndicesSize());
     3.8 +		memset((U8*)buff->getMappedIndices(), 0, buff->getIndicesSize());
     3.9  		facep->setSize(1, 3);
    3.10  		facep->setVertexBuffer(buff);
    3.11  		mReferenceBuffer->flush();

mercurial