Merge branch 'scygan_astc_fix' into 'master'
authorPyry Haulos <phaulos@google.com>
Thu, 14 Jan 2016 18:19:41 +0000 (13:19 -0500)
committerPyry Haulos <phaulos@google.com>
Thu, 14 Jan 2016 18:19:41 +0000 (13:19 -0500)
commit808c0f8d819a3fd64706dfba6b9316c027fd06ab
tree535b88f5bf5cb66b974c6a9c9a3d0fb3a4399707
parent71381a2f57cde6102467af742c10fd91620b8cc1
parente53041dc200d3f44b7b0e84f83ca25f288fbc75a
Merge branch 'scygan_astc_fix' into 'master'

pipeline.image.view_type.2d.format.astc: fix compression parameters for  ASTC formats

Looks like there is an error in tcuCompressedTexture.hpp file. Here:
TexDecompressionParams (AstcMode astcMode_ = ASTCMODE_LAST) : astcMode(astcMode_) {}
ASTCMODE_LAST is set instead of ASTCMODE_LDR.

This causes an assert in tcuCompressedTexture.cpp file:
DE_ASSERT(params.astcMode == TexDecompressionParams::ASTCMODE_LDR || params.astcMode == TexDecompressionParams::ASTCMODE_HDR);

See merge request !276
external/vulkancts/modules/vulkan/pipeline/vktPipelineImageUtil.cpp