From fab9bb700372008130e5026fa9fe5fd22ac6ec4e Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Tue, 3 Oct 2017 12:32:52 +0300
Subject: Rework framebuffer classes

Drop (I)MappedFramebuffer, as it doesn't really provide any value, and
have most of the methods be present in IFramebuffer with default
exception throwing implementation.

This gives us simpler way to use the framebuffers, as almost always we
can just use a pointer to IFramebuffer.
---
 kms++/src/dumbframebuffer.cpp      |  2 +-
 kms++/src/extframebuffer.cpp       |  4 ++--
 kms++/src/mappedframebuffer.cpp    | 20 --------------------
 kms++/src/omap/omapframebuffer.cpp |  2 +-
 4 files changed, 4 insertions(+), 24 deletions(-)
 delete mode 100644 kms++/src/mappedframebuffer.cpp

(limited to 'kms++/src')

diff --git a/kms++/src/dumbframebuffer.cpp b/kms++/src/dumbframebuffer.cpp
index 9de7ee1..b21e8ff 100644
--- a/kms++/src/dumbframebuffer.cpp
+++ b/kms++/src/dumbframebuffer.cpp
@@ -25,7 +25,7 @@ DumbFramebuffer::DumbFramebuffer(Card &card, uint32_t width, uint32_t height, co
 }
 
 DumbFramebuffer::DumbFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format)
-	:MappedFramebuffer(card, width, height), m_format(format)
+	:Framebuffer(card, width, height), m_format(format)
 {
 	Create();
 }
diff --git a/kms++/src/extframebuffer.cpp b/kms++/src/extframebuffer.cpp
index f50c36e..c1f562e 100644
--- a/kms++/src/extframebuffer.cpp
+++ b/kms++/src/extframebuffer.cpp
@@ -14,7 +14,7 @@ namespace kms
 
 ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format,
 			       vector<uint32_t> handles, vector<uint32_t> pitches, vector<uint32_t> offsets)
-	: MappedFramebuffer(card, width, height)
+	: Framebuffer(card, width, height)
 {
 	m_format = format;
 
@@ -44,7 +44,7 @@ ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, Pixe
 
 ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format,
 			       vector<int> fds, vector<uint32_t> pitches, vector<uint32_t> offsets)
-	: MappedFramebuffer(card, width, height)
+	: Framebuffer(card, width, height)
 {
 	int r;
 
diff --git a/kms++/src/mappedframebuffer.cpp b/kms++/src/mappedframebuffer.cpp
deleted file mode 100644
index 21e082f..0000000
--- a/kms++/src/mappedframebuffer.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <kms++/kms++.h>
-
-using namespace std;
-
-namespace kms
-{
-
-MappedFramebuffer::MappedFramebuffer(Card& card, uint32_t id)
-	: Framebuffer(card, id)
-{
-
-}
-
-MappedFramebuffer::MappedFramebuffer(Card& card, uint32_t width, uint32_t height)
-	: Framebuffer(card, width, height)
-{
-
-}
-
-}
diff --git a/kms++/src/omap/omapframebuffer.cpp b/kms++/src/omap/omapframebuffer.cpp
index b27ca22..f33a286 100644
--- a/kms++/src/omap/omapframebuffer.cpp
+++ b/kms++/src/omap/omapframebuffer.cpp
@@ -32,7 +32,7 @@ OmapFramebuffer::OmapFramebuffer(OmapCard& card, uint32_t width, uint32_t height
 }
 
 OmapFramebuffer::OmapFramebuffer(OmapCard& card, uint32_t width, uint32_t height, PixelFormat format, Flags flags)
-	:MappedFramebuffer(card, width, height), m_omap_card(card), m_format(format)
+	:Framebuffer(card, width, height), m_omap_card(card), m_format(format)
 {
 	Create(flags);
 }
-- 
cgit v1.2.3