Gfxprim June 2011

gfxprim@ucw.cz

4 participants
6 discussions

[repo.or.cz] gfxprim.git branch generate updated: b7f10b82d579dfb7878335336b0d016f5343f793
by gavento 13 Jun '11

13 Jun '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, generate has been updated via b7f10b82d579dfb7878335336b0d016f5343f793 (commit) via 132422504ff084746df93675292ee937a946d105 (commit) via 617420b08642f72170638b2f543022c61600e96c (commit) via efa0c0660b9db3601452b32864d0ef114a72e0ce (commit) via b5426313d22d110cc0d9f26d273c5e19c5632687 (commit) via abbcc7e4e20f3d131b2c7fe46895089d2980dc94 (commit) via 092a846fd82550f4435b5396a7e48e789afdd0bc (commit) via 402eaabcf521cf1e6e0643b2d140e4b9dcf3f10a (commit) via d1f7f07b180f153f0eb40e54230537e8495871e9 (commit) via e22c5773aab5f5b5681f9f2d606ebd9eeb4fea7b (commit) via 70a840f2dde4591281025f8acb0374004d8d0e44 (commit) via fe2f2b950ec689827669756925914f61a9f584ab (commit) via 85a6fffce341ae7b993b80fefecb97c1619636e4 (commit) via ebd807bf4a3a9c1f916dff933c16536c4ef2261c (commit) via d01f20fa8ffaa7959891751f12ef3195a7cfbde7 (commit) via 2139339c8854d942378361854f6e1f7c5781b9b1 (commit) via 777062b642ebcecb14a3a8944ff4afd25d145eb7 (commit) via 6d267ad031a775ffb3e7e73a5357a7600e7b96f0 (commit) via 50e68bdcafa2e379597a3c454343c4f3b2c7db73 (commit) via e8872dfaab48d1f16b749fbd0ea698a6b7ce86ae (commit) via d7551ce7958fc44a3a9e070258d3c8a45a23f755 (commit) via 413daca73ab16f53c9fd81410c261bc7628d2e11 (commit) from abf38d0ef10e4cd84391950b1595cfc60dcf3181 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/b7f10b82d579dfb7878335336b0d016f5343… commit b7f10b82d579dfb7878335336b0d016f5343f793 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Mon Jun 13 01:01:58 2011 +0200 Add test OBJs to CLEAN in tests.mk diff --git a/tests.mk b/tests.mk index 846e4f9..e4cf3bb 100644 --- a/tests.mk +++ b/tests.mk @@ -26,7 +26,7 @@ ${TESTSUITE_GEN}: $(filter-out ${TESTSUITE_GEN},${GENSOURCES}) ${GENHEADERS} TESTSUITE_SRCS=$(wildcard *.test.c) ${GENSOURCES} ${GENHEADERS} ${GP_TESTLIB_SRCS} INCLUDE+=../tests/common TESTSUITE_OBJS=$(patsubst %.c,%.o,$(TESTSUITE_SRCS)) -CLEAN+=${TESTSUITE} +CLEAN+=${TESTSUITE} ${TESTSUITE_OBJS} TESTS+=${TESTSUITE} ${TESTSUITE}: ${TESTSUITE_OBJS} http://repo.or.cz/w/gfxprim.git/commit/132422504ff084746df93675292ee937a946… commit 132422504ff084746df93675292ee937a946d105 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Mon Jun 13 00:58:10 2011 +0200 Fix naive blit typo diff --git a/libs/core/GP_Blit.c b/libs/core/GP_Blit.c index 76c7a2c..251272d 100644 --- a/libs/core/GP_Blit.c +++ b/libs/core/GP_Blit.c @@ -23,6 +23,7 @@ #include "GP_Pixel.h" #include "GP_GetPutPixel.h" #include "GP_Context.h" +#include "GP_Convert.h" #include "GP_Blit.h" /* @@ -69,7 +70,7 @@ void GP_Blit_Naive(const GP_Context *c1, GP_Coord x1, GP_Coord y1, GP_Size w, GP for (int j = 0; j < h; j++) { GP_Pixel p = GP_GetPixel(c1, x1 + i, y1 + j); if (c1->pixel_type != c2->pixel_type) - p = GP_GP_ConvertContextPixel(p, c1, c2); + p = GP_ConvertContextPixel(p, c1, c2); GP_PutPixel(c2, x2 + i, y2 + j, p); } } http://repo.or.cz/w/gfxprim.git/commit/617420b08642f72170638b2f543022c61600… commit 617420b08642f72170638b2f543022c61600e96c Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Mon Jun 13 00:57:24 2011 +0200 Improve and extend GP_Convert gen. tests diff --git a/pylib/gfxprim/generators/core/make_GP_Convert.py b/pylib/gfxprim/generators/core/make_GP_Convert.py index 41637ca..dfd23dd 100644 --- a/pylib/gfxprim/generators/core/make_GP_Convert.py +++ b/pylib/gfxprim/generators/core/make_GP_Convert.py @@ -76,8 +76,26 @@ def core_GP_Convert_gen_h(c): '{n' ' GP_Pixel p1 = GP_RandomColor(GP_PIXEL_{{ t.name }});n' ' GP_Pixel p2 = GP_ConvertPixel(p1, GP_PIXEL_{{ t.name }}, GP_PIXEL_RGBA8888);n' - ' GP_Pixel p3 = GP_ConvertPixel(p1, GP_PIXEL_RGBA8888, GP_PIXEL_{{ t.name }});n' - ' fail_unless(GP_EqualColors(p1, GP_PIXEL_{{ t.name }}, p3, GP_PIXEL_{{ t.name }}));n' - ' fail_unless(GP_EqualColors(p1, GP_PIXEL_{{ t.name }}, p2, GP_PIXEL_{{ t.name }}));n' - '}nn' - 'GP_ENDTESTn', t=t) + ' GP_Pixel p3 = GP_ConvertPixel(p2, GP_PIXEL_RGBA8888, GP_PIXEL_{{ t.name }});n' + ' GP_CHECK_EqualColors(p1, GP_PIXEL_{{ t.name }}, p3, GP_PIXEL_{{ t.name }});n' + ' GP_CHECK_EqualColors(p1, GP_PIXEL_{{ t.name }}, p2, GP_PIXEL_RGBA8888);n' + '}n' + 'GP_ENDTESTnn', t=t) + c.rbody( + 'GP_TEST(WhiteStaysWhite_via_{{ t.name }}, "loop_start=0, loop_end=4")n' + '{n' + ' GP_Pixel p1 = GP_RGBToPixel(255, 255, 255, GP_PIXEL_RGB888);n' + ' GP_Pixel p2 = GP_RGB888ToPixel(p1, GP_PIXEL_{{ t.name }});n' + ' GP_Pixel p3 = GP_PixelToRGB888(p2, GP_PIXEL_{{ t.name }});n' + ' GP_CHECK_EqualColors(p1, GP_PIXEL_RGB888, p3, GP_PIXEL_RGB888);n' + '}n' + 'GP_ENDTESTnn', t=t) + c.rbody( + 'GP_TEST(BlackStaysBlack_via_{{ t.name }}, "loop_start=0, loop_end=4")n' + '{n' + ' GP_Pixel p1 = GP_RGBToPixel(0, 0, 0, GP_PIXEL_RGB888);n' + ' GP_Pixel p2 = GP_RGB888ToPixel(p1, GP_PIXEL_{{ t.name }});n' + ' GP_Pixel p3 = GP_PixelToRGB888(p2, GP_PIXEL_{{ t.name }});n' + ' GP_CHECK_EqualColors(p1, GP_PIXEL_RGB888, p3, GP_PIXEL_RGB888);n' + '}n' + 'GP_ENDTESTnn', t=t) http://repo.or.cz/w/gfxprim.git/commit/efa0c0660b9db3601452b32864d0ef114a72… commit efa0c0660b9db3601452b32864d0ef114a72e0ce Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Mon Jun 13 00:56:55 2011 +0200 Bix fix in pixel value scaling DUH diff --git a/pylib/gfxprim/generators/core/make_GP_Convert.py b/pylib/gfxprim/generators/core/make_GP_Convert.py index 249763d..41637ca 100644 --- a/pylib/gfxprim/generators/core/make_GP_Convert.py +++ b/pylib/gfxprim/generators/core/make_GP_Convert.py @@ -26,11 +26,11 @@ def core_GP_Pixel_Scale_gen(h): "{% for s1 in range(1,9) %}{% for s2 in range(1,9) %}" "{% if s2>s1 %}" - "#define GP_SCALE_VAL_{{s1}}_{{s2}}(val) ((val) * {{ multcoef(s1, s2) }})n" + "#define GP_SCALE_VAL_{{s1}}_{{s2}}(val) (((val) * {{ multcoef(s1, s2) }}) >> {{ (-s2) % s1 }})n" "{% else %}" "#define GP_SCALE_VAL_{{s1}}_{{s2}}(val) ((val) >> {{ s1 - s2 }})n" "{% endif %}" - "{% endfor %}{% endfor %}", multcoef = lambda s1,s2: hex(sum([1<<i*s1 for i in range(s2/s1)])) + "{% endfor %}{% endfor %}", multcoef = lambda s1,s2: hex(sum([1<<(i*s1) for i in range((s2+s1-1)/s1)])) ) http://repo.or.cz/w/gfxprim.git/commit/b5426313d22d110cc0d9f26d273c5e19c563… commit b5426313d22d110cc0d9f26d273c5e19c5632687 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Mon Jun 13 00:56:17 2011 +0200 Minor header inclusion diff --git a/include/core/GP_Convert.h b/include/core/GP_Convert.h index aeb5acf..6dd9d61 100644 --- a/include/core/GP_Convert.h +++ b/include/core/GP_Convert.h @@ -25,6 +25,7 @@ #include "GP_Common.h" #include "GP_Context.h" +#include "GP_Pixel.h" /* Generated headers */ #include "GP_Convert.gen.h" http://repo.or.cz/w/gfxprim.git/commit/abbcc7e4e20f3d131b2c7fe46895089d2980… commit abbcc7e4e20f3d131b2c7fe46895089d2980dc94 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Mon Jun 13 00:55:33 2011 +0200 Added hand-made smoke tests for GP_Convert diff --git a/tests/core/GP_Convert.test.c b/tests/core/GP_Convert.test.c new file mode 100644 index 0000000..3f80a3a --- /dev/null +++ b/tests/core/GP_Convert.test.c @@ -0,0 +1,27 @@ +/* + * 2011 - Tomas Gavenciak <gavento(a)ucw.cz> + */ + +#include "GP_Tests.h" +#include "GP_Convert.h" +#include "GP_TestingCore.h" + +GP_SUITE(GP_Convert) + +GP_TEST(BasicPixelConversions) +{ + GP_Pixel p1, p2; + p1 = GP_RGBAToPixel(255, 255, 255, 255, GP_PIXEL_RGBA8888); + fail_unless(p1 == 0xffffffff); + p1 = GP_RGBAToPixel(0, 0, 0, 0, GP_PIXEL_RGBA8888); + fail_unless(p1 == 0x0); + p1 = GP_RGBToPixel(0x12, 0x34, 0x56, GP_PIXEL_RGB888); + fail_unless(p1 == 0x563412); + GP_CHECK_EqualColors(p1, GP_PIXEL_RGB888, p1, GP_PIXEL_RGB888); + + p1 = GP_RGB888ToPixel(GP_RGBToPixel(0x12, 0x34, 0x56, GP_PIXEL_RGB888), GP_PIXEL_V4); + p2 = GP_RGBAToPixel(0x12, 0x34, 0x56, 0x78, GP_PIXEL_V2); + GP_CHECK_EqualColors(p1, GP_PIXEL_V4, p2, GP_PIXEL_V2); +} +GP_ENDTEST + http://repo.or.cz/w/gfxprim.git/commit/092a846fd82550f4435b5396a7e48e789afd… commit 092a846fd82550f4435b5396a7e48e789afdd0bc Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Mon Jun 13 00:54:19 2011 +0200 Extended pixel equality in tests, fixed GP_CHECK_EqualColors but still TODO find better definition of color equality diff --git a/tests/common/GP_TestingCore.c b/tests/common/GP_TestingCore.c index afa2754..501a66a 100644 --- a/tests/common/GP_TestingCore.c +++ b/tests/common/GP_TestingCore.c @@ -43,11 +43,27 @@ void GP_RandomizeRect(GP_Context *context, GP_Coord x, GP_Coord y, GP_Size w, GP GP_PutPixel(context, i + x, j + y, GP_RandomColor(context->pixel_type)); } +/* TODO: Proper equality definition (currently almost ad-hoc */ int GP_EqualColors(GP_Pixel p1, GP_PixelType t1, GP_Pixel p2, GP_PixelType t2) { - GP_Pixel col1 = GP_PixelToRGBA8888(p1, t1); - GP_Pixel col2 = GP_PixelToRGBA8888(p2, t2); - return (col1 & 0xffffffff) == (col2 & 0xffffffff); + int size1 = GP_PixelTypes[t1].size; + int size2 = GP_PixelTypes[t2].size; + + // Same type + if (t1 == t2) + return GP_GET_BITS(0, size1, p1) == GP_GET_BITS(0, size1, p2); + + // t1 -> RGBA8888 -> t2 + GP_Pixel conv1 = GP_RGBA8888ToPixel(GP_PixelToRGBA8888(p1, t1), t2); + if (GP_GET_BITS(0, size2, conv1) == GP_GET_BITS(0, size2, p2)) + return 1; + + // t2 -> RGBA8888 -> t1 + GP_Pixel conv2 = GP_RGBA8888ToPixel(GP_PixelToRGBA8888(p2, t2), t1); + if (GP_GET_BITS(0, size1, conv2) == GP_GET_BITS(0, size1, p1)) + return 1; + + return 0; } int GP_EqualRects(const GP_Context *c1, GP_Coord x1, GP_Coord y1, GP_Size w, GP_Size h, diff --git a/tests/common/GP_TestingCore.h b/tests/common/GP_TestingCore.h index 0e4b726..31d2d1f 100644 --- a/tests/common/GP_TestingCore.h +++ b/tests/common/GP_TestingCore.h @@ -52,8 +52,8 @@ int GP_EqualColors(GP_Pixel p1, GP_PixelType t1, GP_Pixel p2, GP_PixelType t2); char b1[256], b2[256]; GP_PixelSNPrint(b1, 256, p1, t1); GP_PixelSNPrint(b2, 256, p2, t2); - GP_CHECK("Pixel colors %s and %s are not the same color.", b1, b2); - } while (0); + GP_ABORT("Pixels %s and %s are not the same color.", b1, b2); + } } while (0); /* * Compare two rectangles in two contexts. Return 1 on equal. http://repo.or.cz/w/gfxprim.git/commit/402eaabcf521cf1e6e0643b2d140e4b9dcf3… commit 402eaabcf521cf1e6e0643b2d140e4b9dcf3f10a Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Mon Jun 13 00:52:01 2011 +0200 Added GP_PixelSNPrint (similar to snprintf()) diff --git a/include/core/GP_Pixel.h b/include/core/GP_Pixel.h index ec78c04..7250179 100644 --- a/include/core/GP_Pixel.h +++ b/include/core/GP_Pixel.h @@ -34,6 +34,7 @@ #include "GP_Color.h" #include "GP_Common.h" #include "GP_RetCode.h" +#include "GP_FnPerBpp.h" struct GP_Context; @@ -136,4 +137,23 @@ static inline uint32_t GP_PixelSize(GP_PixelType type) return GP_PixelTypes[type].size; } +/* + * Print a human-readable representation of a pixel value to a string. + * Arguments as for snprintf(). + */ +static inline void GP_PixelSNPrint(char *buf, size_t len, GP_Pixel pixel, GP_PixelType type) +{ + GP_FN_PER_PIXELTYPE(GP_PixelSNPrint, type, buf, len, pixel); +} + +/* + * "printf" out a human-readable representation of pixel value. + */ +static inline void GP_PixelPrint(GP_Pixel pixel, GP_PixelType type) +{ + char buf[256]; + GP_PixelSNPrint(buf, 256, pixel, type); + printf("%s", buf); +} + #endif /* GP_PIXEL_H */ diff --git a/pylib/gfxprim/generators/core/gen_pixeltype.py b/pylib/gfxprim/generators/core/gen_pixeltype.py index f6aa886..680a476 100644 --- a/pylib/gfxprim/generators/core/gen_pixeltype.py +++ b/pylib/gfxprim/generators/core/gen_pixeltype.py @@ -63,15 +63,15 @@ def gen_GP_PixelTypes(header, code): '};n', sorted_pts=sorted_pts, len=len) def gen_print(ptype, header, code): - "Generate a GP_Pixel_Print_<TYPE> function (source and header)" + "Generate a GP_PixelSNPrint_<TYPE> function (source and header)" header.rbody( - "/* print formatted value of pixel type {{ f.name }} */n" - "void GP_PixelPrint_{{ f.name }}(GP_Pixel p);n", f=ptype) + "/* snprintf a human readable value of pixel type {{ f.name }} */n" + "void GP_PixelSNPrint_{{ f.name }}(char *buf, size_t len, GP_Pixel p);n", f=ptype) code.rbody( - "/* print formatted value of pixel type {{f.name}} */n" - "void GP_PixelPrint_{{ f.name }}(GP_Pixel p)n" + "/* snprintf a human readable value of pixel type {{f.name}} */n" + "void GP_PixelSNPrint_{{ f.name }}(char *buf, size_t len, GP_Pixel p)n" "{n" - ' printf("<{{ f.name }} %0{{ (f.size+3)//4 }}x{% for c in f.chanslist %} {{ c[0] }}=%d{% endfor %}>",n' + ' snprintf(buf, len, "<{{ f.name }} 0x%0{{ (f.size+3)//4 }}x{% for c in f.chanslist %} {{ c[0] }}=%d{% endfor %}>",n' " GP_GET_BITS(0, {{ f.size }}, p)" "{% for c in f.chanslist %}" ",n GP_GET_BITS({{ c[1] }}, {{ c[2] }}, p)" http://repo.or.cz/w/gfxprim.git/commit/d1f7f07b180f153f0eb40e54230537e84958… commit d1f7f07b180f153f0eb40e54230537e8495871e9 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Mon Jun 13 00:26:58 2011 +0200 Added debugging macros GP_GET_BITS_DBG and GP_SET_BITS_DBG diff --git a/include/core/GP_Common.h b/include/core/GP_Common.h index 48a1167..cda1967 100644 --- a/include/core/GP_Common.h +++ b/include/core/GP_Common.h @@ -141,6 +141,12 @@ #define GP_GET_BITS(offset, count, val) ( ( (val)>>(offset) ) & ( ((((typeof(val))1)<<(count)) - 1) ) ) /* + * Debugging version, evaluates args twice. + */ +#define GP_GET_BITS_DBG(offset, count, val) ( printf("GET_BITS(%d, %d, 0x%x)=%d", offset, count, val, + GP_GET_BITS(offset, count, val)), GP_GET_BITS(offset, count, val)) + +/* * Set count bits of dest at ofset to val (shifted by offset) * * Does not check val for overflow @@ -160,6 +166,14 @@ GP_SET_BITS_OR(offset, dest, val); } while (0) +/* + * Debugging version, evaluates args twice. + */ +#define GP_SET_BITS_DBG(offset, count, dest, val) do { + GP_SET_BITS(offset, count, dest, val); + printf("SET_BITS(%d, %d, p, %d)n", offset, count, val); + } while (0) + /* Determines the sign of the integer value; it is +1 if value is positive, * -1 if negative, and 0 if it is zero. http://repo.or.cz/w/gfxprim.git/commit/e22c5773aab5f5b5681f9f2d606ebd9eeb4f… commit e22c5773aab5f5b5681f9f2d606ebd9eeb4fea7b Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Mon Jun 13 00:25:50 2011 +0200 Added GP_CHECK_EqualColors macro diff --git a/tests/common/GP_TestingCore.h b/tests/common/GP_TestingCore.h index 23ea12a..0e4b726 100644 --- a/tests/common/GP_TestingCore.h +++ b/tests/common/GP_TestingCore.h @@ -45,6 +45,17 @@ void GP_RandomizeRect(GP_Context *context, GP_Coord x, GP_Coord y, GP_Size w, GP int GP_EqualColors(GP_Pixel p1, GP_PixelType t1, GP_Pixel p2, GP_PixelType t2); /* + * Macro version with GP_CHECK + */ +#define GP_CHECK_EqualColors(p1, t1, p2, t2) do { + if (!GP_EqualColors(p1, t1, p2, t2)) { + char b1[256], b2[256]; + GP_PixelSNPrint(b1, 256, p1, t1); + GP_PixelSNPrint(b2, 256, p2, t2); + GP_CHECK("Pixel colors %s and %s are not the same color.", b1, b2); + } while (0); + +/* * Compare two rectangles in two contexts. Return 1 on equal. * The colors are cmpared by first converting them to RGBA8888. * Somewhat inefficient. http://repo.or.cz/w/gfxprim.git/commit/70a840f2dde4591281025f8acb0374004d8d… commit 70a840f2dde4591281025f8acb0374004d8d0e44 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun Jun 12 22:46:52 2011 +0200 Added GP_FN_(RET_)PER_PIXELTYPE switch-branching generation diff --git a/pylib/gfxprim/generators/core/make_GP_Pixel.py b/pylib/gfxprim/generators/core/make_GP_Pixel.py index 05cc28e..fd5b16c 100644 --- a/pylib/gfxprim/generators/core/make_GP_Pixel.py +++ b/pylib/gfxprim/generators/core/make_GP_Pixel.py @@ -41,6 +41,19 @@ def core_GP_Pixel_gen(h, c): gen_get_pixel_addr(t, h, c) gen_create(t, h, c) + ## FnPerPixelType and FnRetPerPixelType + for r in ['', 'return ']: + h.rbody( + 'n/* Macro for branching on PixelType (similar to GP_FnPerBpp macros) */n' + '#define GP_FN_{% if r %}RET_{% endif %}PER_PIXELTYPE(FN_NAME, type, ...) ' + ' switch (type) { ' + '{% for t in types %}{% if t.number != 0 %}' + ' case GP_PIXEL_{{ t.name }}: ' + ' {{ r }}FN_NAME##_{{ t.name }}(__VA_ARGS__); ' + ' break; ' + '{% endif %}{% endfor %}' + ' default: GP_ABORT("Invalid PixelType %d", type); ' + ' }nn', types=pixeltypes.values(), r=r) @generator(CHeaderGenerator(name = 'GP_GetPutPixel.gen.h'), descr = 'Access pixel bytes, Get and PutPixelnDo not include directly, use GP_Pixel.h', http://repo.or.cz/w/gfxprim.git/commit/fe2f2b950ec689827669756925914f61a9f5… commit fe2f2b950ec689827669756925914f61a9f584ab Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun Jun 12 22:37:10 2011 +0200 Rename some helpers in FnPerBpp (colision with planned code) diff --git a/include/core/GP_FnPerBpp.h b/include/core/GP_FnPerBpp.h index bc76178..79361b0 100644 --- a/include/core/GP_FnPerBpp.h +++ b/include/core/GP_FnPerBpp.h @@ -44,13 +44,13 @@ /* * Branch on GP_Context argument. */ -#define GP_FN_PER_CONTEXT(FN_NAME, context, ...) +#define GP_FN_PER_BPP_CONTEXT(FN_NAME, context, ...) GP_FN_PER_BPP(FN_NAME, (context)->bpp, (context)->bit_endian, __VA_ARGS__) /* * Branch on GP_PixelType argument. */ -#define GP_FN_PER_PIXELTYPE(FN_NAME, type, ...) +#define GP_FN_PER_BPP_PIXELTYPE(FN_NAME, type, ...) GP_FN_PER_BPP(FN_NAME, GP_PixelTypes[type].size, GP_PixelTypes[type].bit_endian, __VA_ARGS__) /* @@ -102,13 +102,13 @@ /* * Branch on GP_Context argument. */ -#define GP_FN_RET_PER_CONTEXT(FN_NAME, context, ...) +#define GP_FN_RET_PER_BPP_CONTEXT(FN_NAME, context, ...) GP_FN_RET_PER_BPP(FN_NAME, (context)->bpp, (context)->bit_endian, __VA_ARGS__) /* * Branch on GP_PixelType argument. */ -#define GP_FN_RET_PER_PIXELTYPE(FN_NAME, type, ...) +#define GP_FN_RET_PER_BPP_PIXELTYPE(FN_NAME, type, ...) GP_FN_RET_PER_BPP(FN_NAME, GP_PixelTypes[type].size, GP_PixelTypes[type].bit_endian, __VA_ARGS__) /* http://repo.or.cz/w/gfxprim.git/commit/85a6fffce341ae7b993b80fefecb97c16196… commit 85a6fffce341ae7b993b80fefecb97c1619636e4 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun Jun 12 22:31:39 2011 +0200 Rename GP_Pixel_Print_* to GP_PixelPrint_* diff --git a/pylib/gfxprim/generators/core/gen_pixeltype.py b/pylib/gfxprim/generators/core/gen_pixeltype.py index ba25a20..f6aa886 100644 --- a/pylib/gfxprim/generators/core/gen_pixeltype.py +++ b/pylib/gfxprim/generators/core/gen_pixeltype.py @@ -66,10 +66,10 @@ def gen_print(ptype, header, code): "Generate a GP_Pixel_Print_<TYPE> function (source and header)" header.rbody( "/* print formatted value of pixel type {{ f.name }} */n" - "void GP_Pixel_Print_{{ f.name }}(GP_Pixel p);n", f=ptype) + "void GP_PixelPrint_{{ f.name }}(GP_Pixel p);n", f=ptype) code.rbody( "/* print formatted value of pixel type {{f.name}} */n" - "void GP_Pixel_Print_{{ f.name }}(GP_Pixel p)n" + "void GP_PixelPrint_{{ f.name }}(GP_Pixel p)n" "{n" ' printf("<{{ f.name }} %0{{ (f.size+3)//4 }}x{% for c in f.chanslist %} {{ c[0] }}=%d{% endfor %}>",n' " GP_GET_BITS(0, {{ f.size }}, p)" http://repo.or.cz/w/gfxprim.git/commit/ebd807bf4a3a9c1f916dff933c16536c4ef2… commit ebd807bf4a3a9c1f916dff933c16536c4ef2261c Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun Jun 12 22:30:41 2011 +0200 Added helpers and documentation to FnPerBpp diff --git a/include/core/GP_FnPerBpp.h b/include/core/GP_FnPerBpp.h index ed2356d..bc76178 100644 --- a/include/core/GP_FnPerBpp.h +++ b/include/core/GP_FnPerBpp.h @@ -24,17 +24,44 @@ *****************************************************************************/ /* - * Macro that generates a switch-case block that calls various variants - * of the specified function depending on the bit depth of the context. + * Macros that generate a switch-case block that calls various variants + * of the specified function depending on the bit depth (bpp). + * + * For function name y and x bpp, the function called will be + * y_xBPP, resp y_xBPP_LE (or _BE; the bit-endian) for x<8. + * + * The functions branch either on bpp and bit_endian, type of given + * GP_Context or given GP_PixelType. + * * Extra arguments are arguments to be passed to the function. - * Returns GP_ENOIMPL if the bit depth is unknown. + * Note that if the function takes the context/type/bpp as an argument, + * you still need to provide it in __VA_ARGS__ + * + * The GP_FN_PER_* variants ignore the return value of the called function. + * The GP_FN_RET_PER_* variants "return"s the value returned by the function. + */ + +/* + * Branch on GP_Context argument. + */ +#define GP_FN_PER_CONTEXT(FN_NAME, context, ...) + GP_FN_PER_BPP(FN_NAME, (context)->bpp, (context)->bit_endian, __VA_ARGS__) + +/* + * Branch on GP_PixelType argument. + */ +#define GP_FN_PER_PIXELTYPE(FN_NAME, type, ...) + GP_FN_PER_BPP(FN_NAME, GP_PixelTypes[type].size, GP_PixelTypes[type].bit_endian, __VA_ARGS__) + +/* + * Branch on bpp and bit_endian. */ #define GP_FN_PER_BPP(FN_NAME, bpp, bit_endian, ...) switch (bpp) { case 1: {- if (bit_endian==GP_BIT_ENDIAN_LE)+ if (bit_endian == GP_BIT_ENDIAN_LE) FN_NAME##_1BPP_LE(__VA_ARGS__); else FN_NAME##_1BPP_BE(__VA_ARGS__);@@ -42,7 +69,7 @@ break; case 2: {- if (bit_endian==GP_BIT_ENDIAN_LE)+ if (bit_endian == GP_BIT_ENDIAN_LE) FN_NAME##_2BPP_LE(__VA_ARGS__); else FN_NAME##_2BPP_BE(__VA_ARGS__);@@ -50,7 +77,7 @@ break; case 4: {- if (bit_endian==GP_BIT_ENDIAN_LE)+ if (bit_endian == GP_BIT_ENDIAN_LE) FN_NAME##_4BPP_LE(__VA_ARGS__); else FN_NAME##_4BPP_BE(__VA_ARGS__);@@ -72,26 +99,41 @@ break; } +/* + * Branch on GP_Context argument. + */ +#define GP_FN_RET_PER_CONTEXT(FN_NAME, context, ...) + GP_FN_RET_PER_BPP(FN_NAME, (context)->bpp, (context)->bit_endian, __VA_ARGS__) + +/* + * Branch on GP_PixelType argument. + */ +#define GP_FN_RET_PER_PIXELTYPE(FN_NAME, type, ...) + GP_FN_RET_PER_BPP(FN_NAME, GP_PixelTypes[type].size, GP_PixelTypes[type].bit_endian, __VA_ARGS__) + +/* + * Branch on bpp and bit_endian. + */ #define GP_FN_RET_PER_BPP(FN_NAME, bpp, bit_endian, ...) switch (bpp) { case 1: {- if (bit_endian==GP_BIT_ENDIAN_LE)+ if (bit_endian == GP_BIT_ENDIAN_LE) return FN_NAME##_1BPP_LE(__VA_ARGS__); else return FN_NAME##_1BPP_BE(__VA_ARGS__); } case 2: {- if (bit_endian==GP_BIT_ENDIAN_LE)+ if (bit_endian == GP_BIT_ENDIAN_LE) return FN_NAME##_2BPP_LE(__VA_ARGS__); else return FN_NAME##_2BPP_BE(__VA_ARGS__); } case 4: {- if (bit_endian==GP_BIT_ENDIAN_LE)+ if (bit_endian == GP_BIT_ENDIAN_LE) return FN_NAME##_4BPP_LE(__VA_ARGS__); else return FN_NAME##_4BPP_BE(__VA_ARGS__); http://repo.or.cz/w/gfxprim.git/commit/d01f20fa8ffaa7959891751f12ef3195a7cf… commit d01f20fa8ffaa7959891751f12ef3195a7cfbde7 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun Jun 12 22:00:52 2011 +0200 Added generated test for GP_Convert Failing so far diff --git a/pylib/gfxprim/generators/core/make_GP_Convert.py b/pylib/gfxprim/generators/core/make_GP_Convert.py index 633f6cc..249763d 100644 --- a/pylib/gfxprim/generators/core/make_GP_Convert.py +++ b/pylib/gfxprim/generators/core/make_GP_Convert.py @@ -12,6 +12,7 @@ from gfxprim.generators.generator import * from gfxprim.generators.pixeltype import * from gfxprim.generators.core.gen_convert import * + @generator(CHeaderGenerator(name = 'GP_Convert_Scale.gen.h'), descr = 'Fast value scaling macros', authors = ["2011 - Tomas Gavenciak <gavento(a)ucw.cz>"]) @@ -32,6 +33,7 @@ def core_GP_Pixel_Scale_gen(h): "{% endfor %}{% endfor %}", multcoef = lambda s1,s2: hex(sum([1<<i*s1 for i in range(s2/s1)])) ) + @generator(CHeaderGenerator(name = 'GP_Convert.gen.h'), CSourceGenerator(name = 'GP_Convert.gen.c'), descr = 'Convert PixelType values macros and functions', @@ -58,11 +60,24 @@ def core_GP_Convert_gen_h(h, c): gen_convert_to(pixeltypes['RGBA8888'], pixeltypes['V2'], h, c) gen_convert_to(pixeltypes['VA12'], pixeltypes['RGBA8888'], h, c) + @generator(CSourceGenerator(name = 'GP_Convert.test.gen.c'), descr = 'GP_Convert tests', authors = ["2011 - Tomas Gavenciak <gavento(a)ucw.cz>"]) def core_GP_Convert_gen_h(c): c.rhead('#include "GP_Tests.h"n') - c.rhead('#include "GP_Convert.h"nn') + c.rhead('#include "GP_Convert.h"n') + c.rhead('#include "GP_TestingCore.h"nn') c.rhead('GP_SUITE(GP_Convert)nn') - c.rbody('GP_TEST(triv)n{}nGP_ENDTESTn') + for t in pixeltypes.values(): + if not t.is_palette() and t.number != 0: + c.rbody( + 'GP_TEST(GP_ConvertPixel_for_{{ t.name }}, "loop_start=0, loop_end=4")n' + '{n' + ' GP_Pixel p1 = GP_RandomColor(GP_PIXEL_{{ t.name }});n' + ' GP_Pixel p2 = GP_ConvertPixel(p1, GP_PIXEL_{{ t.name }}, GP_PIXEL_RGBA8888);n' + ' GP_Pixel p3 = GP_ConvertPixel(p1, GP_PIXEL_RGBA8888, GP_PIXEL_{{ t.name }});n' + ' fail_unless(GP_EqualColors(p1, GP_PIXEL_{{ t.name }}, p3, GP_PIXEL_{{ t.name }}));n' + ' fail_unless(GP_EqualColors(p1, GP_PIXEL_{{ t.name }}, p2, GP_PIXEL_{{ t.name }}));n' + '}nn' + 'GP_ENDTESTn', t=t) http://repo.or.cz/w/gfxprim.git/commit/2139339c8854d942378361854f6e1f7c5781… commit 2139339c8854d942378361854f6e1f7c5781b9b1 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun Jun 12 21:57:08 2011 +0200 Fix a bug (arg. order) diff --git a/include/core/GP_Convert.h b/include/core/GP_Convert.h index dff93e6..aeb5acf 100644 --- a/include/core/GP_Convert.h +++ b/include/core/GP_Convert.h @@ -96,7 +96,7 @@ static inline GP_Pixel GP_RGBAToContextPixel(uint8_t r, uint8_t g, uint8_t b, ui */ static inline GP_Pixel GP_ConvertPixel(GP_Pixel pixel, GP_PixelType from, GP_PixelType to) { - return GP_RGBA8888ToPixel(GP_PixelToRGBA8888(from, pixel), to); + return GP_RGBA8888ToPixel(GP_PixelToRGBA8888(pixel, from), to); } /* http://repo.or.cz/w/gfxprim.git/commit/777062b642ebcecb14a3a8944ff4afd25d14… commit 777062b642ebcecb14a3a8944ff4afd25d145eb7 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun Jun 12 21:54:24 2011 +0200 Add random gen initialization to testing, move testing files diff --git a/tests.mk b/tests.mk index 2dc8df3..846e4f9 100644 --- a/tests.mk +++ b/tests.mk @@ -14,7 +14,7 @@ endif ifdef TESTSUITE # a bit crude way to link with test minilibrary -GP_TESTLIB_SRCS=${TOPDIR}/tests/common/GP_Tests.c +GP_TESTLIB_SRCS=$(wildcard ${TOPDIR}/tests/common/*.c) CSOURCES+=${GP_TESTLIB_SRCS} # generated suite creation code diff --git a/libs/core/GP_TestingCore.c b/tests/common/GP_TestingCore.c similarity index 100% rename from libs/core/GP_TestingCore.c rename to tests/common/GP_TestingCore.c diff --git a/include/core/GP_TestingCore.h b/tests/common/GP_TestingCore.h similarity index 100% rename from include/core/GP_TestingCore.h rename to tests/common/GP_TestingCore.h diff --git a/libs/core/GP_TestingRandom.c b/tests/common/GP_TestingRandom.c similarity index 100% rename from libs/core/GP_TestingRandom.c rename to tests/common/GP_TestingRandom.c diff --git a/include/core/GP_TestingRandom.h b/tests/common/GP_TestingRandom.h similarity index 95% rename from include/core/GP_TestingRandom.h rename to tests/common/GP_TestingRandom.h index 9f897f8..9f267fb 100644 --- a/include/core/GP_TestingRandom.h +++ b/tests/common/GP_TestingRandom.h @@ -28,8 +28,10 @@ * on random() called in the tested routines or other tests. */ -#ifndef CORE_GP_TESTING_RANDOM_H -#define CORE_GP_TESTING_RANDOM_H +#ifndef GP_TESTING_RANDOM_H +#define GP_TESTING_RANDOM_H + +#include <stdint.h> /* * Return next random value from the testing random generator @@ -44,4 +46,4 @@ long int GP_TestingRandom(void); */ void GP_InitTestingRandom(const char *text, uint64_t seed); -#endif /* CORE_GP_TESTING_RANDOM_H */ +#endif /* GP_TESTING_RANDOM_H */ diff --git a/tests/common/GP_Tests.h b/tests/common/GP_Tests.h index d24b5f6..72c83bb 100644 --- a/tests/common/GP_Tests.h +++ b/tests/common/GP_Tests.h @@ -41,6 +41,7 @@ */ #include <check.h> +#include "GP_TestingRandom.h" /* * Helper macro to allow auto-generation of test-cases and suites. @@ -62,9 +63,9 @@ * Parameters name, fname, line are used internally, do not use them */ -#define GP_TEST(name, ...) static void name(int);- void GP_TEST_##name(int i) {name(i);} - START_TEST(name) +#define GP_TEST(name, ...) static void name(int); void GP_TEST_##name(int i) {+ GP_InitTestingRandom( #name, i); name(i); } + START_TEST(name) #define GP_ENDTEST END_TEST http://repo.or.cz/w/gfxprim.git/commit/6d267ad031a775ffb3e7e73a5357a7600e7b… commit 6d267ad031a775ffb3e7e73a5357a7600e7b96f0 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun Jun 12 20:57:50 2011 +0200 Fixed "make clean" in tests/core diff --git a/tests/core/Makefile b/tests/core/Makefile index 2d11c70..c03633a 100644 --- a/tests/core/Makefile +++ b/tests/core/Makefile @@ -5,7 +5,6 @@ TESTSUITE=core_suite LDLIBS+=-lGP -L$(TOPDIR)/build/ -lcheck GENSOURCES+=GP_Convert.test.gen.c -include $(TOPDIR)/include.mk include $(TOPDIR)/tests.mk - +include $(TOPDIR)/include.mk http://repo.or.cz/w/gfxprim.git/commit/50e68bdcafa2e379597a3c454343c4f3b2c7… commit 50e68bdcafa2e379597a3c454343c4f3b2c7db73 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun Jun 12 20:56:32 2011 +0200 Support for generating tests source files + demo Added support to tests.mk and make_collected_tests.py Demo in make_GP_Convert.py diff --git a/pylib/gfxprim/generators/core/make_GP_Convert.py b/pylib/gfxprim/generators/core/make_GP_Convert.py index 291b383..633f6cc 100644 --- a/pylib/gfxprim/generators/core/make_GP_Convert.py +++ b/pylib/gfxprim/generators/core/make_GP_Convert.py @@ -57,3 +57,12 @@ def core_GP_Convert_gen_h(h, c): gen_convert_to(pixeltypes['RGB565'], pixeltypes['RGBA8888'], h, c) gen_convert_to(pixeltypes['RGBA8888'], pixeltypes['V2'], h, c) gen_convert_to(pixeltypes['VA12'], pixeltypes['RGBA8888'], h, c) + +@generator(CSourceGenerator(name = 'GP_Convert.test.gen.c'), + descr = 'GP_Convert tests', + authors = ["2011 - Tomas Gavenciak <gavento(a)ucw.cz>"]) +def core_GP_Convert_gen_h(c): + c.rhead('#include "GP_Tests.h"n') + c.rhead('#include "GP_Convert.h"nn') + c.rhead('GP_SUITE(GP_Convert)nn') + c.rbody('GP_TEST(triv)n{}nGP_ENDTESTn') diff --git a/pylib/gfxprim/generators/make_collected_tests.py b/pylib/gfxprim/generators/make_collected_tests.py index ca117ec..d690dac 100644 --- a/pylib/gfxprim/generators/make_collected_tests.py +++ b/pylib/gfxprim/generators/make_collected_tests.py @@ -27,7 +27,7 @@ def msg(prefix, msg_s, fname=None, line=None): s += '] ' sys.stderr.write(s + msg_s + 'n') -testfile_pattern = '*.test.c' +testfile_patterns = ['*.test.c', '*.test.gen.c'] suites = {} # {"suitename":["testname":{test_parameters}]} @@ -39,8 +39,9 @@ test_re = re.compile("A\s*GP_TEST$(.*)$\s*Z") 'from .test.c files', authors = ["2011 - Tomas Gavenciak <gavento(a)ucw.cz>"]) def tests_collected_tests(c): - fnames = glob.fnmatch.filter(os.listdir(c.fdir or '.'), testfile_pattern) - print fnames + fnames = [] + for pat in testfile_patterns: + fnames += glob.fnmatch.filter(os.listdir(c.fdir or '.'), pat) for fn in fnames: dirfn = os.path.join(c.fdir, fn) with open(dirfn, 'rt') as f: diff --git a/tests.mk b/tests.mk index 5dbcc80..2dc8df3 100644 --- a/tests.mk +++ b/tests.mk @@ -21,7 +21,9 @@ CSOURCES+=${GP_TESTLIB_SRCS} TESTSUITE_GEN=collected_tests.gen.c # also fixed in the code generator GENSOURCES+=${TESTSUITE_GEN} -TESTSUITE_SRCS=$(wildcard *.test.c) ${TESTSUITE_GEN} ${GP_TESTLIB_SRCS} +${TESTSUITE_GEN}: $(filter-out ${TESTSUITE_GEN},${GENSOURCES}) ${GENHEADERS} + +TESTSUITE_SRCS=$(wildcard *.test.c) ${GENSOURCES} ${GENHEADERS} ${GP_TESTLIB_SRCS} INCLUDE+=../tests/common TESTSUITE_OBJS=$(patsubst %.c,%.o,$(TESTSUITE_SRCS)) CLEAN+=${TESTSUITE} diff --git a/tests/core/Makefile b/tests/core/Makefile index 929a30c..2d11c70 100644 --- a/tests/core/Makefile +++ b/tests/core/Makefile @@ -1,8 +1,9 @@ TOPDIR=../.. LIBNAME=core -TESTSUITE=core +TESTSUITE=core_suite LDLIBS+=-lGP -L$(TOPDIR)/build/ -lcheck +GENSOURCES+=GP_Convert.test.gen.c include $(TOPDIR)/include.mk include $(TOPDIR)/tests.mk http://repo.or.cz/w/gfxprim.git/commit/e8872dfaab48d1f16b749fbd0ea698a6b7ce… commit e8872dfaab48d1f16b749fbd0ea698a6b7ce86ae Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun Jun 12 20:43:41 2011 +0200 Added helper routines for testing parts of core * Color (pixel) randomization and comparation * Context randomization and comparation diff --git a/include/core/GP_TestingCore.h b/include/core/GP_TestingCore.h new file mode 100644 index 0000000..23ea12a --- /dev/null +++ b/include/core/GP_TestingCore.h @@ -0,0 +1,55 @@ +/***************************************************************************** + * This file is part of gfxprim library. * + * * + * Gfxprim is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2.1 of the License, or (at your option) any later version. * + * * + * Gfxprim is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with gfxprim; if not, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * + * Boston, MA 02110-1301 USA * + * * + * Copyright (C) 2011 Tomas Gavenciak <gavento(a)ucw.cz> * + * * + *****************************************************************************/ + +#ifndef CORE_GP_TESTINGCORE_H +#define CORE_GP_TESTINGCORE_H + +#include "GP_Context.h" +#include "GP_Pixel.h" + +/* + * Return pixel value of random color of given type. + * Uses GP_TestingRandom and is not really efficient. + */ +GP_Pixel GP_RandomColor(GP_PixelType type); + +/* + * Set color of pixels in given bitap rectangle to random values. + * Uses GP_TestingRandom and is not really efficient. + */ +void GP_RandomizeRect(GP_Context *context, GP_Coord x, GP_Coord y, GP_Size w, GP_Size h); + +/* + * Return true if the two colors are equal after conversion to RGBA8888. + * Not very efficient. + */ +int GP_EqualColors(GP_Pixel p1, GP_PixelType t1, GP_Pixel p2, GP_PixelType t2); + +/* + * Compare two rectangles in two contexts. Return 1 on equal. + * The colors are cmpared by first converting them to RGBA8888. + * Somewhat inefficient. + */ +int GP_EqualRects(const GP_Context *c1, GP_Coord x1, GP_Coord y1, GP_Size w, GP_Size h, + const GP_Context *c2, GP_Coord x2, GP_Coord y2); + +#endif /* CORE_GP_TESTINGCORE_H */ diff --git a/libs/core/GP_TestingCore.c b/libs/core/GP_TestingCore.c new file mode 100644 index 0000000..afa2754 --- /dev/null +++ b/libs/core/GP_TestingCore.c @@ -0,0 +1,65 @@ +/***************************************************************************** + * This file is part of gfxprim library. * + * * + * Gfxprim is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2.1 of the License, or (at your option) any later version. * + * * + * Gfxprim is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with gfxprim; if not, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * + * Boston, MA 02110-1301 USA * + * * + * Copyright (C) 2011 Tomas Gavenciak <gavento(a)ucw.cz> * + * * + *****************************************************************************/ + +#include "GP_Common.h" +#include "GP_Convert.h" +#include "GP_GetPutPixel.h" +#include "GP_TestingCore.h" +#include "GP_TestingRandom.h" + +/* + * TODO: Use a different version for palette types. + */ +GP_Pixel GP_RandomColor(GP_PixelType type) +{ + return GP_RGBAToPixel(GP_TestingRandom() % 256, GP_TestingRandom() % 256, + GP_TestingRandom() % 256, GP_TestingRandom() % 256, type); +} + +void GP_RandomizeRect(GP_Context *context, GP_Coord x, GP_Coord y, GP_Size w, GP_Size h) +{ + GP_CHECK(context); + for (GP_Size i = 0; i < w; i++) + for (GP_Size j = 0; j < h; j++) + GP_PutPixel(context, i + x, j + y, GP_RandomColor(context->pixel_type)); +} + +int GP_EqualColors(GP_Pixel p1, GP_PixelType t1, GP_Pixel p2, GP_PixelType t2) +{ + GP_Pixel col1 = GP_PixelToRGBA8888(p1, t1); + GP_Pixel col2 = GP_PixelToRGBA8888(p2, t2); + return (col1 & 0xffffffff) == (col2 & 0xffffffff); +} + +int GP_EqualRects(const GP_Context *c1, GP_Coord x1, GP_Coord y1, GP_Size w, GP_Size h, + const GP_Context *c2, GP_Coord x2, GP_Coord y2) +{ + GP_CHECK(c1); + GP_CHECK(c2); + for (GP_Size i = 0; i < w; i++) + for (GP_Size j = 0; j < h; j++) { + if (!GP_EqualColors(GP_GetPixel(c1, x1 + i, y1 + j), c1->pixel_type, + GP_GetPixel(c2, x2 + i, y2 + j), c2->pixel_type)) + return 0; + } + return 1; +} http://repo.or.cz/w/gfxprim.git/commit/d7551ce7958fc44a3a9e070258d3c8a45a23… commit d7551ce7958fc44a3a9e070258d3c8a45a23f755 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun Jun 12 20:42:53 2011 +0200 Add separate pseudorandom generator for testing inputs diff --git a/include/core/GP_TestingRandom.h b/include/core/GP_TestingRandom.h new file mode 100644 index 0000000..9f897f8 --- /dev/null +++ b/include/core/GP_TestingRandom.h @@ -0,0 +1,47 @@ +/***************************************************************************** + * This file is part of gfxprim library. * + * * + * Gfxprim is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2.1 of the License, or (at your option) any later version. * + * * + * Gfxprim is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with gfxprim; if not, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * + * Boston, MA 02110-1301 USA * + * * + * Copyright (C) 2011 Tomas Gavenciak <gavento(a)ucw.cz> * + * * + *****************************************************************************/ + +/* + * These routines use a pseudorandom generator with internal state. + * Use this only to provide tests with pseudo-random inputs. + * The seed is initialized with the test name, so the random numbers + * (and therefore inputs) are the same for a test, and do not depend + * on random() called in the tested routines or other tests. + */ + +#ifndef CORE_GP_TESTING_RANDOM_H +#define CORE_GP_TESTING_RANDOM_H + +/* + * Return next random value from the testing random generator + */ +long int GP_TestingRandom(void); + +/* + * Initialize the random generator to a seed computed from the given string + * and the given seed value. Needs to be called at least once. + * + * The string may be for example the name of the test, the seed the number of test iteration. + */ +void GP_InitTestingRandom(const char *text, uint64_t seed); + +#endif /* CORE_GP_TESTING_RANDOM_H */ diff --git a/libs/core/GP_TestingRandom.c b/libs/core/GP_TestingRandom.c new file mode 100644 index 0000000..17281a9 --- /dev/null +++ b/libs/core/GP_TestingRandom.c @@ -0,0 +1,58 @@ +/***************************************************************************** + * This file is part of gfxprim library. * + * * + * Gfxprim is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2.1 of the License, or (at your option) any later version. * + * * + * Gfxprim is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with gfxprim; if not, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * + * Boston, MA 02110-1301 USA * + * * + * Copyright (C) 2011 Tomas Gavenciak <gavento(a)ucw.cz> * + * * + *****************************************************************************/ + +#include <stdlib.h> + +#include "GP_Common.h" +#include "GP_TestingRandom.h" + +/* + * State array for testing random generator + * + * The idea is to have a seperate random generator for generating + * random inputs for tests in case tested algorithms also use + * the random generator. Change in the tested algorithm must not + * change the input data generated for this or other part of the test. + * + * Take care when changing the values - unrelated test might start + * exhibiting a bug, some tests may rely on the exact result. + */ +#define GP_RandomStateSize 256 +static char GP_RandomTestingState[GP_RandomStateSize]; +static struct random_data GP_RandomTestingData; + +long int GP_TestingRandom(void) +{ + int32_t r; + GP_ASSERT(random_r(&GP_RandomTestingData, &r) == 0); + return r; +} + +void GP_InitTestingRandom(const char *text, uint64_t seed) +{ + const char *p = text; + for (; (p) && (*p); p++) + seed = ((seed * 327) + *p) % 0x7B391D50A10A3LL; // TODO replace with large primes + GP_ASSERT(initstate_r(seed, GP_RandomTestingState, GP_RandomStateSize, + &GP_RandomTestingData) == 0); +} + http://repo.or.cz/w/gfxprim.git/commit/413daca73ab16f53c9fd81410c261bc7628d… commit 413daca73ab16f53c9fd81410c261bc7628d2e11 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun Jun 12 20:40:02 2011 +0200 Make context arg of GetPixel const diff --git a/include/core/GP_GetPutPixel.h b/include/core/GP_GetPutPixel.h index 102bf9a..7151a36 100644 --- a/include/core/GP_GetPutPixel.h +++ b/include/core/GP_GetPutPixel.h @@ -36,7 +36,7 @@ * GetPixel with context transformations and clipping. * Returns 0 for clipped pixels or pixels outside bitmap. */ -GP_Pixel GP_GetPixel(GP_Context *context, int x, int y); +GP_Pixel GP_GetPixel(const GP_Context *context, int x, int y); /* * Version of GetPixel without transformations nor border checking. diff --git a/libs/core/GP_GetPutPixel.c b/libs/core/GP_GetPutPixel.c index fe37216..9cac910 100644 --- a/libs/core/GP_GetPutPixel.c +++ b/libs/core/GP_GetPutPixel.c @@ -23,7 +23,7 @@ #include "GP_GetPutPixel.h" #include "GP_Transform.h" -GP_Pixel GP_GetPixel(GP_Context *context, int x, int y) +GP_Pixel GP_GetPixel(const GP_Context *context, int x, int y) { GP_TRANSFORM_POINT(context, x, y); if (GP_PIXEL_IS_CLIPPED(context, x, y)) ----------------------------------------------------------------------- Summary of changes: include/core/GP_Common.h | 14 +++ include/core/GP_Convert.h | 3 +- include/core/GP_FnPerBpp.h | 60 ++++++++++++-- include/core/GP_GetPutPixel.h | 2 +- include/core/GP_Pixel.h | 20 +++++ libs/core/GP_Blit.c | 3 +- libs/core/GP_GetPutPixel.c | 2 +- pylib/gfxprim/generators/core/gen_pixeltype.py | 12 ++-- pylib/gfxprim/generators/core/make_GP_Convert.py | 46 ++++++++++- pylib/gfxprim/generators/core/make_GP_Pixel.py | 13 +++ pylib/gfxprim/generators/make_collected_tests.py | 7 +- tests.mk | 8 +- .../GP_Blit.c => tests/common/GP_TestingCore.c | 86 +++++++++++--------- .../common/GP_TestingCore.h | 53 ++++++------ .../common/GP_TestingRandom.c | 57 ++++++------- .../GP_Blit.h => tests/common/GP_TestingRandom.h | 41 +++++----- tests/common/GP_Tests.h | 7 +- tests/core/GP_Convert.test.c | 27 ++++++ tests/core/Makefile | 6 +- 19 files changed, 316 insertions(+), 151 deletions(-) copy libs/core/GP_Blit.c => tests/common/GP_TestingCore.c (50%) copy include/core/GP_GetPutPixel.h => tests/common/GP_TestingCore.h (58%) copy include/core/GP_GetPutPixel.h => tests/common/GP_TestingRandom.c (60%) copy include/core/GP_Blit.h => tests/common/GP_TestingRandom.h (66%) create mode 100644 tests/core/GP_Convert.test.c repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

Problms with git update messages (Your message to Gfxprim awaits moderator approval)
by Tomas Gavenciak 12 Jun '11

12 Jun '11

Dear admins of repo.or.cz, We use your repository to develop our small graphic library, frequently pushing large refactoring commits, many small commits at once or bigger chunks of new code. Getting announces of other peoples' commits is a very useful feature, but the full patch format is inconvenient for at least two reasons: * It is very hard to read the commit comment of other than the first commit in the message * The patch body is quite frequently too large and/or of little interest or information itself I think it would be an improvement to your great service to (have an option to) send the commit messages instead of the full patch. Anyone interested in the actual change can see it the repo within the context. Would you please consider making that change? An inspiration for additional luxury (not requesting those): It might make sense to send the patch if very small (<20 lines or so), but I am not sure how hard/useful would that be. Including a link directly to the commit page or the project commit log page on gitweb might be nice for those who would like to see the full patch without fetching the repo. Best regards, Tomas On Sun, Jun 12, 2011 at 1:29 AM, <gfxprim-bounces(a)ucw.cz> wrote: > Your mail to 'Gfxprim' with the subject > > [repo.or.cz] gfxprim.git branch generate updated: > abf38d0ef10e4cd84391950b1595cfc60dcf3181 > > Is being held until the list moderator can review it for approval. > > The reason it is being held: > > Message body is too big: 94428 bytes with a limit of 40 KB > > Either the message will get posted to the list, or you will receive > notification of the moderator's decision. If you would like to cancel > this posting, please visit the following URL: > > http://www.ucw.cz/mailman/confirm/gfxprim/434baecc73c727fa1e4afc18075d535a0… > >

1 0

[repo.or.cz] gfxprim.git branch generate updated: abf38d0ef10e4cd84391950b1595cfc60dcf3181
by gavento 12 Jun '11

12 Jun '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, generate has been updated via abf38d0ef10e4cd84391950b1595cfc60dcf3181 (commit) via 80c8f8ccda4b63c85fa784cb2ebfa61181a818a4 (commit) via 06fa397a908dd96877573db3df61274cd493eed4 (commit) via 21749e191eb8863acaa33bc32d2959f89cc97d88 (commit) via 4b24345dd60ebbc38dccca753476ebf32cb72df0 (commit) via 47c5f5f4b32da3d004ffa2c037857c8323ea1a1f (commit) via c4ac868f69649ea94eab4a650b49ca25dcd2c490 (commit) via 51e969cd103ec6546ec91af744157338d352896c (commit) via f11293be8118c9707b268f55ba49dc6ea8b111ff (commit) via 6aa9b93dc730b452effb253df5a051bc791692ef (commit) via 93c34cab6ae326bf2ff21a69c973a3922ca9ece7 (commit) via 628bf75875173555777a15ce6a7fe7e91cd328b8 (commit) via cfd3858ce9e6a269b8903bd312e52259c48e318c (commit) from fb094cd7f8086ddb9e59b91224c5fef9702136fa (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/abf38d0ef10e4cd84391950b1595cfc60dcf… commit abf38d0ef10e4cd84391950b1595cfc60dcf3181 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun Jun 12 01:27:18 2011 +0200 Add blit color conversion, use GP_Coord and GP_Size in blits diff --git a/libs/core/GP_Blit.c b/include/core/GP_Blit.h similarity index 55% copy from libs/core/GP_Blit.c copy to include/core/GP_Blit.h index 29e90e8..fc2c6a7 100644 --- a/libs/core/GP_Blit.c +++ b/include/core/GP_Blit.h @@ -20,57 +20,29 @@ * * *****************************************************************************/ -#include "GP_Pixel.h" -#include "GP_Pixel_Access.h" -#include "GP_Context.h" +#ifndef CORE_GP_BLIT_H +#define CORE_GP_BLIT_H -/* -void GP_Blit(const GP_Context *c1, int x1, int y1, int w, int h, - GP_Context *c2, int x2, int y2) -{ - // Ultimate TODO: effective processing - GP_Blit_Naive(c1, x1, y1, w, h, c2, x2, y2); -} -*/ +/* Generated header */ +#include "GP_Blit.gen.h" -// TODO(gavento, czech) Plan: -// GP_Blit_Naive - Zadne rotovani a tak, jen Get/PutPixel a konverze A->RGBA8888->B -// GP_Blit_Simple - S rotovanim, makrovy Get/PutPixel, mozna optimalizace na radky, chytrejsi konverze (ale porad univ.) -// GP_Blit_Simple_xBPP - S rotovanim, makrovy Get/PutPixel -// GP_Blit_xBPP - Optimalizovane, muze volat GP_Blit_Simple_xBPP pro divne pripady -// GP_Blit - Vola GP_Blit_xBPP (stejny typ) nebo GP_Blit_Simple (jine typy), pripadne optimalizovat - -/* -void GP_Blit_Naive(const GP_Context *c1, int x1, int y1, int w, int h, - GP_Context *c2, int x2, int y2) -{ - GP_TRANSFORM_BLIT(c1, x1, y1, w, h, c2, x2, y2); - // TODO: Cipping? - GP_Blit_Naive_Raw(c1, x1, y1, w, h, c2, x2, y2); -} -*/ +void GP_Blit(const GP_Context *c1, int x1, int y1, int w, int h, + GP_Context *c2, int x2, int y2); /* * Very naive blit, no optimalizations whatsoever - keep it that way. * Used as a reference for testing and such. Aaand ultimate fallback. + * GP_CHECKS for clipping and size (for testing) */ -void GP_Blit_Naive(const GP_Context *c1, int x1, int y1, int w, int h, - GP_Context *c2, int x2, int y2) -{ - GP_CHECK(x1 >= 0); - GP_CHECK(y1 >= 0); - GP_CHECK(w >= 0); - GP_CHECK(h >= 0); - GP_CHECK(x1 + w <= GP_ContextW(c1)); - GP_CHECK(y1 + h <= GP_ContextH(c1)); - GP_CHECK(x2 >= 0); - GP_CHECK(y2 >= 0); - GP_CHECK(x2 + w <= GP_ContextW(c2)); - GP_CHECK(y2 + h <= GP_ContextH(c2)); +void GP_Blit_Naive(const GP_Context *c1, GP_Coord x1, GP_Coord y1, GP_Size w, GP_Size h, + GP_Context *c2, GP_Coord x2, GP_Coord y2); - for (int i = 0; i < w; i++) - for (int j = 0; j < h; j++) { - GP_Pixel p = GP_GetPixel(c1, x1 + i, y1 + j); - GP_PutPixel(c2, x2 + i, y2 + j, p); - } -} +/* + * Similar in purpose to GP_Blit_Naive, but operates on raw coordinates. + * Does no range checking. + */ +/* +void GP_Blit_Naive_Raw(const GP_Context *c1, int x1, int y1, int w, int h, + GP_Context *c2, int x2, int y2); +*/ +#endif // CORE_GP_BLIT_H diff --git a/libs/core/GP_Blit.c b/libs/core/GP_Blit.c index 29e90e8..76c7a2c 100644 --- a/libs/core/GP_Blit.c +++ b/libs/core/GP_Blit.c @@ -21,8 +21,9 @@ *****************************************************************************/ #include "GP_Pixel.h" -#include "GP_Pixel_Access.h" +#include "GP_GetPutPixel.h" #include "GP_Context.h" +#include "GP_Blit.h" /* void GP_Blit(const GP_Context *c1, int x1, int y1, int w, int h, @@ -50,12 +51,8 @@ void GP_Blit_Naive(const GP_Context *c1, int x1, int y1, int w, int h, } */ -/* - * Very naive blit, no optimalizations whatsoever - keep it that way. - * Used as a reference for testing and such. Aaand ultimate fallback. - */ -void GP_Blit_Naive(const GP_Context *c1, int x1, int y1, int w, int h, - GP_Context *c2, int x2, int y2) +void GP_Blit_Naive(const GP_Context *c1, GP_Coord x1, GP_Coord y1, GP_Size w, GP_Size h, + GP_Context *c2, GP_Coord x2, GP_Coord y2) { GP_CHECK(x1 >= 0); GP_CHECK(y1 >= 0); @@ -71,6 +68,8 @@ void GP_Blit_Naive(const GP_Context *c1, int x1, int y1, int w, int h, for (int i = 0; i < w; i++) for (int j = 0; j < h; j++) { GP_Pixel p = GP_GetPixel(c1, x1 + i, y1 + j); + if (c1->pixel_type != c2->pixel_type) + p = GP_GP_ConvertContextPixel(p, c1, c2); GP_PutPixel(c2, x2 + i, y2 + j, p); } } diff --git a/pylib/gfxprim/generators/core/gen_blit.py b/pylib/gfxprim/generators/core/gen_blit.py index 819f29f..78be0f8 100644 --- a/pylib/gfxprim/generators/core/gen_blit.py +++ b/pylib/gfxprim/generators/core/gen_blit.py @@ -18,14 +18,14 @@ def gen_blit_same_t(size, size_suffix, header, code): "n/*** Blit preserving type, variant for {{ size_suffix }} ***n" " * Assumes the contexts to be of the right types and sizesn" " * Ignores transformations and clipping */nn" - "void GP_Blit_{{ size_suffix }}(const GP_Context *c1, int x1, int y1, int w, int h,n" - " GP_Context *c2, int x2, int y2);n", + "void GP_Blit_{{ size_suffix }}(const GP_Context *c1, GP_Coord x1, GP_Coord y1, GP_Size w, GP_Size h,n" + " GP_Context *c2, GP_Coord x2, GP_Coord y2);n", size=size, size_suffix=size_suffix) code.rbody( "n/*** Blit preservimg type, variant for {{ size_suffix }} ***/n" - "void GP_Blit_{{ size_suffix }}(const GP_Context *c1, int x1, int y1, int w, int h,n" - " GP_Context *c2, int x2, int y2)n" + "void GP_Blit_{{ size_suffix }}(const GP_Context *c1, GP_Coord x1, GP_Coord y1, GP_Size w, GP_Size h,n" + " GP_Context *c2, GP_Coord x2, GP_Coord y2)n" "{n" " if (unlikely(w == 0 || h == 0)) return;nn" " /* Special case - copy whole line-block with one memcpy() */n" @@ -38,7 +38,7 @@ def gen_blit_same_t(size, size_suffix, header, code): " }nn" "{% if size>=8 %}" " /* General case - memcpy() each horizontal line */n" - " for (int i=0; i<h; i++)n" + " for (GP_Size i = 0; i < h; i++)n" " memcpy(GP_PIXEL_ADDR_{{ size_suffix }}(c2, x2, y2 + i), n" " GP_PIXEL_ADDR_{{ size_suffix }}(c1, x2, y2 + i),n" " {{ size/8 }} * w);n" @@ -57,7 +57,7 @@ def gen_blit_same_t(size, size_suffix, header, code): " uint8_t *p2 = GP_PIXEL_ADDR_{{ size_suffix }}(c2, x2, y2);n" " uint8_t *end_p1 = GP_PIXEL_ADDR_{{ size_suffix }}(c1, x1 + w - 1, y1);n" " uint8_t *end_p2 = GP_PIXEL_ADDR_{{ size_suffix }}(c2, x2 + w - 1, y2);n" - " for (int i = 0; i < h; i++) {n" + " for (GP_Size i = 0; i < h; i++) {n" " if (al1 != 0)n" " GP_SET_BITS(al1, 8-al1, *p2, GP_GET_BITS(al1, 8-al1, *p1));n" " memcpy(p2+(al1!=0), p1+(al1!=0), copy_size);n" @@ -73,19 +73,3 @@ def gen_blit_same_t(size, size_suffix, header, code): "{% endif %}" "}n", size=size, size_suffix=size_suffix) - -def gen_blit_t(f1, f2, header, code): - "Generate a macro GP_Blit_T1_T2 blitting a rectangle" - "Does not (yet) convert between PAL formats and RGBVA" - allowed_chansets = [ set(list(s)) for s in ['RGB', 'RGBA', 'V', 'VA'] ] - if f1!=f2: - assert(set(f1.chans.keys()) in allowed_chansets) - assert(set(f2.chans.keys()) in allowed_chansets) - - header.rbody( - "n/*** Blit line {{ f1.name }} -> {{ f2.name }} ***n" - " * Assumes the contexts to be of the right types and sizes */nn" - "void GP_Blit_{{ f1.name }}_{{ f2.name }}(const GP_Context *c1, int x1, int y2, int w, int h,n" - " GP_Context *c2, int x2, int y2);n", - f1=f1, f2=f2) - diff --git a/pylib/gfxprim/generators/core/make_GP_Blit.py b/pylib/gfxprim/generators/core/make_GP_Blit.py index 702d2ba..03057b0 100644 --- a/pylib/gfxprim/generators/core/make_GP_Blit.py +++ b/pylib/gfxprim/generators/core/make_GP_Blit.py @@ -21,7 +21,7 @@ def core_GP_Blit_gen(h, c): '#include "GP_Pixel.h"n' '#include "GP.h"n' '#include "GP_Context.h"n' - '#include "GP_Blit.gen.h"n' + '#include "GP_Blit.h"n' ) for bpp in bitsizes: http://repo.or.cz/w/gfxprim.git/commit/80c8f8ccda4b63c85fa784cb2ebfa61181a8… commit 80c8f8ccda4b63c85fa784cb2ebfa61181a818a4 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun Jun 12 01:25:24 2011 +0200 Add GP_Size (unsigned int) type diff --git a/include/core/GP_Context.h b/include/core/GP_Context.h index da344f3..ce85f65 100644 --- a/include/core/GP_Context.h +++ b/include/core/GP_Context.h @@ -35,6 +35,7 @@ /* Integer type for coordinates: x, y, width, height, ... * Should be signed to hold negative values as well. */ typedef int GP_Coord; +typedef unsigned int GP_Size; /* This structure holds all information needed for drawing into an image. */ typedef struct GP_Context { http://repo.or.cz/w/gfxprim.git/commit/06fa397a908dd96877573db3df61274cd493… commit 06fa397a908dd96877573db3df61274cd493eed4 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun Jun 12 01:09:05 2011 +0200 Extend value scaling to all values 1..8 Requred by RGB565 etc. diff --git a/pylib/gfxprim/generators/core/make_GP_Convert.py b/pylib/gfxprim/generators/core/make_GP_Convert.py index 8ef43ed..291b383 100644 --- a/pylib/gfxprim/generators/core/make_GP_Convert.py +++ b/pylib/gfxprim/generators/core/make_GP_Convert.py @@ -23,7 +23,7 @@ def core_GP_Pixel_Scale_gen(h): " */n" "#define GP_SCALE_VAL(s1, s2, val) ( GP_SCALE_VAL_##s1##_##s2(val) )nn" - "{% for s1 in [1, 2, 4, 8] %}{% for s2 in [1, 2, 4, 8] %}" + "{% for s1 in range(1,9) %}{% for s2 in range(1,9) %}" "{% if s2>s1 %}" "#define GP_SCALE_VAL_{{s1}}_{{s2}}(val) ((val) * {{ multcoef(s1, s2) }})n" "{% else %}" http://repo.or.cz/w/gfxprim.git/commit/21749e191eb8863acaa33bc32d2959f89cc9… commit 21749e191eb8863acaa33bc32d2959f89cc97d88 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun Jun 12 01:00:16 2011 +0200 Move scaling code generation from Pixel to Convert diff --git a/include/core/GP_Convert.h b/include/core/GP_Convert.h index c1c44ef..dff93e6 100644 --- a/include/core/GP_Convert.h +++ b/include/core/GP_Convert.h @@ -26,8 +26,9 @@ #include "GP_Common.h" #include "GP_Context.h" -/* Generated header */ +/* Generated headers */ #include "GP_Convert.gen.h" +#include "GP_Convert_Scale.gen.h" /* * Generated function to convert RGB888 to any type. diff --git a/include/core/GP_Pixel.h b/include/core/GP_Pixel.h index 7ac0fb7..ec78c04 100644 --- a/include/core/GP_Pixel.h +++ b/include/core/GP_Pixel.h @@ -54,9 +54,8 @@ struct GP_Context; typedef uint32_t GP_Pixel; -/* Generated headers */ +/* Generated header */ #include "GP_Pixel.gen.h" -#include "GP_Pixel_Scale.gen.h" /* * Information about ordering of pixels in byte for 1, 2 and 4 bpp diff --git a/libs/core/Makefile b/libs/core/Makefile index bce6f9d..5bcadca 100644 --- a/libs/core/Makefile +++ b/libs/core/Makefile @@ -1,6 +1,6 @@ TOPDIR=../.. GENSOURCES=GP_Pixel.gen.c GP_Blit.gen.c GP_Convert.gen.c -GENHEADERS=GP_Pixel_Scale.gen.h GP_Blit.gen.h GP_Pixel.gen.h GP_GetPutPixel.gen.h GP_Convert.gen.h +GENHEADERS=GP_Convert_Scale.gen.h GP_Blit.gen.h GP_Pixel.gen.h GP_GetPutPixel.gen.h GP_Convert.gen.h CSOURCES=$(filter-out $(wildcard *.gen.c),$(wildcard *.c)) LIBNAME=core CFLAGS+=-Wno-overflow diff --git a/pylib/gfxprim/generators/core/make_GP_Convert.py b/pylib/gfxprim/generators/core/make_GP_Convert.py index 1800a2c..8ef43ed 100644 --- a/pylib/gfxprim/generators/core/make_GP_Convert.py +++ b/pylib/gfxprim/generators/core/make_GP_Convert.py @@ -3,6 +3,7 @@ # Script generating: # # GP_Convert.gen.c, GP_Convert.gen.h +# GP_Convert_Scale.gen.h # # 2011 - Tomas Gavenciak <gavento(a)ucw.cz> # @@ -11,11 +12,29 @@ from gfxprim.generators.generator import * from gfxprim.generators.pixeltype import * from gfxprim.generators.core.gen_convert import * +@generator(CHeaderGenerator(name = 'GP_Convert_Scale.gen.h'), + descr = 'Fast value scaling macros', + authors = ["2011 - Tomas Gavenciak <gavento(a)ucw.cz>"]) +def core_GP_Pixel_Scale_gen(h): + h.rhead( + "/* helper macros to transfer s1-bit value to s2-bit valuen" + " * NOTE: efficient and accurate for both up- and downscaling,n" + " * WARNING: GP_SCALE_VAL requires constants numebrs as first two parametersn" + " */n" + "#define GP_SCALE_VAL(s1, s2, val) ( GP_SCALE_VAL_##s1##_##s2(val) )nn" + + "{% for s1 in [1, 2, 4, 8] %}{% for s2 in [1, 2, 4, 8] %}" + "{% if s2>s1 %}" + "#define GP_SCALE_VAL_{{s1}}_{{s2}}(val) ((val) * {{ multcoef(s1, s2) }})n" + "{% else %}" + "#define GP_SCALE_VAL_{{s1}}_{{s2}}(val) ((val) >> {{ s1 - s2 }})n" + "{% endif %}" + "{% endfor %}{% endfor %}", multcoef = lambda s1,s2: hex(sum([1<<i*s1 for i in range(s2/s1)])) + ) @generator(CHeaderGenerator(name = 'GP_Convert.gen.h'), CSourceGenerator(name = 'GP_Convert.gen.c'), - descr = 'Convert PixelType values macros and functionsn' - 'Do not include directly, use GP_Convert.h', + descr = 'Convert PixelType values macros and functions', authors = ["2011 - Tomas Gavenciak <gavento(a)ucw.cz>"]) def core_GP_Convert_gen_h(h, c): h.rhead('#include "GP_Common.h"n'); diff --git a/pylib/gfxprim/generators/core/make_GP_Pixel.py b/pylib/gfxprim/generators/core/make_GP_Pixel.py index fc99657..05cc28e 100644 --- a/pylib/gfxprim/generators/core/make_GP_Pixel.py +++ b/pylib/gfxprim/generators/core/make_GP_Pixel.py @@ -3,7 +3,6 @@ # Script generating: # # GP_Pixel.gen.c, GP_Pixel.gen.h -# GP_Pixel_Scale.gen.h # GP_Pixel_Access.gen.h # # 2011 - Tomas Gavenciak <gavento(a)ucw.cz> @@ -14,26 +13,6 @@ from gfxprim.generators.pixeltype import * from gfxprim.generators.core.gen_pixeltype import * from gfxprim.generators.core.gen_getputpixel import * -@generator(CHeaderGenerator(name = 'GP_Pixel_Scale.gen.h'), - descr = 'Fast value scaling macrosnDo not include directly, use GP_Pixel.h', - authors = ["2011 - Tomas Gavenciak <gavento(a)ucw.cz>"]) -def core_GP_Pixel_Scale_gen(h): - h.rhead( - "/* helper macros to transfer s1-bit value to s2-bit valuen" - " * NOTE: efficient and accurate for both up- and downscaling,n" - " * WARNING: GP_SCALE_VAL requires constants numebrs as first two parametersn" - " */n" - "#define GP_SCALE_VAL(s1, s2, val) ( GP_SCALE_VAL_##s1##_##s2(val) )nn" - - "{% for s1 in [1, 2, 4, 8] %}{% for s2 in [1, 2, 4, 8] %}" - "{% if s2>s1 %}" - "#define GP_SCALE_VAL_{{s1}}_{{s2}}(val) ((val) * {{ multcoef(s1, s2) }})n" - "{% else %}" - "#define GP_SCALE_VAL_{{s1}}_{{s2}}(val) ((val) >> {{ s1 - s2 }})n" - "{% endif %}" - "{% endfor %}{% endfor %}", multcoef = lambda s1,s2: hex(sum([1<<i*s1 for i in range(s2/s1)])) - ) - @generator(CHeaderGenerator(name='GP_Pixel.gen.h'), CSourceGenerator(name='GP_Pixel.gen.c'), descr = 'Pixel type definitions and functionsnDo not include directly, use GP_Pixel.h', http://repo.or.cz/w/gfxprim.git/commit/4b24345dd60ebbc38dccca753476ebf32cb7… commit 4b24345dd60ebbc38dccca753476ebf32cb72df0 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun Jun 12 00:56:36 2011 +0200 Write up more conversion code, almost complete diff --git a/include/core/GP_Convert.h b/include/core/GP_Convert.h index bf1580b..c1c44ef 100644 --- a/include/core/GP_Convert.h +++ b/include/core/GP_Convert.h @@ -26,13 +26,40 @@ #include "GP_Common.h" #include "GP_Context.h" +/* Generated header */ +#include "GP_Convert.gen.h" + +/* + * Generated function to convert RGB888 to any type. + * Does not work with palette types. + */ +GP_Pixel GP_RGB888ToPixel(GP_Pixel pixel, GP_PixelType type); + +/* + * Generated function to convert RGBA8888 to any type. + * Does not work with palette types. + */ +GP_Pixel GP_RGBA8888ToPixel(GP_Pixel pixel, GP_PixelType type); + +/* + * Generated function to convert to RGB888 from any type. + * Does not work with palette types. + */ +GP_Pixel GP_PixelToRGB888(GP_Pixel pixel, GP_PixelType type); + +/* + * Generated function to convert to RGBA8888 from any type. + * Does not work with palette types. + */ +GP_Pixel GP_PixelToRGBA8888(GP_Pixel pixel, GP_PixelType type); + /* * Converts a color specified by its R, G, B components to a specified type. */ static inline GP_Pixel GP_RGBToPixel(uint8_t r, uint8_t g, uint8_t b, GP_PixelType type) { GP_Pixel p = GP_Pixel_CREATE_RGB888(r, g, b); - return GP_RGB888ToType(p, type); + return GP_RGB888ToPixel(p, type); } /* @@ -41,7 +68,7 @@ static inline GP_Pixel GP_RGBToPixel(uint8_t r, uint8_t g, uint8_t b, GP_PixelTy static inline GP_Pixel GP_RGBAToPixel(uint8_t r, uint8_t g, uint8_t b, uint8_t a, GP_PixelType type) { GP_Pixel p = GP_Pixel_CREATE_RGBA8888(r, g, b, a); - return GP_RGBA8888ToType(p, type); + return GP_RGBA8888ToPixel(p, type); } /* @@ -55,27 +82,29 @@ static inline GP_Pixel GP_RGBToContextPixel(uint8_t r, uint8_t g, uint8_t b, } /* - * Generated function to convert RGB888 to any type. - * Does not work with palette types. - */ -GP_Pixel GP_RGB888ToPixel(GP_Pixel pixel, GP_PixelType type); - -/* - * Generated function to convert RGBA8888 to any type. - * Does not work with palette types. + * Converts a color specified by its R, G, B, A components to a pixel value + * compatible with the specified context. */ -GP_Pixel GP_RGBA8888ToPixel(GP_Pixel pixel, GP_PixelType type); +static inline GP_Pixel GP_RGBAToContextPixel(uint8_t r, uint8_t g, uint8_t b, uint8_t a, const GP_Context *context) +{ + return GP_RGBAToPixel(r, g, b, a, context->pixel_type); +} /* - * Generated function to convert to RGB888 from any type. - * Does not work with palette types. + * Convert between any pixel types (excl. palette types) via RGBA8888 */ -GP_Pixel GP_PixelToRGB888(GP_Pixel pixel, GP_PixelType type); - +static inline GP_Pixel GP_ConvertPixel(GP_Pixel pixel, GP_PixelType from, GP_PixelType to) +{ + return GP_RGBA8888ToPixel(GP_PixelToRGBA8888(from, pixel), to); +} + /* - * Generated function to convert to RGBA8888 from any type. - * Does not work with palette types. + * Convert between pixel types of given contexts (excl. palette types) via RGBA8888. + * */ -GP_Pixel GP_PixelToRGBA8888(GP_Pixel pixel, GP_PixelType type); +static inline GP_Pixel GP_ConvertContextPixel(GP_Pixel pixel, const GP_Context *from, const GP_Context *to) +{ + return GP_RGBA8888ToPixel(GP_PixelToRGBA8888(from->pixel_type, pixel), to->pixel_type); +} #endif /* CORE_GP_CONVERT_H */ diff --git a/pylib/gfxprim/generators/core/gen_convert.py b/pylib/gfxprim/generators/core/gen_convert.py index a136649..84c2b69 100644 --- a/pylib/gfxprim/generators/core/gen_convert.py +++ b/pylib/gfxprim/generators/core/gen_convert.py @@ -28,10 +28,10 @@ def gen_fixedtype_to_type(fixedtype, header, code): "{% endif %}" "{% endfor %}" " default:n" - " GP_ABORT("Unknown PixelType %ld", type);n" + " GP_ABORT("Unknown PixelType %ud", type);n" " }n" " return p;n" - "}n", f=fixedtype, types=pixeltypes.values()) + "}nn", f=fixedtype, types=pixeltypes.values()) def gen_type_to_fixedtype(fixedtype, header, code): "Generate functions converting to a fixed PixelType from any other" @@ -57,10 +57,10 @@ def gen_type_to_fixedtype(fixedtype, header, code): "{% endif %}" "{% endfor %}" " default:n" - " GP_ABORT("Unknown PixelType %ld", type);n" + " GP_ABORT("Unknown PixelType %u", type);n" " }n" " return p;n" - "}n", f=fixedtype, types=pixeltypes.values()) + "}nn", f=fixedtype, types=pixeltypes.values()) def gen_convert_to(f1, f2, header, code): "Generate a macro converting from f1 to f2" @@ -80,25 +80,25 @@ def gen_convert_to(f1, f2, header, code): # case 1: just copy a channel "{%- if c2[0] in f1.chans.keys() %}{% set c1 = f1.chans[c2[0]] %}" - " /* {{ c2[0] }}:={{ c1[0] }} */ GP_SET_BITS({{c2[1]}}+o2, " - " GP_SCALE_VAL_{{c1[2]}}_{{c2[2]}}(GP_GET_BITS({{c1[1]}}+o1, {{c1[2]}}, p1)), p2); " + " /* {{ c2[0] }}:={{ c1[0] }} */ GP_SET_BITS({{c2[1]}}+o2, {{c2[2]}}, p2, " + " GP_SCALE_VAL_{{c1[2]}}_{{c2[2]}}(GP_GET_BITS({{c1[1]}}+o1, {{c1[2]}}, p1))); " # case 2: set A to full opacity (not present in source) "{% elif c2[0]=='A' %}" - " /* A:={{ hmask(c2[2]) }} */GP_SET_BITS({{c2[1]}}+o2, {{ hmask(c2[2]) }}, p2); " + " /* A:={{ hmask(c2[2]) }} */GP_SET_BITS({{c2[1]}}+o2, {{c2[2]}}, p2, {{ hmask(c2[2]) }}); " # case 3: calculate V as average of RGB "{% elif c2[0]=='V' and set('RGB').issubset(set(f1.chans.keys())) %}" - " /* V:=RGB_avg */ GP_SET_BITS({{c2[1]}}+o2, ( " + " /* V:=RGB_avg */ GP_SET_BITS({{c2[1]}}+o2, {{c2[2]}}, p2, ( " "{% for c1 in [f1.chans['R'], f1.chans['G'], f1.chans['B']] %}" - " /* {{c1[0]}} */ GP_SCALE_VAL_{{c1[2]}}_{{c2[2]}}(GP_GET_BITS({{c1[1]}}+o1, {{c1[2]}}, p1), p2) + " + " /* {{c1[0]}} */ GP_SCALE_VAL_{{c1[2]}}_{{c2[2]}}(GP_GET_BITS({{c1[1]}}+o1, {{c1[2]}}, p1)) + " "{% endfor %}" " 0)/3); " #- case 4: set each RGB to V "{% elif c2[0] in 'RGB' and 'V' in f1.chans.keys() %}{% set c1 = f1.chans['V'] %}" - " /* {{ c2[0] }}:=V */ GP_SET_BITS({{c2[1]}}+o2, " - " GP_SCALE_VAL_{{c1[2]}}_{{c2[2]}}(GP_GET_BITS({{c1[1]}}+o1, {{c1[2]}}, p1)), p2); " + " /* {{ c2[0] }}:=V */ GP_SET_BITS({{c2[1]}}+o2, {{c2[2]}}, p2, " + " GP_SCALE_VAL_{{c1[2]}}_{{c2[2]}}(GP_GET_BITS({{c1[1]}}+o1, {{c1[2]}}, p1))); " # invalid mapping (there should be none, but who knows ...) "{% else %} {{ raise(Error('channel conversion' +f1.name+ ' to ' +f2.name+ ' not supported')) }}" @@ -111,6 +111,6 @@ def gen_convert_to(f1, f2, header, code): # add version without offsets "/* a version without offsets */n" "#define GP_Pixel_{{ f1.name }}_TO_{{ f2.name }}(p1, p2) " - "(GP_Pixel_{{ f1.name }}_TO_{{ f2.name }}_OFFSET(p1, 0, p2, 0))n", + "GP_Pixel_{{ f1.name }}_TO_{{ f2.name }}_OFFSET(p1, 0, p2, 0)n", f1=f1, f2=f2, hmask=hmask, set=set) diff --git a/pylib/gfxprim/generators/core/make_GP_Convert.py b/pylib/gfxprim/generators/core/make_GP_Convert.py index e8c7360..1800a2c 100644 --- a/pylib/gfxprim/generators/core/make_GP_Convert.py +++ b/pylib/gfxprim/generators/core/make_GP_Convert.py @@ -22,8 +22,7 @@ def core_GP_Convert_gen_h(h, c): h.rhead('#include "GP_Context.h"n'); h.rhead('#include "GP_Pixel.h"nn'); - h.rhead('#include "GP_Common.h"n'); - c.rhead('#include "GP_Pixel.h"nn'); + c.rhead('#include "GP_Convert.h"nn'); ## two base types for conversions for bt in [pixeltypes['RGB888'], pixeltypes['RGBA8888']]: http://repo.or.cz/w/gfxprim.git/commit/47c5f5f4b32da3d004ffa2c037857c8323ea… commit 47c5f5f4b32da3d004ffa2c037857c8323ea1a1f Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun Jun 12 00:54:55 2011 +0200 Rename pixel_access -> getputpixel in gener. libs as well diff --git a/pylib/gfxprim/generators/core/gen_pixel_access.py b/pylib/gfxprim/generators/core/gen_getputpixel.py similarity index 100% rename from pylib/gfxprim/generators/core/gen_pixel_access.py rename to pylib/gfxprim/generators/core/gen_getputpixel.py diff --git a/pylib/gfxprim/generators/core/make_GP_Pixel.py b/pylib/gfxprim/generators/core/make_GP_Pixel.py index 0ade754..fc99657 100644 --- a/pylib/gfxprim/generators/core/make_GP_Pixel.py +++ b/pylib/gfxprim/generators/core/make_GP_Pixel.py @@ -12,7 +12,7 @@ from gfxprim.generators.generator import * from gfxprim.generators.pixeltype import * from gfxprim.generators.core.gen_pixeltype import * -from gfxprim.generators.core.gen_pixel_access import * +from gfxprim.generators.core.gen_getputpixel import * @generator(CHeaderGenerator(name = 'GP_Pixel_Scale.gen.h'), descr = 'Fast value scaling macrosnDo not include directly, use GP_Pixel.h', http://repo.or.cz/w/gfxprim.git/commit/c4ac868f69649ea94eab4a650b49ca25dcd2… commit c4ac868f69649ea94eab4a650b49ca25dcd2c490 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun Jun 12 00:20:00 2011 +0200 Fixed Makefile (gen files), disable overflow warning diff --git a/libs/core/Makefile b/libs/core/Makefile index c3692df..bce6f9d 100644 --- a/libs/core/Makefile +++ b/libs/core/Makefile @@ -1,8 +1,9 @@ TOPDIR=../.. -GENSOURCES=GP_Pixel.gen.c GP_Blit.gen.c GP_Convert.gen.c GP_Convert.gen.h -GENHEADERS=GP_Pixel_Scale.gen.h GP_Blit.gen.h GP_Pixel.gen.h GP_GetPutPixel.gen.h +GENSOURCES=GP_Pixel.gen.c GP_Blit.gen.c GP_Convert.gen.c +GENHEADERS=GP_Pixel_Scale.gen.h GP_Blit.gen.h GP_Pixel.gen.h GP_GetPutPixel.gen.h GP_Convert.gen.h CSOURCES=$(filter-out $(wildcard *.gen.c),$(wildcard *.c)) LIBNAME=core +CFLAGS+=-Wno-overflow include $(TOPDIR)/gen.mk include $(TOPDIR)/include.mk http://repo.or.cz/w/gfxprim.git/commit/51e969cd103ec6546ec91af744157338d352… commit 51e969cd103ec6546ec91af744157338d352896c Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun Jun 12 00:15:09 2011 +0200 Remove annoying readout in pixeltype loading replaced by warning in case nothing is loaded diff --git a/pylib/gfxprim/generators/pixeltype.py b/pylib/gfxprim/generators/pixeltype.py index e43ffce..92586ab 100644 --- a/pylib/gfxprim/generators/pixeltype.py +++ b/pylib/gfxprim/generators/pixeltype.py @@ -104,11 +104,7 @@ def load_pixeltypes(defs_file = None): if not defs_file: path = os.path.dirname(os.path.abspath(__file__)) defs_file = os.path.join(path, '..', '..', 'pixeltypes.py') - sys.stderr.write("Opening PixelType defs file '" + defs_file + "'n") - l1 = len(pixeltypes) execfile(defs_file) - l2 = len(pixeltypes) - sys.stderr.write("Read %d PixelTypes, now %d totaln" % (l2 - l1, l2)) def __init__(): "Initialize PixelType UNKNOWN.n" @@ -116,6 +112,9 @@ def __init__(): if 0 not in pixeltypes: PixelType("UNKNOWN", 0, [], bit_endian=bit_endians[0], number=0) load_pixeltypes() + # check if some types were loaded + if len(pixeltypes) <= 1: + sys.stderr.write("WARNING: no PixelTypes were loaded.") __init__() http://repo.or.cz/w/gfxprim.git/commit/f11293be8118c9707b268f55ba49dc6ea8b1… commit f11293be8118c9707b268f55ba49dc6ea8b111ff Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun Jun 12 00:00:41 2011 +0200 Implemented various PixelType conversions diff --git a/include/core/GP_Convert.h b/include/core/GP_Convert.h new file mode 100644 index 0000000..bf1580b --- /dev/null +++ b/include/core/GP_Convert.h @@ -0,0 +1,81 @@ +/***************************************************************************** + * This file is part of gfxprim library. * + * * + * Gfxprim is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2.1 of the License, or (at your option) any later version. * + * * + * Gfxprim is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with gfxprim; if not, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * + * Boston, MA 02110-1301 USA * + * * + * Copyright (C) 2011 Tomas Gavenciak <gavento(a)ucw.cz> * + * * + *****************************************************************************/ + +#ifndef CORE_GP_CONVERT_H +#define CORE_GP_CONVERT_H + +#include "GP_Common.h" +#include "GP_Context.h" + +/* + * Converts a color specified by its R, G, B components to a specified type. + */ +static inline GP_Pixel GP_RGBToPixel(uint8_t r, uint8_t g, uint8_t b, GP_PixelType type) +{ + GP_Pixel p = GP_Pixel_CREATE_RGB888(r, g, b); + return GP_RGB888ToType(p, type); +} + +/* + * Converts a color specified by its R, G, B, A components to a specified type. + */ +static inline GP_Pixel GP_RGBAToPixel(uint8_t r, uint8_t g, uint8_t b, uint8_t a, GP_PixelType type) +{ + GP_Pixel p = GP_Pixel_CREATE_RGBA8888(r, g, b, a); + return GP_RGBA8888ToType(p, type); +} + +/* + * Converts a color specified by its R, G, B components to a pixel value + * compatible with the specified context. + */ +static inline GP_Pixel GP_RGBToContextPixel(uint8_t r, uint8_t g, uint8_t b, + const GP_Context *context) +{ + return GP_RGBToPixel(r, g, b, context->pixel_type); +} + +/* + * Generated function to convert RGB888 to any type. + * Does not work with palette types. + */ +GP_Pixel GP_RGB888ToPixel(GP_Pixel pixel, GP_PixelType type); + +/* + * Generated function to convert RGBA8888 to any type. + * Does not work with palette types. + */ +GP_Pixel GP_RGBA8888ToPixel(GP_Pixel pixel, GP_PixelType type); + +/* + * Generated function to convert to RGB888 from any type. + * Does not work with palette types. + */ +GP_Pixel GP_PixelToRGB888(GP_Pixel pixel, GP_PixelType type); + +/* + * Generated function to convert to RGBA8888 from any type. + * Does not work with palette types. + */ +GP_Pixel GP_PixelToRGBA8888(GP_Pixel pixel, GP_PixelType type); + +#endif /* CORE_GP_CONVERT_H */ diff --git a/include/core/GP_Pixel.h b/include/core/GP_Pixel.h index a1469e8..7ac0fb7 100644 --- a/include/core/GP_Pixel.h +++ b/include/core/GP_Pixel.h @@ -21,6 +21,8 @@ * * * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * * * + * Copyright (C) 2011 Tomas Gavenciak <gavento(a)ucw.cz> * + * * *****************************************************************************/ #ifndef GP_PIXEL_H @@ -135,38 +137,4 @@ static inline uint32_t GP_PixelSize(GP_PixelType type) return GP_PixelTypes[type].size; } - -/* Below -- TODO sync with new pixel type */ - -/* - * Returns GP_PixelType to GP_ColorType mapping. - */ -//GP_ColorType GP_PixelTypeToColorType(GP_PixelType type); - -/* - * Converts a color to the specified pixel type. - */ -//GP_RetCode GP_ColorToPixelType(GP_PixelType pixel_type, GP_Color color, GP_Pixel *pixel); - -/* - * Converts a color to a pixel value suitable for the specified context. - */ -//GP_RetCode GP_ColorToPixel(struct GP_Context *context, GP_Color color, GP_Pixel *pixel); - -/* - * - */ -//GP_RetCode GP_ColorNameToPixel(struct GP_Context *context, GP_ColorName name, GP_Pixel *pixel); - -/* - * Converts a color name to the specified pixel type. - */ -//GP_RetCode GP_ColorNameToPixelType(GP_PixelType pixel_type, GP_ColorName name, GP_Pixel *pixel); - -/* - * Converts a color specified by its R, G, B components to a pixel value - * compatible with the specified context. - */ -GP_RetCode GP_RGBToPixel(struct GP_Context *context, uint8_t r, uint8_t g, uint8_t b, GP_Pixel *pixel); - #endif /* GP_PIXEL_H */ diff --git a/libs/core/Makefile b/libs/core/Makefile index 9ed6c65..c3692df 100644 --- a/libs/core/Makefile +++ b/libs/core/Makefile @@ -1,5 +1,5 @@ TOPDIR=../.. -GENSOURCES=GP_Pixel.gen.c GP_Blit.gen.c +GENSOURCES=GP_Pixel.gen.c GP_Blit.gen.c GP_Convert.gen.c GP_Convert.gen.h GENHEADERS=GP_Pixel_Scale.gen.h GP_Blit.gen.h GP_Pixel.gen.h GP_GetPutPixel.gen.h CSOURCES=$(filter-out $(wildcard *.gen.c),$(wildcard *.c)) LIBNAME=core diff --git a/pylib/gfxprim/generators/core/gen_convert.py b/pylib/gfxprim/generators/core/gen_convert.py new file mode 100644 index 0000000..a136649 --- /dev/null +++ b/pylib/gfxprim/generators/core/gen_convert.py @@ -0,0 +1,116 @@ +# Module generating C source and headers for various PixelType conversions +# 2011 - Tomas Gavenciak <gavento(a)ucw.cz> + +from gfxprim.generators.pixeltype import pixeltypes, channels +from gfxprim.generators.utils import hmask + +def gen_fixedtype_to_type(fixedtype, header, code): + "Generate functions converting a fixed PixelType to any other" + "Does not work on palette types at all (yet)" + code.rbody( + "GP_Pixel GP_{{ f.name }}ToPixel(GP_Pixel pixel, GP_PixelType type)n" + "{n" + " GP_Pixel p = 0;n" + " switch(type) {n" + "{% for tf in types %}" + "{% if tf.number == 0 %}" + " case GP_PIXEL_UNKNOWN:n" + " GP_ABORT("Cannot convert to GP_PIXEL_UNKNOWN");n" + " break;n" + "{% elif tf.is_palette() %}" + " case GP_PIXEL_{{ tf.name }}:n" + " GP_ABORT("Cannot convert to palette type {{ tf.name }}");n" + " break;n" + "{% else %}" + " case GP_PIXEL_{{ tf.name }}:n" + " GP_Pixel_{{ f.name }}_TO_{{ tf.name }}(pixel, p);n" + " break;n" + "{% endif %}" + "{% endfor %}" + " default:n" + " GP_ABORT("Unknown PixelType %ld", type);n" + " }n" + " return p;n" + "}n", f=fixedtype, types=pixeltypes.values()) + +def gen_type_to_fixedtype(fixedtype, header, code): + "Generate functions converting to a fixed PixelType from any other" + "Does not work on palette types at all (yet)" + code.rbody( + "GP_Pixel GP_PixelTo{{ f.name }}(GP_Pixel pixel, GP_PixelType type)n" + "{n" + " GP_Pixel p = 0;n" + " switch(type) {n" + "{% for sf in types %}" + "{% if sf.number == 0 %}" + " case GP_PIXEL_UNKNOWN:n" + " GP_ABORT("Cannot convert from GP_PIXEL_UNKNOWN");n" + " break;n" + "{% elif sf.is_palette() %}" + " case GP_PIXEL_{{ sf.name }}:n" + " GP_ABORT("Cannot convert from palette type {{ sf.name }} (yet)");n" + " break;n" + "{% else %}" + " case GP_PIXEL_{{ sf.name }}:n" + " GP_Pixel_{{ sf.name }}_TO_{{ f.name }}(pixel, p);n" + " break;n" + "{% endif %}" + "{% endfor %}" + " default:n" + " GP_ABORT("Unknown PixelType %ld", type);n" + " }n" + " return p;n" + "}n", f=fixedtype, types=pixeltypes.values()) + +def gen_convert_to(f1, f2, header, code): + "Generate a macro converting from f1 to f2" + "This function supports only RGBVA types (no palettes" + allowed_chansets = [ set(list(s)) for s in ['RGB', 'RGBA', 'V', 'VA'] ] + assert(set(f1.chans.keys()) in allowed_chansets) + assert(set(f2.chans.keys()) in allowed_chansets) + + header.rbody( + "n/*** {{ f1.name }} -> {{ f2.name }} ***n" + " * macro storing p1 ({{ f1.name }} at bit-offset o1) in p2 ({{ f2.name }} at bit-offset o2),n" + " * the relevant part of p2 is assumed to be clear (zero) */nn" + "#define GP_Pixel_{{ f1.name }}_TO_{{ f2.name }}_OFFSET(p1, o1, p2, o2) do { " + + ## set each of <TARGET> channels + "{% for c2 in f2.chanslist %}" + + # case 1: just copy a channel + "{%- if c2[0] in f1.chans.keys() %}{% set c1 = f1.chans[c2[0]] %}" + " /* {{ c2[0] }}:={{ c1[0] }} */ GP_SET_BITS({{c2[1]}}+o2, " + " GP_SCALE_VAL_{{c1[2]}}_{{c2[2]}}(GP_GET_BITS({{c1[1]}}+o1, {{c1[2]}}, p1)), p2); " + + # case 2: set A to full opacity (not present in source) + "{% elif c2[0]=='A' %}" + " /* A:={{ hmask(c2[2]) }} */GP_SET_BITS({{c2[1]}}+o2, {{ hmask(c2[2]) }}, p2); " + + # case 3: calculate V as average of RGB + "{% elif c2[0]=='V' and set('RGB').issubset(set(f1.chans.keys())) %}" + " /* V:=RGB_avg */ GP_SET_BITS({{c2[1]}}+o2, ( " + "{% for c1 in [f1.chans['R'], f1.chans['G'], f1.chans['B']] %}" + " /* {{c1[0]}} */ GP_SCALE_VAL_{{c1[2]}}_{{c2[2]}}(GP_GET_BITS({{c1[1]}}+o1, {{c1[2]}}, p1), p2) + " + "{% endfor %}" + " 0)/3); " + + #- case 4: set each RGB to V + "{% elif c2[0] in 'RGB' and 'V' in f1.chans.keys() %}{% set c1 = f1.chans['V'] %}" + " /* {{ c2[0] }}:=V */ GP_SET_BITS({{c2[1]}}+o2, " + " GP_SCALE_VAL_{{c1[2]}}_{{c2[2]}}(GP_GET_BITS({{c1[1]}}+o1, {{c1[2]}}, p1)), p2); " + + # invalid mapping (there should be none, but who knows ...) + "{% else %} {{ raise(Error('channel conversion' +f1.name+ ' to ' +f2.name+ ' not supported')) }}" + + # end of the loop + "{% endif %}" + "{% endfor %}" + "} while (0)nn" + + # add version without offsets + "/* a version without offsets */n" + "#define GP_Pixel_{{ f1.name }}_TO_{{ f2.name }}(p1, p2) " + "(GP_Pixel_{{ f1.name }}_TO_{{ f2.name }}_OFFSET(p1, 0, p2, 0))n", + f1=f1, f2=f2, hmask=hmask, set=set) + diff --git a/pylib/gfxprim/generators/core/gen_pixeltype.py b/pylib/gfxprim/generators/core/gen_pixeltype.py index ea3ae20..ba25a20 100644 --- a/pylib/gfxprim/generators/core/gen_pixeltype.py +++ b/pylib/gfxprim/generators/core/gen_pixeltype.py @@ -1,12 +1,6 @@ # Module generating C source and headers for various PixelTypes # 2011 - Tomas Gavenciak <gavento(a)ucw.cz> -""" -The functions gen_* generate both source and header. -Such functions accept (and then extend) two list of strins. -These should be later joined with "" or " ". -""" - from gfxprim.generators.pixeltype import pixeltypes, channels from gfxprim.generators.utils import j2render as r, hmask @@ -89,60 +83,19 @@ def gen_get_chs(ptype, header, code): header.rbody( "/* macros to get channels of pixel type {{ f.name }} */n" "{% for c in f.chanslist %}" - "#define GP_Pixel_GET_{{ c[0] }}_{{ f.name }}(p) (GP_GET_BITS({{ c[1] }}, {{ c[2] }}, (p)))n" + "#define GP_Pixel_GET_{{ c[0] }}_{{ f.name }}(p) (GP_GET_BITS({{ c[1] }}, {{ c[2] }}, (p)))n" "{% endfor %}", f=ptype) -def gen_convert_to(f1, f2, header, code): - "Generate a macro converting from f1 to f2" - "This function supports only RGBVA types (no palettes" - allowed_chansets = [ set(list(s)) for s in ['RGB', 'RGBA', 'V', 'VA'] ] - assert(set(f1.chans.keys()) in allowed_chansets) - assert(set(f2.chans.keys()) in allowed_chansets) - +def gen_create(ptype, header, code): + "Generate GP_Pixel_CREATE_<TYPE> macros" header.rbody( - "n/*** {{ f1.name }} -> {{ f2.name }} ***n" - " * macro storing p1 ({{ f1.name }} at bit-offset o1) in p2 ({{ f2.name }} at bit-offset o2),n" - " * the relevant part of p2 is assumed to be clear (zero) */nn" - "#define GP_Pixel_{{ f1.name }}_TO_{{ f2.name }}_OFFSET(p1, o1, p2, o2) do { " - - ## set each of <TARGET> channels - "{% for c2 in f2.chanslist %}" - - # case 1: just copy a channel - "{%- if c2[0] in f1.chans.keys() %}{% set c1 = f1.chans[c2[0]] %}" - " /* {{ c2[0] }}:={{ c1[0] }} */ GP_SET_BITS({{c2[1]}}+o2, " - " GP_SCALE_VAL_{{c1[2]}}_{{c2[2]}}(GP_GET_BITS({{c1[1]}}+o1, {{c1[2]}}, p1)), p2); " - - # case 2: set A to full opacity (not present in source) - "{% elif c2[0]=='A' %}" - " /* A:={{ hmask(c2[2]) }} */GP_SET_BITS({{c2[1]}}+o2, {{ hmask(c2[2]) }}, p2); " - - # case 3: calculate V as average of RGB - "{% elif c2[0]=='V' and set('RGB').issubset(set(f1.chans.keys())) %}" - " /* V:=RGB_avg */ GP_SET_BITS({{c2[1]}}+o2, ( " - "{% for c1 in [f1.chans['R'], f1.chans['G'], f1.chans['B']] %}" - " /* {{c1[0]}} */ GP_SCALE_VAL_{{c1[2]}}_{{c2[2]}}(GP_GET_BITS({{c1[1]}}+o1, {{c1[2]}}, p1), p2) + " - "{% endfor %}" - " 0)/3); " - - #- case 4: set each RGB to V - "{% elif c2[0] in 'RGB' and 'V' in f1.chans.keys() %}{% set c1 = f1.chans['V'] %}" - " /* {{ c2[0] }}:=V */ GP_SET_BITS({{c2[1]}}+o2, " - " GP_SCALE_VAL_{{c1[2]}}_{{c2[2]}}(GP_GET_BITS({{c1[1]}}+o1, {{c1[2]}}, p1)), p2); " - - # invalid mapping (there should be none, but who knows ...) - "{% else %} {{ raise(Error('channel conversion' +f1.name+ ' to ' +f2.name+ ' not supported')) }}" - - # end of the loop - "{% endif %}" - "{% endfor %}" - "} while (0)nn" - - # add version without offsets - "/* a version without offsets */n" - "#define GP_Pixel_{{ f1.name }}_TO_{{ f2.name }}(p1, p2) " - "(GP_Pixel_{{ f1.name }}_TO_{{ f2.name }}_OFFSET(p1, 0, p2, 0))n", - f1=f1, f2=f2, hmask=hmask, set=set) + "/* macros to create GP_Pixel of pixel type {{ f.name }} directly from given values.n" + " * The values are NOT clipped to actual value ranges.*/n" + "#define GP_Pixel_CREATE_{{ f.name }}({{ args }}) (0 " + "{% for c in f.chanslist %}" + " + (({{ c[0] }}) << {{ c[1] }}) " + "{% endfor %}" + " )n", f=ptype, args=', '.join([c[0] for c in ptype.chanslist])) def gen_get_pixel_addr(ptype, header, code): "Generate GP_PIXEL_ADDR_<TYPE> and _OFFSET_<TYPE> macros" diff --git a/pylib/gfxprim/generators/core/make_GP_Convert.py b/pylib/gfxprim/generators/core/make_GP_Convert.py new file mode 100644 index 0000000..e8c7360 --- /dev/null +++ b/pylib/gfxprim/generators/core/make_GP_Convert.py @@ -0,0 +1,41 @@ +#!/usr/bin/python +# +# Script generating: +# +# GP_Convert.gen.c, GP_Convert.gen.h +# +# 2011 - Tomas Gavenciak <gavento(a)ucw.cz> +# + +from gfxprim.generators.generator import * +from gfxprim.generators.pixeltype import * +from gfxprim.generators.core.gen_convert import * + + +@generator(CHeaderGenerator(name = 'GP_Convert.gen.h'), + CSourceGenerator(name = 'GP_Convert.gen.c'), + descr = 'Convert PixelType values macros and functionsn' + 'Do not include directly, use GP_Convert.h', + authors = ["2011 - Tomas Gavenciak <gavento(a)ucw.cz>"]) +def core_GP_Convert_gen_h(h, c): + h.rhead('#include "GP_Common.h"n'); + h.rhead('#include "GP_Context.h"n'); + h.rhead('#include "GP_Pixel.h"nn'); + + h.rhead('#include "GP_Common.h"n'); + c.rhead('#include "GP_Pixel.h"nn'); + + ## two base types for conversions + for bt in [pixeltypes['RGB888'], pixeltypes['RGBA8888']]: + gen_fixedtype_to_type(bt, h, c) + gen_type_to_fixedtype(bt, h, c) + ## Conversion macros + for t in pixeltypes.values(): + if not t.is_palette() and t.number != 0: + gen_convert_to(t, bt, h, c) + gen_convert_to(bt, t, h, c) + + ## Just experimental conversion macros + gen_convert_to(pixeltypes['RGB565'], pixeltypes['RGBA8888'], h, c) + gen_convert_to(pixeltypes['RGBA8888'], pixeltypes['V2'], h, c) + gen_convert_to(pixeltypes['VA12'], pixeltypes['RGBA8888'], h, c) diff --git a/pylib/gfxprim/generators/core/make_GP_Pixel.py b/pylib/gfxprim/generators/core/make_GP_Pixel.py index 21cb252..0ade754 100644 --- a/pylib/gfxprim/generators/core/make_GP_Pixel.py +++ b/pylib/gfxprim/generators/core/make_GP_Pixel.py @@ -60,11 +60,7 @@ def core_GP_Pixel_gen(h, c): gen_print(t, h, c) gen_get_chs(t, h, c) gen_get_pixel_addr(t, h, c) - - ## Conversion macros - gen_convert_to(pixeltypes['RGB565'], pixeltypes['RGBA8888'], h, c) - gen_convert_to(pixeltypes['RGBA8888'], pixeltypes['V2'], h, c) - gen_convert_to(pixeltypes['VA12'], pixeltypes['RGBA8888'], h, c) + gen_create(t, h, c) @generator(CHeaderGenerator(name = 'GP_GetPutPixel.gen.h'), diff --git a/pylib/gfxprim/generators/pixeltype.py b/pylib/gfxprim/generators/pixeltype.py index 384930d..e43ffce 100644 --- a/pylib/gfxprim/generators/pixeltype.py +++ b/pylib/gfxprim/generators/pixeltype.py @@ -91,6 +91,9 @@ class PixelType(object): def __str__(self): return "<PixelType " + self.name + ">" + def is_palette(self): + return ('P' in self.chans) + def load_pixeltypes(defs_file = None): "Initialize pixeltypes by loading the defs file.n" "Looks for the file by parameter, env['PIXELTYPE_DEFS'] and " diff --git a/pylib/gfxprim/generators/utils.py b/pylib/gfxprim/generators/utils.py index 3ddc7ad..fe5abb4 100644 --- a/pylib/gfxprim/generators/utils.py +++ b/pylib/gfxprim/generators/utils.py @@ -19,6 +19,7 @@ def load_generators(): import gfxprim.generators.make_collected_tests import gfxprim.generators.core.make_GP_Pixel import gfxprim.generators.core.make_GP_Blit + import gfxprim.generators.core.make_GP_Convert pass def generate_file(fname): http://repo.or.cz/w/gfxprim.git/commit/6aa9b93dc730b452effb253df5a051bc7916… commit 6aa9b93dc730b452effb253df5a051bc791692ef Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sat Jun 11 22:37:20 2011 +0200 More pruning old code diff --git a/libs/core/GP_Pixel.c b/libs/core/GP_Pixel.c deleted file mode 100644 index eedd94a..0000000 --- a/libs/core/GP_Pixel.c +++ /dev/null @@ -1,235 +0,0 @@ -/***************************************************************************** - * This file is part of gfxprim library. * - * * - * Gfxprim is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Lesser General Public * - * License as published by the Free Software Foundation; either * - * version 2.1 of the License, or (at your option) any later version. * - * * - * Gfxprim is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with gfxprim; if not, write to the Free Software * - * Foundation, Inc., 51 Franklin Street, Fifth Floor, * - * Boston, MA 02110-1301 USA * - * * - * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * - * <jiri.bluebear.dluhos(a)gmail.com> * - * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * - * * - *****************************************************************************/ - -#include "GP_Core.h" - -/////// removed by gavento -// struct PixelTypeInfo { -// const char *type_name; /* human-readable name */ -// GP_ColorType color_type; /* color type used for this pixel type */ -// unsigned int bits; /* how many bits the pixel occupies */ -// }; -// -// /* This table shows relations of pixel types to color types, their names -// * and bits per pixel. -// */ -// static struct PixelTypeInfo pixel_type_infos[] = { -// { "Unknown pixel type", GP_NOCOLOR, 0 }, -// { "Palette 4bit", GP_PAL4, 4 }, -// { "Palette 8bit", GP_PAL8, 8 }, -// { "Grayscale 1bit", GP_G1, 1 }, -// { "Grayscale 2bits", GP_G2, 2 }, -// { "Grayscale 4bits", GP_G4, 4 }, -// { "Grayscale 8bits", GP_G8, 8 }, -// { "RGB 555", GP_RGB555, 16 }, -// { "BGR 555", GP_RGB555, 16 }, -// { "RGB 565", GP_RGB565, 16 }, -// { "BGR 565", GP_RGB565, 16 }, -// { "RGB 888", GP_RGB888, 24 }, -// { "BGR 888", GP_RGB888, 24 }, -// { "XRGB 8888", GP_RGB888, 32 }, -// { "RGBX 8888", GP_RGB888, 32 }, -// { "XBGR 8888", GP_RGB888, 32 }, -// { "BGRX 8888", GP_RGB888, 32 }, -// { "ARGB 8888", GP_RGBA8888, 32 }, -// { "RGBA 8888", GP_RGBA8888, 32 }, -// { "ABGR 8888", GP_RGBA8888, 32 }, -// { "BGRA 8888", GP_RGBA8888, 32 } -// }; -// -// GP_ColorType GP_PixelTypeToColorType(GP_PixelType type) -// { -// if (type >= GP_PIXEL_MAX) -// return GP_COLMAX; -// -// return pixel_type_infos[type].color_type; -// } -// -// #define CHECK_RET(ret) if (ret != GP_ESUCCESS && ret != GP_EUNPRECISE) return ret; -// -// GP_RetCode GP_ColorToPixelType(GP_PixelType pixel_type, GP_Color color, GP_Pixel *pixel) -// { -// if (pixel == NULL) -// return GP_ENULLPTR; -// -// GP_RetCode ret; -// -// switch (pixel_type) { -// case GP_PIXEL_PAL4: -// ret = GP_ColorConvert(&color, GP_PAL4); -// CHECK_RET(ret); -// *pixel = color.pal4.index; -// return ret; -// break; -// case GP_PIXEL_PAL8: -// ret = GP_ColorConvert(&color, GP_PAL8); -// CHECK_RET(ret); -// *pixel = color.pal8.index; -// return ret; -// break; -// case GP_PIXEL_G1: -// ret = GP_ColorConvert(&color, GP_G1); -// CHECK_RET(ret); -// *pixel = color.g1.gray; -// return ret; -// break; -// case GP_PIXEL_G2: -// ret = GP_ColorConvert(&color, GP_G2); -// CHECK_RET(ret); -// *pixel = color.g2.gray; -// return ret; -// break; -// case GP_PIXEL_G4: -// ret = GP_ColorConvert(&color, GP_G4); -// CHECK_RET(ret); -// *pixel = color.g4.gray; -// return ret; -// break; -// case GP_PIXEL_G8: -// ret = GP_ColorConvert(&color, GP_G8); -// CHECK_RET(ret); -// *pixel = color.g8.gray; -// return ret; -// break; -// case GP_PIXEL_RGB565: -// ret = GP_ColorConvert(&color, GP_RGB565); -// CHECK_RET(ret); -// *pixel = color.rgb565.red << 0x0b | -// color.rgb565.green << 0x05 | -// color.rgb565.blue; -// case GP_PIXEL_RGB888: -// case GP_PIXEL_XRGB8888: -// ret = GP_ColorConvert(&color, GP_RGB888); -// CHECK_RET(ret); -// *pixel = color.rgb888.red << 0x10 | -// color.rgb888.green << 0x08 | -// color.rgb888.blue; -// return ret; -// break; -// case GP_PIXEL_BGR888: -// case GP_PIXEL_XBGR8888: -// ret = GP_ColorConvert(&color, GP_RGB888); -// CHECK_RET(ret); -// *pixel = color.rgb888.red | -// color.rgb888.green << 0x08 | -// color.rgb888.blue << 0x10; -// return ret; -// break; -// case GP_PIXEL_RGBX8888: -// ret = GP_ColorConvert(&color, GP_RGB888); -// CHECK_RET(ret); -// *pixel = color.rgb888.red << 0x18 | -// color.rgb888.green << 0x10 | -// color.rgb888.blue << 0x8; -// return ret; -// break; -// case GP_PIXEL_BGRX8888: -// ret = GP_ColorConvert(&color, GP_RGB888); -// CHECK_RET(ret); -// *pixel = color.rgb888.red << 0x08 | -// color.rgb888.green << 0x10 | -// color.rgb888.blue << 0x18; -// return ret; -// break; -// case GP_PIXEL_ARGB8888: -// ret = GP_ColorConvert(&color, GP_RGBA8888); -// CHECK_RET(ret); -// *pixel = color.rgba8888.red << 0x10 | -// color.rgba8888.green << 0x08 | -// color.rgba8888.blue | -// color.rgba8888.alpha << 0x18; -// return ret; -// break; -// case GP_PIXEL_RGBA8888: -// ret = GP_ColorConvert(&color, GP_RGBA8888); -// CHECK_RET(ret); -// *pixel = color.rgba8888.red << 0x18 | -// color.rgba8888.green << 0x10 | -// color.rgba8888.blue << 0x08 | -// color.rgba8888.alpha; -// return ret; -// break; -// case GP_PIXEL_ABGR8888: -// ret = GP_ColorConvert(&color, GP_RGBA8888); -// CHECK_RET(ret); -// *pixel = color.rgba8888.red | -// color.rgba8888.green << 0x08 | -// color.rgba8888.blue << 0x10 | -// color.rgba8888.alpha << 0x18; -// return ret; -// break; -// case GP_PIXEL_BGRA8888: -// ret = GP_ColorConvert(&color, GP_RGBA8888); -// CHECK_RET(ret); -// *pixel = color.rgba8888.red << 0x08 | -// color.rgba8888.green << 0x10 | -// color.rgba8888.blue << 0x18 | -// color.rgba8888.alpha; -// return ret; -// break; -// case GP_PIXEL_MAX: -// break; -// } -// -// if (pixel_type >= GP_PIXEL_MAX) -// return GP_EINVAL; -// else -// return GP_ENOIMPL; -// } -// -// GP_RetCode GP_ColorToPixel(GP_Context *context, GP_Color color, GP_Pixel *pixel) -// { -// if (context == NULL || pixel == NULL) -// return GP_ENULLPTR; -// -// return GP_ColorToPixelType(context->pixel_type, color, pixel); -// } -// -// GP_RetCode GP_ColorNameToPixel(GP_Context *context, GP_ColorName name, GP_Pixel *pixel) -// { -// if (context == NULL || pixel == NULL) -// return GP_ENULLPTR; -// -// GP_Color color = GP_COLNAME_PACK(name); -// return GP_ColorToPixelType(context->pixel_type, color, pixel); -// } -// -// GP_RetCode GP_ColorNameToPixelType(GP_PixelType pixel_type, GP_ColorName name, GP_Pixel *pixel) -// { -// if (pixel == NULL) -// return GP_ENULLPTR; -// -// GP_Color color = GP_COLNAME_PACK(name); -// return GP_ColorToPixelType(pixel_type, color, pixel); -// } -// -// GP_RetCode GP_RGBToPixel(GP_Context *context, uint8_t r, uint8_t g, uint8_t b, GP_Pixel *pixel) -// { -// if (pixel == NULL) -// return GP_ENULLPTR; -// -// GP_Color color = GP_RGB888_PACK(r, g, b); -// return GP_ColorToPixelType(context->pixel_type, color, pixel); -// } http://repo.or.cz/w/gfxprim.git/commit/93c34cab6ae326bf2ff21a69c973a3922ca9… commit 93c34cab6ae326bf2ff21a69c973a3922ca9ece7 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sat Jun 11 22:29:58 2011 +0200 Rename GP_Pixel_Access to GP_GetPutPixel diff --git a/include/core/GP_Core.h b/include/core/GP_Core.h index a00f1d7..6d45291 100644 --- a/include/core/GP_Core.h +++ b/include/core/GP_Core.h @@ -45,6 +45,6 @@ #include "core/GP_Pixel.h" /* Individual pixel access */ -#include "core/GP_Pixel_Access.h" +#include "core/GP_GetPutPixel.h" #endif /* GP_CORE_H */ diff --git a/include/core/GP_Pixel_Access.h b/include/core/GP_GetPutPixel.h similarity index 95% rename from include/core/GP_Pixel_Access.h rename to include/core/GP_GetPutPixel.h index 331d7eb..102bf9a 100644 --- a/include/core/GP_Pixel_Access.h +++ b/include/core/GP_GetPutPixel.h @@ -20,8 +20,8 @@ * * *****************************************************************************/ -#ifndef GP_PIXEL_ACCESS_H -#define GP_PIXEL_ACCESS_H +#ifndef CORE_GP_GETPUTPIXEL_H +#define CORE_GP_GETPUTPIXEL_H #include "GP_Context.h" #include "GP_FnPerBpp.h" @@ -30,7 +30,7 @@ /* * Generated header */ -#include "GP_Pixel_Access.gen.h" +#include "GP_GetPutPixel.gen.h" /* * GetPixel with context transformations and clipping. @@ -62,4 +62,4 @@ static inline void GP_PutPixel_Raw(GP_Context *context, int x, int y, GP_Pixel p context, x, y, p); } -#endif /* GP_PIXEL_ACCESS_H */ +#endif /* CORE_GP_GETPUTPIXEL_H */ diff --git a/include/gfx/GP_Gfx.h b/include/gfx/GP_Gfx.h index 2f42cb1..aa578b4 100644 --- a/include/gfx/GP_Gfx.h +++ b/include/gfx/GP_Gfx.h @@ -37,7 +37,7 @@ #include "core/GP_Transform.h" #include "core/GP_Context.h" #include "core/GP_WritePixel.h" -#include "core/GP_Pixel_Access.h" +#include "core/GP_GetPutPixel.h" #include "core/GP_Color.h" /* public drawing API */ diff --git a/libs/core/GP_Pixel_Access.c b/libs/core/GP_GetPutPixel.c similarity index 98% rename from libs/core/GP_Pixel_Access.c rename to libs/core/GP_GetPutPixel.c index f2b8924..fe37216 100644 --- a/libs/core/GP_Pixel_Access.c +++ b/libs/core/GP_GetPutPixel.c @@ -20,7 +20,7 @@ * * *****************************************************************************/ -#include "GP_Pixel_Access.h" +#include "GP_GetPutPixel.h" #include "GP_Transform.h" GP_Pixel GP_GetPixel(GP_Context *context, int x, int y) diff --git a/libs/core/Makefile b/libs/core/Makefile index 3808736..9ed6c65 100644 --- a/libs/core/Makefile +++ b/libs/core/Makefile @@ -1,6 +1,6 @@ TOPDIR=../.. GENSOURCES=GP_Pixel.gen.c GP_Blit.gen.c -GENHEADERS=GP_Pixel_Scale.gen.h GP_Blit.gen.h GP_Pixel.gen.h GP_Pixel_Access.gen.h +GENHEADERS=GP_Pixel_Scale.gen.h GP_Blit.gen.h GP_Pixel.gen.h GP_GetPutPixel.gen.h CSOURCES=$(filter-out $(wildcard *.gen.c),$(wildcard *.c)) LIBNAME=core diff --git a/pylib/gfxprim/generators/core/make_GP_Pixel.py b/pylib/gfxprim/generators/core/make_GP_Pixel.py index 0a1ff3b..21cb252 100644 --- a/pylib/gfxprim/generators/core/make_GP_Pixel.py +++ b/pylib/gfxprim/generators/core/make_GP_Pixel.py @@ -67,8 +67,8 @@ def core_GP_Pixel_gen(h, c): gen_convert_to(pixeltypes['VA12'], pixeltypes['RGBA8888'], h, c) -@generator(CHeaderGenerator(name = 'GP_Pixel_Access.gen.h'), - descr = 'Access pixel bytes, Put and GetPixelnDo not include directly, use GP_Pixel.h', +@generator(CHeaderGenerator(name = 'GP_GetPutPixel.gen.h'), + descr = 'Access pixel bytes, Get and PutPixelnDo not include directly, use GP_Pixel.h', authors = ["2011 - Tomas Gavenciak <gavento(a)ucw.cz>"]) def core_GP_Pixel_Scale_gen(h): h.rhead('#include "GP_Common.h"nn'); http://repo.or.cz/w/gfxprim.git/commit/628bf75875173555777a15ce6a7fe7e91cd3… commit 628bf75875173555777a15ce6a7fe7e91cd328b8 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sat Jun 11 22:13:05 2011 +0200 Added basic common pixeltypes to be generated diff --git a/pylib/pixeltypes.py b/pylib/pixeltypes.py index 7f77336..4762255 100644 --- a/pylib/pixeltypes.py +++ b/pylib/pixeltypes.py @@ -14,6 +14,9 @@ # a complete recompilation is required after any change. # +# +# Standard RGB types +# PixelType(name='RGBx8888', size=32, chanslist=[ ('R', 0, 8), @@ -28,20 +31,56 @@ PixelType(name='RGBA8888', size=32, chanslist=[ ('A', 24, 8)]) +PixelType(name='RGB888', size=24, chanslist=[ + ('R', 0, 8), + ('G', 8, 8), + ('B', 16, 8)]) + + PixelType(name='RGB565', size=16, chanslist=[ ('R', 0, 5), ('G', 5, 6), ('B', 11, 5)]) +# +# Palette types +# + +PixelType(name='P2', size=2, bit_endian='LE', chanslist=[ + ('P', 0, 2)]) + + +PixelType(name='P4', size=4, bit_endian='LE', chanslist=[ + ('P', 0, 4)]) -PixelType(name='V8', size=8, chanslist=[ - ('V', 0, 8)]) + +PixelType(name='P8', size=8, bit_endian='LE', chanslist=[ + ('P', 0, 8)]) + +# +# Gray-only pixel types +# + +PixelType(name='V1', size=1, bit_endian='LE', chanslist=[ + ('V', 0, 1)]) PixelType(name='V2', size=2, bit_endian='LE', chanslist=[ ('V', 0, 2)]) +PixelType(name='V4', size=4, bit_endian='LE', chanslist=[ + ('V', 0, 4)]) + + +PixelType(name='V8', size=8, bit_endian='LE', chanslist=[ + ('V', 0, 8)]) + + +# +# Experiments +# + PixelType(name='VA12', size=4, bit_endian='BE', chanslist=[ ('A', 1, 2), ('V', 3, 1)]) http://repo.or.cz/w/gfxprim.git/commit/cfd3858ce9e6a269b8903bd312e52259c48e… commit cfd3858ce9e6a269b8903bd312e52259c48e318c Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sat Jun 11 22:11:23 2011 +0200 Drastic color/palette code pruning Palettes to be reimplemented (did not work as such with gen. code anyway) Color as (type, color) pair may be re-added much later diff --git a/include/core/GP_Color.h b/include/core/GP_Color.h index 8f11b03..3f13f95 100644 --- a/include/core/GP_Color.h +++ b/include/core/GP_Color.h @@ -26,101 +26,6 @@ #ifndef GP_COLOR_H #define GP_COLOR_H -#include <stdint.h> - -#include "GP_RetCode.h" - -#define GP_COLNAME_PACK(n) {.name = {GP_COLNAME, n}} -#define GP_PALINDEX_PACK(palette, index) {.pal = {GP_PALETTE, index, palette}} -#define GP_PAL4_PACK(index) {.pal4 = {GP_PAL4, index}} -#define GP_PAL8_PACK(index) {.pal8 = {GP_PAL8, index}} -#define GP_G1_PACK(g) {.g1 = {GP_G1, g}} -#define GP_G2_PACK(g) {.g2 = {GP_G2, g}} -#define GP_G4_PACK(g) {.g4 = {GP_G4, g}} -#define GP_G8_PACK(g) {.g8 = {GP_G8, g}} -#define GP_RGB555_PACK(r, g, b) {.rgb555 = {GP_RGB555, r, g, b}} -#define GP_RGB565_PACK(r, g, b) {.rgb565 = {GP_RGB565, r, g, b}} -#define GP_RGB666_PACK(r, g, b) {.rgb666 = {GP_RGB666, r, g, b}} -#define GP_RGB888_PACK(r, g, b) {.rgb888 = {GP_RGB888, r, g, b}} -#define GP_RGBA8888_PACK(r, g, b, a) {.rgba8888 = {GP_RGBA8888, r, g, b, a}} - -#define GP_COLNAME_FILL(col, n) do { - (col)->name.type = GP_COLNAME; - (col)->name.name = n; -} while (0) - -#define GP_PALINDEX_FILL(col, p, i) do { - (col)->pal.type = GP_PALETTE; - (col)->pal.index = i; - (col)->pal.palette = p; -} while (0) - -#define GP_PAL4_FILL(col, i) do { - (col)->pal4.type = GP_PAL4; - (col)->pal4.index = i; -} while (0) - -#define GP_PAL8_FILL(col, i) do { - (col)->pal8.type = GP_PAL8; - (col)->pal8.index = i; -} while (0) - -#define GP_G1_FILL(col, g) do { - (col)->g1.type = GP_G1; - (col)->g1.gray = g; -} while (0) - -#define GP_G2_FILL(col, g) do { - (col)->g2.type = GP_G2; - (col)->g2.gray = g; -} while (0) - -#define GP_G4_FILL(col, g) do { - (col)->g4.type = GP_G4; - (col)->g4.gray = g; -} while (0) - -#define GP_G8_FILL(col, g) do { - (col)->g8.type = GP_G8; - (col)->g8.gray = g; -} while (0) - -#define GP_RGB555_FILL(col, r, g, b) do {- (col)->rgb555.type = GP_RGB555; - (col)->rgb555.red = r; - (col)->rgb555.green = g; - (col)->rgb555.blue = b; -} while (0) - -#define GP_RGB565_FILL(col, r, g, b) do {- (col)->rgb565.type = GP_RGB565; - (col)->rgb565.red = r; - (col)->rgb565.green = g; - (col)->rgb565.blue = b; -} while (0) - -#define GP_RGB666_FILL(col, r, g, b) do {- (col)->rgb666.type = GP_RGB666; - (col)->rgb666.red = r; - (col)->rgb666.green = g; - (col)->rgb666.blue = b; -} while (0) - -#define GP_RGB888_FILL(col, r, g, b) do {- (col)->rgb888.type = GP_RGB888; - (col)->rgb888.red = r; - (col)->rgb888.green = g; - (col)->rgb888.blue = b; -} while (0) - -#define GP_RGBA8888_FILL(col, r, g, b, a) do {- (col)->rgba8888.type = GP_RGBA8888; - (col)->rgba8888.red = r; - (col)->rgba8888.green = g; - (col)->rgba8888.blue = b; - (col)->rgba8888.alpha = a; -} while (0) - typedef enum GP_ColorName { GP_COL_BLACK, GP_COL_RED, @@ -136,131 +41,4 @@ typedef enum GP_ColorName { GP_COL_MAX, } GP_ColorName; -typedef enum GP_ColorType { - GP_NOCOLOR = 0, - GP_COLNAME, - GP_PALETTE, - GP_PAL4, - GP_PAL8, - GP_G1, - GP_G2, - GP_G4, - GP_G8, - GP_RGB555, - GP_RGB565, - GP_RGB666, - GP_RGB888, - GP_RGBA8888, - GP_COLMAX, -} GP_ColorType; - -struct GP_ColName { - enum GP_ColorType type; - enum GP_ColorName name; -}; - -struct GP_ColPal { - enum GP_ColorType type; - uint16_t index; - union GP_Palette *palette; -}; - -struct GP_ColPal4 { - enum GP_ColorType type; - uint8_t index:4; -}; - -struct GP_ColPal8 { - enum GP_ColorType type; - uint8_t index; -}; - -struct GP_ColRGB888 { - enum GP_ColorType type; - uint8_t red; - uint8_t green; - uint8_t blue; -}; - -struct GP_ColG1 { - enum GP_ColorType type; - uint8_t gray:1; -}; - -struct GP_ColG2 { - enum GP_ColorType type; - uint8_t gray:2; -}; - -struct GP_ColG4 { - enum GP_ColorType type; - uint8_t gray:4; -}; - -struct GP_ColG8 { - enum GP_ColorType type; - uint8_t gray; -}; - -struct GP_ColRGBA8888 { - enum GP_ColorType type; - uint8_t red; - uint8_t green; - uint8_t blue; - uint8_t alpha; -}; - -struct GP_ColRGB555 { - enum GP_ColorType type; - uint16_t red:5; - uint16_t green:5; - uint16_t blue:5; -}; - -struct GP_ColRGB565 { - enum GP_ColorType type; - uint16_t red:5; - uint16_t green:6; - uint16_t blue:5; -}; - -struct GP_ColRGB666 { - enum GP_ColorType type; - uint32_t red:6; - uint32_t green:6; - uint32_t blue:6; -}; - -typedef union GP_Color { - enum GP_ColorType type; - struct GP_ColName name; - struct GP_ColPal pal; - struct GP_ColPal4 pal4; - struct GP_ColPal8 pal8; - struct GP_ColG1 g1; - struct GP_ColG2 g2; - struct GP_ColG4 g4; - struct GP_ColG8 g8; - struct GP_ColRGB888 rgb888; - struct GP_ColRGB555 rgb555; - struct GP_ColRGB565 rgb565; - struct GP_ColRGB666 rgb666; - struct GP_ColRGBA8888 rgba8888; -} GP_Color; - -/* - * Convers color pointed by *color to type. - */ -enum GP_RetCode GP_ColorConvert(GP_Color *color, GP_ColorType type); - -/* - * Returns color type name. - */ -const char *GP_ColorTypeName(GP_ColorType type); - -/* - * Print color into stdout in human-readable format. - */ -void GP_ColorPrint(GP_Color *color); - #endif /* GP_COLOR_H */ diff --git a/include/core/GP_Palette.h b/include/core/GP_Palette.h deleted file mode 100644 index 69f1854..0000000 --- a/include/core/GP_Palette.h +++ /dev/null @@ -1,75 +0,0 @@ -/***************************************************************************** - * This file is part of gfxprim library. * - * * - * Gfxprim is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Lesser General Public * - * License as published by the Free Software Foundation; either * - * version 2.1 of the License, or (at your option) any later version. * - * * - * Gfxprim is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with gfxprim; if not, write to the Free Software * - * Foundation, Inc., 51 Franklin Street, Fifth Floor, * - * Boston, MA 02110-1301 USA * - * * - * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * - * <jiri.bluebear.dluhos(a)gmail.com> * - * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * - * * - *****************************************************************************/ - -#ifndef GP_PALETTE_H -#define GP_PALETTE_H - -#include <stdint.h> - -#include "GP_RetCode.h" -#include "GP_Color.h" - -/* - * Usage: - * - * struct GP_RGB888 pal_cols[] = { - * {0xff, 0x00, 0xff}, - * ... - * }; - * - * GP_Palette my_palette = GP_PAL_RGB888_PACK(pal_cols); - */ -#define GP_PAL_RGB888_PACK(cols) {.rgb888 = {GP_RGB888, - sizeof (cols) / sizeof (struct GP_RGB888),- cols}} - -struct GP_RGB888 { - uint8_t red; - uint8_t green; - uint8_t blue; -}; - -struct GP_PalRGB888 { - enum GP_ColorType type; - uint16_t size; - struct GP_RGB888 *colors; -}; - -typedef union GP_Palette { - enum GP_ColorType type; - struct GP_PalRGB888 rgb888; -} GP_Palette; - -/* - * Converts palette color to direct color. - */ -enum GP_RetCode GP_PaletteColorToColor(GP_Color *color); - -/* - * Print palette into stdout in human-readable format. - */ -void GP_PalettePrint(GP_Palette *palette); - -#endif /* GP_PALETTE_H */ diff --git a/libs/core/GP_Color.c b/libs/core/GP_Color.c index b2e7a0a..e6f2c53 100644 --- a/libs/core/GP_Color.c +++ b/libs/core/GP_Color.c @@ -23,10 +23,7 @@ * * *****************************************************************************/ -#include <stdio.h> - -#include "GP_Palette.h" -#include "GP_Color.h" +#include <stdint.h> static char *color_names[] = { "black ", @@ -56,799 +53,3 @@ static uint8_t rgb888_colors[][3] = { {0xff, 0xff, 0xff}, /* white */ }; -static const char *color_type_names[] = { - "Invalid color" - "ColorName", - "Index to In Memory Palette", - "HW Palete 4bit", - "HW Palete 8bit", - "Grayscale 1bit", - "Grayscale 2bit", - "Grayscale 4bit", - "Grayscale 8bit", - "RGB 555", - "RGB 565", - "RGB 666", - "RGB 888", - "RGBA 8888", -}; - -static enum GP_RetCode conv_from_name(GP_Color *color, GP_ColorType type) -{ - enum GP_ColorName i = color->name.name; - - if (i >= GP_COL_MAX) - return GP_EINVAL; - - switch (type) { - case GP_NOCOLOR: - return GP_EINVAL; - break; - case GP_PAL4: - case GP_PAL8: - return GP_EINVAL; - break; - case GP_G1: - break; - case GP_G2: - break; - case GP_G4: - GP_G4_FILL(color, ((rgb888_colors[i][0] + - rgb888_colors[i][1] + - rgb888_colors[i][2])/3)>>4); - return GP_EUNPRECISE; - break; - case GP_G8: - GP_G8_FILL(color, (rgb888_colors[i][0] + - rgb888_colors[i][1] + - rgb888_colors[i][2])/3); - return GP_EUNPRECISE; - break; - case GP_RGB555: - GP_RGB555_FILL(color, rgb888_colors[i][0]>>3, - rgb888_colors[i][1]>>3, - rgb888_colors[i][2]>>3); - return GP_ESUCCESS; - break; - case GP_RGB565: - GP_RGB565_FILL(color, rgb888_colors[i][0]>>3, - rgb888_colors[i][1]>>2, - rgb888_colors[i][2]>>3); - return GP_ESUCCESS; - break; - case GP_RGB666: - GP_RGB666_FILL(color, rgb888_colors[i][0]>>2, - rgb888_colors[i][1]>>2, - rgb888_colors[i][2]>>2); - return GP_ESUCCESS; - break; - case GP_RGB888: - GP_RGB888_FILL(color, rgb888_colors[i][0], - rgb888_colors[i][1], - rgb888_colors[i][2]); - return GP_ESUCCESS; - break; - case GP_RGBA8888: - GP_RGBA8888_FILL(color, rgb888_colors[i][0], - rgb888_colors[i][1], - rgb888_colors[i][2], 0xff); - return GP_ESUCCESS; - break; - case GP_COLNAME: - case GP_COLMAX: - case GP_PALETTE: - break; - } - - if (type >= GP_COLMAX) - return GP_EINVAL; - else - return GP_ENOIMPL; -} - -const char *GP_ColorTypeName(GP_ColorType type) -{ - if (type >= GP_COLMAX) - return "UNKNOWN"; - - return color_type_names[type]; -} - -static enum GP_RetCode conv_from_g1(GP_Color *color, GP_ColorType type) -{ - struct GP_ColG1 *col = &color->g1; - - switch (type) { - case GP_NOCOLOR: - return GP_EINVAL; - break; - case GP_PAL4: - case GP_PAL8: - return GP_EINVAL; - break; - case GP_G1: - return GP_ESUCCESS; - break; - case GP_G2: - GP_G2_FILL(color, col->gray * 0x03); - return GP_ESUCCESS; - break; - case GP_G4: - GP_G4_FILL(color, col->gray * 0x0f); - return GP_ESUCCESS; - break; - case GP_G8: - GP_G8_FILL(color, col->gray * 0xff); - return GP_ESUCCESS; - break; - case GP_RGB555: - GP_RGB555_FILL(color, col->gray * 0x1f, - col->gray * 0x1f, - col->gray * 0x1f); - return GP_ESUCCESS; - break; - case GP_RGB565: - GP_RGB565_FILL(color, col->gray * 0x1f, - col->gray * 0x3f, - col->gray * 0x1f); - return GP_ESUCCESS; - break; - case GP_RGB666: - GP_RGB666_FILL(color, col->gray * 0x3f, - col->gray * 0x3f, - col->gray * 0x3f); - return GP_ESUCCESS; - break; - case GP_RGB888: - GP_RGB888_FILL(color, col->gray * 0xff, - col->gray * 0xff, - col->gray * 0xff); - return GP_ESUCCESS; - break; - case GP_RGBA8888: - GP_RGBA8888_FILL(color, col->gray * 0xff, - col->gray * 0xff, - col->gray * 0xff, 0xff); - return GP_ESUCCESS; - break; - case GP_COLMAX: - case GP_COLNAME: - case GP_PALETTE: - break; - } - - if (type >= GP_COLMAX) - return GP_EINVAL; - else - return GP_ENOIMPL; -} - -static enum GP_RetCode conv_from_g2(GP_Color *color, GP_ColorType type) -{ - struct GP_ColG2 *col = &color->g2; - - switch (type) { - case GP_NOCOLOR: - return GP_EINVAL; - break; - case GP_PAL4: - case GP_PAL8: - return GP_EINVAL; - break; - case GP_G1: - GP_G1_FILL(color, col->gray>>2); - return GP_EUNPRECISE; - break; - case GP_G2: - return GP_ESUCCESS; - break; - case GP_G4: - GP_G4_FILL(color, col->gray * 0x0f / 0x03); - return GP_ESUCCESS; - break; - case GP_G8: - GP_G8_FILL(color, col->gray * 0xff / 0x03); - return GP_ESUCCESS; - break; - case GP_RGB555: - GP_RGB555_FILL(color, col->gray * 0x1f / 0x03, - col->gray * 0x1f / 0x03, - col->gray * 0x1f / 0x03); - return GP_ESUCCESS; - break; - case GP_RGB565: - GP_RGB565_FILL(color, col->gray * 0x1f / 0x03, - col->gray * 0x3f / 0x03, - col->gray * 0x1f / 0x03); - return GP_ESUCCESS; - break; - case GP_RGB666: - GP_RGB666_FILL(color, col->gray * 0x3f / 0x03, - col->gray * 0x3f / 0x03, - col->gray * 0x3f / 0x03); - return GP_ESUCCESS; - break; - case GP_RGB888: - GP_RGB888_FILL(color, col->gray * 0xff / 0x03, - col->gray * 0xff / 0x03, - col->gray * 0xff / 0x03); - return GP_ESUCCESS; - break; - case GP_RGBA8888: - GP_RGBA8888_FILL(color, col->gray * 0xff / 0x03, - col->gray * 0xff / 0x03, - col->gray * 0xff / 0x03, 0xff); - return GP_ESUCCESS; - break; - case GP_COLMAX: - case GP_COLNAME: - case GP_PALETTE: - break; - } - - if (type >= GP_COLMAX) - return GP_EINVAL; - else - return GP_ENOIMPL; -} - -static enum GP_RetCode conv_from_g4(GP_Color *color, GP_ColorType type) -{ - struct GP_ColG4 *col = &color->g4; - - switch (type) { - case GP_NOCOLOR: - return GP_EINVAL; - break; - case GP_PAL4: - case GP_PAL8: - return GP_EINVAL; - break; - case GP_G1: - GP_G1_FILL(color, col->gray>>3); - return GP_EUNPRECISE; - break; - case GP_G2: - GP_G2_FILL(color, col->gray>>2); - return GP_EUNPRECISE; - break; - case GP_G4: - return GP_ESUCCESS; - break; - case GP_G8: - GP_G8_FILL(color, col->gray * 0xff / 0x0f); - return GP_ESUCCESS; - break; - case GP_RGB555: - GP_RGB555_FILL(color, col->gray * 0x1f / 0x0f, - col->gray * 0x1f / 0x0f, - col->gray * 0x1f / 0x0f); - return GP_ESUCCESS; - break; - case GP_RGB565: - GP_RGB565_FILL(color, col->gray * 0x1f / 0x0f, - col->gray * 0x3f / 0x0f, - col->gray * 0x1f / 0x0f); - return GP_ESUCCESS; - break; - case GP_RGB666: - GP_RGB666_FILL(color, col->gray * 0x3f / 0x0f, - col->gray * 0x3f / 0x0f, - col->gray * 0x3f / 0x0f); - return GP_ESUCCESS; - break; - case GP_RGB888: - GP_RGB888_FILL(color, col->gray * 0xff / 0x0f, - col->gray * 0xff / 0x0f, - col->gray * 0xff / 0x0f); - return GP_ESUCCESS; - break; - case GP_RGBA8888: - GP_RGBA8888_FILL(color, col->gray * 0xff / 0x0f, - col->gray * 0xff / 0x0f, - col->gray * 0xff / 0x0f, 0xff); - return GP_ESUCCESS; - break; - case GP_COLMAX: - case GP_COLNAME: - case GP_PALETTE: - break; - } - - if (type >= GP_COLMAX) - return GP_EINVAL; - else - return GP_ENOIMPL; -} - -static enum GP_RetCode conv_from_g8(GP_Color *color, GP_ColorType type) -{ - struct GP_ColG8 *col = &color->g8; - - switch (type) { - case GP_NOCOLOR: - return GP_EINVAL; - break; - case GP_PAL4: - case GP_PAL8: - return GP_EINVAL; - break; - case GP_G1: - GP_G1_FILL(color, col->gray / 8); - return GP_EUNPRECISE; - break; - case GP_G2: - GP_G2_FILL(color, col->gray / 4); - return GP_EUNPRECISE; - break; - case GP_G4: - GP_G4_FILL(color, col->gray / 2); - return GP_EUNPRECISE; - break; - case GP_G8: - return GP_ESUCCESS; - break; - case GP_RGB555: - GP_RGB555_FILL(color, col->gray * 0x1f / 0xff, - col->gray * 0x1f / 0xff, - col->gray * 0x1f / 0xff); - return GP_ESUCCESS; - break; - case GP_RGB565: - GP_RGB565_FILL(color, col->gray * 0x1f / 0xff, - col->gray * 0x3f / 0xff, - col->gray * 0x1f / 0xff); - return GP_ESUCCESS; - break; - case GP_RGB666: - GP_RGB666_FILL(color, col->gray * 0x3f / 0xff, - col->gray * 0x3f / 0xff, - col->gray * 0x3f / 0xff); - return GP_ESUCCESS; - break; - case GP_RGB888: - GP_RGB888_FILL(color, col->gray, - col->gray, - col->gray); - return GP_ESUCCESS; - break; - case GP_RGBA8888: - GP_RGBA8888_FILL(color, col->gray, - col->gray, - col->gray, 0xff); - return GP_ESUCCESS; - break; - case GP_COLMAX: - case GP_COLNAME: - case GP_PALETTE: - break; - } - - if (type >= GP_COLMAX) - return GP_EINVAL; - else - return GP_ENOIMPL; -} - -static enum GP_RetCode conv_from_rgb555(GP_Color *color, GP_ColorType type) -{ - struct GP_ColRGB555 *col = &color->rgb555; - uint8_t val; - - switch (type) { - case GP_NOCOLOR: - return GP_EINVAL; - break; - case GP_PAL4: - case GP_PAL8: - return GP_EINVAL; - break; - case GP_G1: - val = ((col->red + col->green + col->blue) / 3)>>4; - GP_G1_FILL(color, val); - return GP_EUNPRECISE; - break; - case GP_G2: - val = ((col->red + col->green + col->blue) / 3)>>3; - GP_G2_FILL(color, val); - return GP_EUNPRECISE; - break; - case GP_G4: - val = ((col->red + col->green + col->blue) / 3)>>2; - GP_G4_FILL(color, val); - return GP_EUNPRECISE; - break; - case GP_G8: - val = (0xff * (col->red + col->green + col->blue)) / - (3 * 0x1f); - GP_G8_FILL(color, val); - return GP_EUNPRECISE; - break; - case GP_RGB555: - return GP_ESUCCESS; - break; - case GP_RGB565: - GP_RGB565_FILL(color, col->red, col->green << 1, - col->blue); - return GP_ESUCCESS; - break; - case GP_RGB666: - GP_RGB666_FILL(color, 0x3f * col->red / 0x1f, - 0x3f * col->green / 0x1f, - 0x3f * col->blue / 0x1f); - return GP_ESUCCESS; - break; - case GP_RGB888: - GP_RGB888_FILL(color, 0xff * col->red / 0x1f, - 0xff * col->green / 0x1f, - 0xff * col->blue / 0x1f); - return GP_ESUCCESS; - break; - case GP_RGBA8888: - GP_RGBA8888_FILL(color, 0xff * col->red / 0x1f, - 0xff * col->green / 0x1f, - 0xff * col->blue / 0x1f, 0xff); - return GP_ESUCCESS; - break; - case GP_COLMAX: - case GP_COLNAME: - case GP_PALETTE: - break; - } - - if (type >= GP_COLMAX) - return GP_EINVAL; - else - return GP_ENOIMPL; -} - -static enum GP_RetCode conv_from_rgb888(GP_Color *color, GP_ColorType type) -{ - struct GP_ColRGB888 *col = &color->rgb888; - uint8_t val; - - switch (type) { - case GP_NOCOLOR: - return GP_EINVAL; - break; - case GP_PAL4: - case GP_PAL8: - return GP_EINVAL; - break; - case GP_G1: - val = ((col->red + col->green + col->blue)/3)>>7; - GP_G1_FILL(color, val); - return GP_EUNPRECISE; - break; - case GP_G2: - val = ((col->red + col->green + col->blue)/3)>>6; - GP_G2_FILL(color, val); - return GP_EUNPRECISE; - break; - case GP_G4: - val = ((col->red + col->green + col->blue)/3)>>4; - GP_G4_FILL(color, val); - return GP_EUNPRECISE; - break; - case GP_G8: - val = ((col->red + col->green + col->blue)/3); - GP_G8_FILL(color, val); - return GP_EUNPRECISE; - break; - case GP_RGB555: - GP_RGB555_FILL(color, col->red>>3, - col->green>>3, - col->blue>>3); - return GP_EUNPRECISE; - break; - case GP_RGB565: - GP_RGB565_FILL(color, col->red>>3, col->green>>2, - col->blue>>3); - return GP_EUNPRECISE; - break; - case GP_RGB666: - GP_RGB666_FILL(color, col->red>>2, col->green>>2, - col->blue>>2); - return GP_EUNPRECISE; - break; - case GP_RGB888: - return GP_ESUCCESS; - break; - case GP_RGBA8888: - GP_RGBA8888_FILL(color, col->red, col->green, - col->blue, 0xff); - return GP_ESUCCESS; - break; - - case GP_COLMAX: - case GP_COLNAME: - case GP_PALETTE: - break; - } - - if (type >= GP_COLMAX) - return GP_EINVAL; - else - return GP_ENOIMPL; -} - -static enum GP_RetCode conv_from_rgba8888(GP_Color *color, GP_ColorType type) -{ - struct GP_ColRGBA8888 *col = &color->rgba8888; - uint8_t val; - - switch (type) { - case GP_NOCOLOR: - return GP_EINVAL; - break; - case GP_PAL4: - case GP_PAL8: - return GP_EINVAL; - break; - case GP_G1: - val = ((col->red + col->green + col->blue)/3)>>7; - GP_G1_FILL(color, val); - return GP_EUNPRECISE; - break; - case GP_G2: - val = ((col->red + col->green + col->blue)/3)>>6; - GP_G2_FILL(color, val); - return GP_EUNPRECISE; - break; - case GP_G4: - val = ((col->red + col->green + col->blue)/3)>>4; - GP_G4_FILL(color, val); - return GP_EUNPRECISE; - break; - case GP_G8: - val = ((col->red + col->green + col->blue)/3); - GP_G8_FILL(color, val); - return GP_EUNPRECISE; - break; - case GP_RGB555: - GP_RGB555_FILL(color, col->red>>3, - col->green>>3, - col->blue>>3); - return GP_EUNPRECISE; - break; - case GP_RGB888: - GP_RGB888_FILL(color, col->red, - col->green, - col->blue); - return GP_EUNPRECISE; - break; - case GP_RGBA8888: - return GP_ESUCCESS; - break; - case GP_COLMAX: - case GP_COLNAME: - case GP_PALETTE: - break; - } - - if (type >= GP_COLMAX) - return GP_EINVAL; - else - return GP_ENOIMPL; -} - -static enum GP_RetCode color_convert(GP_Color *color, GP_ColorType type) -{ - switch (color->type) { - case GP_NOCOLOR: - return GP_EINVAL; - break; - case GP_PAL4: - case GP_PAL8: - return GP_EINVAL; - break; - case GP_COLNAME: - return conv_from_name(color, type); - break; - case GP_G1: - return conv_from_g1(color, type); - break; - case GP_G2: - return conv_from_g2(color, type); - break; - case GP_G4: - return conv_from_g4(color, type); - break; - case GP_G8: - return conv_from_g8(color, type); - break; - case GP_RGB888: - return conv_from_rgb888(color, type); - break; - case GP_RGBA8888: - return conv_from_rgba8888(color, type); - break; - case GP_RGB555: - return conv_from_rgb555(color, type); - break; - case GP_COLMAX: - case GP_PALETTE: - break; - } - - if (color->type >= GP_COLMAX) - return GP_EINVAL; - else - return GP_ENOIMPL; -} - -GP_RetCode GP_ColorConvert(GP_Color *color, GP_ColorType type) -{ - if (!color) - return GP_ENULLPTR; - - /* nothing to do */ - if (color->type == type) - return GP_ESUCCESS; - - GP_RetCode ret; - - /* convert palette color to color */ - if (color->type == GP_PALETTE) { - ret = GP_PaletteColorToColor(color); - - if (ret != GP_ESUCCESS) - return ret; - } - - /* convert color */ - return color_convert(color, type); -} - -static void print_name(struct GP_ColName *color) -{ - printf(" TYPE NAMEn"); - - if (color->name > GP_COL_MAX) { - printf("COLNAME invalidn"); - return; - } - - printf("COLNAME %sn", color_names[color->name]); -} - -static void print_palette(struct GP_ColPal *color) -{ - printf("Palette index %04un", color->index); - GP_PalettePrint(color->palette); -} - -static void print_pal4(struct GP_ColPal4 *color) -{ - printf("HW Palette index 0x%01u", color->index); -} - -static void print_pal8(struct GP_ColPal8 *color) -{ - printf("HW Palette index 0x%02u", color->index); -} - -static void print_g1(struct GP_ColG1 *color) -{ - printf(" TYPE Gn"); - printf(" G1 0x%xn", color->gray); -} - -static void print_g2(struct GP_ColG2 *color) -{ - printf(" TYPE Gn"); - printf(" G2 0x%xn", color->gray); -} - -static void print_g4(struct GP_ColG4 *color) -{ - printf(" TYPE Gn"); - printf(" G4 0x%02xn", color->gray); -} - -static void print_g8(struct GP_ColG8 *color) -{ - printf(" TYPE Gn"); - printf(" G8 0x%02xn", color->gray); -} - -static void print_rgb555(struct GP_ColRGB555 *color) -{ - printf(" TYPE R G Bn"); - printf("RGB555 0x%02x 0x%02x 0x%02xn", color->red, - color->green, - color->blue); -} - -static void print_rgb565(struct GP_ColRGB565 *color) -{ - printf(" TYPE R G Bn"); - printf("RGB565 0x%02x 0x%02x 0x%02xn", color->red, - color->green, - color->blue); -} - -static void print_rgb666(struct GP_ColRGB666 *color) -{ - printf(" TYPE R G Bn"); - printf("RGB666 0x%02x 0x%02x 0x%02xn", color->red, - color->green, - color->blue); -} -static void print_rgb888(struct GP_ColRGB888 *color) -{ - printf(" TYPE R G Bn"); - printf("RGB888 0x%02x 0x%02x 0x%02xn", color->red, - color->green, - color->blue); -} - -static void print_rgba8888(struct GP_ColRGBA8888 *color) -{ - printf(" TYPE R G B An"); - printf("RGBA8888 0x%02x 0x%02x 0x%02x 0x%02xn", color->red, - color->green, - color->blue, - color->alpha); -} - -void GP_ColorPrint(GP_Color *color) -{ - switch (color->type) { - case GP_COLNAME: - print_name(&color->name); - return; - break; - case GP_PALETTE: - print_palette(&color->pal); - return; - break; - case GP_PAL4: - print_pal4(&color->pal4); - return; - break; - case GP_PAL8: - print_pal8(&color->pal8); - break; - case GP_G1: - print_g1(&color->g1); - return; - break; - case GP_G2: - print_g2(&color->g2); - return; - break; - case GP_G4: - print_g4(&color->g4); - return; - break; - case GP_G8: - print_g8(&color->g8); - return; - break; - case GP_RGB555: - print_rgb555(&color->rgb555); - return; - break; - case GP_RGB565: - print_rgb565(&color->rgb565); - return; - break; - case GP_RGB666: - print_rgb666(&color->rgb666); - return; - break; - case GP_RGB888: - print_rgb888(&color->rgb888); - return; - break; - case GP_RGBA8888: - print_rgba8888(&color->rgba8888); - return; - break; - case GP_COLMAX: - break; - } - - printf("Invalid color type (%u)n", color->type); -} diff --git a/libs/core/GP_Palette.c b/libs/core/GP_Palette.c deleted file mode 100644 index 01224f8..0000000 --- a/libs/core/GP_Palette.c +++ /dev/null @@ -1,83 +0,0 @@ -/***************************************************************************** - * This file is part of gfxprim library. * - * * - * Gfxprim is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Lesser General Public * - * License as published by the Free Software Foundation; either * - * version 2.1 of the License, or (at your option) any later version. * - * * - * Gfxprim is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with gfxprim; if not, write to the Free Software * - * Foundation, Inc., 51 Franklin Street, Fifth Floor, * - * Boston, MA 02110-1301 USA * - * * - * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * - * <jiri.bluebear.dluhos(a)gmail.com> * - * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * - * * - *****************************************************************************/ - -#include <stdio.h> - -#include "GP_Color.h" -#include "GP_Palette.h" - -enum GP_RetCode GP_PaletteColorToColor(GP_Color *color) -{ - struct GP_ColPal *pal; - GP_Palette *palette; - uint16_t index; - - if (color->type != GP_PALETTE) - return GP_EINVAL; - - pal = &color->pal; - palette = pal->palette; - index = pal->index; - - switch (pal->palette->type) { - case GP_RGB888: - if (index >= palette->rgb888.size) - return GP_EINVAL; - - GP_RGB888_FILL(color, palette->rgb888.colors[index].red, - palette->rgb888.colors[index].green, - palette->rgb888.colors[index].blue); - return GP_ESUCCESS; - break; - default: - return GP_ENOIMPL; - } -} - -static void print_rgb888(struct GP_PalRGB888 *palette) -{ - uint16_t i; - - printf("palette format rgb888 (size = %u)n", palette->size); - printf(" NR R G Bn"); - - for (i = 0; i < palette->size; i++) { - printf("%04u: 0x%.2x 0x%.2x 0x%.2xn", i, - palette->colors[i].red, - palette->colors[i].green, - palette->colors[i].blue); - } -} - -void GP_PalettePrint(GP_Palette *palette) -{ - switch (palette->type) { - case GP_RGB888: - print_rgb888(&palette->rgb888); - break; - default: - break; - } -} ----------------------------------------------------------------------- Summary of changes: .../GP_Pixel_Access.c => include/core/GP_Blit.h | 39 +- include/core/GP_Color.h | 222 ------ include/core/GP_Context.h | 1 + include/core/GP_Convert.h | 111 +++ include/core/GP_Core.h | 2 +- .../core/{GP_Pixel_Access.h => GP_GetPutPixel.h} | 8 +- include/core/GP_Palette.h | 75 -- include/core/GP_Pixel.h | 39 +- include/gfx/GP_Gfx.h | 2 +- libs/core/GP_Blit.c | 13 +- libs/core/GP_Color.c | 801 +------------------- libs/core/{GP_Pixel_Access.c => GP_GetPutPixel.c} | 2 +- libs/core/GP_Palette.c | 83 -- libs/core/GP_Pixel.c | 235 ------ libs/core/Makefile | 5 +- pylib/gfxprim/generators/core/gen_blit.py | 28 +- pylib/gfxprim/generators/core/gen_convert.py | 116 +++ .../{gen_pixel_access.py => gen_getputpixel.py} | 0 pylib/gfxprim/generators/core/gen_pixeltype.py | 67 +-- pylib/gfxprim/generators/core/make_GP_Blit.py | 2 +- pylib/gfxprim/generators/core/make_GP_Convert.py | 59 ++ pylib/gfxprim/generators/core/make_GP_Pixel.py | 33 +- pylib/gfxprim/generators/pixeltype.py | 10 +- pylib/gfxprim/generators/utils.py | 1 + pylib/pixeltypes.py | 43 +- 25 files changed, 400 insertions(+), 1597 deletions(-) copy libs/core/GP_Pixel_Access.c => include/core/GP_Blit.h (66%) create mode 100644 include/core/GP_Convert.h rename include/core/{GP_Pixel_Access.h => GP_GetPutPixel.h} (95%) delete mode 100644 include/core/GP_Palette.h rename libs/core/{GP_Pixel_Access.c => GP_GetPutPixel.c} (98%) delete mode 100644 libs/core/GP_Palette.c delete mode 100644 libs/core/GP_Pixel.c create mode 100644 pylib/gfxprim/generators/core/gen_convert.py rename pylib/gfxprim/generators/core/{gen_pixel_access.py => gen_getputpixel.py} (100%) create mode 100644 pylib/gfxprim/generators/core/make_GP_Convert.py repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch generate updated: fb094cd7f8086ddb9e59b91224c5fef9702136fa
by gavento 05 Jun '11

05 Jun '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, generate has been updated via fb094cd7f8086ddb9e59b91224c5fef9702136fa (commit) from 1e00e08031c90d4f8d1b987d4908c9d2c938671a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/fb094cd7f8086ddb9e59b91224c5fef97021… commit fb094cd7f8086ddb9e59b91224c5fef9702136fa Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun Jun 5 13:00:56 2011 +0200 Fix a typo diff --git a/libs/core/GP_Blit.c b/libs/core/GP_Blit.c index a316597..29e90e8 100644 --- a/libs/core/GP_Blit.c +++ b/libs/core/GP_Blit.c @@ -71,6 +71,6 @@ void GP_Blit_Naive(const GP_Context *c1, int x1, int y1, int w, int h, for (int i = 0; i < w; i++) for (int j = 0; j < h; j++) { GP_Pixel p = GP_GetPixel(c1, x1 + i, y1 + j); - GP_PutPixel(c2, x2 + i, y2 + j); + GP_PutPixel(c2, x2 + i, y2 + j, p); } } ----------------------------------------------------------------------- Summary of changes: libs/core/GP_Blit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

Core and clipping
by Tomas Gavenciak 03 Jun '11

03 Jun '11

Hi all, With metan, we discussed Context, blits, drawing and clipping in core. My proposal would be to remove clipping information from Context and to think about some structure for "Drawing context". This structure could also include other style information and would act as a wrapper around context and used in convenience drawing functions. The goal is to simplify the base api and modularize the library. I believe that we should allow separate use of any part of the library as much as possible - library supporting all kinds of weird devices can see many uses both with variable subset of the modules. Arguments to move clipping from Context to drawing are * One use of clipping is convenience when drawing primitives. This should be handled with drawing functions. There, clipping can save some complicated reasoning. * Blits should not respect clipping. Blitting a superset of clip-region is very frequent and even if needed, calculating intersection of two rectangles is very easy. * One use-case of clipping is "user" routines drawing inside windows etc. This can be done using subcontexts (context pointing to part of memory of other context). This has also the advantage of coordinate system being always (0,0) and solves the problem when (clipped) "user" drawing routine would like to use clipping itself. Of course that every context is still "naturally" clipped by (0,0,w,h). >From my own experience, I used clipping very rarely, but I see its value as a convenience mechanism. Having two variants of drawing functions - one "bare" (unclipped, without implicit style information, etc.) and an optional set of "convenience" functions (clipping, using implicit style info on BGcolor, clipping, aliasing, font, ...) would be the best of both. It still remains a question how to implement such wrapper (structure pointing to a context? context-independent structure? something extensible or fixed? ...). I haven't given it much thought. Any ideas? If there is an important use-case that I forgot to mention or if there is any technical problem, bring it on. Best, Tomas

3 6

[repo.or.cz] gfxprim.git branch generate updated: 1e00e08031c90d4f8d1b987d4908c9d2c938671a
by gavento 02 Jun '11

02 Jun '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, generate has been updated via 1e00e08031c90d4f8d1b987d4908c9d2c938671a (commit) via 0dc22c99f6f5c323d4d623e57edce53324d7caeb (commit) via 8484734afb7ec336d7cf4399064b785e8a3d99d4 (commit) via daa6ed769550d82191a853913d329d4881a9ab85 (commit) via 9d50a7192a8d4620a221c571092015891182f63a (commit) via 57eae77c4371c555ba66b24e739bd2aab83732a9 (commit) via a31120b664ac415df88655407937f2e9c0fea489 (commit) via 3eca4f4778eee54992fcd133978419cefd9135b0 (commit) via 34f8b640d9ce81505a024b745b03a9d179eb9b27 (commit) via ecb50dd5415f6b8079e3dda4e2cd0a4f9d8043d3 (commit) from 46a94e8b7af27012503eca96f3d5a1395d75bb10 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/1e00e08031c90d4f8d1b987d4908c9d2c938… commit 1e00e08031c90d4f8d1b987d4908c9d2c938671a Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Thu Jun 2 19:16:20 2011 +0200 Update .gitignore (.dep, library) diff --git a/.gitignore b/.gitignore index 6126da2..1d500c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,9 @@ *.o +*.dep *.pyc *.gen.c *.gen.h *.swp -libGP_core.so* -libGP_core.a +libGP.so* +libGP.a http://repo.or.cz/w/gfxprim.git/commit/0dc22c99f6f5c323d4d623e57edce53324d7… commit 0dc22c99f6f5c323d4d623e57edce53324d7caeb Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Thu Jun 2 19:15:23 2011 +0200 Fix a typo in GP_Get/PutPixel name diff --git a/include/core/GP_Pixel_Access.h b/include/core/GP_Pixel_Access.h index 3513d61..331d7eb 100644 --- a/include/core/GP_Pixel_Access.h +++ b/include/core/GP_Pixel_Access.h @@ -36,7 +36,7 @@ * GetPixel with context transformations and clipping. * Returns 0 for clipped pixels or pixels outside bitmap. */ -GP_Pixel GP_GetPixel_(GP_Context *context, int x, int y); +GP_Pixel GP_GetPixel(GP_Context *context, int x, int y); /* * Version of GetPixel without transformations nor border checking. @@ -51,7 +51,7 @@ static inline GP_Pixel GP_GetPixel_Raw(GP_Context *context, int x, int y) * PutPixel with context transformations and clipping. * NOP for clipped pixels or pixels outside bitmap. */ -void GP_PutPixel_(GP_Context *context, int x, int y, GP_Pixel p); +void GP_PutPixel(GP_Context *context, int x, int y, GP_Pixel p); /* * Version of PutPixel without transformations nor border checking. diff --git a/libs/core/GP_Pixel_Access.c b/libs/core/GP_Pixel_Access.c index 4f9b579..f2b8924 100644 --- a/libs/core/GP_Pixel_Access.c +++ b/libs/core/GP_Pixel_Access.c @@ -23,7 +23,7 @@ #include "GP_Pixel_Access.h" #include "GP_Transform.h" -GP_Pixel GP_GetPixel_(GP_Context *context, int x, int y) +GP_Pixel GP_GetPixel(GP_Context *context, int x, int y) { GP_TRANSFORM_POINT(context, x, y); if (GP_PIXEL_IS_CLIPPED(context, x, y)) @@ -31,7 +31,7 @@ GP_Pixel GP_GetPixel_(GP_Context *context, int x, int y) return GP_GetPixel_Raw(context, x, y); } -void GP_PutPixel_(GP_Context *context, int x, int y, GP_Pixel p) +void GP_PutPixel(GP_Context *context, int x, int y, GP_Pixel p) { GP_TRANSFORM_POINT(context, x, y); if (! GP_PIXEL_IS_CLIPPED(context, x, y)) http://repo.or.cz/w/gfxprim.git/commit/8484734afb7ec336d7cf4399064b785e8a3d… commit 8484734afb7ec336d7cf4399064b785e8a3d99d4 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Thu Jun 2 19:12:27 2011 +0200 Testing framework refactoring and move, new tests.mk Test collection now part of code generation Testing should be now accessible from any module diff --git a/gen.mk b/gen.mk index ba375c0..5df5588 100644 --- a/gen.mk +++ b/gen.mk @@ -5,6 +5,14 @@ ifndef LIBNAME $(error LIBNAME not defined, fix your library Makefile) endif +ifndef GENHEADERS +GENHEADERS= +endif + +ifndef GENSOURCES +GENSOURCES= +endif + # # Headers goes into include/core/ # diff --git a/include.mk b/include.mk index 2a103a9..c8f8b18 100644 --- a/include.mk +++ b/include.mk @@ -1,3 +1,10 @@ +# +# Make no subdirs by default +# +ifndef SUBDIRS +SUBDIRS= +endif + .PHONY: $(SUBDIRS) all clean help all: $(SUBDIRS) diff --git a/pylib/gfxprim/generators/make_collected_tests.py b/pylib/gfxprim/generators/make_collected_tests.py new file mode 100644 index 0000000..ca117ec --- /dev/null +++ b/pylib/gfxprim/generators/make_collected_tests.py @@ -0,0 +1,140 @@ +#!/usr/bin/python +# +# Script generating collected_tests.gen.c +# +# Scrapes the target directory for .test.c files, looks for +# GP_TEST and GP_SUITE macros and generates code creating all the +# tests and the suite +# +# 2011 - Tomas Gavenciak <gavento(a)ucw.cz> +# + +# Also fixed in tests.mk +collected_tests_file = 'collected_tests.gen.c' + +import os, re, glob +from gfxprim.generators.generator import * + +def warn(msg_s, fname=None, line=None): + msg('W', msg_s, fname, line) + +def msg(prefix, msg_s, fname=None, line=None): + s = '[' + prefix + if fname: + s += ' ' + fname + if line: + s += ':%d'%line + s += '] ' + sys.stderr.write(s + msg_s + 'n') + +testfile_pattern = '*.test.c' + +suites = {} # {"suitename":["testname":{test_parameters}]} + +suite_re = re.compile("A\s*GP_SUITE$(.*)$\s*Z") +test_re = re.compile("A\s*GP_TEST$(.*)$\s*Z") + +@generator(CHeaderGenerator(name = collected_tests_file), + descr = 'Code creating the tests and suites for tests collected ' + 'from .test.c files', + authors = ["2011 - Tomas Gavenciak <gavento(a)ucw.cz>"]) +def tests_collected_tests(c): + fnames = glob.fnmatch.filter(os.listdir(c.fdir or '.'), testfile_pattern) + print fnames + for fn in fnames: + dirfn = os.path.join(c.fdir, fn) + with open(dirfn, 'rt') as f: + find_tests(f, fn) + if not fnames: + warn('No .test.c files found in "%s".' % c.fdir) + if not suites: + warn('No suites found, generating empty testsuite.') + + c.rhead("#include <check.h>nn") + + for suite, tests in suites.iteritems(): + c.rbody( + "/****************************************************************n" + " * Suite {{ suite }}n" + " */nn", suite=suite) + for t in tests: + assert ('loop_start' in t) == ('loop_end' in t) + c.rbody( + "/*n" + " * Test {{ suite }}/{{ t['name'] }} defined in {{ t['fname'] }}:{{ t['line'] }}n" + " */nn" + "void GP_TEST_{{ t['name'] }}(int);nn" + "TCase *GP_TC_{{ suite }}_{{ t['name'] }}() {n" + " TCase *tc = tcase_create("{{ t['name'] }}");n" + " _tcase_add_test(tc, GP_TEST_{{ t['name'] }}, "{{ t['name'] }}", " + "{{ t.get('expect_signal', 0) }}, {{ t.get('expect_exit', 0) }}, " + "{{ t.get('loop_start', 0) }}, {{ t.get('loop_end', 1) }});n" + " return tc;n}nn", t=t, suite=suite) + # TODO: Handle special test requirements (timing, fixture, ...) + + c.rbody( + "Suite *GP_TS_{{ suite }}() {n" + " Suite *s = suite_create("{{ suite }}");n" + "{% for t in tests %}" + " suite_add_tcase(s, GP_TC_{{ suite }}_{{ t['name'] }}());n" + "{% endfor %}" + " return s;n}nn", tests=tests, suite=suite) + + # Once for all suites + c.rbody( + "/****************************************************************n" + " * Create and add all suites to a SRunnern" + " */nn" + "void GP_AddSuitesToSRunner(SRunner *sr) {n" + "{% for s in suites %}" + " srunner_add_suite(sr, GP_TS_{{ s }}());n" + "{% endfor %}" + "}nn", suites=suites) + +def find_GP_directive(name, regexp, l, fname='unknown', line=0): + "Looks for a given GP_* directive, parses args if any, " + "retuns (name, dict_of_args) or (None, None) if not found." + if name in l: + m = regexp.search(l) + if not m: + warn("found unsuitable %s directive, ignoring." % name, fname, line) + else: + d = m.groups()[0].split(',', 1) + args = {} + if len(d)>1: + try: + s = 'dict( ' + d[1].strip(" tn"") + ' )' + args = eval(s) + except: + die("error parsing arguments: %r" % s, fname, line) + return d[0].strip(), args + return None, None + +def find_tests(f, fname): + "Finds all tests in a file." + suite = None + ls = f.readlines() + for i in range(len(ls)): + l = ls[i] + # Look for suite declaration + name, args = find_GP_directive("GP_SUITE", suite_re, l, fname=fname, line=i) + if name: + suite = name + if args: + warn("suite should have no arguments other than name.", fname, i) + suites.setdefault(name, []) + # Look for suite declaration + name, args = find_GP_directive("GP_TEST", test_re, l, fname=fname, line=i) + if name: + test_suite = suite + if 'suite' in args: + test_suite = args['suite'] + if not test_suite: + test_suite = 'default' + warn("no suite defined before test %s, using %r." % (name, test_suite), fname, i) + args['name'] = name + args['fname'] = fname + args['line'] = i + suites.setdefault(test_suite, []) + suites[test_suite].append(args) + diff --git a/pylib/gfxprim/generators/utils.py b/pylib/gfxprim/generators/utils.py index 28c1891..3ddc7ad 100644 --- a/pylib/gfxprim/generators/utils.py +++ b/pylib/gfxprim/generators/utils.py @@ -16,6 +16,7 @@ def j2render(tmpl, **kw): def load_generators(): "Load all modules containig generators to allow them to register" # TODO: write proper discovery + import gfxprim.generators.make_collected_tests import gfxprim.generators.core.make_GP_Pixel import gfxprim.generators.core.make_GP_Blit pass diff --git a/tests.mk b/tests.mk new file mode 100644 index 0000000..5dbcc80 --- /dev/null +++ b/tests.mk @@ -0,0 +1,46 @@ +.PHONY: tests runtests + +# +# List of test targets (testsuite incl. automatically) +# +ifndef TESTS +TESTS= +endif + +# +# Testsuite with automated collection of tests +# All .test.c files are scraped for GP_TEST definitions +# + +ifdef TESTSUITE +# a bit crude way to link with test minilibrary +GP_TESTLIB_SRCS=${TOPDIR}/tests/common/GP_Tests.c +CSOURCES+=${GP_TESTLIB_SRCS} + +# generated suite creation code +TESTSUITE_GEN=collected_tests.gen.c # also fixed in the code generator +GENSOURCES+=${TESTSUITE_GEN} + +TESTSUITE_SRCS=$(wildcard *.test.c) ${TESTSUITE_GEN} ${GP_TESTLIB_SRCS} +INCLUDE+=../tests/common +TESTSUITE_OBJS=$(patsubst %.c,%.o,$(TESTSUITE_SRCS)) +CLEAN+=${TESTSUITE} +TESTS+=${TESTSUITE} + +${TESTSUITE}: ${TESTSUITE_OBJS} +ifdef VERBOSE + $(CC) $(CFLAGS) $(LDFLAGS) -Wl,--start-group $(LDLIBS) $^ -Wl,--end-group -o $@ +else + @echo "LD $@" + @$(CC) $(CFLAGS) $(LDFLAGS) -Wl,--start-group $(LDLIBS) $^ -Wl,--end-group -o $@ +endif # VERBOSE + +endif # TESTSUITE + +tests: $(TESTS) + +runtests: tests + for test in $(TESTS); do LD_LIBRARY_PATH=../../build ./"$$test" -v ; done + +# WARN: avoid double includion? +include $(TOPDIR)/gen.mk diff --git a/tests/core/core_tests.c b/tests/common/GP_Tests.c similarity index 100% rename from tests/core/core_tests.c rename to tests/common/GP_Tests.c diff --git a/tests/core/GP_Tests.h b/tests/common/GP_Tests.h similarity index 100% rename from tests/core/GP_Tests.h rename to tests/common/GP_Tests.h diff --git a/tests/core/GP_Comon.test.c b/tests/core/GP_Common.test.c similarity index 100% rename from tests/core/GP_Comon.test.c rename to tests/core/GP_Common.test.c diff --git a/tests/core/Makefile b/tests/core/Makefile index 2911629..929a30c 100644 --- a/tests/core/Makefile +++ b/tests/core/Makefile @@ -1,31 +1,10 @@ TOPDIR=../.. -CSOURCES=$(shell echo *.test.c) core_tests.gen.c - -INCLUDE=core +LIBNAME=core +TESTSUITE=core LDLIBS+=-lGP -L$(TOPDIR)/build/ -lcheck -APPS=core_tests - include $(TOPDIR)/include.mk -include $(TOPDIR)/app.mk - -.PHONY: run - -TEST_SRCS=$(wildcard *.test.c) -TEST_OBJS=$(patsubst %.c,%.o,$(TEST_SRCS)) -TESTS=core_tests -CLEAN+=core_tests.gen.c - -run: $(TESTS) - for test in $(TESTS); do LD_LIBRARY_PATH=../../build ./"$$test" -v ; done +include $(TOPDIR)/tests.mk -core_tests.gen.c: $(TEST_SRCS) find_tests.py -ifdef VERBOSE - python find_tests.py -c $@ $(TEST_SRCS) -else - @echo "GEN (python) $@" - @python find_tests.py -c $@ $(TEST_SRCS) -endif -core_tests: $(TEST_OBJS) core_tests.gen.o diff --git a/tests/core/find_tests.py b/tests/core/find_tests.py deleted file mode 100644 index 7ddc7fb..0000000 --- a/tests/core/find_tests.py +++ /dev/null @@ -1,154 +0,0 @@ -#!/bin/python - -import sys, re, getopt - -# Helpers - -def die(msg_s, fname=None, line=None): - msg('E', msg_s, fname, line) - sys.exit(1) - -def warn(msg_s, fname=None, line=None): - msg('W', msg_s, fname, line) - -def msg(prefix, msg_s, fname=None, line=None): - s = '[' + prefix - if fname: - s += ' ' + fname - if line: - s += ':%d'%line - s += '] ' - sys.stderr.write(s + msg_s + 'n') - -# Globals - -suites = {} # {"suitename":["testname":{test_parameters}]} - -suite_re = re.compile("A\s*GP_SUITE$(.*)$\s*Z") -test_re = re.compile("A\s*GP_TEST$(.*)$\s*Z") - - -def find_GP_directive(name, regexp, l, fname='unknown', line=0): - "Looks for a given GP_* directive, parses args if any, " - "retuns (name, dict_of_args) or (None, None) if not found." - if name in l: - m = regexp.search(l) - if not m: - warn("found unsuitable %s directive, ignoring." % name, fname, line) - else: - d = m.groups()[0].split(',', 1) - args = {} - if len(d)>1: - try: - s = 'dict( ' + d[1].strip(" tn"") + ' )' - args = eval(s) - except: - die("error parsing arguments: %r" % s, fname, line) - return d[0].strip(), args - return None, None - -def find_tests(f, fname): - "Finds all tests in a file." - suite = None - ls = f.readlines() - for i in range(len(ls)): - l = ls[i] - # Look for suite declaration - name, args = find_GP_directive("GP_SUITE", suite_re, l, fname=fname, line=i) - if name: - suite = name - if args: - warn("suite should have no arguments other than name.", fname, i) - suites.setdefault(name, []) - # Look for suite declaration - name, args = find_GP_directive("GP_TEST", test_re, l, fname=fname, line=i) - if name: - test_suite = suite - if 'suite' in args: - test_suite = args['suite'] - if not test_suite: - test_suite = 'default' - warn("no suite defined before test %s, using %r." % (name, test_suite), fname, i) - args['name'] = name - args['fname'] = fname - args['line'] = i - suites.setdefault(test_suite, []) - suites[test_suite].append(args) - -def gen_tests(f): - f.write("/*n" - " * This GENERATED file is part of GfxPrim. See LICENSE for legal stuff.n" - " * Do not modify this file directly!n" - " */nn" - "#include <check.h>nn") - - for suite, tests in suites.iteritems(): - f.write("/****************************************************************n" - " * Suite %sn" - " */nn" % suite) - for t in tests: - f.write("/*n" - " * Test %s/%s defined in %s:%dn" - " */nn" % (suite, t['name'], t['fname'], t['line'])) - f.write("void GP_TEST_%s(int);nn" - "TCase *GP_TC_%s_%s()n" - "{n" - " TCase *tc = tcase_create("%s");n" % - (t['name'], suite, t['name'], t['name'])) - signal = t.get('expect_signal', 0) - exitval = t.get('expect_exit', 0) - assert ('loop_start' in t) == ('loop_end' in t) - loop_start = t.get('loop_start', 0) - loop_end = t.get('loop_end', 1) - f.write(" _tcase_add_test(tc, GP_TEST_%s, "%s", %d, %d, %d, %d);n" % - (t['name'], t['name'], signal, exitval, loop_start, loop_end)) - f.write(" return tc;n}nn") - # TODO: Handle special test requirements (timing, fixture, ...) - - f.write("Suite *GP_TS_%s()n" - "{n" - " Suite *s = suite_create("%s");n" % (suite, suite)) - for t in tests: - f.write(" suite_add_tcase(s, GP_TC_%s_%s());n" % (suite, t['name'])) - f.write(" return s;n" - "}nn") - - f.write("/****************************************************************n" - " * Create and add all suites to a SRunnern" - " */nn" - "void GP_AddSuitesToSRunner(SRunner *sr)n" - "{n") - for suite in suites: - f.write(" srunner_add_suite(sr, GP_TS_%s());n" % suite) - f.write("}nn") - - -def main(): - try: - opts, args = getopt.gnu_getopt(sys.argv[1:], "c:") - except: - die("Invalid arguments") - cfile = None - for opt, val in opts: - if opt == '-c': - cfile = val - if not cfile: - die("You must specify: -c <output.c>") - - for fn in args: - try: - f = open(fn, 'rt') - except: - die("Unable to open '%s'" % fn) - find_tests(f, fn) - f.close() - - try: - f = open(cfile, 'wt') - except: - die("Unable to open '%s'" % cfile) - gen_tests(f) - f.close() - -if __name__ == '__main__': - main() diff --git a/tests/core/font.test.c b/tests/text/font.test.c similarity index 100% rename from tests/core/font.test.c rename to tests/text/font.test.c http://repo.or.cz/w/gfxprim.git/commit/daa6ed769550d82191a853913d329d4881a9… commit daa6ed769550d82191a853913d329d4881a9ab85 Merge: 46a94e8 9d50a71 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Thu Jun 2 17:40:59 2011 +0200 Merge remote branch 'origin/master' into generate Conflicts: libs/core/Makefile ----------------------------------------------------------------------- Summary of changes: .gitignore | 5 +- Makefile | 22 +--- build/Makefile | 4 + gen.mk | 8 + include.mk | 7 + include/{sdl => SDL}/GP_SDL.h | 0 include/{sdl => SDL}/GP_SDL_Context.h | 0 include/{sdl => SDL}/GP_SDL_VideoInit.h | 0 include/{sdl => SDL}/README | 0 include/core/GP_Pixel_Access.h | 4 +- install.sh | 24 ++++ lib.mk | 39 ++++++- libs/Makefile | 2 +- libs/{sdl => SDL}/GP_SDL_Context.c | 0 libs/{sdl => SDL}/GP_SDL_VideoInit.c | 0 libs/{backends => SDL}/Makefile | 3 +- libs/core/GP_Pixel_Access.c | 4 +- libs/core/Makefile | 1 - libs/sdl/Makefile | 5 - pylib/gfxprim/generators/make_collected_tests.py | 140 ++++++++++++++++++++ pylib/gfxprim/generators/utils.py | 1 + tests.mk | 46 +++++++ tests/Makefile | 2 +- tests/{sdl => SDL}/Makefile | 10 +- tests/{sdl => SDL}/fileview.c | 0 tests/{sdl => SDL}/fonttest.c | 0 tests/{sdl => SDL}/linetest.c | 0 tests/{sdl => SDL}/pixeltest.c | 0 tests/{sdl => SDL}/randomshapetest.c | 0 tests/{sdl => SDL}/runtest.sh | 0 tests/{sdl => SDL}/shapetest.c | 0 tests/{sdl => SDL}/sierpinsky.c | 0 tests/{sdl => SDL}/symbolstest.c | 0 tests/{sdl => SDL}/textaligntest.c | 0 tests/{sdl => SDL}/trianglefps.c | 0 tests/{core/core_tests.c => common/GP_Tests.c} | 0 tests/{core => common}/GP_Tests.h | 0 tests/core/{GP_Comon.test.c => GP_Common.test.c} | 0 tests/core/Makefile | 27 +---- tests/core/find_tests.py | 154 ---------------------- tests/sdl/old.dddd | 19 --- tests/{core => text}/font.test.c | 0 42 files changed, 291 insertions(+), 236 deletions(-) rename include/{sdl => SDL}/GP_SDL.h (100%) rename include/{sdl => SDL}/GP_SDL_Context.h (100%) rename include/{sdl => SDL}/GP_SDL_VideoInit.h (100%) rename include/{sdl => SDL}/README (100%) create mode 100755 install.sh rename libs/{sdl => SDL}/GP_SDL_Context.c (100%) rename libs/{sdl => SDL}/GP_SDL_VideoInit.c (100%) copy libs/{backends => SDL}/Makefile (78%) delete mode 100644 libs/sdl/Makefile create mode 100644 pylib/gfxprim/generators/make_collected_tests.py create mode 100644 tests.mk rename tests/{sdl => SDL}/Makefile (55%) rename tests/{sdl => SDL}/fileview.c (100%) rename tests/{sdl => SDL}/fonttest.c (100%) rename tests/{sdl => SDL}/linetest.c (100%) rename tests/{sdl => SDL}/pixeltest.c (100%) rename tests/{sdl => SDL}/randomshapetest.c (100%) rename tests/{sdl => SDL}/runtest.sh (100%) rename tests/{sdl => SDL}/shapetest.c (100%) rename tests/{sdl => SDL}/sierpinsky.c (100%) rename tests/{sdl => SDL}/symbolstest.c (100%) rename tests/{sdl => SDL}/textaligntest.c (100%) rename tests/{sdl => SDL}/trianglefps.c (100%) rename tests/{core/core_tests.c => common/GP_Tests.c} (100%) rename tests/{core => common}/GP_Tests.h (100%) rename tests/core/{GP_Comon.test.c => GP_Common.test.c} (100%) delete mode 100644 tests/core/find_tests.py delete mode 100644 tests/sdl/old.dddd rename tests/{core => text}/font.test.c (100%) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

Gfxprim June 2011