[Mesa-dev] [PATCH 2/2] mesa: remove gl_sync_object::Type field

[Marek Olšák]

For the series:

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

Marek

On Thu, Jul 27, 2017 at 4:05 PM, Samuel Pitoiset
<samuel.pitoiset at gmail.com> wrote:
> This is useless.
>
> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
> ---
>  src/mesa/main/mtypes.h  | 1 -
>  src/mesa/main/syncobj.c | 5 +----
>  2 files changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
> index 0d0536c775..404d586ff7 100644
> --- a/src/mesa/main/mtypes.h
> +++ b/src/mesa/main/mtypes.h
> @@ -3188,7 +3188,6 @@ struct gl_query_state
>  /** Sync object state */
>  struct gl_sync_object
>  {
> -   GLenum Type;               /**< GL_SYNC_FENCE */
>     GLuint Name;               /**< Fence name */
>     GLchar *Label;             /**< GL_KHR_debug */
>     GLint RefCount;            /**< Reference count */
> diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
> index 981e5db470..84f920bf14 100644
> --- a/src/mesa/main/syncobj.c
> +++ b/src/mesa/main/syncobj.c
> @@ -164,7 +164,6 @@ _mesa_free_sync_data(struct gl_context *ctx)
>   * Check if the given sync object is:
>   *  - non-null
>   *  - not in sync objects hash table
> - *  - type is GL_SYNC_FENCE
>   *  - not marked as deleted
>   *
>   * Returns the internal gl_sync_object pointer if the sync object is valid
> @@ -181,7 +180,6 @@ _mesa_get_and_ref_sync(struct gl_context *ctx, GLsync sync, bool incRefCount)
>     mtx_lock(&ctx->Shared->Mutex);
>     if (syncObj != NULL
>        && _mesa_set_search(ctx->Shared->SyncObjects, syncObj) != NULL
> -      && (syncObj->Type == GL_SYNC_FENCE)
>        && !syncObj->DeletePending) {
>       if (incRefCount) {
>         syncObj->RefCount++;
> @@ -280,7 +278,6 @@ fence_sync(struct gl_context *ctx, GLenum condition, GLbitfield flags)
>
>     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
>         * applications.  If sync support is extended to provide support for
>         * NV_fence, this field will be used.  We'll also need to add an object
> @@ -463,7 +460,7 @@ _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
>
>     switch (pname) {
>     case GL_OBJECT_TYPE:
> -      v[0] = syncObj->Type;
> +      v[0] = GL_SYNC_FENCE;
>        size = 1;
>        break;
>
> --
> 2.13.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev