[Piglit] [PATCH] egl: Add EGL_KHR_gl_texture_2d_image/GL_OES_EGL_image test
Ken Phillis Jr
kphillisjr at gmail.com
Mon Nov 25 20:58:27 PST 2013
The patch so far is looking good. I only suggest to instead define the
missing tokens instead of flat out disabling the test when the
EGL_KHR_gl_texture_2D_image test fails. This is based on reading over the
EGL_KHR_gl_texture_2D_image spec ( located at
http://www.khronos.org/registry/egl/extensions/KHR/EGL_KHR_gl_image.txt )
Although a secondary fix could be to go ahead and push a patch to include
an updated eglext.h file since the egl.h file does not change all that
often.
On Sun, Nov 24, 2013 at 9:09 PM, <christopher.halse.rogers at canonical.com>wrote:
> From: Christopher James Halse Rogers <raof at ubuntu.com>
>
> ---
>
> This looks pretty much right to me, but it may be missing some necessary
> flushing - it will occasionally fail on i965, and more frequently on
> radeon with my gallium image patch series.
>
> tests/egl/CMakeLists.gl.txt | 2 +
> tests/egl/egl-khr-gl-image.c | 142
> +++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 144 insertions(+)
> create mode 100644 tests/egl/egl-khr-gl-image.c
>
> diff --git a/tests/egl/CMakeLists.gl.txt b/tests/egl/CMakeLists.gl.txt
> index 4a2a57c..0115e2c 100644
> --- a/tests/egl/CMakeLists.gl.txt
> +++ b/tests/egl/CMakeLists.gl.txt
> @@ -20,6 +20,8 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
> target_link_libraries(egl-create-surface pthread ${X11_X11_LIB})
> piglit_add_executable (egl-query-surface egl-util.c
> egl-query-surface.c)
> target_link_libraries(egl-query-surface pthread ${X11_X11_LIB})
> + piglit_add_executable (egl-khr-gl-image egl-util.c
> egl-khr-gl-image.c)
> + target_link_libraries(egl-khr-gl-image pthread ${X11_X11_LIB})
>
> add_subdirectory(spec)
> ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
> diff --git a/tests/egl/egl-khr-gl-image.c b/tests/egl/egl-khr-gl-image.c
> new file mode 100644
> index 0000000..5b0d58e
> --- /dev/null
> +++ b/tests/egl/egl-khr-gl-image.c
> @@ -0,0 +1,142 @@
> +/*
> + * Copyright © 2013 Canonical Inc.
> + *
> + * 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.
> + *
> + * Author: Christopher James Halse Rogers <
> christopher.halse.rogers at canonical.com>
> + */
> +
> +#include "piglit-util-gl-common.h"
> +#include "egl-util.h"
> +
> +#ifdef EGL_KHR_gl_texture_2D_image
> +
> +const char *extensions[] = { "EGL_KHR_gl_texture_2D_image", NULL };
> +
> +static enum piglit_result
> +draw(struct egl_state *state)
> +{
> + float aubergine[] = { 0.46, 0.13, 0.44, 1.0 };
> + float orange[] = { 0.86, 0.28, 0.08, 1.0 };
> + GLuint fb = 0;
> + GLuint exportTex, importTex;
> + EGLImageKHR texImg;
> + PFNEGLCREATEIMAGEKHRPROC eglCreateImageKHR;
> + PFNGLEGLIMAGETARGETTEXTURE2DOESPROC EGLImageTargetTexture2DOES;
> +
> + piglit_require_extension("GL_OES_EGL_image");
> + piglit_require_extension("GL_EXT_framebuffer_object");
> +
> + eglCreateImageKHR =
> + (PFNEGLCREATEIMAGEKHRPROC)
> eglGetProcAddress("eglCreateImageKHR");
> + EGLImageTargetTexture2DOES =
> + (PFNGLEGLIMAGETARGETTEXTURE2DOESPROC)
> eglGetProcAddress("glEGLImageTargetTexture2DOES");
> +
> + /* Allocate render texture */
> + glGenTextures(1, &exportTex);
> +
> + glBindTexture(GL_TEXTURE_2D, exportTex);
> + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
> + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
> + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 100, 100, 0, GL_BGRA,
> GL_UNSIGNED_BYTE, NULL);
> +
> + /* Bind to eglImageOES */
> + texImg = eglCreateImageKHR(state->egl_dpy, state->ctx,
> +
> EGL_GL_TEXTURE_2D_KHR,
> +
> (EGLClientBuffer)exportTex,
> + NULL);
> +
> + /* Bind EGL image to output texture */
> + glGenTextures(1, &importTex);
> +
> + glBindTexture(GL_TEXTURE_2D, importTex);
> + EGLImageTargetTexture2DOES(GL_TEXTURE_2D, (GLeglImageOES)texImg);
> +
> + if (!eglMakeCurrent(state->egl_dpy,
> + state->surf, state->surf,
> state->ctx)) {
> + fprintf(stderr, "eglMakeCurrent() failed\n");
> + piglit_report_result(PIGLIT_FAIL);
> + }
> +
> + glGenFramebuffersEXT(1, &fb);
> + glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fb);
> +
> + glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,
> GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, exportTex, 0);
> +
> + if (glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT) !=
> GL_FRAMEBUFFER_COMPLETE_EXT) {
> + fprintf(stderr, "FBO incomplete\n");
> + piglit_report_result(PIGLIT_FAIL);
> + }
> +
> + /* Clear render texture to orange */
> + glClearColor(orange[0], orange[1], orange[2], orange[3]);
> + glClear(GL_COLOR_BUFFER_BIT);
> +
> + glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
> +
> + glViewport(0, 0, state->width, state->height);
> + piglit_ortho_projection(state->width, state->height, GL_FALSE);
> +
> + glClearColor(aubergine[0], aubergine[1], aubergine[2],
> aubergine[3]);
> + glClear(GL_COLOR_BUFFER_BIT);
> +
> + glEnable(GL_TEXTURE_2D);
> + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
> + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
> + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
> +
> + glBindTexture(GL_TEXTURE_2D, importTex);
> + piglit_draw_rect_tex(20, 20, 100, 100, 0, 0, 1, 1);
> + eglSwapBuffers(state->egl_dpy, state->surf);
> +
> + if (!piglit_probe_pixel_rgba(10, 10, aubergine) ||
> + !piglit_probe_pixel_rgba(50, 10, aubergine) ||
> + !piglit_probe_pixel_rgba(10, 50, aubergine) ||
> + !piglit_probe_pixel_rgba(50, 50, orange) ||
> + !piglit_probe_pixel_rgba(110, 110, orange) ||
> + !piglit_probe_pixel_rgba(130, 130, aubergine))
> + return PIGLIT_FAIL;
> +
> + return PIGLIT_PASS;
> +}
> +
> +int
> +main(int argc, char *argv[])
> +{
> + struct egl_test test;
> +
> + egl_init_test(&test);
> + test.extensions = extensions;
> + test.draw = draw;
> +
> + return egl_util_run(&test, argc, argv);
> +}
> +
> +#else
> +
> +int
> +main(int argc, char *argv[])
> +{
> + piglit_report_result(PIGLIT_SKIP);
> +
> + return 0;
> +}
> +
> +#endif
> --
> 1.8.4.4
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/piglit/attachments/20131125/85e4e987/attachment.html>
More information about the Piglit
mailing list