On 26/02/15 13:06, Tapani Pälli wrote:


On 02/16/2015 03:12 PM, Martin Peres wrote:
Signed-off-by: Martin Peres <[email protected]>
---
  tests/all.py                                       |   1 +
  .../spec/arb_direct_state_access/CMakeLists.gl.txt |   1 +
.../create-programpipelines.c | 129 +++++++++++++++++++++
  3 files changed, 131 insertions(+)
create mode 100644 tests/spec/arb_direct_state_access/create-programpipelines.c

diff --git a/tests/all.py b/tests/all.py
index 5729b12..0e2c59c 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -4430,6 +4430,7 @@ spec['ARB_direct_state_access']['compressedtextureimage'] = PiglitGLTest(['arb_d spec['ARB_direct_state_access']['getcompressedtextureimage'] = PiglitGLTest(['arb_direct_state_access-getcompressedtextureimage'], run_concurrent=True) spec['ARB_direct_state_access']['texture-storage-multisample'] = PiglitGLTest(['arb_direct_state_access-texture-storage-multisample'], run_concurrent=True) spec['ARB_direct_state_access']['texture-buffer'] = PiglitGLTest(['arb_direct_state_access-texture-buffer'], run_concurrent=True) +spec['ARB_direct_state_access']['create-programpipelines'] = PiglitGLTest(['arb_direct_state_access-create-programpipelines'], run_concurrent=True) spec['ARB_direct_state_access']['create-queries'] = PiglitGLTest(['arb_direct_state_access-create-queries'], run_concurrent=True)

  arb_shader_image_load_store = {}
diff --git a/tests/spec/arb_direct_state_access/CMakeLists.gl.txt b/tests/spec/arb_direct_state_access/CMakeLists.gl.txt
index f998c25..2a65bf5 100644
--- a/tests/spec/arb_direct_state_access/CMakeLists.gl.txt
+++ b/tests/spec/arb_direct_state_access/CMakeLists.gl.txt
@@ -31,5 +31,6 @@ piglit_add_executable (arb_direct_state_access-compressedtextureimage compressed piglit_add_executable (arb_direct_state_access-getcompressedtextureimage getcompressedtextureimage.c) piglit_add_executable (arb_direct_state_access-texture-storage-multisample texture-storage-multisample.c) piglit_add_executable (arb_direct_state_access-texture-buffer texture-buffer.c) +piglit_add_executable (arb_direct_state_access-create-programpipelines create-programpipelines.c) piglit_add_executable (arb_direct_state_access-create-queries create-queries.c)
  # vim: ft=cmake:
diff --git a/tests/spec/arb_direct_state_access/create-programpipelines.c b/tests/spec/arb_direct_state_access/create-programpipelines.c
new file mode 100644
index 0000000..a94f09a
--- /dev/null
+++ b/tests/spec/arb_direct_state_access/create-programpipelines.c
@@ -0,0 +1,129 @@
+/*
+ * 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 create-programpipelines.c
+ *
+ * Tests glCreateProgramPipelines to see if it behaves in the expected way,
+ * throwing the correct errors, etc.
+ */
+
+#include "piglit-util-gl.h"
+#include "dsa-utils.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+    config.supports_gl_compat_version = 13;
+
+    config.window_visual = PIGLIT_GL_VISUAL_RGBA |
+        PIGLIT_GL_VISUAL_DOUBLE;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+void
+piglit_init(int argc, char **argv)
+{
+    piglit_require_extension("GL_ARB_direct_state_access");
+    piglit_require_extension("GL_ARB_separate_shader_objects");
+}
+
+enum piglit_result
+piglit_display(void)
+{
+    bool pass = true;
+    GLchar label[11];
+    GLsizei length;
+    GLuint ids[10];
+    GLint param;
+
+    /* Throw some invalid inputs at glCreateProgramPipelines */
+
+    /* n is negative */
+    glCreateProgramPipelines(-1, ids);
+    SUBTEST(GL_INVALID_VALUE, pass, "negative n");
+
+    /* Throw some valid inputs at glCreateProgramPipelines. */
+
+    /* n is zero */
+    glCreateProgramPipelines(0, NULL);
+    SUBTEST(GL_NO_ERROR, pass, "n is 0");
+
+    /* n is more than 1 */
+    glCreateProgramPipelines(10, ids);
+    SUBTEST(GL_NO_ERROR, pass, "n > 1");
+
+ /* test the default state of dsa-created program pipeline objects */
+    SUBTESTCONDITION(glIsProgramPipeline(ids[2]), pass,
+             "IsProgramPipeline()");
+
+    glGetProgramPipelineiv(ids[2], GL_ACTIVE_PROGRAM, &param);
+    piglit_check_gl_error(GL_NO_ERROR);
+    SUBTESTCONDITION(param == 0, pass,
+             "default active program(%d) == 0", param);
+
+    glGetProgramPipelineiv(ids[2], GL_VERTEX_SHADER, &param);
+    piglit_check_gl_error(GL_NO_ERROR);
+    SUBTESTCONDITION(param == 0, pass,
+             "default vertex shader program(%d) == 0", param);
+
+    glGetProgramPipelineiv(ids[2], GL_GEOMETRY_SHADER, &param);
+    piglit_check_gl_error(GL_NO_ERROR);
+    SUBTESTCONDITION(param == 0, pass,
+             "default geometry shader program(%d) == 0", param);
+
+    glGetProgramPipelineiv(ids[2], GL_FRAGMENT_SHADER, &param);
+    piglit_check_gl_error(GL_NO_ERROR);
+    SUBTESTCONDITION(param == 0, pass,
+             "default fragment shader program(%d) == 0", param);
+
+    glGetProgramPipelineiv(ids[2], GL_COMPUTE_SHADER, &param);

I think you should require GL_ARB_compute_shader for this subtest. Otherwise there is (should be) error thrown for this enum.

+    piglit_check_gl_error(GL_NO_ERROR);
+    SUBTESTCONDITION(param == 0, pass,
+             "default compute shader program(%d) == 0", param);
+
+    glGetProgramPipelineiv(ids[2], GL_TESS_CONTROL_SHADER, &param);
+    piglit_check_gl_error(GL_NO_ERROR);
+    SUBTESTCONDITION(param == 0, pass,
+             "default TCS(%d) == 0", param);
+
+    glGetProgramPipelineiv(ids[2], GL_TESS_EVALUATION_SHADER, &param);
+    piglit_check_gl_error(GL_NO_ERROR);
+    SUBTESTCONDITION(param == 0, pass,
+             "default TES(%d) == 0", param);

And these ones should require GL_ARB_tessellation_shader support, otherwise will throw error.

Thanks a lot Tapani. All your remarks should have been addressed in the new series. Please check and give me your R-b if you are satisfied.


+
+    glGetProgramPipelineiv(ids[2], GL_VALIDATE_STATUS, &param);
+    piglit_check_gl_error(GL_NO_ERROR);
+    SUBTESTCONDITION(param == GL_FALSE, pass,
+             "default validate status(%d) == FALSE", param);
+
+    glGetProgramPipelineiv(ids[2], GL_INFO_LOG_LENGTH, &param);
+    piglit_check_gl_error(GL_NO_ERROR);
+    SUBTESTCONDITION(param == 0, pass,
+             "startup log length(%d) == 0", param);
+
+    glGetObjectLabel(GL_PROGRAM_PIPELINE, ids[2], 11, &length, label);
+    piglit_check_gl_error(GL_NO_ERROR);
+    SUBTESTCONDITION(length == 0, pass,
+             "default label size(%d) == 0", length);
+
+    return pass ? PIGLIT_PASS : PIGLIT_FAIL;
+}


_______________________________________________
Piglit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/piglit

Reply via email to