---
tests/all.py | 1 +
.../spec/arb_direct_state_access/CMakeLists.gl.txt | 1 +
.../fbattachmentparam-errors.c | 117 +++++++++++++++++++++
3 files changed, 119 insertions(+)
create mode 100644
tests/spec/arb_direct_state_access/fbattachmentparam-errors.c
diff --git a/tests/all.py b/tests/all.py
index 3015857..8c23e7c 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -4031,6 +4031,7 @@ spec['ARB_direct_state_access']['getnamedbuffersubdata']
= PiglitGLTest(['arb_di
spec['ARB_direct_state_access']['namedframebufferrenderbuffer'] =
PiglitGLTest(['arb_direct_state_access-namedframebufferrenderbuffer'],
run_concurrent=True)
spec['ARB_direct_state_access']['framebufferblit'] =
PiglitGLTest(['arb_direct_state_access-framebufferblit'], run_concurrent=True)
spec['ARB_direct_state_access']['checkfbstatus-errors'] =
PiglitGLTest(['arb_direct_state_access-checkfbstatus-errors'],
run_concurrent=True)
+spec['ARB_direct_state_access']['fbattachmentparam-errors'] =
PiglitGLTest(['arb_direct_state_access-fbattachmentparam-errors'],
run_concurrent=True)
arb_shader_image_load_store = spec['ARB_shader_image_load_store']
arb_shader_image_load_store['atomicity'] =
PiglitGLTest(['arb_shader_image_load_store-atomicity'], run_concurrent=True)
diff --git a/tests/spec/arb_direct_state_access/CMakeLists.gl.txt
b/tests/spec/arb_direct_state_access/CMakeLists.gl.txt
index 744735a..8ecb1ce 100644
--- a/tests/spec/arb_direct_state_access/CMakeLists.gl.txt
+++ b/tests/spec/arb_direct_state_access/CMakeLists.gl.txt
@@ -28,6 +28,7 @@ piglit_add_executable
(arb_direct_state_access-getnamedbuffersubdata getnamedbuf
piglit_add_executable (arb_direct_state_access-namedframebufferrenderbuffer
namedframebufferrenderbuffer.c)
piglit_add_executable (arb_direct_state_access-framebufferblit
framebufferblit.c)
piglit_add_executable (arb_direct_state_access-checkfbstatus-errors
checkfbstatus-errors.c)
+piglit_add_executable (arb_direct_state_access-fbattachmentparam-errors
fbattachmentparam-errors.c)
piglit_add_executable (arb_direct_state_access-dsa-textures dsa-textures.c
dsa-utils.c)
piglit_add_executable (arb_direct_state_access-texturesubimage
texturesubimage.c)
piglit_add_executable (arb_direct_state_access-bind-texture-unit
bind-texture-unit.c)
diff --git a/tests/spec/arb_direct_state_access/fbattachmentparam-errors.c
b/tests/spec/arb_direct_state_access/fbattachmentparam-errors.c
new file mode 100644
index 0000000..3d6670b
--- /dev/null
+++ b/tests/spec/arb_direct_state_access/fbattachmentparam-errors.c
@@ -0,0 +1,117 @@
+/*
+ * Copyright © 2015 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 fbattachmentparam-errors.c
+ *
+ * Make sure that glGetNamedFramebufferAttachmentParameteriv behaves
+ * according to the OpenGL 4.5 spec (30.10.2014).
+ *
+ * Section 9.2 Binding and Managing Framebuffer Objects of the OpenGL
+ * 4.5 core spec (30.10.2014, PDF page 314):
+ * "If framebuffer is zero, then the default draw framebuffer is
+ * queried."
+ */
+
+#include "piglit-util-gl.h"
+#include "dsa-utils.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+ config.supports_gl_core_version = 32;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+void
+piglit_init(int argc, char **argv)
+{
+ piglit_require_extension("GL_ARB_direct_state_access");
+}
+
+static bool
+get_param(GLuint fbo, GLenum att, GLenum pname, GLint expected_param,
+ bool expect_fail)
+{
+ GLint param;
+
+ glGetNamedFramebufferAttachmentParameteriv(fbo, att, pname, ¶m);
+ if (!expect_fail && (param != expected_param)) {
+ printf("fbo=%u, att=%s, pname=%s status:"
+ " got %d, expected %d\n",
+ fbo, piglit_get_gl_enum_name(att),
+ piglit_get_gl_enum_name(pname), param, expected_param);
+ return false;
+ }
+
+ return true;
+}
+
+enum piglit_result
+piglit_display(void)
+{
+ bool pass = true;
+ GLuint fbo, texture;
+
+ /* Non-generated name */
+ get_param(1337, GL_COLOR_ATTACHMENT0,
+ GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME, 0, true);
+ SUBTEST(GL_INVALID_OPERATION, pass, "bad fbo name");
+
+ /* Uninitialized fbo */
+ glCreateFramebuffers(1, &fbo);
+ SUBTESTCONDITION(get_param(fbo, GL_COLOR_ATTACHMENT0,
+ GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE,
+ GL_NONE, false), pass, "uninitialized fbo");
+ piglit_check_gl_error(GL_NO_ERROR);
+
+ /* This should be complete */
+ glCreateTextures(GL_TEXTURE_2D, 1, &texture);
+ glTextureStorage2D(texture, 1, GL_RGB8, 30, 30);
+ glNamedFramebufferTexture(fbo, GL_COLOR_ATTACHMENT0, texture, 0);
+ SUBTESTCONDITION(get_param(fbo, GL_COLOR_ATTACHMENT0,
+ GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE,
+ GL_TEXTURE, false), pass, "initialized fbo");
+ piglit_check_gl_error(GL_NO_ERROR);
+
+ /* Bad attachment name for user fbo */
+ get_param(fbo, GL_FRONT_LEFT,
+ GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME, 0, true);
+ SUBTEST(GL_INVALID_ENUM, pass, "default fb attachment, user fbo");
+
+ /* Bad attachment name for default fbo */
+ get_param(0, GL_COLOR_ATTACHMENT0,
+ GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME, 0, true);
+ SUBTEST(GL_INVALID_ENUM, pass, "fbo attachment, default fb");
+
+ /* Default fbo */
+ SUBTESTCONDITION(get_param(0, GL_FRONT_LEFT,
+ GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE,
+ GL_FRAMEBUFFER_DEFAULT, false), pass,
+ "default fb with default fb attachment");
+ piglit_check_gl_error(GL_NO_ERROR);
+
+
+ glDeleteTextures(1, &texture);
+ glDeleteFramebuffers(1, &fbo);
+
+ return pass ? PIGLIT_PASS : PIGLIT_FAIL;
+}
--
2.1.0
_______________________________________________
Piglit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/piglit
