Hash :
96f4f45e
Author :
Date :
2016-09-02T16:20:11
Fix ImageIndexIterator termination. There was an off-by-one error preventing proper iteration. BUG=angleproject:1493 BUG=chromium:638323 Change-Id: I8a3907620a1503d16b039606a67fe3471f88e165 Reviewed-on: https://chromium-review.googlesource.com/380325 Reviewed-by: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Geoff Lang <geofflang@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
//
// 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(static_cast<GLenum>(GL_TEXTURE_2D), nextIndex.type);
EXPECT_EQ(mip, nextIndex.mipIndex);
EXPECT_FALSE(nextIndex.hasLayer());
// Also test current
EXPECT_EQ(current.type, nextIndex.type);
EXPECT_EQ(current.mipIndex, nextIndex.mipIndex);
EXPECT_EQ(current.layerIndex, nextIndex.layerIndex);
}
EXPECT_FALSE(iter.hasNext());
}
TEST(ImageIndexTest, IteratorCube)
{
ImageIndexIterator iter = ImageIndexIterator::MakeCube(0, 4);
ASSERT_GE(0, minMip);
for (GLint mip = minMip; mip < maxMip; mip++)
{
for (GLint layer = 0; layer < 6; layer++)
{
EXPECT_TRUE(iter.hasNext());
ImageIndex nextIndex = iter.next();
GLenum cubeTarget = LayerIndexToCubeMapTextureTarget(layer);
EXPECT_EQ(cubeTarget, nextIndex.type);
EXPECT_EQ(mip, nextIndex.mipIndex);
EXPECT_EQ(layer, nextIndex.layerIndex);
EXPECT_TRUE(nextIndex.hasLayer());
}
}
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(static_cast<GLenum>(GL_TEXTURE_3D), nextIndex.type);
EXPECT_EQ(mip, nextIndex.mipIndex);
EXPECT_EQ(layer, nextIndex.layerIndex);
EXPECT_TRUE(nextIndex.hasLayer());
}
}
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(static_cast<GLenum>(GL_TEXTURE_2D_ARRAY), nextIndex.type);
EXPECT_EQ(mip, nextIndex.mipIndex);
EXPECT_EQ(layer, nextIndex.layerIndex);
EXPECT_TRUE(nextIndex.hasLayer());
}
}
EXPECT_FALSE(iter.hasNext());
}
} // namespace