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

Unified Diff: ui/ozone/platform/drm/gpu/mock_scanout_buffer.cc

Issue 2951193002: ozone/drm: Only reuse ScanoutBuffers with compatible modifiers (Closed)
Patch Set: Created 3 years, 6 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
Index: ui/ozone/platform/drm/gpu/mock_scanout_buffer.cc
diff --git a/ui/ozone/platform/drm/gpu/mock_scanout_buffer.cc b/ui/ozone/platform/drm/gpu/mock_scanout_buffer.cc
index 91c0082d97914e23404df76981dca81166dee434..fd15615ecd6f6d67a57c10b0f175aeecdfaeb802 100644
--- a/ui/ozone/platform/drm/gpu/mock_scanout_buffer.cc
+++ b/ui/ozone/platform/drm/gpu/mock_scanout_buffer.cc
@@ -3,16 +3,30 @@
// found in the LICENSE file.
#include "ui/ozone/platform/drm/gpu/mock_scanout_buffer.h"
+#include "ui/ozone/platform/drm/gpu/mock_drm_device.h"
namespace ui {
-MockScanoutBuffer::MockScanoutBuffer(const gfx::Size& size, uint32_t format)
- : size_(size), format_(format) {}
+namespace {
+
+uint32_t g_current_framebuffer_id = 1;
+
+} // namespace
+
+MockScanoutBuffer::MockScanoutBuffer(const gfx::Size& size,
+ uint32_t format,
+ uint64_t modifier,
+ const scoped_refptr<DrmDevice>& drm)
+ : size_(size),
+ format_(format),
+ modifier_(modifier),
+ id_(g_current_framebuffer_id++),
+ drm_(drm) {}
MockScanoutBuffer::~MockScanoutBuffer() {}
uint32_t MockScanoutBuffer::GetFramebufferId() const {
- return 1;
+ return id_;
}
uint32_t MockScanoutBuffer::GetOpaqueFramebufferId() const {
@@ -35,8 +49,12 @@ uint32_t MockScanoutBuffer::GetOpaqueFramebufferPixelFormat() const {
return format_;
}
+uint64_t MockScanoutBuffer::GetFormatModifier() const {
+ return modifier_;
+}
+
const DrmDevice* MockScanoutBuffer::GetDrmDevice() const {
- return nullptr;
+ return drm_.get();
}
bool MockScanoutBuffer::RequiresGlFinish() const {
« no previous file with comments | « ui/ozone/platform/drm/gpu/mock_scanout_buffer.h ('k') | ui/ozone/platform/drm/gpu/mock_scanout_buffer_generator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698