gl/vdpau: chnaged to API to C

Author: MartinPulec

src/video_display/gl.cpp

@@ -477,9 +477,7 @@ struct state_gl {
         struct dictionary *window_hints;
         int use_pbo = -1;
         int req_monitor_idx = -1;
-#ifdef HWACC_VDPAU
-        struct state_vdpau vdp;
-#endif
+        struct state_vdpau *vdp{};
         bool         vdp_interop = false;
         void*        scratchpad{}; ///< scratchpad sized WxHx8
 
@@ -1180,12 +1178,10 @@ static void gl_reconfigure_screen(struct state_gl *s, struct video_desc desc)
                                 (desc.width + 3) / 4 * 4, s->dxt_height, 0,
                                 (desc.width + 3) / 4 * 4 * s->dxt_height,
                                 NULL);
+        } else if (desc.color_spec == HW_VDPAU) {
+                s->vdp = vdp_init();
         }
-#ifdef HWACC_VDPAU
-        else if (desc.color_spec == HW_VDPAU) {
-                s->vdp.init();
-        }
-#endif
+
         glActiveTexture(GL_TEXTURE0 + 0);
         glBindTexture(GL_TEXTURE_2D, s->texture_display);
         struct pixfmt_config const *cfg = get_pixfmt_config(desc.color_spec);
@@ -1966,12 +1962,12 @@ static void upload_compressed_texture(struct state_gl *s, char *data) {
 
 static void upload_texture(struct state_gl *s, char *data)
 {
-#ifdef HWACC_VDPAU
         if (s->current_display_desc.color_spec == HW_VDPAU) {
-                s->vdp.loadFrame(reinterpret_cast<hw_vdpau_frame *>(data));
+                vdp_load_frame(s->vdp,
+                               reinterpret_cast<struct hw_vdpau_frame *>(data));
                 return;
         }
-#endif
+
         if (s->current_display_desc.color_spec == DXT1 || s->current_display_desc.color_spec == DXT1_YUV || s->current_display_desc.color_spec == DXT5) {
                 upload_compressed_texture(s, data);
                 return;
@@ -2227,6 +2223,7 @@ static void display_gl_done(void *state)
         glfwTerminate();
 
         module_done(&s->mod);
+        vdp_destroy(s->vdp);
 
         delete s;
 }

src/video_display/gl_vdpau.hpp

@@ -52,7 +52,27 @@ struct state_vdpau {
 
 };
 
+static inline struct state_vdpau *
+vdp_init()
+{
+        struct state_vdpau *vdp = new state_vdpau();
+        vdp->init();
+        return vdp;
+}
+
+static inline void
+vdp_load_frame(struct state_vdpau *vdp, hw_vdpau_frame *frame)
+{
+        vdp->loadFrame(frame);
+}
+
+static inline void vdp_destroy(struct state_vdpau *vdp) { delete vdp; }
 
+#else
+
+#define vdp_init() 0
+#define vdp_destroy(...)
+#define vdp_load_frame(...)
 
 #endif //HWACC_VDPAU
 #endif //GL_VDPAU_HPP_667244de5757