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>

Generated from the following semantic patch:

@@
expression VER;
expression MSG;
@@

-	if (piglit_get_gl_version() < VER) {
-		printf(MSG);
-		piglit_report_result(PIGLIT_SKIP);
(
-		exit(1);
|
)
-	}

+   piglit_require_gl_version(VER);
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>

Converts most of the custom reshape funcs to set the projection
in either piglit_init or piglit_display, depending on whether
it depends on the size.

V2: dont introduce unrelated projection changes
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>

V2: Don't break tests/general/read-front
Reviewed-by: Paul Berry <stereotype441@gmail.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.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 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>

Each test that did not define main() now does so using
PIGLIT_GL_TEST_MAIN().
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>

v2: simplify the Z coord code: use [0,1] range for Z for all drawing.
Reviewed-by: Eric Anholt <eric@anholt.net>

primitive-restart can now test 5 scenarios which are
selected by a command line parameter:
 * DISABLE_VBO
 * VBO_VERTEX_ONLY
 * VBO_INDEX_ONLY
 * VBO_SEPARATE_VERTEX_AND_INDEX
 * VBO_COMBINED_VERTEX_AND_INDEX

All 5 scenarios are added to all.tests.
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

Previously the code would build an array of GLuint for the
indicies. This lead to extra processing at draw time.

Now, we build an array of indicies of the size currently
being tested.
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

Since failures of primitive restart sometimes lead a vertex to
appear at 0, 0, we test this pixel to make sure it was not drawn.
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

If USE_WAFFLE is enabled, do not build the tests below.  The tests use
quirky use GLUT functions that will not be implemented in Waffle.
    fbo-depth-sample-compare: Uses glutSolidSphere.
    windowoverlap: Uses glutCreateSubWindow.
    texwrap: Uses glutBitmapCharacter.
    texture-pakced-formats: Uses glutBitmapCharacter.

Eventually, these tests need to be repaired so that they no longer require
the quirky GLUT functions.  However, the Waffle integration shouldn't be
blocked by this small set of tests. Work on reparing these tests can
proceed in tandem with the Waffle integration.

v2: Fix indentation.
Reviewed-by: Pauli Nieminen <pauli.nieminen@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>

Replace it with piglit_is_extension_supported or piglit_require_extension,
as appropriate.
Reviewed-by: Pauli Nieminen <pauli.nieminen@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>

Nearly all CMakeLists.gl.txt contained the following:
    include_directories(${GLUT_INCLUDE_DIR})
    link_libraries(${GLUT_glut_LIBRARY})

This patch relocates them to cmake/target_api/gl/CMakeLists.txt.
Reviewed-by: Pauli Nieminen <pauli.nieminen@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>

It seems that this was written long ago before the piglit framework
existed.

Remove the test's main() and convert it to use piglit_init() and
piglit_display(). Some of the code from main() is moved into
piglit_init().
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>

Replace it with piglit_is_extension_supported or piglit_require_extension,
as appropriate.
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>

std::vector::data is in C++11 and not in C++03.

Fixes build with Solaris Studio.
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: José Fonseca <jfonseca@vmware.com>

Stencil buffer is not normally visible, so it's much easier to debug this
if the color inversion is done through blending.
Reviewed-by: Brian Paul <brianp@vmware.com>

Draws a circle using a triangle fan from a random point using stencil
buffer xor,
can also test clipping by drawing a circle which contains the window.

Ensures all pixels are drawn only once thus testing that all triangles
are rasterised correctly.

Based off Brian Paul's suggestion.
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

Ensures correct rasterisation by comparing a randomly drawn triangle
against a software rasteriser.

The software rasteriser complies with the GL spec and has been verified
against NVIDIA drivers.
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

This change expands the function previously named
test_draw_elements to support testing primitive restart with
the glArrayElement function.

All the tests previously run in test_draw_elements
are now repeated using glArrayElement.
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

v2: Added testing for all supported data types and format/type mismatch
v3: Defined new functions, loosened up the tolerence for 2_3_3 and 3_3_2
    formats.
Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

This test varifies glCopyPixels() with GL_COLOR, GL_DEPTH and GL_STENCIL
v2:  Defined few local variables for x,y positions and width, height
Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

v2: Don't forget to reindent to standard style.
Reviewed-by: Dave Airlie <airlied@redhat.com>

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

Replace
    add_executable -> piglit_add_executable
    add_library -> piglit_add_library

For now, each wrapper function trivially wraps the function it replaces,
and so this patch changes no behavior.

This commit was created using the command:

   sed -i -e "s/add_executable/piglit_add_executable/" -e "s/add_library/piglit_add_library/" $(find src/ tests/ -name "*CMakeLists*")
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>

If the OpenGL max line width is really only one pixel (despite requesting
width=3) the black_pixel() probe function could miss the line because of
rasterization differences.  We'd report a false failure in that case.
Probing two pixels instead of one avoids that issue.

v2: change array size to be [2][3] since we're reading two RGB pixels.

Previously this test didn't initialize GLEW, presumably because it
only uses GL 1.0 functions, and those functions bypass GLEW.  But once
we switch to using piglit-dispatch instead of GLEW, we will need to
initialize it in order for any GL functions to work.  This patch adds
a call to glewInit() in the place where a call to
piglit_dispatch_default_init() will eventually be needed.
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>

Some tests were using the GLEW_GET_FUN macro to retrieve GL function
pointers from GLEW.  This was necessary using old versions of GLEW,
but it is not necessary anymore; now we can just refer to the GLEW
function pointers directly.
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

Several tests were using the function glewIsSupported() to check for
extensions and GL versions.  This patch changes the tests to use
piglit_get_gl_version() and piglit_is_extension_supported(), which
provide the same functionality in a way that is not dependent on GLEW.
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

v2: Follow piglit convention of including "GL_" in the string passed
to piglit_is_extension_supported().

Several tests were checking for the presence of GL extensions using
GLEW macros.  This patch changes the tests to use
piglit_is_extension_supported(), which provides the same functionality
in a way that is not dependent on GLEW.

v2: Follow piglit convention of including "GL_" in the string passed
to piglit_is_extension_supported().
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

Several tests were checking the GL version using GLEW's GLEW_VERSION_*
macros.  This patch changes the tests to use piglit_get_gl_version(),
which provides the same functionality in a way that is not dependent
on GLEW.
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>

It was impossible to have the source directory read-only.

Also add the include_directories() directive for tests/util
in just one place, under tests/, so that all subdirectories
inherit it. A bunch of CMakeLists.txt files duplicate it,
so delete those redundant include flags:

sed -i -e "/^\t\${piglit_SOURCE_DIR}\/tests\/util/ d" \
 `grep piglit_SOURCE_DIR -rl tests/ | grep "CMakeLists\.gl"`

This patch removes extraneous glewInit() calls from piglit_init()
functions.  These calls are unnecessary since the Piglit framework
calls glewInit() before calling piglit_init().
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>

This patch converts the following tests to use the main() function in
piglit-framework.c rather than define their own main() function.

- asmparsertest
- fdo14575
- fdo20701
- fdo22540
- fdo31934
- glslparsertest
- texunits
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>