Allow creation of 3d textures with --depth 1. (KhronosGroup#610)

MarkCallow · web-flow · commit affb48fbe021 · 2022-08-04T10:31:17.000+09:00
Fixes KhronosGroup#609.
diff --git a/lib/texture.c b/lib/texture.c
@@ -138,6 +138,7 @@ ktxTexture_construct(ktxTexture* This, ktxTextureCreateInfo* createInfo,
     if (createInfo->numLayers == 0)
         return KTX_INVALID_VALUE;
     This->numLayers = createInfo->numLayers;
+    This->isArray = createInfo->isArray;
 
     if (createInfo->numFaces == 6) {
         if (This->numDimensions != 2) {
@@ -171,9 +172,6 @@ ktxTexture_construct(ktxTexture* This, ktxTextureCreateInfo* createInfo,
         }
     }
 
-    This->numLayers = createInfo->numLayers;
-    This->isArray = createInfo->isArray;
-
     ktxHashList_Construct(&This->kvDataHead);
     return KTX_SUCCESS;
 }

Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,7 @@ ktxTexture_construct(ktxTexture* This, ktxTextureCreateInfo* createInfo,`
`138`	`138`	`if (createInfo->numLayers == 0)`
`139`	`139`	`return KTX_INVALID_VALUE;`
`140`	`140`	`This->numLayers = createInfo->numLayers;`
	`141`	`+ This->isArray = createInfo->isArray;`
`141`	`142`
`142`	`143`	`if (createInfo->numFaces == 6) {`
`143`	`144`	`if (This->numDimensions != 2) {`
`@@ -171,9 +172,6 @@ ktxTexture_construct(ktxTexture* This, ktxTextureCreateInfo* createInfo,`
`171`	`172`	`}`
`172`	`173`	`}`
`173`	`174`
`174`		`- This->numLayers = createInfo->numLayers;`
`175`		`- This->isArray = createInfo->isArray;`
`176`		`-`
`177`	`175`	`ktxHashList_Construct(&This->kvDataHead);`
`178`	`176`	`return KTX_SUCCESS;`
`179`	`177`	`}`