From: Jarkko Pöyry Date: Thu, 30 Jul 2015 21:43:32 +0000 (+0000) Subject: Merge "Use de::ArrayBuffer in glu::TextureBuffer." X-Git-Tag: upstream/0.1.0~1474 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ca33fc6fd955721e2c3bd8188f049838d5d995d4;p=platform%2Fupstream%2FVK-GL-CTS.git Merge "Use de::ArrayBuffer in glu::TextureBuffer." --- ca33fc6fd955721e2c3bd8188f049838d5d995d4 diff --cc modules/glshared/glsTextureBufferCase.cpp index cb4b35a,5c62626..b7f1f73 --- a/modules/glshared/glsTextureBufferCase.cpp +++ b/modules/glshared/glsTextureBufferCase.cpp @@@ -495,9 -508,10 +501,10 @@@ void modifyMapReadWrite (TestLog& lo glu::TextureBuffer& texture) { const size_t minSize = 4*16; - const size_t size = de::max(minSize, size_t((texture.getSize() != 0 ? texture.getSize() : texture.getBufferSize()) * (0.7 + 0.3 * rng.getFloat()))); + const size_t size = de::max(minSize, size_t((float)(texture.getSize() != 0 ? texture.getSize() : texture.getBufferSize()) * (0.7f + 0.3f * rng.getFloat()))); const size_t minOffset = texture.getOffset(); const size_t offset = minOffset + (rng.getUint32() % (texture.getBufferSize() - (size + minOffset))); + deUint8* const refPtr = (deUint8*)texture.getRefBuffer().getPtr() + offset; vector data; genRandomCoords(rng, data, offset, size);