Merge branch 'master' of github.com:bkaradzic/bimg

This commit is contained in:
Branimir Karadžić
2018-07-11 17:18:31 -07:00
2 changed files with 34 additions and 9 deletions

View File

@@ -50,9 +50,9 @@ namespace nvtt
for (uint32_t blockX = 0; blockX < ZOH::Tile::TILE_W; ++blockX)
{
nv::Vector4 color = srcRgba[blockY*srcRgbaStride + blockX];
zohTile.data[blockY][blockX].x = float(int16_t(bx::halfFromFloat(color.x) ) );
zohTile.data[blockY][blockX].y = float(int16_t(bx::halfFromFloat(color.y) ) );
zohTile.data[blockY][blockX].z = float(int16_t(bx::halfFromFloat(color.z) ) );
zohTile.data[blockY][blockX].x = float(int16_t(bx::halfFromFloat(bx::max(color.x, 0.0f) ) ) );
zohTile.data[blockY][blockX].y = float(int16_t(bx::halfFromFloat(bx::max(color.y, 0.0f) ) ) );
zohTile.data[blockY][blockX].z = float(int16_t(bx::halfFromFloat(bx::max(color.z, 0.0f) ) ) );
}
}