Gfxprim May 2011

gfxprim@ucw.cz

4 participants
42 discussions

[repo.or.cz] gfxprim.git branch master updated: 44de9a46432c45949764964d3c49e65e2bb9701b
by gavento 22 May '11

22 May '11

1 0

[repo.or.cz] gfxprim.git branch master updated: f553db48b5df795253902ce74770f57217b642ab
by gavento 22 May '11

22 May '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, master has been updated via f553db48b5df795253902ce74770f57217b642ab (commit) via ff4fe6a3deedee19d4472c17568f13c3a029475b (commit) via dfefe1528e754ca7f9908dafb4544c08a78f6e6c (commit) from cf69cb4b75d228a01a4d7b803e6dfd2d32efbef3 (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/f553db48b5df795253902ce74770f57217b6… commit f553db48b5df795253902ce74770f57217b642ab Merge: ff4fe6a cf69cb4 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun May 22 13:07:05 2011 +0200 Merge branch 'master' of git://repo.or.cz/gfxprim Conflicts: core/GP_Common.h http://repo.or.cz/w/gfxprim.git/commit/ff4fe6a3deedee19d4472c17568f13c3a029… commit ff4fe6a3deedee19d4472c17568f13c3a029475b Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun May 22 13:05:42 2011 +0200 Tests for GP_ASSERT/CHECK/ABORT, minor fix (ambiguous else) diff --git a/core/GP_Common.h b/core/GP_Common.h index 19cc9b9..d077f33 100644 --- a/core/GP_Common.h +++ b/core/GP_Common.h @@ -83,11 +83,12 @@ * Internal macro with common code for GP_ASSERT and GP_CHECK. */ #define GP_GENERAL_CHECK(check_cond_, check_message_, ...) do { - if (unlikely(!(check_cond_))) + if (unlikely(!(check_cond_))) { if (#__VA_ARGS__ [0]) GP_ABORT(check_message_ #check_cond_ "n" __VA_ARGS__); else GP_ABORT(check_message_ #check_cond_); + } } while (0) /* diff --git a/core/tests/common.test.c b/core/tests/GP_Comon.test.c similarity index 83% rename from core/tests/common.test.c rename to core/tests/GP_Comon.test.c index c7bd904..9faa290 100644 --- a/core/tests/common.test.c +++ b/core/tests/GP_Comon.test.c @@ -64,3 +64,26 @@ GP_TEST(set_bits) fail_unless(x == 0xF108F000); } END_TEST + +GP_TEST(abort_check_assert, "loop_start=0, loop_end=9, expect_exit=1") +{ + if (_i==0) GP_ABORT(); + if (_i==1) GP_ABORT("MSG"); + if (_i==2) GP_ABORT("FORMAT %d", _i); + if (_i==3) GP_ASSERT(1==0); + if (_i==4) GP_ASSERT(1==0, "MSG"); + if (_i==5) GP_ASSERT(1==0, "FORMAT %d", _i); + if (_i==6) GP_CHECK(1==0); + if (_i==7) GP_CHECK(1==0, "MSG"); + if (_i==8) GP_CHECK(1==0, "FORMAT %d", _i); +} +END_TEST + +GP_TEST(assert_check_nop) +{ + GP_ASSERT(1); + GP_ASSERT(1, "MSG"); + GP_CHECK(1); + GP_CHECK(1, "MSG"); +} +END_TEST http://repo.or.cz/w/gfxprim.git/commit/dfefe1528e754ca7f9908dafb4544c08a78f… commit dfefe1528e754ca7f9908dafb4544c08a78f6e6c Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun May 22 13:03:54 2011 +0200 Added looping, exit and signal handling to test parameters diff --git a/core/tests/GP_Tests.h b/core/tests/GP_Tests.h index 6068d67..1735f60 100644 --- a/core/tests/GP_Tests.h +++ b/core/tests/GP_Tests.h @@ -33,9 +33,13 @@ * The optional string is passed as parameters to Python dict() as parameters * for the testcase-generator. * Currently, the following parameters are recognized: - * suite -- name of the suite + * suite -- name of the suite + * loop_start -- test will be repeated as with: + * loop_end for (int _i = loop_start; _i < loop_end; i++) { ... } + * expect_exit -- expect the function to exit with given exitcode + * expect_signal -- expect the function to exit with given exitcode * - * Do NOT use parameters: name, fname, line + * Parameters name, fname, line are used internally, do not use them */ #define GP_TEST(name, ...) static void name(int);diff --git a/core/tests/find_tests.py b/core/tests/find_tests.py index c16c881..7ddc7fb 100644 --- a/core/tests/find_tests.py +++ b/core/tests/find_tests.py @@ -91,19 +91,25 @@ def gen_tests(f): " * 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()n" + "TCase *GP_TC_%s_%s()n" "{n" - " TCase *tc = tcase_create("%s");n" - " tcase_add_test(tc, GP_TEST_%s);n" - " return tc;n" - "}nn" % (t['name'], t['name'], t['name'], t['name'])) + " 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());n" % (t['name'])) + f.write(" suite_add_tcase(s, GP_TC_%s_%s());n" % (suite, t['name'])) f.write(" return s;n" "}nn") ----------------------------------------------------------------------- Summary of changes: core/GP_Common.h | 2 +- core/tests/{common.test.c => GP_Comon.test.c} | 23 +++++++++++++++++++++++ core/tests/GP_Tests.h | 8 ++++++-- core/tests/find_tests.py | 18 ++++++++++++------ 4 files changed, 42 insertions(+), 9 deletions(-) rename core/tests/{common.test.c => GP_Comon.test.c} (83%) 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 master updated: cf69cb4b75d228a01a4d7b803e6dfd2d32efbef3
by metan 22 May '11

22 May '11

1 0

[repo.or.cz] gfxprim.git branch master updated: 3e29dc184eff61f987adb9bbab4c223a9b07ff5f
by metan 22 May '11

22 May '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, master has been updated via 3e29dc184eff61f987adb9bbab4c223a9b07ff5f (commit) via e3dfb3d477878b7ae70682ef12aefb91d9a17dba (commit) from 852d0d3925acf658dd96979bfbaef0dabb45e81b (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/3e29dc184eff61f987adb9bbab4c223a9b07… commit 3e29dc184eff61f987adb9bbab4c223a9b07ff5f Merge: e3dfb3d 852d0d3 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun May 22 12:16:58 2011 +0200 Merge branch 'master' of git://repo.or.cz/gfxprim http://repo.or.cz/w/gfxprim.git/commit/e3dfb3d477878b7ae70682ef12aefb91d9a1… commit e3dfb3d477878b7ae70682ef12aefb91d9a17dba Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun May 22 12:16:31 2011 +0200 Make FnPerBpp() even more clear. diff --git a/core/GP_Circle.c b/core/GP_Circle.c index 354405e..8be5f55 100644 --- a/core/GP_Circle.c +++ b/core/GP_Circle.c @@ -41,7 +41,8 @@ void GP_Circle(GP_Context *context, int xcenter, int ycenter, { GP_CHECK_CONTEXT(context); - GP_FN_PER_BPP(GP_Circle, context, xcenter, ycenter, r, pixel); + GP_FN_PER_BPP(GP_Circle, context->bpp, context, + xcenter, ycenter, r, pixel); } void GP_TCircle(GP_Context *context, int xcenter, int ycenter, diff --git a/core/GP_Ellipse.c b/core/GP_Ellipse.c index d499501..c3fefbb 100644 --- a/core/GP_Ellipse.c +++ b/core/GP_Ellipse.c @@ -41,7 +41,8 @@ void GP_Ellipse(GP_Context *context, int xcenter, int ycenter, { GP_CHECK_CONTEXT(context); - GP_FN_PER_BPP(GP_Ellipse, context, xcenter, ycenter, a, b, pixel); + GP_FN_PER_BPP(GP_Ellipse, context->bpp, context, + xcenter, ycenter, a, b, pixel); } void GP_TEllipse(GP_Context *context, int xcenter, int ycenter, diff --git a/core/GP_FillCircle.c b/core/GP_FillCircle.c index e2a0f1f..a7cacb1 100644 --- a/core/GP_FillCircle.c +++ b/core/GP_FillCircle.c @@ -41,7 +41,8 @@ void GP_FillCircle(GP_Context *context, int xcenter, int ycenter, { GP_CHECK_CONTEXT(context); - GP_FN_PER_BPP(GP_FillCircle, context, xcenter, ycenter, r, pixel); + GP_FN_PER_BPP(GP_FillCircle, context->bpp, context, + xcenter, ycenter, r, pixel); } void GP_TFillCircle(GP_Context *context, int xcenter, int ycenter, diff --git a/core/GP_FillEllipse.c b/core/GP_FillEllipse.c index 79df163..5625012 100644 --- a/core/GP_FillEllipse.c +++ b/core/GP_FillEllipse.c @@ -41,7 +41,8 @@ void GP_FillEllipse(GP_Context *context, int xcenter, int ycenter, { GP_CHECK_CONTEXT(context); - GP_FN_PER_BPP(GP_FillEllipse, context, xcenter, ycenter, a, b, pixel); + GP_FN_PER_BPP(GP_FillEllipse, context->bpp, context, + xcenter, ycenter, a, b, pixel); } void GP_TFillEllipse(GP_Context *context, int xcenter, int ycenter, diff --git a/core/GP_FnPerBpp.h b/core/GP_FnPerBpp.h index 0e3da13..2a745e7 100644 --- a/core/GP_FnPerBpp.h +++ b/core/GP_FnPerBpp.h @@ -31,49 +31,49 @@ * Extra arguments are arguments to be passed to the function. * Returns GP_ENOIMPL if the bit depth is unknown. */ -#define GP_FN_PER_BPP(FN_NAME, context, args ...) +#define GP_FN_PER_BPP(FN_NAME, bpp, ...) - switch (context->bpp) { + switch (bpp) { case 1: - FN_NAME##1bpp(context, ##args); + FN_NAME##1bpp(__VA_ARGS__); break; case 2: - FN_NAME##2bpp(context, ##args); + FN_NAME##2bpp(__VA_ARGS__); break; case 4: - FN_NAME##4bpp(context, ##args); + FN_NAME##4bpp(__VA_ARGS__); break; case 8: - FN_NAME##8bpp(context, ##args); + FN_NAME##8bpp(__VA_ARGS__); break; case 16: - FN_NAME##16bpp(context, ##args); + FN_NAME##16bpp(__VA_ARGS__); break; case 24: - FN_NAME##24bpp(context, ##args); + FN_NAME##24bpp(__VA_ARGS__); break; case 32: - FN_NAME##32bpp(context, ##args); + FN_NAME##32bpp(__VA_ARGS__); break; default: break; } -#define GP_FN_RET_PER_BPP(FN_NAME, context, args ...) +#define GP_FN_RET_PER_BPP(FN_NAME, bpp, ...) - switch (context->bpp) { + switch (bpp) { case 1: - return FN_NAME##1bpp(context, ##args); + return FN_NAME##1bpp(__VA_ARGS__); case 2: - return FN_NAME##2bpp(context, ##args); + return FN_NAME##2bpp(__VA_ARGS__); case 4: - return FN_NAME##4bpp(context, ##args); + return FN_NAME##4bpp(__VA_ARGS__); case 8: - return FN_NAME##8bpp(context, ##args); + return FN_NAME##8bpp(__VA_ARGS__); case 16: - return FN_NAME##16bpp(context, ##args); + return FN_NAME##16bpp(__VA_ARGS__); case 24: - return FN_NAME##24bpp(context, ##args); + return FN_NAME##24bpp(__VA_ARGS__); case 32: - return FN_NAME##32bpp(context, ##args); + return FN_NAME##32bpp(__VA_ARGS__); } diff --git a/core/GP_GetPixel.c b/core/GP_GetPixel.c index 1f08f0c..3bbd201 100644 --- a/core/GP_GetPixel.c +++ b/core/GP_GetPixel.c @@ -47,7 +47,7 @@ GP_Pixel GP_GetPixel(GP_Context *context, int x, int y) { GP_CHECK_CONTEXT(context); - GP_FN_RET_PER_BPP(GP_GetPixel, context, x, y); + GP_FN_RET_PER_BPP(GP_GetPixel, context->bpp, context, x, y); return 0; } diff --git a/core/GP_HLine.c b/core/GP_HLine.c index 9e14052..71c4671 100644 --- a/core/GP_HLine.c +++ b/core/GP_HLine.c @@ -40,7 +40,7 @@ void GP_HLineXXY(GP_Context *context, int x0, int x1, int y, GP_Pixel pixel) { GP_CHECK_CONTEXT(context); - GP_FN_PER_BPP(GP_HLine, context, x0, x1, y, pixel); + GP_FN_PER_BPP(GP_HLine, context->bpp, context, x0, x1, y, pixel); } void GP_HLineXYW(GP_Context *context, int x, int y, unsigned int w, diff --git a/core/GP_Line.c b/core/GP_Line.c index d8f495f..23ea98d 100644 --- a/core/GP_Line.c +++ b/core/GP_Line.c @@ -41,7 +41,7 @@ void GP_Line(GP_Context *context, int x0, int y0, int x1, int y1, { GP_CHECK_CONTEXT(context); - GP_FN_PER_BPP(GP_Line, context, x0, y0, x1, y1, pixel); + GP_FN_PER_BPP(GP_Line, context->bpp, context, x0, y0, x1, y1, pixel); } void GP_TLine(GP_Context *context, int x0, int y0, int x1, int y1, diff --git a/core/GP_PutPixel.c b/core/GP_PutPixel.c index 5e62a5b..70bd85d 100644 --- a/core/GP_PutPixel.c +++ b/core/GP_PutPixel.c @@ -52,7 +52,7 @@ void GP_PutPixel(GP_Context *context, int x, int y, GP_Pixel pixel) { GP_CHECK_CONTEXT(context); - GP_FN_PER_BPP(GP_PutPixel, context, x, y, pixel); + GP_FN_PER_BPP(GP_PutPixel, context->bpp, context, x, y, pixel); } void GP_TPutPixel(GP_Context *context, int x, int y, GP_Pixel pixel) diff --git a/core/GP_Text.c b/core/GP_Text.c index f9bc779..4e331b0 100644 --- a/core/GP_Text.c +++ b/core/GP_Text.c @@ -86,7 +86,8 @@ GP_RetCode GP_Text(GP_Context *context, const GP_TextStyle *style, return GP_EINVAL; } - GP_FN_PER_BPP(GP_Text, context, style, topleft_x, topleft_y, str, pixel); + GP_FN_PER_BPP(GP_Text, context->bpp, context, + style, topleft_x, topleft_y, str, pixel); return GP_ESUCCESS; } diff --git a/core/GP_VLine.c b/core/GP_VLine.c index 91e59b3..3985329 100644 --- a/core/GP_VLine.c +++ b/core/GP_VLine.c @@ -40,7 +40,7 @@ void GP_VLineXYY(GP_Context *context, int x, int y0, int y1, GP_Pixel pixel) { GP_CHECK_CONTEXT(context); - GP_FN_PER_BPP(GP_VLine, context, x, y0, y1, pixel); + GP_FN_PER_BPP(GP_VLine, context->bpp, context, x, y0, y1, pixel); } void GP_VLineXYH(GP_Context *context, int x, int y, unsigned int height, diff --git a/filters/GP_Rotate.c b/filters/GP_Rotate.c index 0d46a9c..6f595fc 100644 --- a/filters/GP_Rotate.c +++ b/filters/GP_Rotate.c @@ -77,7 +77,7 @@ GP_RetCode GP_MirrorV(GP_Context *context) if (context == NULL) return GP_ENULLPTR; - GP_FN_PER_BPP(GP_MirrorV, context); + GP_FN_PER_BPP(GP_MirrorV, context->bpp, context); return GP_ESUCCESS; } @@ -95,7 +95,7 @@ GP_RetCode GP_RotateCW(GP_Context *context) if (context == NULL) return GP_ENULLPTR; - GP_FN_RET_PER_BPP(GP_RotateCW, context); + GP_FN_RET_PER_BPP(GP_RotateCW, context->bpp, context); return GP_ENOIMPL; } @@ -113,7 +113,7 @@ GP_RetCode GP_RotateCCW(GP_Context *context) if (context == NULL) return GP_ENULLPTR; - GP_FN_RET_PER_BPP(GP_RotateCCW, context); + GP_FN_RET_PER_BPP(GP_RotateCCW, context->bpp, context); return GP_ENOIMPL; } ----------------------------------------------------------------------- Summary of changes: core/GP_Circle.c | 3 ++- core/GP_Ellipse.c | 3 ++- core/GP_FillCircle.c | 3 ++- core/GP_FillEllipse.c | 3 ++- core/GP_FnPerBpp.h | 36 ++++++++++++++++++------------------ core/GP_GetPixel.c | 2 +- core/GP_HLine.c | 2 +- core/GP_Line.c | 2 +- core/GP_PutPixel.c | 2 +- core/GP_Text.c | 3 ++- core/GP_VLine.c | 2 +- filters/GP_Rotate.c | 6 +++--- 12 files changed, 36 insertions(+), 31 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

[repo.or.cz] gfxprim.git branch master updated: 852d0d3925acf658dd96979bfbaef0dabb45e81b
by gavento 22 May '11

22 May '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, master has been updated via 852d0d3925acf658dd96979bfbaef0dabb45e81b (commit) via 266c6d21983c196e2071c65d6b5d14d201d9392c (commit) from 983969d8fad548991c47cf81e7e013308fcf6a70 (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/852d0d3925acf658dd96979bfbaef0dabb45… commit 852d0d3925acf658dd96979bfbaef0dabb45e81b Merge: 266c6d2 983969d Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun May 22 11:45:06 2011 +0200 Merge branch 'master' of git://repo.or.cz/gfxprim http://repo.or.cz/w/gfxprim.git/commit/266c6d21983c196e2071c65d6b5d14d201d9… commit 266c6d21983c196e2071c65d6b5d14d201d9392c Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun May 22 11:41:36 2011 +0200 Unified ASSERT/ABORT/CHECK code, printf-like behaviour diff --git a/core/GP_Common.h b/core/GP_Common.h index c6005f8..19cc9b9 100644 --- a/core/GP_Common.h +++ b/core/GP_Common.h @@ -65,40 +65,53 @@ /* * Aborts and prints the message along with the location in code * to stderr. Used for fatal errors. + * + * Use as either GP_ABORT(), GP_ABORT(msg) or GP_ABORT(format, params...) where + * msg and format must be string constants. */ -#define GP_ABORT(msg) do { - fprintf(stderr, "*** gfxprim: aborted: %s:%d: in %s: %sn", - __FILE__, __LINE__, __FUNCTION__, msg); +#define GP_ABORT(...) do { + fprintf(stderr, "*** gfxprim: %s:%d: in %s: ", + __FILE__, __LINE__, __FUNCTION__); + fprintf(stderr, "" __VA_ARGS__); + if (! (#__VA_ARGS__ [0])) + fprintf(stderr, "abort()"); + fprintf(stderr, "n"); abort(); } while (0) /* + * Internal macro with common code for GP_ASSERT and GP_CHECK. + */ +#define GP_GENERAL_CHECK(check_cond_, check_message_, ...) do { + if (unlikely(!(check_cond_))) + if (#__VA_ARGS__ [0]) + GP_ABORT(check_message_ #check_cond_ "n" __VA_ARGS__); + else + GP_ABORT(check_message_ #check_cond_); +} while (0) + +/* * Checks the condition and aborts immediately if it is not satisfied, * printing the condition and location in the source. - * (Intended for checking for bugs within the library itself. - * GP_CHECK is used for reporting user errors, like invalid arguments.) + * (Intended for checking for bugs within the library itself.) + * + * Use as either GP_ASSERT(cond), GP_ASSERT(cond, msg) or + * GP_ASSERT(cond, format, params...) where msg and format must be string + * constants. */ -#define GP_ASSERT(cond) do { - if (unlikely(!(cond))) { - fprintf(stderr, "*** gfxprim: %s:%d: in %s: BUG: assertion failed: %sn", - __FILE__, __LINE__, __FUNCTION__, #cond); - abort(); - } -} while (0) +#define GP_ASSERT(check_cond_, ...) + GP_GENERAL_CHECK(check_cond_, "asserion failed: ", ##__VA_ARGS__); /* * Perform a runtime check, on failure abort and print a message. - * (This macro is intended for checks for user-caused errors, - * like invalid arguments, leaving the library in improper state etc. - * For internal sanity checks, use GP_ASSERT.) + * (Intended for user-caused errors like invalid arguments.) + * + * Use as either GP_CHECK(cond), GP_CHECK(cond, msg) or + * GP_CHECK(cond, format, params...) where msg and format must be string + * constants. */ -#define GP_CHECK(cond, msg) do { - if (unlikely(!(cond))) { - fprintf(stderr, "*** gfxprim: %s:%d: in %s: %sn", - __FILE__, __LINE__, __FUNCTION__, msg); - abort(); - } -} while (0) +#define GP_CHECK(check_cond_, ...) + GP_GENERAL_CHECK(check_cond_, "check failed: ", ##__VA_ARGS__); /* * Swap a and b using an intermediate variable ----------------------------------------------------------------------- Summary of changes: core/GP_Common.h | 57 +++++++++++++++++++++++++++++++++-------------------- 1 files changed, 35 insertions(+), 22 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

[repo.or.cz] gfxprim.git branch master updated: 983969d8fad548991c47cf81e7e013308fcf6a70
by metan 22 May '11

22 May '11

1 0

[repo.or.cz] gfxprim.git branch master updated: ab15bc2a2e7b7636d7e0481251615c360de17c3f
by metan 22 May '11

22 May '11

1 0

[repo.or.cz] gfxprim.git branch master updated: 94a7d269628a94cf585ed33951bac25b370f20cc
by bluebear 22 May '11

22 May '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, master has been updated via 94a7d269628a94cf585ed33951bac25b370f20cc (commit) from 48a02d9f6947b24c9b1ea70effaeee5191bf454a (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/94a7d269628a94cf585ed33951bac25b370f… commit 94a7d269628a94cf585ed33951bac25b370f20cc Author: BlueBear <jiri.bluebear.dluhos(a)gmail.com> Date: Sun May 22 02:47:54 2011 +0200 First try on backend event API. diff --git a/backends/GP_Backend_SDL.c b/backends/GP_Backend_SDL.c index 17a3d20..af746c1 100644 --- a/backends/GP_Backend_SDL.c +++ b/backends/GP_Backend_SDL.c @@ -32,6 +32,18 @@ #include <SDL/SDL.h> struct GP_Backend GP_SDL_backend; +static SDL_Surface *GP_SDL_display = NULL; +static GP_Context GP_SDL_context; + +/* Functions from the SDL library, dynamically loaded in GP_SDL_InitFn(). */ +static void (*dyn_SDL_Quit)(void); +static int (*dyn_SDL_Init)(int); +static SDL_Surface *(*dyn_SDL_SetVideoMode)(int, int, int, uint32_t); +static void (*dyn_SDL_UpdateRect)(SDL_Surface *, int, int, int, int); +static int (*dyn_SDL_WaitEvent)(SDL_Event *); + +/* User callbacks. */ +static void (*GP_SDL_update_video_callback)(void) = NULL; /* * Checks whether pixel color component masks in the given surface are equal @@ -142,14 +154,6 @@ inline GP_RetCode GP_SDL_ContextFromSurface( return GP_ESUCCESS; } -static SDL_Surface *GP_SDL_display = NULL; -static GP_Context GP_SDL_context; - -static void (*dyn_SDL_Quit)(void); -static int (*dyn_SDL_Init)(int); -static SDL_Surface *(*dyn_SDL_SetVideoMode)(int, int, int, uint32_t); -static void (*dyn_SDL_UpdateRect)(SDL_Surface *, int, int, int, int); - static void GP_SDL_ShutdownFn(void) { dyn_SDL_Quit(); @@ -165,6 +169,7 @@ static struct GP_Backend *GP_SDL_InitFn(void) dyn_SDL_Quit = dlsym(library, "SDL_Quit"); dyn_SDL_UpdateRect = dlsym(library, "SDL_UpdateRect"); dyn_SDL_SetVideoMode = dlsym(library, "SDL_SetVideoMode"); + dyn_SDL_WaitEvent = dlsym(library, "SDL_WaitEvent"); if (dyn_SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER) != 0) return NULL; @@ -199,13 +204,34 @@ static void GP_SDL_UpdateVideoFn(void) GP_SDL_display->w, GP_SDL_display->h); } +static int GP_SDL_GetEventFn(struct GP_BackendEvent *event) +{ + SDL_Event sdl_event; + + if (dyn_SDL_WaitEvent(&sdl_event) == 0) + return 0; + + switch (sdl_event.type) { + case SDL_VIDEOEXPOSE: + event->type = GP_BACKEND_EVENT_UPDATE_VIDEO; + return 1; + case SDL_QUIT: + event->type = GP_BACKEND_EVENT_QUIT_REQUEST; + return 1; + } + + /* for the time being, unknown events are simply ignored */ + return 0; +} + struct GP_Backend GP_SDL_backend = { - "SDL", - GP_SDL_InitFn, - GP_SDL_ShutdownFn, - GP_SDL_OpenVideoFn, - GP_SDL_VideoContextFn, - GP_SDL_UpdateVideoFn + .name = "SDL", + .init_fn = GP_SDL_InitFn, + .shutdown_fn = GP_SDL_ShutdownFn, + .open_video_fn = GP_SDL_OpenVideoFn, + .video_context_fn = GP_SDL_VideoContextFn, + .update_video_fn = GP_SDL_UpdateVideoFn, + .get_event_fn = GP_SDL_GetEventFn, }; #endif /* GP_HAVE_SDL */ diff --git a/core/GP_Backend.c b/core/GP_Backend.c index f1cbce5..12d2e5d 100644 --- a/core/GP_Backend.c +++ b/core/GP_Backend.c @@ -28,7 +28,9 @@ #include <string.h> -/* The current backend. */ +/* + * The currently active backend (NULL if none). + */ static struct GP_Backend *current_backend = NULL; #ifdef GP_HAVE_SDL @@ -76,3 +78,9 @@ void GP_UpdateBackendVideo(void) GP_CHECK(current_backend, "no current backend"); return current_backend->update_video_fn(); } + +int GP_GetBackendEvent(struct GP_BackendEvent *event) +{ + GP_CHECK(current_backend, "no current backend"); + return current_backend->get_event_fn(event); +} diff --git a/core/GP_Backend.h b/core/GP_Backend.h index afe7f67..d1dff51 100644 --- a/core/GP_Backend.h +++ b/core/GP_Backend.h @@ -28,6 +28,23 @@ #include "GP_Context.h" +/* + * Types of events provided by the backend. + */ +enum GP_BackendEventType { + GP_BACKEND_EVENT_NONE = 0, + GP_BACKEND_EVENT_UPDATE_VIDEO = 1, /* video redraw is needed */ + GP_BACKEND_EVENT_QUIT_REQUEST = 2, /* user requests quitting */ +}; + +/* + * Structure describing an event reported by a backend. + */ +struct GP_BackendEvent { + enum GP_BackendEventType type; +}; + +/* Describes a backend and holds all its API functions. */ struct GP_Backend { const char *name; struct GP_Backend *(*init_fn)(void); @@ -35,13 +52,14 @@ struct GP_Backend { GP_Context *(*open_video_fn)(int w, int h, int flags); GP_Context *(*video_context_fn)(void); void (*update_video_fn)(void); + int (*get_event_fn)(struct GP_BackendEvent *event); }; /* * Attempts to initialize a backend. * * If name is specified, only that backend is tried; if name is NULL, - * all known backends are tried and the first usable is picked. + * all known backends are tried and the first usable one is picked. * * Returns the backend structure, or NULL on failure. */ @@ -65,4 +83,10 @@ GP_Context *GP_GetBackendVideoContext(void); */ void GP_UpdateBackendVideo(void); +/* + * Reads the first pending backend event. + * Returns 0 if no events were pending, 1 on success. + */ +int GP_GetBackendEvent(struct GP_BackendEvent *event); + #endif diff --git a/targets/sdl/tests/sierpinsky.c b/targets/sdl/tests/sierpinsky.c index 99fc99a..1136a45 100644 --- a/targets/sdl/tests/sierpinsky.c +++ b/targets/sdl/tests/sierpinsky.c @@ -41,7 +41,7 @@ #define sgn(x) ((x)>0 ? 1 : -1) SDL_Surface *display; -GP_Context context; +GP_Context *context; SDL_TimerID timer; @@ -51,15 +51,15 @@ GP_Pixel black, blue, gray, red; int draw_edge = 1; -static void sierpinsky(SDL_Surface *surf, double x1, double y1, double x4, double y4, int iter) +static void sierpinsky(double x1, double y1, double x4, double y4, int iter) { double x2, y2, x3, y3, x5, y5; GP_Pixel pixel; - GP_RGBToPixel(&context, 0, 0, 255-16*iter, &pixel); + GP_RGBToPixel(context, 0, 0, 255-16*iter, &pixel); if (iter <= 0) { if (draw_edge) - GP_Line(&context, x1, y1, x4, y4, black); + GP_Line(context, x1, y1, x4, y4, black); return; } @@ -72,23 +72,23 @@ static void sierpinsky(SDL_Surface *surf, double x1, double y1, double x4, doubl x5 = (x1+x4)/2 + (y2 - y3)*sqrt(3.00/4); y5 = (y1+y4)/2 + (x3 - x2)*sqrt(3.00/4); - GP_FillTriangle(&context, x2, y2, x3, y3, x5, y5, pixel); + GP_FillTriangle(context, x2, y2, x3, y3, x5, y5, pixel); - GP_PutPixel(&context, x2, y2, red); - GP_PutPixel(&context, x3, y3, red); - GP_PutPixel(&context, x5, y5, red); + GP_PutPixel(context, x2, y2, red); + GP_PutPixel(context, x3, y3, red); + GP_PutPixel(context, x5, y5, red); - sierpinsky(surf, x1, y1, x2, y2, iter - 1); - sierpinsky(surf, x2, y2, x5, y5, iter - 1); - sierpinsky(surf, x5, y5, x3, y3, iter - 1); - sierpinsky(surf, x3, y3, x4, y4, iter - 1); + sierpinsky(x1, y1, x2, y2, iter - 1); + sierpinsky(x2, y2, x5, y5, iter - 1); + sierpinsky(x5, y5, x3, y3, iter - 1); + sierpinsky(x3, y3, x4, y4, iter - 1); } -static void draw(SDL_Surface *surf, int x, int y, int l, int iter) +static void draw(int x, int y, int l, int iter) { double x1, y1, x2, y2, x3, y3; - int w = surf->w; - int h = surf->h; + int w = context->w; + int h = context->h; l = ((w < h ? w : h) - 20)/(5 - 1.00*iter/120); @@ -101,15 +101,15 @@ static void draw(SDL_Surface *surf, int x, int y, int l, int iter) x3 = sin(1.00 * (iter+240)/57) * l + x; y3 = cos(1.00 * (iter+240)/57) * l + y; - GP_Fill(&context, gray); + GP_Fill(context, gray); - GP_FillTriangle(&context, x1, y1, x2, y2, x3, y3, blue); + GP_FillTriangle(context, x1, y1, x2, y2, x3, y3, blue); - sierpinsky(surf, x1, y1, x2, y2, iter/60%6); - sierpinsky(surf, x2, y2, x3, y3, iter/60%6); - sierpinsky(surf, x3, y3, x1, y1, iter/60%6); - - SDL_UpdateRect(surf, 0, 0, surf->w, surf->h); + sierpinsky(x1, y1, x2, y2, iter/60%6); + sierpinsky(x2, y2, x3, y3, iter/60%6); + sierpinsky(x3, y3, x1, y1, iter/60%6); + + GP_UpdateBackendVideo(); } int paused = 0; @@ -127,7 +127,7 @@ Uint32 timer_callback(Uint32 interval __attribute__ ((unused)), void *ptr __attr if (iter < 2 * way) way *= 1; - draw(display, display->w/2, display->h/2, l, iter); + draw(display->w/2, display->h/2, l, iter); return TIMER_TICK; } @@ -136,6 +136,16 @@ int main(void) { SDL_Event ev; + if (!GP_InitBackend("SDL")) { + fprintf(stderr, "error: could not initialize backendn"); + return 2; + } + if (!GP_OpenBackendVideo(DISPLAY_W, DISPLAY_H, 0)) { + fprintf(stderr, "error: could not open videon"); + return 2; + } + +/* if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) != 0) return -1; @@ -147,14 +157,18 @@ int main(void) } GP_SDL_ContextFromSurface(&context, display); +*/ + + display = SDL_GetVideoSurface(); + context = GP_GetBackendVideoContext(); - GP_ColorNameToPixel(&context, GP_COL_BLACK, &black); - GP_ColorNameToPixel(&context, GP_COL_BLUE, &blue); - GP_ColorNameToPixel(&context, GP_COL_GRAY_LIGHT, &gray); - GP_ColorNameToPixel(&context, GP_COL_RED, &red); + GP_ColorNameToPixel(context, GP_COL_BLACK, &black); + GP_ColorNameToPixel(context, GP_COL_BLUE, &blue); + GP_ColorNameToPixel(context, GP_COL_GRAY_LIGHT, &gray); + GP_ColorNameToPixel(context, GP_COL_RED, &red); iter = 0; - draw(display, display->w/2, display->h/2, l, iter); + draw(display->w/2, display->h/2, l, iter); timer = SDL_AddTimer(0, timer_callback, NULL); ----------------------------------------------------------------------- Summary of changes: backends/GP_Backend_SDL.c | 54 +++++++++++++++++++++++-------- core/GP_Backend.c | 10 +++++- core/GP_Backend.h | 26 ++++++++++++++- targets/sdl/tests/sierpinsky.c | 70 ++++++++++++++++++++++++---------------- 4 files changed, 116 insertions(+), 44 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

[repo.or.cz] gfxprim.git branch master updated: 48a02d9f6947b24c9b1ea70effaeee5191bf454a
by bluebear 21 May '11

21 May '11

1 0

[repo.or.cz] gfxprim.git branch master updated: 3e089f991eb2a1946964b6d42357db197d3be099
by bluebear 09 May '11

09 May '11

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

Gfxprim May 2011