[Piglit] [PATCH 3/4] tests: Add miptree tests for KHR_texture_compression_astc_{ldr, hdr}
Nanley Chery
nanleychery at gmail.com
Thu Jul 30 10:47:04 PDT 2015
From: Nanley Chery <nanley.g.chery at intel.com>
These tests run through every ASTC configuration, comparing the
render of a compressed texture against a render of the decompressed
version of that compressed texture. The compressed and decompressed
texture was generated with a reference codec.
Signed-off-by: Nanley Chery <nanley.g.chery at intel.com>
---
The ASTC binaries are omitted, but can be found here:
http://cgit.freedesktop.org/~nchery/piglit/log/?h=astc
tests/all.py | 6 +
tests/spec/CMakeLists.txt | 1 +
.../khr_texture_compression_astc/CMakeLists.gl.txt | 14 +
.../CMakeLists.gles2.txt | 8 +
.../khr_texture_compression_astc/CMakeLists.txt | 1 +
.../compressed/hdr/waffles-10x10.ktx | Bin 0 -> 4000 bytes
.../compressed/hdr/waffles-10x5.ktx | Bin 0 -> 7696 bytes
.../compressed/hdr/waffles-10x6.ktx | Bin 0 -> 6336 bytes
.../compressed/hdr/waffles-10x8.ktx | Bin 0 -> 4960 bytes
.../compressed/hdr/waffles-12x10.ktx | Bin 0 -> 3552 bytes
.../compressed/hdr/waffles-12x12.ktx | Bin 0 -> 2992 bytes
.../compressed/hdr/waffles-4x4.ktx | Bin 0 -> 23456 bytes
.../compressed/hdr/waffles-5x4.ktx | Bin 0 -> 18768 bytes
.../compressed/hdr/waffles-5x5.ktx | Bin 0 -> 15248 bytes
.../compressed/hdr/waffles-6x5.ktx | Bin 0 -> 13040 bytes
.../compressed/hdr/waffles-6x6.ktx | Bin 0 -> 10720 bytes
.../compressed/hdr/waffles-8x5.ktx | Bin 0 -> 9632 bytes
.../compressed/hdr/waffles-8x6.ktx | Bin 0 -> 7920 bytes
.../compressed/hdr/waffles-8x8.ktx | Bin 0 -> 6192 bytes
.../compressed/ldrl/waffles-10x10.ktx | Bin 0 -> 4000 bytes
.../compressed/ldrl/waffles-10x5.ktx | Bin 0 -> 7696 bytes
.../compressed/ldrl/waffles-10x6.ktx | Bin 0 -> 6336 bytes
.../compressed/ldrl/waffles-10x8.ktx | Bin 0 -> 4960 bytes
.../compressed/ldrl/waffles-12x10.ktx | Bin 0 -> 3552 bytes
.../compressed/ldrl/waffles-12x12.ktx | Bin 0 -> 2992 bytes
.../compressed/ldrl/waffles-4x4.ktx | Bin 0 -> 23456 bytes
.../compressed/ldrl/waffles-5x4.ktx | Bin 0 -> 18768 bytes
.../compressed/ldrl/waffles-5x5.ktx | Bin 0 -> 15248 bytes
.../compressed/ldrl/waffles-6x5.ktx | Bin 0 -> 13040 bytes
.../compressed/ldrl/waffles-6x6.ktx | Bin 0 -> 10720 bytes
.../compressed/ldrl/waffles-8x5.ktx | Bin 0 -> 9632 bytes
.../compressed/ldrl/waffles-8x6.ktx | Bin 0 -> 7920 bytes
.../compressed/ldrl/waffles-8x8.ktx | Bin 0 -> 6192 bytes
.../compressed/ldrs/waffles-10x10.ktx | Bin 0 -> 4000 bytes
.../compressed/ldrs/waffles-10x5.ktx | Bin 0 -> 7696 bytes
.../compressed/ldrs/waffles-10x6.ktx | Bin 0 -> 6336 bytes
.../compressed/ldrs/waffles-10x8.ktx | Bin 0 -> 4960 bytes
.../compressed/ldrs/waffles-12x10.ktx | Bin 0 -> 3552 bytes
.../compressed/ldrs/waffles-12x12.ktx | Bin 0 -> 2992 bytes
.../compressed/ldrs/waffles-4x4.ktx | Bin 0 -> 23456 bytes
.../compressed/ldrs/waffles-5x4.ktx | Bin 0 -> 18768 bytes
.../compressed/ldrs/waffles-5x5.ktx | Bin 0 -> 15248 bytes
.../compressed/ldrs/waffles-6x5.ktx | Bin 0 -> 13040 bytes
.../compressed/ldrs/waffles-6x6.ktx | Bin 0 -> 10720 bytes
.../compressed/ldrs/waffles-8x5.ktx | Bin 0 -> 9632 bytes
.../compressed/ldrs/waffles-8x6.ktx | Bin 0 -> 7920 bytes
.../compressed/ldrs/waffles-8x8.ktx | Bin 0 -> 6192 bytes
.../decompressed/hdr/waffles-10x10.ktx | Bin 0 -> 135572 bytes
.../decompressed/hdr/waffles-10x5.ktx | Bin 0 -> 135572 bytes
.../decompressed/hdr/waffles-10x6.ktx | Bin 0 -> 135572 bytes
.../decompressed/hdr/waffles-10x8.ktx | Bin 0 -> 135572 bytes
.../decompressed/hdr/waffles-12x10.ktx | Bin 0 -> 135572 bytes
.../decompressed/hdr/waffles-12x12.ktx | Bin 0 -> 135572 bytes
.../decompressed/hdr/waffles-4x4.ktx | Bin 0 -> 135572 bytes
.../decompressed/hdr/waffles-5x4.ktx | Bin 0 -> 135572 bytes
.../decompressed/hdr/waffles-5x5.ktx | Bin 0 -> 135572 bytes
.../decompressed/hdr/waffles-6x5.ktx | Bin 0 -> 135572 bytes
.../decompressed/hdr/waffles-6x6.ktx | Bin 0 -> 135572 bytes
.../decompressed/hdr/waffles-8x5.ktx | Bin 0 -> 135572 bytes
.../decompressed/hdr/waffles-8x6.ktx | Bin 0 -> 135572 bytes
.../decompressed/hdr/waffles-8x8.ktx | Bin 0 -> 135572 bytes
.../decompressed/ldrl/waffles-10x10.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrl/waffles-10x5.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrl/waffles-10x6.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrl/waffles-10x8.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrl/waffles-12x10.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrl/waffles-12x12.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrl/waffles-4x4.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrl/waffles-5x4.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrl/waffles-5x5.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrl/waffles-6x5.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrl/waffles-6x6.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrl/waffles-8x5.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrl/waffles-8x6.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrl/waffles-8x8.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrs/waffles-10x10.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrs/waffles-10x5.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrs/waffles-10x6.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrs/waffles-10x8.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrs/waffles-12x10.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrs/waffles-12x12.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrs/waffles-4x4.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrs/waffles-5x4.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrs/waffles-5x5.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrs/waffles-6x5.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrs/waffles-6x6.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrs/waffles-8x5.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrs/waffles-8x6.ktx | Bin 0 -> 67848 bytes
.../decompressed/ldrs/waffles-8x8.ktx | Bin 0 -> 67848 bytes
.../khr_compressed_astc-miptree.c | 356 +++++++++++++++++++++
90 files changed, 386 insertions(+)
create mode 100644 tests/spec/khr_texture_compression_astc/CMakeLists.gl.txt
create mode 100644 tests/spec/khr_texture_compression_astc/CMakeLists.gles2.txt
create mode 100644 tests/spec/khr_texture_compression_astc/CMakeLists.txt
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/hdr/waffles-10x10.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/hdr/waffles-10x5.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/hdr/waffles-10x6.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/hdr/waffles-10x8.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/hdr/waffles-12x10.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/hdr/waffles-12x12.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/hdr/waffles-4x4.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/hdr/waffles-5x4.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/hdr/waffles-5x5.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/hdr/waffles-6x5.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/hdr/waffles-6x6.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/hdr/waffles-8x5.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/hdr/waffles-8x6.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/hdr/waffles-8x8.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrl/waffles-10x10.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrl/waffles-10x5.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrl/waffles-10x6.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrl/waffles-10x8.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrl/waffles-12x10.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrl/waffles-12x12.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrl/waffles-4x4.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrl/waffles-5x4.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrl/waffles-5x5.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrl/waffles-6x5.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrl/waffles-6x6.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrl/waffles-8x5.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrl/waffles-8x6.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrl/waffles-8x8.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrs/waffles-10x10.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrs/waffles-10x5.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrs/waffles-10x6.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrs/waffles-10x8.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrs/waffles-12x10.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrs/waffles-12x12.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrs/waffles-4x4.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrs/waffles-5x4.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrs/waffles-5x5.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrs/waffles-6x5.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrs/waffles-6x6.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrs/waffles-8x5.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrs/waffles-8x6.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/compressed/ldrs/waffles-8x8.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/hdr/waffles-10x10.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/hdr/waffles-10x5.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/hdr/waffles-10x6.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/hdr/waffles-10x8.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/hdr/waffles-12x10.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/hdr/waffles-12x12.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/hdr/waffles-4x4.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/hdr/waffles-5x4.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/hdr/waffles-5x5.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/hdr/waffles-6x5.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/hdr/waffles-6x6.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/hdr/waffles-8x5.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/hdr/waffles-8x6.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/hdr/waffles-8x8.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrl/waffles-10x10.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrl/waffles-10x5.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrl/waffles-10x6.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrl/waffles-10x8.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrl/waffles-12x10.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrl/waffles-12x12.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrl/waffles-4x4.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrl/waffles-5x4.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrl/waffles-5x5.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrl/waffles-6x5.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrl/waffles-6x6.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrl/waffles-8x5.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrl/waffles-8x6.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrl/waffles-8x8.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrs/waffles-10x10.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrs/waffles-10x5.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrs/waffles-10x6.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrs/waffles-10x8.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrs/waffles-12x10.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrs/waffles-12x12.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrs/waffles-4x4.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrs/waffles-5x4.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrs/waffles-5x5.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrs/waffles-6x5.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrs/waffles-6x6.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrs/waffles-8x5.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrs/waffles-8x6.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/decompressed/ldrs/waffles-8x8.ktx
create mode 100644 tests/spec/khr_texture_compression_astc/khr_compressed_astc-miptree.c
diff --git a/tests/all.py b/tests/all.py
index 3106c33..9945766 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -4136,6 +4136,12 @@ with profile.group_manager(
g(['oes_compressed_etc1_rgb8_texture-miptree'], 'miptree')
with profile.group_manager(
+ PiglitGLTest,
+ grouptools.join('spec', 'khr_texture_compression_astc')) as g:
+ g(['khr_compressed_astc-miptree_gl'], 'miptree-gl')
+ g(['khr_compressed_astc-miptree_gles2'], 'miptree-gles')
+
+with profile.group_manager(
PiglitGLTest,
grouptools.join('spec', 'oes_compressed_paletted_texture')) as g:
g(['oes_compressed_paletted_texture-api'], 'basic API')
diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt
index 0ed7aa3..7ae4816 100644
--- a/tests/spec/CMakeLists.txt
+++ b/tests/spec/CMakeLists.txt
@@ -11,6 +11,7 @@ add_subdirectory (arb_compute_shader)
add_subdirectory (arb_cull_distance)
add_subdirectory (arb_debug_output)
add_subdirectory (khr_debug)
+add_subdirectory (khr_texture_compression_astc)
add_subdirectory (arb_depth_clamp)
add_subdirectory (arb_draw_indirect)
add_subdirectory (arb_draw_instanced)
diff --git a/tests/spec/khr_texture_compression_astc/CMakeLists.gl.txt b/tests/spec/khr_texture_compression_astc/CMakeLists.gl.txt
new file mode 100644
index 0000000..a47c7d3
--- /dev/null
+++ b/tests/spec/khr_texture_compression_astc/CMakeLists.gl.txt
@@ -0,0 +1,14 @@
+include_directories(
+ ${GLEXT_INCLUDE_DIR}
+ ${OPENGL_INCLUDE_PATH}
+)
+
+link_libraries (
+ piglitutil_${piglit_target_api}
+ ${OPENGL_gl_LIBRARY}
+ ${OPENGL_glu_LIBRARY}
+)
+
+piglit_add_executable(khr_compressed_astc-miptree_${piglit_target_api} khr_compressed_astc-miptree.c)
+
+# vim: ft=cmake:
diff --git a/tests/spec/khr_texture_compression_astc/CMakeLists.gles2.txt b/tests/spec/khr_texture_compression_astc/CMakeLists.gles2.txt
new file mode 100644
index 0000000..047b8ac
--- /dev/null
+++ b/tests/spec/khr_texture_compression_astc/CMakeLists.gles2.txt
@@ -0,0 +1,8 @@
+include_directories(
+ ${GLEXT_INCLUDE_DIR}
+ ${OPENGL_INCLUDE_PATH}
+)
+link_libraries(piglitutil_${piglit_target_api})
+piglit_add_executable(khr_compressed_astc-miptree_${piglit_target_api} khr_compressed_astc-miptree.c)
+
+# vim: ft=cmake:
diff --git a/tests/spec/khr_texture_compression_astc/CMakeLists.txt b/tests/spec/khr_texture_compression_astc/CMakeLists.txt
new file mode 100644
index 0000000..144a306
--- /dev/null
+++ b/tests/spec/khr_texture_compression_astc/CMakeLists.txt
@@ -0,0 +1 @@
+piglit_include_target_api()
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
new file mode 100644
index 0000000..d6331fb
--- /dev/null
+++ b/tests/spec/khr_texture_compression_astc/khr_compressed_astc-miptree.c
@@ -0,0 +1,356 @@
+/*
+ * Copyright 2015 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file
+ * \brief Test texturing from an ASTC miptree of a real image.
+ *
+ * This test is an adaptation of the oes_compressed_etc1_rgb8_textures test.
+ *
+ * This test uses eighty-four data files. The files under compressed contain
+ * full miptrees, in the GL_*_ASTC_* formats, of a 2D texture of waffles and
+ * fruit [1]. The base level size is 160x106 pixels. The files under the
+ * decompressed directory contain the same miptree in GL_RGBA format. Each
+ * miplevel was obtained by decompressing the corresponding ASTC texture with
+ * astcenc [2]. The reference compressor was modified to create void-extent
+ * sRGB blocks by shifting the UNORM16 value to the right 8 places.
+ *
+ * This test draws each miplevel i of the ASTC texture such that the image's
+ * lower left corner is at (x=0, y=sum(height of miplevel j for j=0 to i-1)),
+ * and it draws each miplevel of the RGB texture to the right of its
+ * corresponding ASTC image. Then it compares that the images are identical.
+ *
+ * [1] The reference image is located at http://people.freedesktop.org/~chadversary/permalink/2012-07-09/1574cff2-d091-4421-a3cf-b56c7943d060.jpg.
+ * [2] astcenc is the reference ASTC compression tool, available at http://malideveloper.arm.com/develop-for-mali/tools/software-tools/astc-evaluation-codec/.
+ */
+
+#include "piglit-util-gl.h"
+#include "piglit_ktx.h"
+
+#define num_levels 8
+#define level0_width 160
+#define level0_height 106
+
+#define num_vertices 4
+
+static GLuint prog;
+
+static struct piglit_gl_test_config *piglit_config;
+
+
+/**
+ * The \a filename is relative to the current test's source directory.
+ *
+ * A new texture is created and returned in \a tex_name.
+ */
+static void
+load_texture(const char *dir1, const char *dir2,
+ const char *filename, GLuint *tex_name)
+{
+ struct piglit_ktx *ktx;
+ const struct piglit_ktx_info *info;
+ char filepath[4096];
+ bool ok = true;
+
+ piglit_join_paths(filepath, sizeof(filepath), 7,
+ piglit_source_dir(),
+ "tests",
+ "spec",
+ "khr_texture_compression_astc",
+ dir1,
+ dir2,
+ filename);
+
+ ktx = piglit_ktx_read_file(filepath);
+ if (ktx == NULL)
+ piglit_report_result(PIGLIT_FAIL);
+
+ info = piglit_ktx_get_info(ktx);
+ assert(info->num_miplevels == num_levels);
+ assert(info->target == GL_TEXTURE_2D);
+ assert(info->pixel_width == level0_width);
+ assert(info->pixel_height== level0_height);
+
+ *tex_name = 0;
+ ok = piglit_ktx_load_texture(ktx, tex_name, NULL);
+ if (!ok)
+ piglit_report_result(PIGLIT_FAIL);
+
+ piglit_ktx_destroy(ktx);
+}
+
+/** Compares the compressed texture against the decompressed texture */
+bool draw_compare_levels(bool check_error,
+ GLint level_pixel_size_loc, GLint pixel_offset_loc,
+ GLuint compressed_tex, GLuint decompressed_tex)
+{
+ /* Fully-saturated magenta */
+ static const float error_color[4] = {1.0, 0.0, 1.0, 1.0};
+
+ unsigned y = 0;
+ unsigned x = 0;
+ bool pass = true;
+ int level = 0;
+
+ for (; level < num_levels; ++level) {
+ int w = level0_width >> level;
+ int h = level0_height >> level;
+ glUniform2f(level_pixel_size_loc, (float) w, (float) h);
+
+
+ /* Draw miplevel of compressed texture. */
+ glBindTexture(GL_TEXTURE_2D, compressed_tex);
+ glUniform2f(pixel_offset_loc, x, y);
+ glDrawArrays(GL_TRIANGLE_FAN, 0, num_vertices);
+
+ /* Draw miplevel of decompressed texture. */
+ if (!check_error) {
+ glBindTexture(GL_TEXTURE_2D, decompressed_tex);
+ glUniform2f(pixel_offset_loc, level0_width + x, y);
+ glDrawArrays(GL_TRIANGLE_FAN, 0, num_vertices);
+ }
+
+ /* Check the textures (or error-colors) for equivalence. */
+ if (pass) {
+ if (check_error) {
+ pass = piglit_probe_rect_rgba(x, y, w, h,
+ error_color);
+ } else {
+ pass = piglit_probe_rects_equal(x, y,
+ level0_width + x, y,
+ w, h, GL_RGBA);
+ }
+
+ if (!pass)
+ piglit_loge("Miplevel %d", level);
+ }
+
+ /* Update the next miplevel arrangement */
+ if (level == 1)
+ x += w;
+ else
+ y += h;
+ }
+
+ /* Delete bound textures */
+ glDeleteTextures(1, &compressed_tex);
+ glDeleteTextures(1, &decompressed_tex);
+
+ piglit_present_results();
+ return pass;
+}
+
+enum piglit_result
+test_miptrees(void* hdr_test)
+{
+ /* Texture objects. */
+ GLuint compressed_tex;
+ GLuint decompressed_tex;
+
+ int subtest = 0;
+ static const char * tests[3] = {"ldrl", "ldrs", "hdr"};
+ static const char * block_dim_str[14] = {
+ "4x4",
+ "5x4",
+ "5x5",
+ "6x5",
+ "6x6",
+ "8x5",
+ "8x6",
+ "8x8",
+ "10x5",
+ "10x6",
+ "10x8",
+ "10x10",
+ "12x10",
+ "12x12"
+ };
+
+ /* Skip if on an HDR system not running the HDR test
+ * or if on an LDR system running the HDR test.
+ */
+ static const char * hdr_str = "GL_KHR_texture_compression_astc_hdr";
+ bool hdr_sys = piglit_is_extension_supported(hdr_str);
+ if (hdr_sys != (bool)hdr_test)
+ return PIGLIT_SKIP;
+
+ GLint pixel_offset_loc = glGetUniformLocation(prog, "pixel_offset");
+ GLint level_pixel_size_loc = glGetUniformLocation(prog,
+ "level_pixel_size");
+
+ /* Test each submode */
+ for (; subtest < ARRAY_SIZE(tests); ++subtest) {
+
+ /* Check for error color if an LDR-only sys reading an HDR
+ * texture. No need to draw a reference mipmap in this case.
+ */
+ int check_error = !hdr_sys && subtest == 2;
+ int block_dims = 0;
+ for (; block_dims < ARRAY_SIZE(block_dim_str); ++block_dims) {
+ glClear(GL_COLOR_BUFFER_BIT);
+
+ /* Generate filename for compressed texture */
+ char cur_file[20];
+ snprintf(cur_file, sizeof(cur_file), "waffles-%s.ktx",
+ block_dim_str[block_dims]);
+
+ /* Load texture for current submode and block size */
+ load_texture("compressed", tests[subtest], cur_file,
+ &compressed_tex);
+ if (!check_error)
+ load_texture("decompressed", tests[subtest],
+ cur_file, &decompressed_tex);
+
+ /* Draw and compare each level of the two textures */
+ if (!draw_compare_levels(check_error,
+ level_pixel_size_loc,
+ pixel_offset_loc,
+ compressed_tex,
+ decompressed_tex)) {
+ piglit_loge("Mode %s Block %s.",
+ tests[subtest],
+ block_dim_str[block_dims]);
+ return PIGLIT_FAIL;
+ }
+ }
+ }
+ return PIGLIT_PASS;
+}
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+ piglit_config = &config;
+ config.supports_gl_compat_version = 11;
+ config.supports_gl_es_version = 10;
+
+ config.window_width = 2 * level0_width;
+ config.window_height = level0_height + (level0_height >> 1);
+ config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+
+ config.subtests = (struct piglit_subtest[]) {
+ {
+ "LDR Profile",
+ "ldr",
+ test_miptrees,
+ false
+ },
+ {
+ "HDR Profile",
+ "hdr",
+ test_miptrees,
+ true
+ },
+ {NULL},
+ };
+
+PIGLIT_GL_TEST_CONFIG_END
+
+void
+piglit_init(int argc, char **argv)
+{
+ static const char vs_source[] =
+ "#version 100\n"
+ "\n"
+ "uniform vec2 window_pixel_size;\n"
+ "uniform vec2 level_pixel_size;\n"
+ "uniform vec2 pixel_offset;\n"
+ "\n"
+ "// vertex is some corner of the unit square [0,1]^2 \n"
+ "attribute vec2 vertex;\n"
+ "varying vec2 tex_coord;\n"
+ "\n"
+ "void main()\n"
+ "{\n"
+ " vec2 pos = vertex;\n"
+ " pos *= level_pixel_size;\n"
+ " pos += pixel_offset;\n"
+ " pos /= 0.5 * window_pixel_size;\n"
+ " pos -= vec2(1, 1);\n"
+ " gl_Position = vec4(pos.xy, 0.0, 1.0);\n"
+ "\n"
+ " tex_coord = vertex;\n"
+ "}\n";
+
+ static const char fs_source[] =
+ "#version 100\n"
+ "precision highp float;\n"
+ "\n"
+ "uniform sampler2D tex;\n"
+ "varying vec2 tex_coord;\n"
+ "\n"
+ "void main()\n"
+ "{\n"
+ " vec4 t = texture2D(tex, tex_coord);\n"
+ " gl_FragColor = vec4(t.rgb, 1.0);\n"
+ "}\n";
+
+ /* Vertices to draw a square triangle strip. */
+ static const GLfloat vertices[2 * num_vertices] = {
+ 0, 0,
+ 1, 0,
+ 1, 1,
+ 0, 1,
+ };
+
+ GLint vertex_loc;
+ GLuint vertex_buf;
+ GLuint vao;
+
+ piglit_require_extension("GL_KHR_texture_compression_astc_ldr");
+
+ glClearColor(0.9098, 0.8314, 0.7843, 1.0);
+ glViewport(0, 0, piglit_width, piglit_height);
+
+ glGenBuffers(1, &vertex_buf);
+ glBindBuffer(GL_ARRAY_BUFFER, vertex_buf);
+
+ glGenVertexArrays(1, &vao);
+ glBindVertexArray(vao);
+
+ prog = piglit_build_simple_program(vs_source, fs_source);
+ glReleaseShaderCompiler();
+ glUseProgram(prog);
+
+ vertex_loc = glGetAttribLocation(prog, "vertex");
+ glEnableVertexAttribArray(vertex_loc);
+ glVertexAttribPointer(vertex_loc, 2, GL_FLOAT, GL_FALSE, 0, NULL);
+ glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices,
+ GL_STATIC_DRAW);
+
+ glUniform1i(glGetUniformLocation(prog, "tex"), 0);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
+ GL_NEAREST_MIPMAP_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+
+ glUniform2f(glGetUniformLocation(prog, "window_pixel_size"),
+ piglit_width, piglit_height);
+}
+
+enum piglit_result
+piglit_display(void)
+{
+ return piglit_run_selected_subtests(piglit_config->subtests,
+ piglit_config->selected_subtests,
+ piglit_config->num_selected_subtests,
+ PIGLIT_SKIP);
+}
--
2.4.2
More information about the Piglit
mailing list