diff options
| -rw-r--r-- | libkmstest/colorbar.h | 6 | ||||
| -rw-r--r-- | libkmstest/conv.cpp | 3 | ||||
| -rw-r--r-- | libkmstest/conv.h | 8 | ||||
| -rw-r--r-- | libkmstest/kmstest.h | 10 | ||||
| -rw-r--r-- | libkmstest/test.h | 4 | ||||
| -rw-r--r-- | libkmstest/testpat.cpp | 4 | ||||
| -rw-r--r-- | libkmstest/testpat.h | 6 | ||||
| -rw-r--r-- | lua/luakms.i | 4 | ||||
| -rw-r--r-- | py/pykms.i | 4 |
9 files changed, 17 insertions, 32 deletions
diff --git a/libkmstest/colorbar.h b/libkmstest/colorbar.h deleted file mode 100644 index a47d64d..0000000 --- a/libkmstest/colorbar.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -namespace kms -{ -void draw_color_bar(kms::DumbFramebuffer& buf, int old_xpos, int xpos, int width); -} diff --git a/libkmstest/conv.cpp b/libkmstest/conv.cpp index b716020..f2f19ac 100644 --- a/libkmstest/conv.cpp +++ b/libkmstest/conv.cpp @@ -1,9 +1,8 @@ #include <drm_fourcc.h> #include <stdexcept> -#include "dumbframebuffer.h" +#include "kms++.h" #include "color.h" -#include "conv.h" namespace kms { diff --git a/libkmstest/conv.h b/libkmstest/conv.h deleted file mode 100644 index 105aaf0..0000000 --- a/libkmstest/conv.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - -namespace kms -{ -class DumbFramebuffer; - -void color_convert(DumbFramebuffer& dst, const DumbFramebuffer &src); -} diff --git a/libkmstest/kmstest.h b/libkmstest/kmstest.h new file mode 100644 index 0000000..a77f0ff --- /dev/null +++ b/libkmstest/kmstest.h @@ -0,0 +1,10 @@ +#pragma once + +namespace kms +{ +class DumbFramebuffer; + +void color_convert(DumbFramebuffer& dst, const DumbFramebuffer &src); +void draw_color_bar(kms::DumbFramebuffer& buf, int old_xpos, int xpos, int width); +void draw_test_pattern(DumbFramebuffer& fb); +} diff --git a/libkmstest/test.h b/libkmstest/test.h index fbc4727..56ceb27 100644 --- a/libkmstest/test.h +++ b/libkmstest/test.h @@ -1,9 +1,7 @@ #pragma once #include "color.h" -#include "conv.h" -#include "testpat.h" -#include "colorbar.h" +#include "kmstest.h" #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) diff --git a/libkmstest/testpat.cpp b/libkmstest/testpat.cpp index 958d785..1516369 100644 --- a/libkmstest/testpat.cpp +++ b/libkmstest/testpat.cpp @@ -9,9 +9,7 @@ #include <drm.h> #include <drm_mode.h> -#include "card.h" -#include "dumbframebuffer.h" -#include "testpat.h" +#include "kms++.h" #include "color.h" #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) diff --git a/libkmstest/testpat.h b/libkmstest/testpat.h deleted file mode 100644 index e051f4a..0000000 --- a/libkmstest/testpat.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -namespace kms -{ -void draw_test_pattern(DumbFramebuffer& fb); -} diff --git a/lua/luakms.i b/lua/luakms.i index 5530f84..cdf802b 100644 --- a/lua/luakms.i +++ b/lua/luakms.i @@ -2,7 +2,7 @@ %{ #include "kms++.h" -#include "testpat.h" +#include "kmstest.h" using namespace kms; %} @@ -22,4 +22,4 @@ using namespace kms; %include "connector.h" %include "encoder.h" -%include "testpat.h" +%include "kmstest.h" @@ -2,7 +2,7 @@ %{ #include "kms++.h" -#include "testpat.h" +#include "kmstest.h" using namespace kms; %} @@ -22,4 +22,4 @@ using namespace kms; %include "connector.h" %include "encoder.h" -%include "testpat.h" +%include "kmstest.h" |