diff --git a/benchmark-program/b_circles.p8 b/benchmark-program/b_circles.p8 index 791ce2df1..a30cdb934 100644 --- a/benchmark-program/b_circles.p8 +++ b/benchmark-program/b_circles.p8 @@ -1,4 +1,4 @@ -%import gfx2 +%import gfx_lores %import math circles { @@ -14,7 +14,7 @@ circles { if use_kernal void cx16.set_screen_mode(128) else - gfx2.screen_mode(1) + gfx_lores.graphics_mode() math.rndseed(12345,6789) cbm.SETTIM(0,0,0) @@ -28,14 +28,14 @@ circles { cx16.GRAPH_clear() } else - gfx2.clear_screen(0) + gfx_lores.clear_screen(0) total_num_circles += draw_circles(use_kernal, max_time) } if use_kernal void cx16.set_screen_mode(3) else { - gfx2.screen_mode(0) + gfx_lores.text_mode() } return total_num_circles @@ -66,7 +66,7 @@ circles { cx16.GRAPH_draw_oval(x-radius, y-radius, radius*2, radius*2, true) } else - gfx2.disc(x, y as ubyte, radius, color) + gfx_lores.disc(x, y as ubyte, radius, color) circle_x[num_circles] = x circle_y[num_circles] = y circle_radius[num_circles] = radius diff --git a/benchmark-program/benchmark.p8 b/benchmark-program/benchmark.p8 index 7209b9cbb..e8d053277 100644 --- a/benchmark-program/benchmark.p8 +++ b/benchmark-program/benchmark.p8 @@ -62,7 +62,7 @@ main { benchmark_score[benchmark_number] = adpcm.decode_benchmark(300) benchmark_number++ - announce_benchmark("circles with gfx2") + announce_benchmark("circles with gfx_lores") benchmark_score[benchmark_number] = circles.draw(false, 300) benchmark_number++ diff --git a/docs/source/todo.rst b/docs/source/todo.rst index 173d6a832..3f2e04a78 100644 --- a/docs/source/todo.rst +++ b/docs/source/todo.rst @@ -1,6 +1,10 @@ TODO ==== +remove all remaining 'gfx2' references in code and docs + +benchmark program is slightly slower than before. why + paint and rockrunner are a couple of bytes bigger. why? merge problem: if 2 library modules both have merge, stuff breaks (math & prog8_math where prog8_math used to have math block.... didn't work)