From c17c439a70b86b08c8d584928e94eb52096b79b6 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Mon, 23 May 2016 10:05:40 +0300 Subject: Reorganize libkms++utils header --- kmscube/cube-egl.cpp | 2 +- kmscube/cube-gbm.cpp | 2 +- kmscube/cube-gles2.cpp | 2 +- kmscube/cube-null.cpp | 2 +- kmscube/cube-x11.cpp | 2 +- kmscube/cube.cpp | 4 ++-- libkms++util/colorbar.cpp | 3 +-- libkms++util/extcpuframebuffer.cpp | 2 +- libkms++util/kms++util.h | 44 ++++++++++++++++++++++++++++++++++++++ libkms++util/kmstest.h | 15 ------------- libkms++util/test.h | 32 --------------------------- libkms++util/testpat.cpp | 6 +++--- py/pykmsutil.cpp | 2 +- utils/db.cpp | 5 ++--- utils/fbtestpat.cpp | 4 ++-- utils/kmscapture.cpp | 6 +++--- utils/kmsview.cpp | 5 ++--- utils/testpat.cpp | 8 +++---- 18 files changed, 70 insertions(+), 76 deletions(-) create mode 100644 libkms++util/kms++util.h delete mode 100644 libkms++util/kmstest.h delete mode 100644 libkms++util/test.h diff --git a/kmscube/cube-egl.cpp b/kmscube/cube-egl.cpp index d2bc7e3..310ff07 100644 --- a/kmscube/cube-egl.cpp +++ b/kmscube/cube-egl.cpp @@ -1,7 +1,7 @@ #include "cube-egl.h" #include "cube.h" -#include "test.h" +#include using namespace std; diff --git a/kmscube/cube-gbm.cpp b/kmscube/cube-gbm.cpp index 022c761..f6d312b 100644 --- a/kmscube/cube-gbm.cpp +++ b/kmscube/cube-gbm.cpp @@ -10,7 +10,7 @@ #include #include -#include "test.h" +#include #include "cube-egl.h" #include "cube-gles2.h" diff --git a/kmscube/cube-gles2.cpp b/kmscube/cube-gles2.cpp index 68b3831..bda2f59 100644 --- a/kmscube/cube-gles2.cpp +++ b/kmscube/cube-gles2.cpp @@ -2,7 +2,7 @@ #include "cube-gles2.h" #include "cube.h" -#include "test.h" +#include using namespace std; diff --git a/kmscube/cube-null.cpp b/kmscube/cube-null.cpp index 2623394..64fbb45 100644 --- a/kmscube/cube-null.cpp +++ b/kmscube/cube-null.cpp @@ -4,7 +4,7 @@ #include "cube-gles2.h" #include "cube.h" -#include "test.h" +#include using namespace std; diff --git a/kmscube/cube-x11.cpp b/kmscube/cube-x11.cpp index 9ac64c3..dde4f61 100644 --- a/kmscube/cube-x11.cpp +++ b/kmscube/cube-x11.cpp @@ -6,7 +6,7 @@ #include "cube-egl.h" #include "cube-gles2.h" -#include "test.h" +#include using namespace std; diff --git a/kmscube/cube.cpp b/kmscube/cube.cpp index 42e05be..9aa8a84 100644 --- a/kmscube/cube.cpp +++ b/kmscube/cube.cpp @@ -26,8 +26,8 @@ /* Based on a egl cube test app originally written by Arvin Schnell */ #include "cube.h" -#include "opts.h" -#include "test.h" +#include +#include using namespace std; diff --git a/libkms++util/colorbar.cpp b/libkms++util/colorbar.cpp index 9fbec28..6a5dbc4 100644 --- a/libkms++util/colorbar.cpp +++ b/libkms++util/colorbar.cpp @@ -1,8 +1,7 @@ #include #include - -#include "test.h" +#include "kms++util.h" namespace kms { diff --git a/libkms++util/extcpuframebuffer.cpp b/libkms++util/extcpuframebuffer.cpp index 145168f..bd0b10c 100644 --- a/libkms++util/extcpuframebuffer.cpp +++ b/libkms++util/extcpuframebuffer.cpp @@ -1,6 +1,6 @@ #include "extcpuframebuffer.h" -#include "test.h" +#include "kms++util.h" using namespace std; diff --git a/libkms++util/kms++util.h b/libkms++util/kms++util.h new file mode 100644 index 0000000..c02c12c --- /dev/null +++ b/libkms++util/kms++util.h @@ -0,0 +1,44 @@ +#pragma once + +#include "color.h" +#include +#include + +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])) + +#define unlikely(x) __builtin_expect(!!(x), 0) + +#define ASSERT(x) \ + if (unlikely(!(x))) { \ + fprintf(stderr, "%s:%d: %s: ASSERT(%s) failed\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, __STRING(x)); \ + abort(); \ + } + +#define FAIL(fmt, ...) \ + do { \ + fprintf(stderr, "%s:%d: %s:\n" fmt "\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, ##__VA_ARGS__); \ + abort(); \ + } while(0) + +#define FAIL_IF(x, fmt, ...) \ + if (unlikely(x)) { \ + fprintf(stderr, "%s:%d: %s:\n" fmt "\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, ##__VA_ARGS__); \ + abort(); \ + } + +#define EXIT(fmt, ...) \ + do { \ + fprintf(stderr, fmt "\n", ##__VA_ARGS__); \ + exit(-1); \ + } while(0) diff --git a/libkms++util/kmstest.h b/libkms++util/kmstest.h deleted file mode 100644 index aed40fe..0000000 --- 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); -} diff --git a/libkms++util/test.h b/libkms++util/test.h deleted file mode 100644 index 3631f2c..0000000 --- a/libkms++util/test.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once - -#include "color.h" -#include "kmstest.h" - -#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) - -#define unlikely(x) __builtin_expect(!!(x), 0) - -#define ASSERT(x) \ - if (unlikely(!(x))) { \ - fprintf(stderr, "%s:%d: %s: ASSERT(%s) failed\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, __STRING(x)); \ - abort(); \ - } - -#define FAIL(fmt, ...) \ - do { \ - fprintf(stderr, "%s:%d: %s:\n" fmt "\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, ##__VA_ARGS__); \ - abort(); \ - } while(0) - -#define FAIL_IF(x, fmt, ...) \ - if (unlikely(x)) { \ - fprintf(stderr, "%s:%d: %s:\n" fmt "\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, ##__VA_ARGS__); \ - abort(); \ - } - -#define EXIT(fmt, ...) \ - do { \ - fprintf(stderr, fmt "\n", ##__VA_ARGS__); \ - exit(-1); \ - } while(0) diff --git a/libkms++util/testpat.cpp b/libkms++util/testpat.cpp index 68f4385..cee6e85 100644 --- a/libkms++util/testpat.cpp +++ b/libkms++util/testpat.cpp @@ -5,9 +5,9 @@ #include #include -#include "kms++.h" -#include "test.h" -#include "cpuframebuffer.h" +#include +#include +#include #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) diff --git a/py/pykmsutil.cpp b/py/pykmsutil.cpp index 407330d..0d4cf89 100644 --- a/py/pykmsutil.cpp +++ b/py/pykmsutil.cpp @@ -1,7 +1,7 @@ #include #include #include -#include "kmstest.h" +#include namespace py = pybind11; diff --git a/utils/db.cpp b/utils/db.cpp index 3e8420b..13bc5e2 100644 --- a/utils/db.cpp +++ b/utils/db.cpp @@ -6,9 +6,8 @@ #include #include -#include "kms++.h" - -#include "test.h" +#include +#include using namespace std; using namespace kms; diff --git a/utils/fbtestpat.cpp b/utils/fbtestpat.cpp index d82f3e4..de707d6 100644 --- a/utils/fbtestpat.cpp +++ b/utils/fbtestpat.cpp @@ -11,8 +11,8 @@ #include -#include "test.h" -#include "extcpuframebuffer.h" +#include +#include using namespace kms; diff --git a/utils/kmscapture.cpp b/utils/kmscapture.cpp index ee700b7..7fc054e 100644 --- a/utils/kmscapture.cpp +++ b/utils/kmscapture.cpp @@ -9,9 +9,9 @@ #include #include -#include "kms++.h" -#include "test.h" -#include "opts.h" +#include +#include +#include #define CAMERA_BUF_QUEUE_SIZE 3 #define MAX_CAMERA 9 diff --git a/utils/kmsview.cpp b/utils/kmsview.cpp index aae7e80..ebe0297 100644 --- a/utils/kmsview.cpp +++ b/utils/kmsview.cpp @@ -2,9 +2,8 @@ #include #include -#include "kms++.h" - -#include "test.h" +#include +#include using namespace std; using namespace kms; diff --git a/utils/testpat.cpp b/utils/testpat.cpp index ede176c..cb2fe41 100644 --- a/utils/testpat.cpp +++ b/utils/testpat.cpp @@ -4,11 +4,11 @@ #include #include -#include "kms++.h" -#include "modedb.h" +#include +#include -#include "test.h" -#include "opts.h" +#include +#include using namespace std; using namespace kms; -- cgit v1.2.3