OK, so here's round 2. The notable difference between this and v1, is that this version works on GLES 2, with the exception of the blitframebuffer test, which requires GLES 3.
When doing this porting, I realized that I was depending on a bug in Mesa, where GL_SAMPLES_PASSED was allowed in GLES 3 even though it's clearly not supposed to be. This version remedies this, by using EXT_occlusion_query_boolean instead, if available. Additionally, some code-repetion has ben avoided by introducing some helper functions. Erik Faye-Lund (15): nv_conditional_render: use common fill_tex-helper nv_conditional_render: fixup test-requirements nv_conditional_render: drop mipmapping from tests that doesn't care nv_conditional_render: do not depend on float-textures nv_conditional_render: factor out query-helpers nv_conditional_render: wrap up query gen/deletion nv_conditional_render: prefer GL_EXT_occlusion_query_boolean nv_conditional_render: port trivial tests to gles2 nv_conditional_render: add helpers to compile useful programs nv_conditional_render: port blitframebuffer-test to gles3 nv_conditional_render: port clear-test to gles2 nv_conditional_render: port copyteximage-test to gles2 nv_conditional_render: port copytexsubimage-test to gles2 nv_conditional_render: port generatemipmap-test to gles2 nv_conditional_render: port vertex_array-test to gles2 tests/opengl.py | 8 + .../nv_conditional_render/CMakeLists.gl.txt | 22 +-- .../CMakeLists.gles2.txt | 12 ++ .../begin-while-active.c | 16 +- tests/spec/nv_conditional_render/begin-zero.c | 7 +- tests/spec/nv_conditional_render/bitmap.c | 15 +- .../nv_conditional_render/blitframebuffer.c | 71 +++++---- tests/spec/nv_conditional_render/clear.c | 34 +++-- tests/spec/nv_conditional_render/common.c | 139 ++++++++++++++++++ tests/spec/nv_conditional_render/common.h | 60 ++++++++ tests/spec/nv_conditional_render/copypixels.c | 19 +-- .../spec/nv_conditional_render/copyteximage.c | 62 ++++---- .../nv_conditional_render/copytexsubimage.c | 62 ++++---- tests/spec/nv_conditional_render/dlist.c | 15 +- tests/spec/nv_conditional_render/drawpixels.c | 15 +- .../nv_conditional_render/generatemipmap.c | 61 ++++---- .../spec/nv_conditional_render/vertex_array.c | 39 +++-- 17 files changed, 462 insertions(+), 195 deletions(-) create mode 100644 tests/spec/nv_conditional_render/CMakeLists.gles2.txt create mode 100644 tests/spec/nv_conditional_render/common.c create mode 100644 tests/spec/nv_conditional_render/common.h -- 2.19.1 _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
