summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/state_tracker')
-rw-r--r--src/mesa/state_tracker/st_vdpau.c9
-rw-r--r--src/mesa/state_tracker/st_vdpau.h5
2 files changed, 8 insertions, 6 deletions
diff --git a/src/mesa/state_tracker/st_vdpau.c b/src/mesa/state_tracker/st_vdpau.c
index e0126cc03d8..eb61aef1116 100644
--- a/src/mesa/state_tracker/st_vdpau.c
+++ b/src/mesa/state_tracker/st_vdpau.c
@@ -31,6 +31,8 @@
*
*/
+#ifdef HAVE_ST_VDPAU
+
#include "main/texobj.h"
#include "main/teximage.h"
#include "main/errors.h"
@@ -48,8 +50,6 @@
#include "st_format.h"
#include "st_cb_flush.h"
-#ifdef HAVE_ST_VDPAU
-
#include "state_tracker/vdpau_interop.h"
#include "state_tracker/vdpau_dmabuf.h"
#include "state_tracker/vdpau_funcs.h"
@@ -268,13 +268,10 @@ st_vdpau_unmap_surface(struct gl_context *ctx, GLenum target, GLenum access,
st_flush(st, NULL, 0);
}
-#endif
-
void
st_init_vdpau_functions(struct dd_function_table *functions)
{
-#ifdef HAVE_ST_VDPAU
functions->VDPAUMapSurface = st_vdpau_map_surface;
functions->VDPAUUnmapSurface = st_vdpau_unmap_surface;
-#endif
}
+#endif
diff --git a/src/mesa/state_tracker/st_vdpau.h b/src/mesa/state_tracker/st_vdpau.h
index 59c744305cf..6f4d46091f2 100644
--- a/src/mesa/state_tracker/st_vdpau.h
+++ b/src/mesa/state_tracker/st_vdpau.h
@@ -36,7 +36,12 @@
struct dd_function_table;
+#ifdef HAVE_ST_VDPAU
extern void
st_init_vdpau_functions(struct dd_function_table *functions);
+#else
+static inline void
+st_init_vdpau_functions(struct dd_function_table *functions) {}
+#endif
#endif /* ST_VDPAU_H */