vulkan watermark

Author: mfkl

PluginSource/RenderAPI_OpenGLWatermark.h

@@ -1,4 +1,5 @@
-
+#ifndef RENDERAPI_OPENGLWATERMARK_H
+#define RENDERAPI_OPENGLWATERMARK_H
 
 #if defined(UNITY_IPHONE)
 #include <OpenGLES/ES2/gl.h>
@@ -22,18 +23,20 @@ class OpenGLWatermark
  void cleanup();
 
  void draw(GLuint framebuffer, unsigned width, unsigned height);
- 
+
  void randomizePosition();
 
 private:
  void updateVertexBuffer();
- 
+
  GLuint program = 0;
  GLuint vbo = 0;
  GLuint tex = 0;
  GLuint posAttrib = 0;
  GLuint uvAttrib = 0;
- 
+
  float xOffset = -1.f;
  float yOffset = 1.f;
 };
+
+#endif /* RENDERAPI_OPENGLWATERMARK_H */

PluginSource/RenderAPI_Vulkan.cpp

@@ -215,14 +215,32 @@ bool RenderAPI_Vulkan::setup(void **opaque, const libvlc_video_setup_device_cfg_
  auto *that = static_cast<RenderAPI_Vulkan*>(*opaque);
  that->width = 0;
  that->height = 0;
- return true;
+
+ bool ret = true;
+
+#if defined(SHOW_WATERMARK)
+ that->makeCurrent(true);
+
+ ret &= that->watermark.setup();
+
+ that->makeCurrent(false);
+#endif
+
+ return ret;
 }
 
 void RenderAPI_Vulkan::cleanup(void* opaque)
 {
  DEBUG("[Vulkan] output callback cleanup");
  auto *that = static_cast<RenderAPI_Vulkan*>(opaque);
+
+ that->ensureCurrentContext();
  that->releaseHardwareBufferResources();
+
+#if defined(SHOW_WATERMARK)
+ that->watermark.cleanup();
+#endif
+ that->makeCurrent(false);
 }
 
 bool RenderAPI_Vulkan::resize(void* opaque, const libvlc_video_render_cfg_t *cfg,
@@ -271,9 +289,14 @@ void RenderAPI_Vulkan::swap(void* opaque)
 {
  DEBUG_VERBOSE("[Vulkan] swap callback");
  RenderAPI_Vulkan* that = reinterpret_cast<RenderAPI_Vulkan*>(opaque);
- glFlush();
  std::lock_guard<std::mutex> lock(that->text_lock);
  that->updated = true;
+
+#if defined(SHOW_WATERMARK)
+ that->watermark.draw(that->buffers[that->idx_render].fbo, that->width, that->height);
+#endif
+
+ glFlush();
  std::swap(that->idx_swap, that->idx_render);
  glBindFramebuffer(GL_FRAMEBUFFER, that->buffers[that->idx_render].fbo);
  DEBUG_VERBOSE("[Vulkan] swap callback complete");

PluginSource/RenderAPI_Vulkan.h

@@ -5,6 +5,10 @@
 #include "RenderAPI_OpenGLEGL.h"
 #include "PlatformBase.h"
 
+#if defined(SHOW_WATERMARK)
+# include "RenderAPI_OpenGLWatermark.h"
+#endif
+
 #if defined(UNITY_ANDROID)
 #include <android/hardware_buffer.h>
 #include <android/native_window_jni.h>
@@ -144,6 +148,10 @@ class RenderAPI_Vulkan : public RenderAPI_OpenEGL
  static PFN_vkCreateDebugUtilsMessengerEXT vkCreateDebugUtilsMessengerEXT;
  static PFN_vkDestroyDebugUtilsMessengerEXT vkDestroyDebugUtilsMessengerEXT;
 #endif
+
+#if defined(SHOW_WATERMARK)
+ OpenGLWatermark watermark;
+#endif
 };
 
 #endif // UNITY_ANDROID