Scarfski/basis_universal
1
0
Fork 0
mirror of https://github.com/BinomialLLC/basis_universal.git synced 2026-09-30 14:15:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor transcoder update: Adding support for arbitrary output texture row pitches, for usage with the Vulkan rendering API.

Browse Source
This commit is contained in:
Rich Geldreich
2019-05-28 15:41:06 -07:00
parent 5a3da3eb3a
commit c180a087b9
7 changed files with 126 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
basisu_gpu_texture.cpp
View File

@@ -428,7 +428,7 @@ namespace basisu
bool gpu_image::unpack(image& img, bool pvrtc_wrap_addressing) const
{
img.resize(get_width(), get_height());
img.resize(get_pixel_width(), get_pixel_height());
img.set_all(g_black_color);
if (!img.get_width() || !img.get_height())
@@ -549,15 +549,15 @@ namespace basisu
if (!array_index)
{
width = levels[0].get_width();
height = levels[0].get_height();
width = levels[0].get_pixel_width();
height = levels[0].get_pixel_height();
total_levels = (uint32_t)levels.size();
fmt = levels[0].get_format();
}
else
{
if ((width != levels[0].get_width()) ||
(height != levels[0].get_height()) ||
if ((width != levels[0].get_pixel_width()) ||
(height != levels[0].get_pixel_height()) ||
(total_levels != levels.size()))
{
// All cubemap/texture array faces must be the same dimension
@@ -570,8 +570,8 @@ namespace basisu
{
if (level_index)
{
if ( (levels[level_index].get_width() != maximum<uint32_t>(1, levels[0].get_width() >> level_index)) ||
(levels[level_index].get_height() != maximum<uint32_t>(1, levels[0].get_height() >> level_index)) )
if ( (levels[level_index].get_pixel_width() != maximum<uint32_t>(1, levels[0].get_pixel_width() >> level_index)) ||
(levels[level_index].get_pixel_height() != maximum<uint32_t>(1, levels[0].get_pixel_height() >> level_index)) )
{
// Malformed mipmap chain
assert(0);