st/mesa: implement ARB_sync

The ServerWaitSync implementation matches Intel's driver.

The extension is advertised when pipe_screen::fence_finish is set.

6 files changed, 168 insertions, 0 deletions

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 7e8bb2486c3..f797d62dc0e 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -197,6 +197,7 @@ statetracker_sources = [
     'state_tracker/st_cb_queryobj.c',
     'state_tracker/st_cb_rasterpos.c',
     'state_tracker/st_cb_readpixels.c',
+    'state_tracker/st_cb_syncobj.c',
     'state_tracker/st_cb_strings.c',
     'state_tracker/st_cb_texture.c',
     'state_tracker/st_cb_viewport.c',
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index ae92e4da940..95330947a83 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -215,6 +215,7 @@ STATETRACKER_SOURCES = \
 	state_tracker/st_cb_queryobj.c \
 	state_tracker/st_cb_rasterpos.c \
 	state_tracker/st_cb_readpixels.c \
+	state_tracker/st_cb_syncobj.c \
 	state_tracker/st_cb_strings.c \
 	state_tracker/st_cb_texture.c \
 	state_tracker/st_cb_viewport.c \
diff --git a/src/mesa/state_tracker/st_cb_syncobj.c b/src/mesa/state_tracker/st_cb_syncobj.c
new file mode 100644
index 00000000000..69a8678a7c0
--- /dev/null
+++ b/src/mesa/state_tracker/st_cb_syncobj.c
@@ -0,0 +1,122 @@
+/**************************************************************************
+ *
+ * Copyright 2011 Marek Olšák <[email protected]>
+ * All Rights Reserved.
+ *
+ * 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, sub license, 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 NON-INFRINGEMENT.
+ * IN NO EVENT SHALL AUTHORS AND/OR ITS SUPPLIERS 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.
+ *
+ **************************************************************************/
+
+ /*
+  * Authors:
+  *   Marek Olšák <[email protected]>
+  */
+
+#include "main/glheader.h"
+#include "main/macros.h"
+#include "pipe/p_context.h"
+#include "pipe/p_screen.h"
+#include "st_context.h"
+#include "st_cb_syncobj.h"
+
+struct st_sync_object {
+   struct gl_sync_object b;
+
+   struct pipe_fence_handle *fence;
+};
+
+
+static struct gl_sync_object * st_new_sync_object(struct gl_context *ctx,
+                                                  GLenum type)
+{
+   if (type == GL_SYNC_FENCE)
+      return (struct gl_sync_object*)CALLOC_STRUCT(st_sync_object);
+   else
+      return NULL;
+}
+
+static void st_delete_sync_object(struct gl_context *ctx,
+                                  struct gl_sync_object *obj)
+{
+   struct pipe_screen *screen = st_context(ctx)->pipe->screen;
+   struct st_sync_object *so = (struct st_sync_object*)obj;
+
+   screen->fence_reference(screen, &so->fence, NULL);
+   FREE(so);
+}
+
+static void st_fence_sync(struct gl_context *ctx, struct gl_sync_object *obj,
+                          GLenum condition, GLbitfield flags)
+{
+   struct pipe_context *pipe = st_context(ctx)->pipe;
+   struct st_sync_object *so = (struct st_sync_object*)obj;
+
+   assert(condition == GL_SYNC_GPU_COMMANDS_COMPLETE && flags == 0);
+   assert(so->fence == NULL);
+
+   pipe->flush(pipe, 0, &so->fence);
+}
+
+static void st_check_sync(struct gl_context *ctx, struct gl_sync_object *obj)
+{
+   struct pipe_screen *screen = st_context(ctx)->pipe->screen;
+   struct st_sync_object *so = (struct st_sync_object*)obj;
+
+   if (so->fence && screen->fence_signalled(screen, so->fence, 0) == 0) {
+      screen->fence_reference(screen, &so->fence, NULL);
+      so->b.StatusFlag = GL_TRUE;
+   }
+}
+
+static void st_client_wait_sync(struct gl_context *ctx,
+                                struct gl_sync_object *obj,
+                                GLbitfield flags, GLuint64 timeout)
+{
+   struct pipe_screen *screen = st_context(ctx)->pipe->screen;
+   struct st_sync_object *so = (struct st_sync_object*)obj;
+
+   /* We don't care about GL_SYNC_FLUSH_COMMANDS_BIT, because flush is
+    * already called when creating a fence. */
+
+   if (so->fence) {
+      screen->fence_finish(screen, so->fence, 0);
+      screen->fence_reference(screen, &so->fence, NULL);
+      so->b.StatusFlag = GL_TRUE;
+   }
+}
+
+static void st_server_wait_sync(struct gl_context *ctx,
+                                struct gl_sync_object *obj,
+                                GLbitfield flags, GLuint64 timeout)
+{
+   /* NO-OP.
+    * Neither Gallium nor DRM interfaces support blocking on the GPU. */
+}
+
+void st_init_syncobj_functions(struct dd_function_table *functions)
+{
+   functions->NewSyncObject = st_new_sync_object;
+   functions->FenceSync = st_fence_sync;
+   functions->DeleteSyncObject = st_delete_sync_object;
+   functions->CheckSync = st_check_sync;
+   functions->ClientWaitSync = st_client_wait_sync;
+   functions->ServerWaitSync = st_server_wait_sync;
+}
diff --git a/src/mesa/state_tracker/st_cb_syncobj.h b/src/mesa/state_tracker/st_cb_syncobj.h
new file mode 100644
index 00000000000..c254684780c
--- /dev/null
+++ b/src/mesa/state_tracker/st_cb_syncobj.h
@@ -0,0 +1,38 @@
+/**************************************************************************
+ *
+ * Copyright 2011 Marek Olšák <[email protected]>
+ * All Rights Reserved.
+ *
+ * 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, sub license, 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 NON-INFRINGEMENT.
+ * IN NO EVENT SHALL AUTHORS AND/OR ITS SUPPLIERS 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.
+ *
+ **************************************************************************/
+
+#ifndef ST_CB_SYNCOBJ_H
+#define ST_CB_SYNCOBJ_H
+
+
+struct dd_function_table;
+
+extern void
+st_init_syncobj_functions(struct dd_function_table *functions);
+
+
+#endif /* ST_CB_SYNCOBJ_H */
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 7a19f35bbf5..60972e07de8 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -51,6 +51,7 @@
 #include "st_cb_texture.h"
 #include "st_cb_xformfb.h"
 #include "st_cb_flush.h"
+#include "st_cb_syncobj.h"
 #include "st_cb_strings.h"
 #include "st_cb_viewport.h"
 #include "st_atom.h"
@@ -292,6 +293,7 @@ void st_init_driver_functions(struct dd_function_table *functions)
    st_init_viewport_functions(functions);
 
    st_init_xformfb_functions(functions);
+   st_init_syncobj_functions(functions);
 
    functions->UpdateState = st_invalidate_state;
 }
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index d96985a3747..aaa1658f4a0 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -518,4 +518,8 @@ void st_init_extensions(struct st_context *st)
    if (screen->get_param(screen, PIPE_CAP_VERTEX_ELEMENT_INSTANCE_DIVISOR)) {
       ctx->Extensions.ARB_instanced_arrays = GL_TRUE;
    }
+
+   if (screen->fence_finish) {
+      ctx->Extensions.ARB_sync = GL_TRUE;
+   }
 }