summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a5c28bc)
raw | patch | inline | side by side (parent: a5c28bc)
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | |
Mon, 23 May 2016 07:05:40 +0000 (10:05 +0300) | ||
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | |
Mon, 23 May 2016 07:05:40 +0000 (10:05 +0300) |
17 files changed:
kmscube/cube-egl.cpp | patch | blob | history | |
kmscube/cube-gbm.cpp | patch | blob | history | |
kmscube/cube-gles2.cpp | patch | blob | history | |
kmscube/cube-null.cpp | patch | blob | history | |
kmscube/cube-x11.cpp | patch | blob | history | |
kmscube/cube.cpp | patch | blob | history | |
libkms++util/colorbar.cpp | patch | blob | history | |
libkms++util/extcpuframebuffer.cpp | patch | blob | history | |
libkms++util/kms++util.h | [moved from libkms++util/test.h with 70% similarity] | patch | blob | history |
libkms++util/kmstest.h | [deleted file] | patch | blob | history |
libkms++util/testpat.cpp | patch | blob | history | |
py/pykmsutil.cpp | patch | blob | history | |
utils/db.cpp | patch | blob | history | |
utils/fbtestpat.cpp | patch | blob | history | |
utils/kmscapture.cpp | patch | blob | history | |
utils/kmsview.cpp | patch | blob | history | |
utils/testpat.cpp | patch | blob | history |
diff --git a/kmscube/cube-egl.cpp b/kmscube/cube-egl.cpp
index d2bc7e32f2bb83821767e97ded10516cbd0a71e5..310ff072be0a7f1108ad08a72c78607974796083 100644 (file)
--- a/kmscube/cube-egl.cpp
+++ b/kmscube/cube-egl.cpp
#include "cube-egl.h"
#include "cube.h"
-#include "test.h"
+#include <kms++util.h>
using namespace std;
diff --git a/kmscube/cube-gbm.cpp b/kmscube/cube-gbm.cpp
index 022c7618e23ca2ca12656fb3242b0b68b9affbc0..f6d312b5277718fa879e1cc71d500e2745574ab6 100644 (file)
--- a/kmscube/cube-gbm.cpp
+++ b/kmscube/cube-gbm.cpp
#include <gbm.h>
#include <kms++.h>
-#include "test.h"
+#include <kms++util.h>
#include "cube-egl.h"
#include "cube-gles2.h"
diff --git a/kmscube/cube-gles2.cpp b/kmscube/cube-gles2.cpp
index 68b383182b9f273ca1bd2903ff35bb48a62ea1a0..bda2f59008f48fcd6c04dc67919f8d924b58888b 100644 (file)
--- a/kmscube/cube-gles2.cpp
+++ b/kmscube/cube-gles2.cpp
#include "cube-gles2.h"
#include "cube.h"
-#include "test.h"
+#include <kms++util.h>
using namespace std;
diff --git a/kmscube/cube-null.cpp b/kmscube/cube-null.cpp
index 26233947cb79f7ef179e9b3b49e389e0b39cefef..64fbb45f573fce091fe494635e6a6493e1eb89a8 100644 (file)
--- a/kmscube/cube-null.cpp
+++ b/kmscube/cube-null.cpp
#include "cube-gles2.h"
#include "cube.h"
-#include "test.h"
+#include <kms++util.h>
using namespace std;
diff --git a/kmscube/cube-x11.cpp b/kmscube/cube-x11.cpp
index 9ac64c342926d3369f7d22f59f26f4d2976e1d3b..dde4f61148214347522c0561fa2cc744fb2ad566 100644 (file)
--- a/kmscube/cube-x11.cpp
+++ b/kmscube/cube-x11.cpp
#include "cube-egl.h"
#include "cube-gles2.h"
-#include "test.h"
+#include <kms++util.h>
using namespace std;
diff --git a/kmscube/cube.cpp b/kmscube/cube.cpp
index 42e05be410023c88cf9eb061ac4e2c80564418d2..9aa8a84f72d78e94fdec04d2a4e1d72d6b35aafb 100644 (file)
--- a/kmscube/cube.cpp
+++ b/kmscube/cube.cpp
/* Based on a egl cube test app originally written by Arvin Schnell */
#include "cube.h"
-#include "opts.h"
-#include "test.h"
+#include <opts.h>
+#include <kms++util.h>
using namespace std;
index 9fbec28d98660bcd4ea640cc83f2b00a663ebae7..6a5dbc47199aeef8733d765adeb80f99a875c4a8 100644 (file)
#include <cstdint>
#include <kms++.h>
-
-#include "test.h"
+#include "kms++util.h"
namespace kms
{
index 145168f50e1bfc611b217875be2286fc689667b9..bd0b10c9ad475d7a1cffb949e6d6bfad4b795b32 100644 (file)
#include "extcpuframebuffer.h"
-#include "test.h"
+#include "kms++util.h"
using namespace std;
diff --git a/libkms++util/test.h b/libkms++util/kms++util.h
similarity index 70%
rename from libkms++util/test.h
rename to libkms++util/kms++util.h
index 3631f2ca2f384013ea3f7b12e7c5b7227bf215d3..c02c12cbfc4a37f08497bb73eb8c28122f527ac7 100644 (file)
rename from libkms++util/test.h
rename to libkms++util/kms++util.h
index 3631f2ca2f384013ea3f7b12e7c5b7227bf215d3..c02c12cbfc4a37f08497bb73eb8c28122f527ac7 100644 (file)
--- a/libkms++util/test.h
+++ b/libkms++util/kms++util.h
#pragma once
#include "color.h"
-#include "kmstest.h"
+#include <cstdio>
+#include <cstdlib>
+
+namespace kms
+{
+class IMappedFramebuffer;
+
+void draw_color_bar(IMappedFramebuffer& buf, int old_xpos, int xpos, int width);
+
+void draw_test_pattern(IMappedFramebuffer &fb);
+
+void draw_rect(IMappedFramebuffer &fb, uint32_t x, uint32_t y, uint32_t w, uint32_t h, RGB color);
+}
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
diff --git a/libkms++util/kmstest.h b/libkms++util/kmstest.h
--- a/libkms++util/kmstest.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "color.h"
-#include "framebuffer.h"
-
-namespace kms
-{
-class IMappedFramebuffer;
-
-void draw_color_bar(IMappedFramebuffer& buf, int old_xpos, int xpos, int width);
-
-void draw_test_pattern(IMappedFramebuffer &fb);
-
-void draw_rect(IMappedFramebuffer &fb, uint32_t x, uint32_t y, uint32_t w, uint32_t h, RGB color);
-}
index 68f438540d563e754d9a4dcc594c8aa8e398006e..cee6e85b4e946b167fb74f910bc4601f3536a692 100644 (file)
--- a/libkms++util/testpat.cpp
+++ b/libkms++util/testpat.cpp
#include <cstring>
#include <cassert>
-#include "kms++.h"
-#include "test.h"
-#include "cpuframebuffer.h"
+#include <kms++.h>
+#include <kms++util.h>
+#include <cpuframebuffer.h>
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
diff --git a/py/pykmsutil.cpp b/py/pykmsutil.cpp
index 407330d06ad28368810df86534d17eff62fb0699..0d4cf89e2aeadbc318447c49e658ade757b1b499 100644 (file)
--- a/py/pykmsutil.cpp
+++ b/py/pykmsutil.cpp
#include <pybind11/pybind11.h>
#include <pybind11/stl.h>
#include <kms++.h>
-#include "kmstest.h"
+#include <kms++util.h>
namespace py = pybind11;
diff --git a/utils/db.cpp b/utils/db.cpp
index 3e8420bbb1ac4b02d46b0f895f927a9629b24e13..13bc5e206c5d015fa043bbb7df1136f6b1b4a3ce 100644 (file)
--- a/utils/db.cpp
+++ b/utils/db.cpp
#include <xf86drmMode.h>
#include <drm_fourcc.h>
-#include "kms++.h"
-
-#include "test.h"
+#include <kms++.h>
+#include <kms++util.h>
using namespace std;
using namespace kms;
diff --git a/utils/fbtestpat.cpp b/utils/fbtestpat.cpp
index d82f3e4210646e1824b3822c6b01f8323c0657f6..de707d6106f9cd112b5c84e1793cbcccd7b721b4 100644 (file)
--- a/utils/fbtestpat.cpp
+++ b/utils/fbtestpat.cpp
#include <linux/fb.h>
-#include "test.h"
-#include "extcpuframebuffer.h"
+#include <kms++util.h>
+#include <extcpuframebuffer.h>
using namespace kms;
diff --git a/utils/kmscapture.cpp b/utils/kmscapture.cpp
index ee700b7970fd1ab8d4cb7e63a4ff9126eb156980..7fc054ec95531a3981c231944ec3b0cf9e2b1116 100644 (file)
--- a/utils/kmscapture.cpp
+++ b/utils/kmscapture.cpp
#include <xf86drm.h>
#include <glob.h>
-#include "kms++.h"
-#include "test.h"
-#include "opts.h"
+#include <kms++.h>
+#include <kms++util.h>
+#include <opts.h>
#define CAMERA_BUF_QUEUE_SIZE 3
#define MAX_CAMERA 9
diff --git a/utils/kmsview.cpp b/utils/kmsview.cpp
index aae7e80d9b9dfa2828206a3472943c364608e90b..ebe02974bb516887c10697ac913cccb58cb1ac5c 100644 (file)
--- a/utils/kmsview.cpp
+++ b/utils/kmsview.cpp
#include <fstream>
#include <unistd.h>
-#include "kms++.h"
-
-#include "test.h"
+#include <kms++.h>
+#include <kms++util.h>
using namespace std;
using namespace kms;
diff --git a/utils/testpat.cpp b/utils/testpat.cpp
index ede176c69072d62edf5e52aa15ffca113c0c4c08..cb2fe4124da8d9d3f8200fc6f886ff04714c2d80 100644 (file)
--- a/utils/testpat.cpp
+++ b/utils/testpat.cpp
#include <regex>
#include <set>
-#include "kms++.h"
-#include "modedb.h"
+#include <kms++.h>
+#include <modedb.h>
-#include "test.h"
-#include "opts.h"
+#include <kms++util.h>
+#include <opts.h>
using namespace std;
using namespace kms;