Tests that one can sample the given buffer without other mipmap
levels by setting texture filtering accordingly.
v2:
- compile only on platforms that have drm (Eric)
- use standard drm definitions for fourcc instead of duplicated
local (Daniel, Eric)
- removed irrelevant quote of the spec (Eric)
- use helper variables for width, height and cpp instead
of repeating the magic numbers over and over again (Eric)
- used the same refactored common logic as the mipmap ARGB test
v3 (Eric):
- use properly linked egl-extension calls
v4 (Eric):
- add to 'all.tests'
- removed inclusion of standard EGL entrypoints as there is the
special dispatcher for the test cases to use
v5 (Eric, Chad):
- sample using image-external extension
- fix inclusion in all.tests
v6 (Chad):
- check for GL error instead of EGL when invoking
glEGLImageTargetTexture2DOES()
- allow the test to be skipped if external textures or the
chosen format are not supported
- fix the scope of the comment describing the need for closing
file descriptors in case image creation fails
- introduce format as command line argument and merge the XRGB
test here
- don't invoke glReadPixels() for each pixel separately
v7 (Chad):
- fix egl-image error checking - do not call eglGetError() twice
in a row as the first call resets the error
- convert the boolean returned by 'piglit_probe_image_ubyte()'
into 'enum piglit_result'
- re-introduce separate vector for expected results - probe
expects RGB instead of the BGR of source
v8:
- add missing fragment shader float precision qualifier
Signed-off-by: Topi Pohjolainen <[email protected]>
Reviewed-by: Chad Versace <[email protected]> (v7)
---
tests/all.tests | 2 +
.../ext_image_dma_buf_import/CMakeLists.gles2.txt | 23 +++
.../spec/ext_image_dma_buf_import/sample_common.c | 175 +++++++++++++++++++++
.../spec/ext_image_dma_buf_import/sample_common.h | 37 +++++
tests/spec/ext_image_dma_buf_import/sample_rgb.c | 111 +++++++++++++
5 files changed, 348 insertions(+)
create mode 100644 tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt
create mode 100644 tests/spec/ext_image_dma_buf_import/sample_common.c
create mode 100644 tests/spec/ext_image_dma_buf_import/sample_common.h
create mode 100644 tests/spec/ext_image_dma_buf_import/sample_rgb.c
diff --git a/tests/all.tests b/tests/all.tests
index 1446b77..afd8eb8 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1817,6 +1817,8 @@ add_plain_test(ext_image_dma_buf_import,
'ext_image_dma_buf_import-invalid_hints
add_plain_test(ext_image_dma_buf_import,
'ext_image_dma_buf_import-invalid_attributes')
add_plain_test(ext_image_dma_buf_import,
'ext_image_dma_buf_import-missing_attributes')
add_plain_test(ext_image_dma_buf_import,
'ext_image_dma_buf_import-ownership_transfer')
+ext_image_dma_buf_import['ext_image_dma_buf_import-sample_argb8888'] =
PlainExecTest(['ext_image_dma_buf_import-sample_rgb', '-fmt=AR24', '-auto'])
+ext_image_dma_buf_import['ext_image_dma_buf_import-sample_xrgb8888'] =
PlainExecTest(['ext_image_dma_buf_import-sample_rgb', '-auto', '-fmt=XR24',
'-alpha-one'])
ext_packed_depth_stencil = Group()
spec['EXT_packed_depth_stencil'] = ext_packed_depth_stencil
diff --git a/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt
b/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt
new file mode 100644
index 0000000..b36e96b
--- /dev/null
+++ b/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt
@@ -0,0 +1,23 @@
+#add_definitions(-DSOURCE_DIR="${piglit_SOURCE_DIR}/")
+
+include_directories(
+ ${OPENGL_INCLUDE_PATH}
+ )
+
+link_libraries(
+ ${OPENGL_egl_LIBRARY}
+ piglitutil_gles2
+ )
+
+# These tests rely on drm and are hence compiled only on linux/drm platforms
+if(LIBDRM_FOUND)
+ add_definitions(-DHAVE_LIBDRM)
+
+ include_directories(
+ ${LIBDRM_INCLUDE_DIRS}
+ )
+
+ piglit_add_executable(ext_image_dma_buf_import-sample_rgb sample_rgb.c
sample_common.c image_common.c)
+endif(LIBDRM_FOUND)
+
+# vim: ft=cmake:
diff --git a/tests/spec/ext_image_dma_buf_import/sample_common.c
b/tests/spec/ext_image_dma_buf_import/sample_common.c
new file mode 100644
index 0000000..29877be
--- /dev/null
+++ b/tests/spec/ext_image_dma_buf_import/sample_common.c
@@ -0,0 +1,175 @@
+/*
+ * Copyright © 2013 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.
+ */
+
+#include "sample_common.h"
+#include "piglit-util-egl.h"
+#define EGL_EGLEXT_PROTOTYPES 1
+#include <EGL/eglext.h>
+#include <unistd.h>
+
+static const char fs_src[] =
+ "#extension GL_OES_EGL_image_external : require\n"
+ "precision mediump float;\n"
+ "uniform samplerExternalOES sampler;\n"
+ "varying vec2 texcoords;\n"
+ "\n"
+ "void main()\n"
+ "{\n"
+ "gl_FragColor = texture2D(sampler, texcoords);\n"
+ "}\n";
+static const char vs_src[] =
+ "attribute vec4 position;\n"
+ "varying vec2 texcoords;\n"
+ "\n"
+ "void main()\n"
+ "{\n"
+ "texcoords = 0.5 * (position.xy + vec2(1.0, 1.0));\n"
+ "gl_Position = position;\n"
+ "}\n";
+
+static void
+set_vertices(GLuint prog)
+{
+ static const GLfloat v[] = { -1.0f, 1.0f, -1.0f, -1.0f,
+ 1.0f, -1.0f, 1.0f, 1.0f };
+
+ GLint i = glGetAttribLocation(prog, "position");
+ glVertexAttribPointer(i, 2, GL_FLOAT, GL_FALSE, 0, v);
+ glEnableVertexAttribArray(i);
+}
+
+static enum piglit_result
+sample_and_destroy_img(unsigned w, unsigned h, EGLImageKHR img)
+{
+ GLuint prog, tex;
+ GLenum error;
+
+ glGenTextures(1, &tex);
+ glBindTexture(GL_TEXTURE_EXTERNAL_OES, tex);
+
+ /* Set the image as level zero */
+ glEGLImageTargetTexture2DOES(GL_TEXTURE_EXTERNAL_OES,
+ (GLeglImageOES)img);
+ error = glGetError();
+
+ /**
+ * EGL may not support binding of external textures, this is not an
+ * error.
+ */
+ if (error == GL_INVALID_OPERATION)
+ return PIGLIT_SKIP;
+
+ if (error != GL_NO_ERROR) {
+ printf("glEGLImageTargetTexture2DOES() failed: %s 0x%x\n",
+ piglit_get_gl_error_name(error), error);
+ return PIGLIT_FAIL;
+ }
+
+ glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MIN_FILTER,
+ GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MAG_FILTER,
+ GL_NEAREST);
+
+ prog = piglit_build_simple_program(vs_src, fs_src);
+
+ glUseProgram(prog);
+
+ glUniform1i(glGetUniformLocation(prog, "sampler"), 0);
+ set_vertices(prog);
+
+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+ glViewport(0, 0, w, h);
+ glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+
+ glDeleteProgram(prog);
+ glUseProgram(0);
+
+ glDeleteTextures(1, &tex);
+ eglDestroyImageKHR(eglGetCurrentDisplay(), img);
+
+ return PIGLIT_PASS;
+}
+
+static enum piglit_result
+sample_buffer(void *buf, int fd, int fourcc, unsigned w, unsigned h,
+ unsigned stride, unsigned offset)
+{
+ EGLint error;
+ EGLImageKHR img;
+ EGLint attr[] = {
+ EGL_WIDTH, w,
+ EGL_HEIGHT, h,
+ EGL_LINUX_DRM_FOURCC_EXT, fourcc,
+ EGL_DMA_BUF_PLANE0_FD_EXT, fd,
+ EGL_DMA_BUF_PLANE0_OFFSET_EXT, offset,
+ EGL_DMA_BUF_PLANE0_PITCH_EXT, stride,
+ EGL_NONE
+ };
+
+ img = eglCreateImageKHR(eglGetCurrentDisplay(), EGL_NO_CONTEXT,
+ EGL_LINUX_DMA_BUF_EXT, (EGLClientBuffer)0, attr);
+
+ /* Release the creator side of the buffer. */
+ piglit_destroy_dma_buf(buf);
+
+ error = eglGetError();
+
+ /* EGL may not support the format, this is not an error. */
+ if (!img && error == EGL_BAD_MATCH)
+ return PIGLIT_SKIP;
+
+ if (error != EGL_SUCCESS) {
+ printf("eglCreateImageKHR() failed: %s 0x%x\n",
+ piglit_get_egl_error_name(error), error);
+
+ /* Close the descriptor also, EGL does not have ownership */
+ close(fd);
+
+ return PIGLIT_FAIL;
+ }
+
+ if (!img) {
+ fprintf(stderr, "image creation succeeded but returned NULL\n");
+ return PIGLIT_FAIL;
+ }
+
+ return sample_and_destroy_img(w, h, img);
+}
+
+enum piglit_result
+dma_buf_create_and_sample_32bpp(unsigned w, unsigned h, unsigned cpp,
+ int fourcc, const unsigned char *src)
+{
+ struct piglit_dma_buf *buf;
+ unsigned stride, offset;
+ int fd;
+ enum piglit_result res;
+
+ res = piglit_create_dma_buf(w, h, cpp, src, w * cpp, &buf, &fd, &stride,
+ &offset);
+ if (res != PIGLIT_PASS)
+ return res;
+
+ return sample_buffer(buf, fd, fourcc, w, h, stride, offset);
+}
diff --git a/tests/spec/ext_image_dma_buf_import/sample_common.h
b/tests/spec/ext_image_dma_buf_import/sample_common.h
new file mode 100644
index 0000000..243d42b
--- /dev/null
+++ b/tests/spec/ext_image_dma_buf_import/sample_common.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2013 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.
+ */
+#ifndef SAMPLE_COMMON_H
+#define SAMPLE_COMMON_H
+
+#include <stdbool.h>
+
+/**
+ * Create a dma buffer with format 'fourcc' setting the given pixels as its
+ * content, create an EGL image against the buffer, bind it as texture and
+ * sample it using a shader program.
+ */
+enum piglit_result
+dma_buf_create_and_sample_32bpp(unsigned w, unsigned h, unsigned cpp,
+ int fourcc, const unsigned char *src);
+
+#endif /* SAMPLE_COMMON_H */
diff --git a/tests/spec/ext_image_dma_buf_import/sample_rgb.c
b/tests/spec/ext_image_dma_buf_import/sample_rgb.c
new file mode 100644
index 0000000..f398d7c
--- /dev/null
+++ b/tests/spec/ext_image_dma_buf_import/sample_rgb.c
@@ -0,0 +1,111 @@
+/*
+ * Copyright © 2013 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.
+ */
+
+#include "piglit-util-egl.h"
+#include <unistd.h>
+#include <drm_fourcc.h>
+#include "sample_common.h"
+#include "image_common.h"
+
+/**
+ * @file sample_rgb.c
+ *
+ * Create EGL images out of ARGB8888 and XRGB8888 formatted dma buffers, set
+ * them as external textures, set texture filters for avoiding need for other
+ * mipmap-levels and sample the textures using a shader program.
+ */
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+ config.supports_gl_es_version = 20;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+static bool force_alpha_to_one = false;
+static int fourcc = -1;
+
+enum piglit_result
+piglit_display(void)
+{
+ const unsigned char src[] = {
+ 10, 20, 30, 40,
+ 50, 60, 70, 80,
+ 11, 22, 33, 44,
+ 55, 66, 77, 88 };
+ const unsigned char expected[] = {
+ src[ 2], src[ 1], src[ 0], force_alpha_to_one ? 255 : src[ 3],
+ src[ 6], src[ 5], src[ 4], force_alpha_to_one ? 255 : src[ 7],
+ src[10], src[ 9], src[ 8], force_alpha_to_one ? 255 : src[11],
+ src[14], src[13], src[12], force_alpha_to_one ? 255 : src[15] };
+ enum piglit_result res = dma_buf_create_and_sample_32bpp(
+ 2, 2, 4, fourcc, src);
+
+ if (res != PIGLIT_PASS)
+ return res;
+
+ return piglit_probe_image_ubyte(0, 0, 2, 2, GL_RGBA, expected) ?
+ PIGLIT_PASS : PIGLIT_FAIL;
+}
+
+static int
+parse_format(const char *s)
+{
+ if (strlen(s) != 4)
+ return -1;
+
+ return (int)fourcc_code(s[0], s[1], s[2], s[3]);
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+ unsigned i;
+
+ piglit_require_egl_extension("EGL_EXT_image_dma_buf_import");
+ piglit_require_extension("GL_OES_EGL_image_external");
+
+ for (i = 1; i < argc; i++) {
+ static const char fmt[] = "-fmt=";
+
+ if (!strcmp(argv[i], "-alpha-one")) {
+ force_alpha_to_one = true;
+ continue;
+ }
+
+ if (strncmp(argv[i], fmt, sizeof(fmt) - 1)) {
+ fprintf(stderr, "unknown argument %s\n", argv[i]);
+ continue;
+ }
+
+ fourcc = parse_format(argv[i] + sizeof(fmt) - 1);
+ if (fourcc == -1) {
+ fprintf(stderr, "invalid format: %s\n", argv[i]);
+ piglit_report_result(PIGLIT_SKIP);
+ }
+ }
+
+ if (fourcc == -1) {
+ fprintf(stderr, "format not specified\n");
+ piglit_report_result(PIGLIT_SKIP);
+ }
+}
--
1.8.3.1
_______________________________________________
Piglit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/piglit
