Hash :
cc129377
Author :
Date :
2018-04-12T09:13:18
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>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158
//
// 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