GitLab

I'm trying to transition Piglit from using GLUT to using Waffle. This
requires killing all uses of GLUT functions, one-by-one.

This patch replaces all-but-one instance of glutPostRedisplay with a new
wrapper, piglit_post_redisplay. The sole remaining test that uses
glutPostRedisplay is windowoverlap; but that test doesn't use
piglit-framework, anyway.

Since piglit_escape_exit_key() calls piglit_post_redisplay() which is
defined in piglitutil_gl*, we must now link piglitutil_gl
into piglitglxutil to prevent link errors.
Acked-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-and-tested-by: Jordan Justen <jordan.l.justen@intel.com>
Tested-by: Paul Berry <stereotype441@gmail.com>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>

Reviewed-by: Eric Anholt <eric@anholt.net>

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>

This better matches the interface of glGetStringi, which should be used
for GL >= 3.0.
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>

Create an image buffer with red, green, blue, white quadrants.
This code was extracted out of the piglit_rgbw_texture() function.
The piglit_rgbw_texture() function is then rewritten to use the new
piglit_rgbw_image() function.

This reflects the order they are requires for ARB_texture_cube_map_array,

I've tested that this causes no regressions here.
Signed-off-by: Dave Airlie <airlied@redhat.com>

Should fix shader_runner build failure.

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>

Add BUILD_CL_TESTS option to cmake configuration and build OpenCL
utilities and framework to library piglitutil_cl.
Signed-off-by: Blaž Tomažič <blaz.tomazic@gmail.com>

The framework is composed of 1 main part and 3 different sub-parts. Each
test is linked to this framework and calls the piglit_cl_framework_run
function.

The main part is in piglit-framework-cl.* files. The header contains
definitions to implement each specific test type. The source file's
piglit_cl_framework_run function is called by each test of any type.
This file then parses program and environment variables, and depending
on test configuration, runs the test on selected platforms and devices.

The other 3 sub-parts are tests types implementations: Custom, API and
Program. Each one is used to create tests that benefit from different
functionality. Here each header file contains definitions to implement
an OpenCL test and each source file handles the specific options used in
test configurtation.
Signed-off-by: Blaž Tomažič <blaz.tomazic@gmail.com>

piglit-util-cl.* adds functions for faster and easier writing of OpenCL
programs. Most of the functions return NULL or false on errors and print
the error to stderr, others print an error and exit the program.

piglit-util-cl-enum.* files add enum definitions (some of them also by
version) and their string representations.
Signed-off-by: Blaž Tomažič <blaz.tomazic@gmail.com>

Otherwise, piglit would fail to parse the version string and report a
failure if glGetString(GL_VERSION) were called in an ES 1.x context.

If piglit is configured to use waffle, then use pkgconfig to require
waffle>=1.0. Also, replace the custom cmake WAFFLE variables with those
provided by the pkg_check_modules.

Waffle 1.0 moved its header directory from $prefix/include/waffle to
$prefix/include/waffle-1. So add '-I $prefix/include/waffle-1' to the
CFLAGS and update the #include directives appropriately.
Signed-off-by: Chad Versace <chad@chad.versace.us>

MinGW has many Unix headers, but unfortunately aren't complete.

This fixes build failure due to missing S_ISLNK() macro.

Using void pointers for pointer arithmetic doesn't work.  Fixes:
tests\util\piglit_ktx.c(333) : error C2036: 'void *' : unknown size

Fixes http://bugs.freedesktop.org/show_bug.cgi?id=53013Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Reviewed-by: José Fonseca <jfonseca@vmware.com>

Piglit would segfault if piglit_load_text_file() was accidentally passed
a directory name instead of a filename.  Now return NULL if the file is
not regular or a symlink.

We've got a bunch of instances of this happening intermittently during
runs with gnome-shell.  Because our tests are not generally able to
handle resizes, they would show up as spurious failures that are hard
to reproduce.  Instead, provide a diagnostic message and report WARN.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

sys/mman.h is not available on Windows.

The KTX (Khronos texture) file format specifies a simple format for
storing texture miptrees. This patch adds utility functions for reading
and inspecting KTX files, iterating over the contained images, and easily
loading the miptree with glTexImage().

A future test (oes_compressed_etc1_rgb8_test-miptree) will use this to
load an ETC1 miptree and a reference RGB miptree.
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>

This is a variable argument function that joins together paths with the
system path separator (Unix='/', Windows='\\').

v2: Prevent a buffer overflow found by Jose.
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>

This function reads the environment variable PIGLIT_SOURCE_DIR, and
reports failure if the function is undefined. The intention is that tests
should use to construct the path to any needed data files.
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>

Move the function from piglit-util-gl.c to piglit-util-gl-common.c so that
all GL API's can use it.
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>

In GLES, glReadPixels does not accept format=GL_FLOAT, but it does accept
format=GL_BYTE.

This shouldn't make any tests begin failing. If anything, this commit may
make pass some almost-passing tests because there is less precision in
probing with glReadPixels(GL_BYTE) than glReadPixels(GL_FLOAT).
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>

With the transform feedback wrapper functions removed,
piglit_require_transform_feedback() was the only function left in
piglit-transform-feedback.{c.h}.  This patch moves it to piglit-util.c
so that it won't get lonely.
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

The wrapper functions in tests/util/piglit-transform-feedback.{c,h}
(e.g. piglit_BeginTransformFeedback()), are no longer needed, since
the piglit-dispatch mechanism automatically redirects to the EXT
variants when GL 3.0 is not supported.

This patch removes the unnecessary wrapper functions.
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

Solaris Studio does not support "#pragma once".

Fixes piglit-framework build error with Solaris Studio.
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Brian Paul <brianp@vmware.com>

Build API-independent utilities to piglitutil library and link all other
utility libraries to it (gl, gles1, gles2).
Signed-off-by: Blaž Tomažič <blaz.tomazic@gmail.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>

Build gl utilities to piglitutil_gl library insted of piglitutil.

As a result all executables linking to piglitutil library now link to
piglitutil_gl.
Signed-off-by: Blaž Tomažič <blaz.tomazic@gmail.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>

Move function for reading files from shader-load.c to piglit-util.c.
Delete shader-load.c because it had no other functionality.
Signed-off-by: Blaž Tomažič <blaz.tomazic@gmail.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>

Rename piglit-util-enum.c to piglit-util-gl-enum.c.
Signed-off-by: Blaž Tomažič <blaz.tomazic@gmail.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>

Move API-independent code from piglit-util-gl-common.c and
piglit-util-gl-common.h to piglit-util.c and piglit-util.h respectively.
Signed-off-by: Blaž Tomažič <blaz.tomazic@gmail.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>

Move piglit-util.* to piglit-util-gl-common.*
Signed-off-by: Blaž Tomažič <blaz.tomazic@gmail.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>

This patch splits off a new piglit-util function,
piglit_compare_images_color(), from the existing
piglit_probe_image_color() function.  The new function compares two
images in memory, so that the caller can take responsibility for
calling glReadPixels().

In addition, this patch creates a function
piglit_compute_probe_tolerance(), which detemines the correct
tolerance thresholds to use when comparing images.

These functions will be needed in order to test proper behaviour of
MSAA with different buffer formats, since the MSAA format test needs
to be able to read the rendered image using glReadPixels, make
adjustments to it in memory, and then compare the results.
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>