diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-08-18 16:56:48 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-08-28 21:24:41 +0100 |
| commit | e3fd703e85c07225d3173f104f5384e0f07233c6 (patch) | |
| tree | 1232545076597799567bb51cd04fb98590498ea4 | |
| parent | 60d772cd9d100a0573371af8461b55804b0f903a (diff) | |
st/vdpau: remove obsolete define VL_HANDLES
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@amd.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
| -rw-r--r-- | src/gallium/state_trackers/vdpau/htab.c | 25 | ||||
| -rw-r--r-- | 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 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 } diff --git a/src/gallium/state_trackers/vdpau/vdpau_private.h b/src/gallium/state_trackers/vdpau/vdpau_private.h index d1443a0196e..e14ce041947 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) |