1 files changed, 5 insertions, 20 deletions

diff --git a/src/gallium/state_trackers/vdpau/htab.c b/src/gallium/state_trackers/vdpau/htab.c
index 16da577553a..1d7b3fffab2 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
 }