[Piglit] [PATCH 6/7] khr_texture_compression_astc: Move image files to 2D directory

[Anuj Phogat]

This will give way to creating a new directory under compressed and
decompressed directory in an upcoming patch.

Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
---
Patch is trimmed to keep the size under limit.
See full patch at: https://github.com/aphogat/piglit.git, branch: review


diff --git a/tests/spec/khr_texture_compression_astc/khr_compressed_astc-miptree-array.c b/tests/spec/khr_texture_compression_astc/khr_compressed_astc-miptree-array.c
index 199924c..0cc0ec8 100644
--- a/tests/spec/khr_texture_compression_astc/khr_compressed_astc-miptree-array.c
+++ b/tests/spec/khr_texture_compression_astc/khr_compressed_astc-miptree-array.c
@@ -193,7 +193,7 @@ test_miptrees(void* odd)
 	for (; subtest < ARRAY_SIZE(tests); ++subtest) {
 
 		/* Load texture for current submode and block size */
-		load_texture("compressed", tests[subtest], cur_file,
+		load_texture("compressed/2D", tests[subtest], cur_file,
 		    &compressed_tex);
 
 		/* Draw and compare each level of the two textures */
diff --git a/tests/spec/khr_texture_compression_astc/khr_compressed_astc-miptree.c b/tests/spec/khr_texture_compression_astc/khr_compressed_astc-miptree.c
index da43cb8..2fdfb28 100644
--- a/tests/spec/khr_texture_compression_astc/khr_compressed_astc-miptree.c
+++ b/tests/spec/khr_texture_compression_astc/khr_compressed_astc-miptree.c
@@ -27,9 +27,9 @@
  *
  * This test is an adaptation of the oes_compressed_etc1_rgb8_textures test.
  *
- * The files under compressed/ contain full miptrees, in the
+ * The files under compressed/2D contain full miptrees, in the
  * GL_*_ASTC_* formats, of a 2D texture of waffles and fruit [1]. The base
- * level size was shrunken to 160x106 pixels. The files under the decompressed
+ * level size was shrunken to 160x106 pixels. The files under the decompressed/2D
  * directory contain the same miptree in GL_RGBA format. Each miplevel was
  * obtained by decompressing the corresponding ASTC texture with astcenc [2].
  *
@@ -292,11 +292,11 @@ test_miptrees(void* input_type)
 		GLuint tex_decompressed = 0;
 
 		/* Load texture for current submode and block size */
-		load_texture("compressed", tests[subtest],
+		load_texture("compressed/2D", tests[subtest],
 				block_dim_str[block_dims],
 				&tex_compressed);
 		if (!check_error) {
-			load_texture("decompressed", tests[subtest],
+			load_texture("decompressed/2D", tests[subtest],
 					block_dim_str[block_dims],
 					&tex_decompressed);
 		}
-- 
2.5.5