[Piglit] [PATCH] wgl: add new multi-context, multi-window rendering tests

Neha Bhende bhenden at vmware.com
Wed Jul 12 03:58:02 UTC 2017


Looks great!


Reviewed-by: Neha Bhende<bhenden at vmware.com>


Regards,

Neha

________________________________
From: Brian Paul <brianp at vmware.com>
Sent: Tuesday, July 11, 2017 8:22:07 PM
To: piglit at lists.freedesktop.org
Cc: Charmaine Lee; Neha Bhende; Brian Paul
Subject: [PATCH] wgl: add new multi-context, multi-window rendering tests

Like the corresponding glx tests which I recently added.
Both pass on native NVIDIA drivers.  The multi-context-single-window
test fails with the VMware OpenGL driver.
---
 tests/all.py                                |   2 +
 tests/wgl/CMakeLists.gl.txt                 |   2 +
 tests/wgl/wgl-multi-context-single-window.c | 155 ++++++++++++++++++++++++++++
 tests/wgl/wgl-multi-window-single-context.c | 130 +++++++++++++++++++++++
 4 files changed, 289 insertions(+)
 create mode 100644 tests/wgl/wgl-multi-context-single-window.c
 create mode 100644 tests/wgl/wgl-multi-window-single-context.c

diff --git a/tests/all.py b/tests/all.py
index a7a0e20..e08cee9 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -839,6 +839,8 @@ with profile.test_list.group_manager(
         PiglitGLTest, 'wgl',
         require_platforms=['wgl']) as g:
     g(['wgl-sanity'])
+    g(['wgl-multi-context-single-window'])
+    g(['wgl-multi-window-single-context'])

 with profile.test_list.group_manager(
         PiglitGLTest,
diff --git a/tests/wgl/CMakeLists.gl.txt b/tests/wgl/CMakeLists.gl.txt
index c631f85..0c8135f 100644
--- a/tests/wgl/CMakeLists.gl.txt
+++ b/tests/wgl/CMakeLists.gl.txt
@@ -22,6 +22,8 @@ IF(PIGLIT_BUILD_WGL_TESTS)
                 ${X11_X11_LIB}
         )
         piglit_add_executable (wgl-sanity wgl-sanity.c)
+       piglit_add_executable (wgl-multi-context-single-window wgl-multi-context-single-window.c)
+       piglit_add_executable (wgl-multi-window-single-context wgl-multi-window-single-context.c)
 ENDIF(PIGLIT_BUILD_WGL_TESTS)

 # vim: ft=cmake:
diff --git a/tests/wgl/wgl-multi-context-single-window.c b/tests/wgl/wgl-multi-context-single-window.c
new file mode 100644
index 0000000..a28a324
--- /dev/null
+++ b/tests/wgl/wgl-multi-context-single-window.c
@@ -0,0 +1,155 @@
+/*
+ * Copyright © 2017 VMware, Inc.
+ *
+ * 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.
+ */
+
+/*
+ * Test rendering into one window with multiple contexts.
+ *
+ * Authors:
+ *    Brian Paul
+ */
+
+#include <assert.h>
+#include <stdio.h>
+#include "piglit-util-gl.h"
+#include "piglit-wgl-util.h"
+
+
+
+#define MAX_CONTEXTS 8
+
+static HGLRC ctx[MAX_CONTEXTS];
+static int num_contexts = MAX_CONTEXTS;
+static HWND win;
+
+static const float colors[MAX_CONTEXTS][4] = {
+       {1, 0, 0, 1},
+       {0, 1, 0, 1},
+       {0, 0, 1, 1},
+       {0, 1, 1, 1},
+       {1, 0, 1, 1},
+       {1, 1, 0, 1},
+       {1, 1, 1, 1},
+       {.5, .5, .5, 1},
+};
+
+
+static int rect_size = 40;
+
+
+static int
+rect_pos(int i)
+{
+       return i * rect_size / 2;
+}
+
+
+enum piglit_result
+draw(void)
+{
+       int i;
+       bool pass = true;
+
+       /* draw a series of colored quads, one per context, at increasing
+        * Z distance.
+        */
+       for (i = 0; i < num_contexts; i++) {
+               if (!wglMakeCurrent(GetDC(win), ctx[i])) {
+                       fprintf(stderr, "wglMakeCurrent failed\n");
+                       return PIGLIT_FAIL;
+               }
+
+               if (i == 0) {
+                       glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+               }
+
+               glEnable(GL_DEPTH_TEST);
+               glMatrixMode(GL_PROJECTION);
+               glLoadIdentity();
+               glOrtho(0, piglit_width, 0, piglit_height, 0, 1);
+
+               glMatrixMode(GL_MODELVIEW);
+               glLoadIdentity();
+
+               glPushMatrix();
+               float p = rect_pos(i);
+               float z = -i / 10.0;
+               glTranslatef(p, p, z);
+
+               glColor4fv(colors[i]);
+               piglit_draw_rect(0, 0, rect_size, rect_size);
+
+               glPopMatrix();
+       }
+
+       /* probe rendering */
+       wglMakeCurrent(GetDC(win), ctx[0]);
+       for (i = 0; i < num_contexts; i++) {
+               int x = rect_pos(i) + rect_size * 3 / 4;
+               int p = piglit_probe_pixel_rgb(x, x, colors[i]);
+
+               if (!p) {
+                       printf("Failed probe for rect/context %d\n", i);
+                       pass = false;
+               }
+       }
+
+       SwapBuffers(GetDC(win));
+
+       return pass ? PIGLIT_PASS : PIGLIT_FAIL;
+}
+
+
+int
+main(int argc, char **argv)
+{
+       int i;
+
+       piglit_width = 500;
+       piglit_height = 500;
+
+       for (i = 1; i < argc; i++) {
+               if (strcmp(argv[i], "-auto") == 0) {
+                       piglit_automatic = 1;
+                       break;
+               }
+       }
+
+       win = piglit_get_wgl_window();
+       assert(win);
+
+       for (i = 0; i < num_contexts; i++) {
+               ctx[i] = piglit_get_wgl_context(win);
+               assert(ctx[i]);
+       }
+
+       if (!wglMakeCurrent(GetDC(win), ctx[0])) {
+               fprintf(stderr, "wglMakeCurrent failed\n");
+               return 0;
+       }
+
+       piglit_dispatch_default_init(PIGLIT_DISPATCH_GL);
+
+       piglit_wgl_event_loop(draw);
+
+       return 0;
+}
diff --git a/tests/wgl/wgl-multi-window-single-context.c b/tests/wgl/wgl-multi-window-single-context.c
new file mode 100644
index 0000000..3c801be
--- /dev/null
+++ b/tests/wgl/wgl-multi-window-single-context.c
@@ -0,0 +1,130 @@
+/*
+ * Copyright © 2017 VMware, Inc.
+ *
+ * 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.
+ */
+
+/*
+ * Test rendering into multiple windows with one context.
+ *
+ * Authors:
+ *    Brian Paul
+ */
+
+#include <assert.h>
+#include <stdio.h>
+#include "piglit-util-gl.h"
+#include "piglit-wgl-util.h"
+
+
+#define MAX_WINDOWS 8
+
+static HWND win[MAX_WINDOWS];
+static int num_windows = MAX_WINDOWS;
+static HGLRC ctx;
+
+static const float colors[MAX_WINDOWS][4] = {
+       {1, 0, 0, 1},
+       {0, 1, 0, 1},
+       {0, 0, 1, 1},
+       {0, 1, 1, 1},
+       {1, 0, 1, 1},
+       {1, 1, 0, 1},
+       {1, 1, 1, 1},
+       {.5, .5, .5, 1},
+};
+
+
+enum piglit_result
+draw(void)
+{
+       int i;
+       bool pass = true;
+
+       /* draw colored quad in each window */
+       for (i = 0; i < num_windows; i++) {
+               wglMakeCurrent(GetDC(win[i]), ctx);
+
+               glClear(GL_COLOR_BUFFER_BIT);
+               glColor4fv(colors[i]);
+               piglit_draw_rect(-1, -1, 2, 2);
+       }
+
+       /* probe windows */
+       for (i = 0; i < num_windows; i++) {
+               wglMakeCurrent(GetDC(win[i]), ctx);
+
+               glReadBuffer(GL_BACK);
+               /* only read back 20x20 region instead of
+                * piglit_width x piglit_height since Windows may
+                * resize our windows.
+                */
+               int p = piglit_probe_rect_rgb(0, 0, 20, 20,
+                                             colors[i]);
+
+               SwapBuffers(GetDC(win[i]));
+
+               if (!p) {
+                       printf("Failed probe in window %d\n", i);
+                       pass = false;
+               }
+       }
+
+       return pass ? PIGLIT_PASS : PIGLIT_FAIL;
+}
+
+
+int
+main(int argc, char **argv)
+{
+       int i;
+
+       piglit_width = 100;
+       piglit_height = 100;
+
+       for (i = 1; i < argc; i++) {
+               if (strcmp(argv[i], "-auto") == 0) {
+                       piglit_automatic = 1;
+                       break;
+               }
+       }
+
+       /* Create windows */
+       for (i = 0; i < num_windows; i++) {
+               win[i] = piglit_get_wgl_window();
+               MoveWindow(win[i], i*130, 0,
+                          piglit_width, piglit_height, FALSE);
+               assert(win[i]);
+       }
+
+       ctx = piglit_get_wgl_context(win[0]);
+       assert(ctx);
+
+       if (!wglMakeCurrent(GetDC(win[0]), ctx)) {
+               fprintf(stderr, "wglMakeCurrent failed\n");
+               return 0;
+       }
+
+       piglit_dispatch_default_init(PIGLIT_DISPATCH_GL);
+
+       piglit_wgl_event_loop(draw);
+
+       return 0;
+}
--
1.9.1

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/piglit/attachments/20170712/1e804724/attachment-0001.html>


More information about the Piglit mailing list