Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(615)

Unified Diff: ui/gl/gl_image_dxgi.h

Issue 2968503003: Allow presenting DXGI share handles as overlays. (Closed)
Patch Set: fix keyed mutex usage Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/gpu/dxva_picture_buffer_win.cc ('k') | ui/gl/gl_image_dxgi.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_image_dxgi.h
diff --git a/ui/gl/gl_image_dxgi.h b/ui/gl/gl_image_dxgi.h
index c61946100ee47b893d1061959b7e3275733e3fd3..c87d4025e3bb6e4f5d13b2d2425516f5ff4a3415 100644
--- a/ui/gl/gl_image_dxgi.h
+++ b/ui/gl/gl_image_dxgi.h
@@ -5,6 +5,7 @@
#include <d3d11.h>
#include "base/win/scoped_comptr.h"
+#include "base/win/scoped_handle.h"
#include "ui/gl/gl_export.h"
#include "ui/gl/gl_image.h"
@@ -12,12 +13,12 @@ typedef void* EGLStreamKHR;
namespace gl {
-class GL_EXPORT GLImageDXGI : public GLImage {
+class GL_EXPORT GLImageDXGIBase : public GLImage {
public:
- GLImageDXGI(const gfx::Size& size, EGLStreamKHR stream);
+ GLImageDXGIBase(const gfx::Size& size);
// Safe downcast. Returns nullptr on failure.
- static GLImageDXGI* FromGLImage(GLImage* image);
+ static GLImageDXGIBase* FromGLImage(GLImage* image);
// GLImage implementation.
gfx::Size GetSize() override;
@@ -39,23 +40,38 @@ class GL_EXPORT GLImageDXGI : public GLImage {
const std::string& dump_name) override;
Type GetType() const override;
- void SetTexture(const base::win::ScopedComPtr<ID3D11Texture2D>& texture,
- size_t level);
-
base::win::ScopedComPtr<ID3D11Texture2D> texture() { return texture_; }
size_t level() const { return level_; }
+ base::win::ScopedComPtr<IDXGIKeyedMutex> keyed_mutex() {
+ return keyed_mutex_;
+ }
protected:
- ~GLImageDXGI() override;
+ ~GLImageDXGIBase() override;
gfx::Size size_;
- EGLStreamKHR stream_;
-
base::win::ScopedComPtr<ID3D11Texture2D> texture_;
+ base::win::ScopedComPtr<IDXGIKeyedMutex> keyed_mutex_;
size_t level_ = 0;
};
+class GL_EXPORT GLImageDXGI : public GLImageDXGIBase {
+ public:
+ GLImageDXGI(const gfx::Size& size, EGLStreamKHR stream);
+
+ // GLImage implementation.
+ bool BindTexImage(unsigned target) override;
+
+ void SetTexture(const base::win::ScopedComPtr<ID3D11Texture2D>& texture,
+ size_t level);
+
+ protected:
+ ~GLImageDXGI() override;
+
+ EGLStreamKHR stream_;
+};
+
// This copies to a new texture on bind.
class GL_EXPORT CopyingGLImageDXGI : public GLImageDXGI {
public:
@@ -86,4 +102,18 @@ class GL_EXPORT CopyingGLImageDXGI : public GLImageDXGI {
base::win::ScopedComPtr<ID3D11Texture2D> decoder_copy_texture_;
base::win::ScopedComPtr<ID3D11VideoProcessorOutputView> output_view_;
};
+
+class GL_EXPORT GLImageDXGIHandle : public GLImageDXGIBase {
+ public:
+ GLImageDXGIHandle(const gfx::Size& size,
+ base::win::ScopedHandle handle,
+ uint32_t level);
+
+ bool Initialize();
+
+ protected:
+ ~GLImageDXGIHandle() override;
+
+ base::win::ScopedHandle handle_;
+};
}
« no previous file with comments | « media/gpu/dxva_picture_buffer_win.cc ('k') | ui/gl/gl_image_dxgi.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698