ImageIndexIterator_unittest.cpp

Branch :

Show log
Commit
Author : Jamie Madill
Date : 2018-04-12 09:13:18
Hash : cc129377
Message : ImageIndex: Consolidate layer/cube face. In terms of the Texture or Image resource, a cube face refers to a layer of a 2D texture. This layer has a special meaning for cube textures, but it is represented as a layer with a layer index. Cube array textures are no different, they just use a different indexing scheme for the array layers. This also cleans up the ImageIndex helper to have a class structure with private data, and cleans up a few cases to use generic Make functions and iterators where they were setting properties of the index directly. This will make it easier to have ImageIndexes address entire levels of a Cube map in the future, and makes the layer count logic in Vulkan cleaner. Bug: angleproject:2318 Change-Id: Iea9842e233f974a9896282ca224cb001f7882bd1 Reviewed-on: https://chromium-review.googlesource.com/987525 Reviewed-by: Luc Ferron <lucferron@chromium.org> Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/ImageIndexIterator_unittest.cpp

//
// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//

#include "gmock/gmock.h"
#include "gtest/gtest.h"

#include "common/utilities.h"
#include "libANGLE/ImageIndex.h"

using namespace gl;

namespace
{

static const GLint minMip = 0;
static const GLint maxMip = 4;
static const GLint minLayer = 1;
static const GLint maxLayer = 3;

TEST(ImageIndexTest, Iterator2D)
{
    ImageIndexIterator iter = ImageIndexIterator::Make2D(minMip, maxMip);

    ASSERT_GE(0, minMip);

    for (GLint mip = minMip; mip < maxMip; mip++)
    {
        EXPECT_TRUE(iter.hasNext());
        ImageIndex current = iter.current();
        ImageIndex nextIndex = iter.next();

        EXPECT_EQ(TextureType::_2D, nextIndex.getType());
        EXPECT_EQ(TextureTarget::_2D, nextIndex.getTarget());
        EXPECT_EQ(mip, nextIndex.getLevelIndex());
        EXPECT_FALSE(nextIndex.hasLayer());
        EXPECT_FALSE(nextIndex.has3DLayer());

        // Also test current
        EXPECT_EQ(current.getType(), nextIndex.getType());
        EXPECT_EQ(current.getLevelIndex(), nextIndex.getLevelIndex());
        EXPECT_EQ(current.getLayerIndex(), nextIndex.getLayerIndex());
    }

    EXPECT_FALSE(iter.hasNext());
}

TEST(ImageIndexTest, IteratorCube)
{
    ImageIndexIterator iter = ImageIndexIterator::MakeCube(minMip, maxMip);

    ASSERT_GE(0, minMip);

    for (GLint mip = minMip; mip < maxMip; mip++)
    {
        for (TextureTarget target : AllCubeFaceTextureTargets())
        {
            EXPECT_TRUE(iter.hasNext());
            ImageIndex nextIndex = iter.next();

            EXPECT_EQ(TextureType::CubeMap, nextIndex.getType());
            EXPECT_EQ(target, nextIndex.getTarget());
            EXPECT_EQ(mip, nextIndex.getLevelIndex());
            EXPECT_TRUE(nextIndex.hasLayer());
            EXPECT_FALSE(nextIndex.has3DLayer());
        }
    }

    EXPECT_FALSE(iter.hasNext());
}

TEST(ImageIndexTest, Iterator3D)
{
    ImageIndexIterator iter = ImageIndexIterator::Make3D(minMip, maxMip, minLayer, maxLayer);

    ASSERT_GE(0, minMip);

    for (GLint mip = minMip; mip < maxMip; mip++)
    {
        for (GLint layer = minLayer; layer < maxLayer; layer++)
        {
            EXPECT_TRUE(iter.hasNext());
            ImageIndex nextIndex = iter.next();

            EXPECT_EQ(TextureType::_3D, nextIndex.getType());
            EXPECT_EQ(TextureTarget::_3D, nextIndex.getTarget());
            EXPECT_EQ(mip, nextIndex.getLevelIndex());
            EXPECT_EQ(layer, nextIndex.getLayerIndex());
            EXPECT_TRUE(nextIndex.hasLayer());
            EXPECT_TRUE(nextIndex.has3DLayer());
        }
    }

    EXPECT_FALSE(iter.hasNext());
}

TEST(ImageIndexTest, Iterator2DArray)
{
    GLsizei layerCounts[] = { 1, 3, 5, 2 };

    ImageIndexIterator iter = ImageIndexIterator::Make2DArray(minMip, maxMip, layerCounts);

    ASSERT_GE(0, minMip);
    ASSERT_EQ(ArraySize(layerCounts), static_cast<size_t>(maxMip));

    for (GLint mip = minMip; mip < maxMip; mip++)
    {
        for (GLint layer = 0; layer < layerCounts[mip]; layer++)
        {
            EXPECT_TRUE(iter.hasNext());
            ImageIndex nextIndex = iter.next();

            EXPECT_EQ(TextureType::_2DArray, nextIndex.getType());
            EXPECT_EQ(TextureTarget::_2DArray, nextIndex.getTarget());
            EXPECT_EQ(mip, nextIndex.getLevelIndex());
            EXPECT_EQ(layer, nextIndex.getLayerIndex());
            EXPECT_TRUE(nextIndex.hasLayer());
            EXPECT_TRUE(nextIndex.has3DLayer());
        }
    }

    EXPECT_FALSE(iter.hasNext());
}

TEST(ImageIndexTest, LayerIterator2DArray)
{
    GLsizei layerCounts[] = {1, 3, 5, 2};

    ASSERT_GE(0, minMip);
    ASSERT_EQ(ArraySize(layerCounts), static_cast<size_t>(maxMip));

    for (GLint mip = minMip; mip < maxMip; mip++)
    {
        // Make a layer iterator.
        ImageIndex mipImageIndex = ImageIndex::Make2DArray(mip, ImageIndex::kEntireLevel);
        ImageIndexIterator iter  = mipImageIndex.getLayerIterator(layerCounts[mip]);

        for (GLint layer = 0; layer < layerCounts[mip]; layer++)
        {
            EXPECT_TRUE(iter.hasNext());
            ImageIndex nextIndex = iter.next();

            EXPECT_EQ(TextureType::_2DArray, nextIndex.getType());
            EXPECT_EQ(TextureTarget::_2DArray, nextIndex.getTarget());
            EXPECT_EQ(mip, nextIndex.getLevelIndex());
            EXPECT_EQ(layer, nextIndex.getLayerIndex());
            EXPECT_TRUE(nextIndex.hasLayer());
            EXPECT_TRUE(nextIndex.has3DLayer());
            EXPECT_LT(nextIndex.getLayerIndex(), layerCounts[mip]);
        }

        EXPECT_FALSE(iter.hasNext());
    }
}

} // namespace

kc3-lang/angle/src/libANGLE/ImageIndexIterator_unittest.cpp

Commit

kc3-lang/angle /src/libANGLE/ImageIndexIterator_unittest.cpp