[Mesa-dev] [PATCH 16/22] st/vdpau: remove obsolete define VL_HANDLES

[Christian König]

Am 19.08.2014 um 01:20 schrieb Emil Velikov:
> This define is always set and it had no real purpose according to
> git log. Seems like it is a leftover from the vl/vdpau prototype
> stage.
>
> Cc: Christian König <christian.koenig at amd.com>
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   src/gallium/state_trackers/vdpau/htab.c          | 25 +++++-------------------
>   src/gallium/state_trackers/vdpau/vdpau_private.h |  1 -
>   2 files changed, 5 insertions(+), 21 deletions(-)
>
> diff --git a/src/gallium/state_trackers/vdpau/htab.c b/src/gallium/state_trackers/vdpau/htab.c
> index 16da577..1d7b3ff 100644
> --- a/src/gallium/state_trackers/vdpau/htab.c
> +++ b/src/gallium/state_trackers/vdpau/htab.c
> @@ -29,15 +29,13 @@
>   #include "os/os_thread.h"
>   #include "vdpau_private.h"
>   
> -#ifdef VL_HANDLES
>   static struct handle_table *htab = NULL;
>   pipe_static_mutex(htab_lock);
> -#endif
>   
>   boolean vlCreateHTAB(void)
>   {
> -#ifdef VL_HANDLES
>      boolean ret;
> +
>      /* Make sure handle table handles match VDPAU handles. */
>      assert(sizeof(unsigned) <= sizeof(vlHandle));
>      pipe_mutex_lock(htab_lock);
> @@ -46,59 +44,46 @@ boolean vlCreateHTAB(void)
>      ret = htab != NULL;
>      pipe_mutex_unlock(htab_lock);
>      return ret;
> -#else
> -   return TRUE;
> -#endif
>   }
>   
>   void vlDestroyHTAB(void)
>   {
> -#ifdef VL_HANDLES
>      pipe_mutex_lock(htab_lock);
>      if (htab && !handle_table_get_first_handle(htab)) {
>         handle_table_destroy(htab);
>         htab = NULL;
>      }
>      pipe_mutex_unlock(htab_lock);
> -#endif
>   }
>   
>   vlHandle vlAddDataHTAB(void *data)
>   {
> -   assert(data);
> -#ifdef VL_HANDLES
>      vlHandle handle = 0;
> +
> +   assert(data);
>      pipe_mutex_lock(htab_lock);
>      if (htab)
>         handle = handle_table_add(htab, data);
>      pipe_mutex_unlock(htab_lock);
>      return handle;
> -#else
> -   return (vlHandle)data;
> -#endif
>   }
>   
>   void* vlGetDataHTAB(vlHandle handle)
>   {
> -   assert(handle);
> -#ifdef VL_HANDLES
>      void *data = NULL;
> +
> +   assert(handle);
>      pipe_mutex_lock(htab_lock);
>      if (htab)
>         data = handle_table_get(htab, handle);
>      pipe_mutex_unlock(htab_lock);
>      return data;
> -#else
> -   return (void*)handle;
> -#endif
>   }
>   
>   void vlRemoveDataHTAB(vlHandle handle)
>   {
> -#ifdef VL_HANDLES
>      pipe_mutex_lock(htab_lock);
>      if (htab)
>         handle_table_remove(htab, handle);
>      pipe_mutex_unlock(htab_lock);
> -#endif
>   }
> diff --git a/src/gallium/state_trackers/vdpau/vdpau_private.h b/src/gallium/state_trackers/vdpau/vdpau_private.h
> index 65f8e47..fb83908 100644
> --- a/src/gallium/state_trackers/vdpau/vdpau_private.h
> +++ b/src/gallium/state_trackers/vdpau/vdpau_private.h
> @@ -57,7 +57,6 @@
>   #define QUOTEME(x) #x
>   #define TOSTRING(x) QUOTEME(x)
>   #define INFORMATION_STRING TOSTRING(INFORMATION)
> -#define VL_HANDLES
>   
>   static inline enum pipe_video_chroma_format
>   ChromaToPipe(VdpChromaType vdpau_type)