Skip to content

Commit

Permalink
Remove vestiges of obsolete ktxTexture_Create function. (#526)
Browse files Browse the repository at this point in the history
  • Loading branch information
@MarkCallow
MarkCallow authored Jan 30, 2022
1 parent 4f97569 commit c9f68f0
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 26 deletions.
7 changes: 4 additions & 3 deletions include/ktx.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -700,9 +700,10 @@ typedef struct ktxTexture2 {
/**
* @memberof ktxTexture
* @~English
* @brief Structure for passing texture information to ktxTexture[12]_Create().
* @brief Structure for passing texture information to ktxTexture1_Create() and
* ktxTexture2_Create().
*
* @sa ktxTexture_Create()
* @sa ktxTexture1_Create() and ktxTexture2_Create().
*/
typedef struct
{
Expand Down Expand Up @@ -736,7 +737,7 @@ typedef struct
* @~English
* @brief Enum for requesting, or not, allocation of storage for images.
*
* @sa ktxTexture_Create()
* @sa ktxTexture1_Create() and ktxTexture2_Create().
*/
typedef enum {
KTX_TEXTURE_CREATE_NO_STORAGE = 0, /*!< Don't allocate any image storage. */
Expand Down
48 changes: 25 additions & 23 deletions tests/texturetests/texturetests.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,9 @@ class ktxTextureTestBase : public ::testing::Test {
texture->kvDataHead = helper.kvHash_ktx2;
}
if (KTX_SUCCESS != errorCode) {
ADD_FAILURE() << "ktxTexture_Create failed: "
ADD_FAILURE() << "ktxTexture"
<< (fv == KTX_FORMAT_VERSION_ONE ? "1" : "2")
<< "_Create failed: "
<< ktxErrorString(errorCode);
return;
}
Expand Down Expand Up @@ -595,7 +597,7 @@ TEST_F(ktxTexture1_CreateTest, CreateEmpty) {
result = ktxTexture1_Create(&createInfo, KTX_TEXTURE_CREATE_NO_STORAGE,
&texture);
EXPECT_EQ(result, KTX_SUCCESS);
ASSERT_TRUE(texture != NULL) << "ktxTexture_Create failed: "
ASSERT_TRUE(texture != NULL) << "ktxTexture1_Create failed: "
<< ktxErrorString(result);
if (texture)
ktxTexture1_Destroy(texture);
Expand All @@ -617,7 +619,7 @@ TEST_F(ktxTexture1_CreateTest, InvalidOpOnSetImagesNoStorage) {
result = ktxTexture1_Create(&createInfo, KTX_TEXTURE_CREATE_NO_STORAGE,
&texture);
EXPECT_EQ(result, KTX_SUCCESS);
ASSERT_TRUE(texture != NULL) << "ktxTexture_Create failed: "
ASSERT_TRUE(texture != NULL) << "ktxTexture1_Create failed: "
<< ktxErrorString(result);

// Type RGBA UNSIGNED_BYTE -> *4
Expand All @@ -641,7 +643,7 @@ TEST_F(ktxTexture1_CreateTest, CreateEmptyAndSetImages) {
result = ktxTexture1_Create(&createInfo, KTX_TEXTURE_CREATE_ALLOC_STORAGE,
&texture);
EXPECT_EQ(result, KTX_SUCCESS);
ASSERT_TRUE(texture != NULL) << "ktxTexture_Create failed: "
ASSERT_TRUE(texture != NULL) << "ktxTexture1_Create failed: "
<< ktxErrorString(result);

result = helper.copyImagesToTexture(texture);
Expand All @@ -664,7 +666,7 @@ TEST_F(ktxTexture1_CreateTest, CreateEmptySetImagesWriteToMemory) {
result = ktxTexture1_Create(&createInfo, KTX_TEXTURE_CREATE_ALLOC_STORAGE,
&texture);
EXPECT_EQ(result, KTX_SUCCESS);
ASSERT_TRUE(texture != NULL) << "ktxTexture_Create failed: "
ASSERT_TRUE(texture != NULL) << "ktxTexture1_Create failed: "
<< ktxErrorString(result);

snprintf(orientation, sizeof(orientation), KTX_ORIENTATION2_FMT,
Expand Down Expand Up @@ -1238,7 +1240,7 @@ TEST(ktxTexture_calcImageSize, ImageSizeAtEachLevelRGBA2D) {
result = ktxTexture1_Create(&createInfo, KTX_TEXTURE_CREATE_NO_STORAGE,
(ktxTexture1**)&texture);
EXPECT_EQ(result, KTX_SUCCESS);
ASSERT_TRUE(texture != NULL) << "ktxTexture_Create failed: "
ASSERT_TRUE(texture != NULL) << "ktxTexture1_Create failed: "
<< ktxErrorString(result);
for (ktx_uint32_t i = 0; i < createInfo.numLevels; i++) {
ktx_size_t imageSize;
Expand Down Expand Up @@ -1266,7 +1268,7 @@ TEST(ktxTexture_calcImageSize, ImageSizeAtEachLevelRGB2D) {
result = ktxTexture1_Create(&createInfo, KTX_TEXTURE_CREATE_NO_STORAGE,
(ktxTexture1**)&texture);
EXPECT_EQ(result, KTX_SUCCESS);
ASSERT_TRUE(texture != NULL) << "ktxTexture_Create failed: "
ASSERT_TRUE(texture != NULL) << "ktxTexture1_Create failed: "
<< ktxErrorString(result);
for (ktx_uint32_t i = 0; i < createInfo.numLevels; i++) {
ktx_size_t imageSize;
Expand Down Expand Up @@ -1297,7 +1299,7 @@ TEST(ktxTexture_calcLevelSize, SizeOfEachLevelRGBA2D) {
result = ktxTexture1_Create(&createInfo, KTX_TEXTURE_CREATE_NO_STORAGE,
(ktxTexture1**)&texture);
EXPECT_EQ(result, KTX_SUCCESS);
ASSERT_TRUE(texture != NULL) << "ktxTexture_Create failed: "
ASSERT_TRUE(texture != NULL) << "ktxTexture1_Create failed: "
<< ktxErrorString(result);
for (ktx_uint32_t i = 0; i < createInfo.numLevels; i++) {
ktx_size_t levelSize;
Expand Down Expand Up @@ -1325,7 +1327,7 @@ TEST(ktxTexture_calcLevelSize, SizeOfEachLevelRGB2D) {
result = ktxTexture1_Create(&createInfo, KTX_TEXTURE_CREATE_NO_STORAGE,
(ktxTexture1**)&texture);
EXPECT_EQ(result, KTX_SUCCESS);
ASSERT_TRUE(texture != NULL) << "ktxTexture_Create failed: "
ASSERT_TRUE(texture != NULL) << "ktxTexture1_Create failed: "
<< ktxErrorString(result);
for (ktx_uint32_t i = 0; i < createInfo.numLevels; i++) {
ktx_size_t levelSize;
Expand Down Expand Up @@ -1358,12 +1360,12 @@ TEST(ktxTexture_calcLevelOffset, OffsetOfEachLevelRGBA2D) {
result = ktxTexture1_Create(&createInfo, KTX_TEXTURE_CREATE_NO_STORAGE,
&ktx1texture);
EXPECT_EQ(result, KTX_SUCCESS);
ASSERT_TRUE(ktx1texture != NULL) << "ktxTexture_Create failed: "
ASSERT_TRUE(ktx1texture != NULL) << "ktxTexture1_Create failed: "
<< ktxErrorString(result);
result = ktxTexture2_Create(&createInfo, KTX_TEXTURE_CREATE_NO_STORAGE,
&ktx2texture);
EXPECT_EQ(result, KTX_SUCCESS);
ASSERT_TRUE(ktx2texture != NULL) << "ktxTexture_Create failed: "
ASSERT_TRUE(ktx2texture != NULL) << "ktxTexture2_Create failed: "
<< ktxErrorString(result);
for (ktx_uint32_t i = 0; i < createInfo.numLevels; i++) {
ktx_size_t levelOffset;
Expand Down Expand Up @@ -1393,12 +1395,12 @@ TEST(ktxTexture_calcLevelOffset, OffsetOfEachLevelRGB2D) {
result = ktxTexture1_Create(&createInfo, KTX_TEXTURE_CREATE_NO_STORAGE,
&ktx1texture);
EXPECT_EQ(result, KTX_SUCCESS);
ASSERT_TRUE(ktx1texture != NULL) << "ktxTexture_Create failed: "
ASSERT_TRUE(ktx1texture != NULL) << "ktxTexture1_Create failed: "
<< ktxErrorString(result);
result = ktxTexture2_Create(&createInfo, KTX_TEXTURE_CREATE_NO_STORAGE,
&ktx2texture);
EXPECT_EQ(result, KTX_SUCCESS);
ASSERT_TRUE(ktx2texture != NULL) << "ktxTexture_Create failed: "
ASSERT_TRUE(ktx2texture != NULL) << "ktxTexture2_Create failed: "
<< ktxErrorString(result);

for (ktx_uint32_t i = 0; i < createInfo.numLevels; i++) {
Expand Down Expand Up @@ -1427,7 +1429,7 @@ TEST(ktxTexture_GetImageOffsetTest, InvalidOpOnLevelFaceLayerTooBig) {
result = ktxTexture1_Create(&createInfo, KTX_TEXTURE_CREATE_NO_STORAGE,
(ktxTexture1**)&texture);
EXPECT_EQ(result, KTX_SUCCESS);
ASSERT_TRUE(texture != NULL) << "ktxTexture_Create failed: "
ASSERT_TRUE(texture != NULL) << "ktxTexture1_Create failed: "
<< ktxErrorString(result);
EXPECT_EQ(ktxTexture_GetImageOffset(texture, createInfo.numLevels, 0, 0, &offset),
KTX_INVALID_OPERATION);
Expand All @@ -1452,7 +1454,7 @@ TEST(ktxTexture_GetImageOffsetTest, ImageOffsetLevel) {
KTX_TEXTURE_CREATE_NO_STORAGE,
(ktxTexture1**)&texture);
EXPECT_EQ(result, KTX_SUCCESS);
ASSERT_TRUE(texture != NULL) << "ktxTexture_Create failed: "
ASSERT_TRUE(texture != NULL) << "ktxTexture1_Create failed: "
<< ktxErrorString(result);
EXPECT_EQ(ktxTexture_GetImageOffset(texture, 0, 0, 0, &offset),
KTX_SUCCESS);
Expand Down Expand Up @@ -1487,7 +1489,7 @@ TEST(ktxTexture_GetImageOffsetTest, ImageOffsetWithRowPadding) {
result = ktxTexture1_Create(&createInfo, KTX_TEXTURE_CREATE_NO_STORAGE,
(ktxTexture1**)&texture);
EXPECT_EQ(result, KTX_SUCCESS);
ASSERT_TRUE(texture != NULL) << "ktxTexture_Create failed: "
ASSERT_TRUE(texture != NULL) << "ktxTexture1_Create failed: "
<< ktxErrorString(result);
rowBytes = 9 * 3;
rowRounding = ROUNDING(rowBytes);
Expand Down Expand Up @@ -1529,7 +1531,7 @@ TEST(ktxTexture_GetImageOffsetTest, ImageOffsetArray) {
result = ktxTexture1_Create(&createInfo, KTX_TEXTURE_CREATE_NO_STORAGE,
(ktxTexture1**)&texture);
EXPECT_EQ(result, KTX_SUCCESS);
ASSERT_TRUE(texture != NULL) << "ktxTexture_Create failed: "
ASSERT_TRUE(texture != NULL) << "ktxTexture1_Create failed: "
<< ktxErrorString(result);
rowBytes = 9 * 3;
rowRounding = ROUNDING(rowBytes);
Expand Down Expand Up @@ -1570,7 +1572,7 @@ TEST(ktxTexture_GetImageOffsetTest, ImageOffsetFace) {
result = ktxTexture1_Create(&createInfo, KTX_TEXTURE_CREATE_NO_STORAGE,
(ktxTexture1**)&texture);
EXPECT_EQ(result, KTX_SUCCESS);
ASSERT_TRUE(texture != NULL) << "ktxTexture_Create failed: "
ASSERT_TRUE(texture != NULL) << "ktxTexture1_Create failed: "
<< ktxErrorString(result);
rowBytes = 9 * 3;
rowRounding = ROUNDING(rowBytes);
Expand Down Expand Up @@ -1612,7 +1614,7 @@ TEST(ktxTexture_GetImageOffsetTest, ImageOffsetArrayFace) {
result = ktxTexture1_Create(&createInfo, KTX_TEXTURE_CREATE_NO_STORAGE,
(ktxTexture1**)&texture);
EXPECT_EQ(result, KTX_SUCCESS);
ASSERT_TRUE(texture != NULL) << "ktxTexture_Create failed: "
ASSERT_TRUE(texture != NULL) << "ktxTexture1_Create failed: "
<< ktxErrorString(result);
rowBytes = 9 * 3;
rowRounding = ROUNDING(rowBytes);
Expand Down Expand Up @@ -1757,7 +1759,7 @@ class ktxTexture1WriteKTX2TestBase
KTX_TEXTURE_CREATE_ALLOC_STORAGE,
&texture);
EXPECT_EQ(result, KTX_SUCCESS);
ASSERT_TRUE(texture != NULL) << "ktxTexture_Create failed: "
ASSERT_TRUE(texture != NULL) << "ktxTexture1_Create failed: "
<< ktxErrorString(result);

if (writeOrientationMeta) {
Expand Down Expand Up @@ -1869,7 +1871,7 @@ class ktxTexture1WriteKTX2TestBase
KTX_TEXTURE_CREATE_ALLOC_STORAGE,
&texture);
EXPECT_EQ(result, KTX_SUCCESS);
ASSERT_TRUE(texture != NULL) << "ktxTexture_Create failed: "
ASSERT_TRUE(texture != NULL) << "ktxTexture1_Create failed: "
<< ktxErrorString(result);

ktxHashList* hl;
Expand Down Expand Up @@ -2107,7 +2109,7 @@ class ktxTexture2ReadTestBase
KTX_TEXTURE_CREATE_ALLOC_STORAGE,
&texture);
EXPECT_EQ(result, KTX_SUCCESS);
ASSERT_TRUE(texture != NULL) << "ktxTexture_Create failed: "
ASSERT_TRUE(texture != NULL) << "ktxTexture1_Create failed: "
<< ktxErrorString(result);

// Reminder: this is for the KTX 1 texture we have just created.
Expand All @@ -2126,7 +2128,7 @@ class ktxTexture2ReadTestBase
result = ktxTexture1_WriteKTX2ToMemory(texture,
&ktx2MemFile,
&ktx2MemFileLen);
ASSERT_TRUE(result == KTX_SUCCESS) << "ktxTexture_WriteKTX2ToMemory failed: "
ASSERT_TRUE(result == KTX_SUCCESS) << "ktxTexture1_WriteKTX2ToMemory failed: "
<< ktxErrorString(result);
fileHeader = (KTX_header2*)ktx2MemFile;
levelIndex = (ktxLevelIndexEntry*)(ktx2MemFile + sizeof(KTX_header2));
Expand Down

0 comments on commit c9f68f0

Please sign in to comment.