[Piglit] [PATCH 2/5] Revert "GL_ARB_ubo/negative-bindbuffer-buffer: New test for API error."

[Eric Anholt]

This reverts commit ba79f8c3f85a479e97d43f41bf6d2064a1e174fe.

This test has been replaced with gl-3.0/genned-names,
and the pre-GL-3.0 behavior is relatively unspecified and
uninteresting.
---
 tests/all.tests                                    |    1 -
 .../arb_uniform_buffer_object/CMakeLists.gl.txt    |    1 -
 .../negative-bindbuffer-buffer.c                   |   70 --------------------
 3 files changed, 72 deletions(-)
 delete mode 100644 tests/spec/arb_uniform_buffer_object/negative-bindbuffer-buffer.c

diff --git a/tests/all.tests b/tests/all.tests
index 3a1a192..8d7fdce 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1954,7 +1954,6 @@ arb_uniform_buffer_object['layout-std140-base-size-and-alignment'] = concurrent_
 arb_uniform_buffer_object['link-mismatch-blocks'] = concurrent_test('arb_uniform_buffer_object-link-mismatch-blocks')
 arb_uniform_buffer_object['maxblocks'] = concurrent_test('arb_uniform_buffer_object-maxblocks')
 arb_uniform_buffer_object['minmax'] = concurrent_test('arb_uniform_buffer_object-minmax')
-arb_uniform_buffer_object['negative-bindbuffer-buffer'] = concurrent_test('arb_uniform_buffer_object-negative-bindbuffer-buffer')
 arb_uniform_buffer_object['negative-bindbuffer-index'] = concurrent_test('arb_uniform_buffer_object-negative-bindbuffer-index')
 arb_uniform_buffer_object['negative-bindbuffer-target'] = concurrent_test('arb_uniform_buffer_object-negative-bindbuffer-target')
 arb_uniform_buffer_object['negative-bindbufferrange-range'] = concurrent_test('arb_uniform_buffer_object-negative-bindbufferrange-range')
diff --git a/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt b/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
index 2a846e8..b2a5b44 100644
--- a/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
@@ -32,7 +32,6 @@ add_executable (arb_uniform_buffer_object-link-mismatch-blocks link-mismatch-blo
 add_executable (arb_uniform_buffer_object-maxblocks maxblocks.c)
 add_executable (arb_uniform_buffer_object-minmax minmax.c)
 add_executable (arb_uniform_buffer_object-negative-bindbuffer-index negative-bindbuffer-index.c)
-add_executable (arb_uniform_buffer_object-negative-bindbuffer-buffer negative-bindbuffer-buffer.c)
 add_executable (arb_uniform_buffer_object-negative-bindbuffer-target negative-bindbuffer-target.c)
 add_executable (arb_uniform_buffer_object-negative-bindbufferrange-range negative-bindbufferrange-range.c)
 add_executable (arb_uniform_buffer_object-negative-getactiveuniformblockiv negative-getactiveuniformblockiv.c)
diff --git a/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-buffer.c b/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-buffer.c
deleted file mode 100644
index 32ffa1c..0000000
--- a/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-buffer.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright © 2012 Intel Corporation
- *
- * 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.
- */
-
-/** @file negative-bindbuffer-buffer.c
- *
- * Tests for errors when binding a bad buffer object name.
- */
-
-#include "piglit-util-gl-common.h"
-
-PIGLIT_GL_TEST_CONFIG_BEGIN
-
-	config.supports_gl_compat_version = 10;
-
-	config.window_width = 10;
-	config.window_height = 10;
-	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA;
-
-PIGLIT_GL_TEST_CONFIG_END
-
-void
-piglit_init(int argc, char **argv)
-{
-	bool pass = true;
-
-	piglit_require_extension("GL_ARB_uniform_buffer_object");
-
-	/* From the GL_ARB_uniform_buffer_object spec:
-	 *
-	 *     "The error INVALID_VALUE is generated if <index> is
-	 *      greater than or equal to the value of
-	 *      MAX_UNIFORM_BUFFER_BINDINGS.
-	 */
-
-	glBindBufferBase(GL_UNIFORM_BUFFER, 0, 0xd0d0d0d0);
-	if (!piglit_check_gl_error(GL_INVALID_OPERATION))
-		pass = false;
-
-	glBindBufferRange(GL_UNIFORM_BUFFER, 0, 0xd0d0d0d0, 0, 1);
-	if (!piglit_check_gl_error(GL_INVALID_OPERATION))
-		pass = false;
-
-	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
-}
-
-enum piglit_result piglit_display(void)
-{
-	/* UNREACHED */
-	return PIGLIT_FAIL;
-}
-- 
1.7.10.4