From 3cb200b2278a473e55b3ad6fa17dd8babbd3d00f Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Thu, 8 Nov 2018 11:00:56 +0100 Subject: [PATCH] khr_debug: fix invalid enum usage on gles3 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit GL_SAMPLES_PASSED isn't allowed on gles3, so doing a quiery with it isn't going to work. But GL_ANY_SAMPLES_PASSED is allowed, so so let's use that one instead on gles. Signed-off-by: Erik Faye-Lund Reviewed-by: Tapani Pälli --- tests/spec/khr_debug/debug-object-label.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/spec/khr_debug/debug-object-label.c b/tests/spec/khr_debug/debug-object-label.c index e9617d719..f9c7eac5a 100644 --- a/tests/spec/khr_debug/debug-object-label.c +++ b/tests/spec/khr_debug/debug-object-label.c @@ -236,8 +236,13 @@ test_object_label_types() piglit_get_gl_version() >= 30) { /* Test QUERY */ glGenQueries(1, &query); - glBeginQuery(GL_SAMPLES_PASSED, query); - glEndQuery(GL_SAMPLES_PASSED); + if (piglit_is_gles()) { + glBeginQuery(GL_ANY_SAMPLES_PASSED, query); + glEndQuery(GL_ANY_SAMPLES_PASSED); + } else { + glBeginQuery(GL_SAMPLES_PASSED, query); + glEndQuery(GL_SAMPLES_PASSED); + } ObjectLabel(GL_QUERY, query, -1, TestLabel); GetObjectLabel(GL_QUERY, query, TestLabelLen + 1, &length[QUERY_IDX], label[QUERY_IDX]); -- 2.11.4.GIT