mesa: drop fence type parameter from NewSyncObject()

This is useless.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/mesa/drivers/dri/i915/intel_syncobj.c b/src/mesa/drivers/dri/i915/intel_syncobj.c
index 0766a169d0169855ac6e3a8512a22f47e73da030..4839164ed97bd23846bc7ba8bc139a9cf9a40dda 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_syncobj.c
+++ b/src/mesa/drivers/dri/i915/intel_syncobj.c
@@ -160,7 +160,7 @@ intel_fence_server_wait(struct intel_context *intel, struct intel_fence *fence)
 }
 
 static struct gl_sync_object *
-intel_gl_new_sync_object(struct gl_context *ctx, GLuint id)
+intel_gl_new_sync_object(struct gl_context *ctx)
 {
    struct intel_gl_sync_object *sync;
 

diff --git a/src/mesa/drivers/dri/i965/brw_sync.c b/src/mesa/drivers/dri/i965/brw_sync.c
index edfb1881bc074a840492ee8540b104cfb7f35409..3926d95d25f5af0460ae3033abb53dc6db044ef2 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_sync.c
+++ b/src/mesa/drivers/dri/i965/brw_sync.c
@@ -337,7 +337,7 @@ brw_fence_server_wait(struct brw_context *brw, struct brw_fence *fence)
 }
 
 static struct gl_sync_object *
-brw_gl_new_sync(struct gl_context *ctx, GLuint id)
+brw_gl_new_sync(struct gl_context *ctx)
 {
    struct brw_gl_sync *sync;
 

diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 8e382e1e9a457a616bcad90545e5e6e58f3be906..462829d755daad7d8e1264df9f5d1cdd24621e5e 100644 (file)
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -872,7 +872,7 @@ struct dd_function_table {
     * \name GL_ARB_sync interfaces
     */
    /*@{*/
-   struct gl_sync_object * (*NewSyncObject)(struct gl_context *, GLenum);
+   struct gl_sync_object * (*NewSyncObject)(struct gl_context *);
    void (*FenceSync)(struct gl_context *, struct gl_sync_object *,
                      GLenum, GLbitfield);
    void (*DeleteSyncObject)(struct gl_context *, struct gl_sync_object *);

diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
index 9c165314bf3b2f59e33a1b3d4132c772172f2254..1b223e5a164a42df2393c075436b570717c0f874 100644 (file)
--- a/src/mesa/main/syncobj.c
+++ b/src/mesa/main/syncobj.c
@@ -69,11 +69,10 @@
 #include "syncobj.h"
 
 static struct gl_sync_object *
-_mesa_new_sync_object(struct gl_context *ctx, GLenum type)
+_mesa_new_sync_object(struct gl_context *ctx)
 {
    struct gl_sync_object *s = CALLOC_STRUCT(gl_sync_object);
    (void) ctx;
-   (void) type;
 
    return s;
 }
@@ -263,7 +262,7 @@ fence_sync(struct gl_context *ctx, GLenum condition, GLbitfield flags)
 {
    struct gl_sync_object *syncObj;
 
-   syncObj = ctx->Driver.NewSyncObject(ctx, GL_SYNC_FENCE);
+   syncObj = ctx->Driver.NewSyncObject(ctx);
    if (syncObj != NULL) {
       syncObj->Type = GL_SYNC_FENCE;
       /* The name is not currently used, and it is never visible to

diff --git a/src/mesa/state_tracker/st_cb_syncobj.c b/src/mesa/state_tracker/st_cb_syncobj.c
index 7a4ba71b3e994f8465e490b28ed6ffdc506e7ebb..637fbe3b73a82b47ebc995ae38fd9495fe5c6181 100644 (file)
--- a/src/mesa/state_tracker/st_cb_syncobj.c
+++ b/src/mesa/state_tracker/st_cb_syncobj.c
@@ -45,17 +45,12 @@ struct st_sync_object {
 };
 
 
-static struct gl_sync_object * st_new_sync_object(struct gl_context *ctx,
-                                                  GLenum type)
+static struct gl_sync_object *st_new_sync_object(struct gl_context *ctx)
 {
-   if (type == GL_SYNC_FENCE) {
-      struct st_sync_object *so = CALLOC_STRUCT(st_sync_object);
+   struct st_sync_object *so = CALLOC_STRUCT(st_sync_object);
 
-      mtx_init(&so->mutex, mtx_plain);
-      return &so->b;
-   } else {
-      return NULL;
-   }
+   mtx_init(&so->mutex, mtx_plain);
+   return &so->b;
 }
 
 static void st_delete_sync_object(struct gl_context *ctx,