remove last references to gfx2 module

compiler/res/prog8lib/cx16/gfx_hires4.p8

@@ -185,7 +185,7 @@ gfx_hires4 {
         position2(xx,yy,true)
         set_both_strides(13)    ; 160 increment = 1 line in 640 px 4c mode
         ;; color &= 3
-        ;; color <<= gfx2.plot.shift4c[lsb(xx) & 3]
+        ;; color <<= plot.shift4c[lsb(xx) & 3]
         cx16.r2L = lsb(xx) & 3
         when color & 3 {
             0 -> color = 0

compiler/res/prog8lib/cx16/gfx_lores.p8

@@ -269,7 +269,7 @@ gfx_lores {
     sub line(uword x1, ubyte y1, uword x2, ubyte y2, ubyte color) {
         ; Bresenham algorithm.
         ; This code special-cases various quadrant loops to allow simple ++ and -- operations.
-        ; NOTE:  this is about twice as fast as the kernal routine GRAPH_draw_line, and ~3-4 times as fast as gfx2.line()
+        ; NOTE:  this is about twice as fast as the kernal routine GRAPH_draw_line
         ;        it trades memory for speed (uses inline plot routine and multiplication lookup tables)
         ;
         ; NOTE:  is currently still a regular 6502 routine, could likely be made much faster with the VeraFX line helper.

compiler/res/prog8lib/cx16/graphics.p8

@@ -4,7 +4,7 @@
 ; Wraps the graphics functions that are in ROM.
 ; Only lo-res 320x240 256 color mode for now.
 ; Unlike graphics module on the C64, you can use colors() to set new drawing colors for every draw operation.
-; For other resolutions or other color modes, use the "gfx2" or "monogfx" module instead. (which is Cx16-specific)
+; For other resolutions or other color modes, use the "gfx_lores", "gfx_hires4", or "monogfx" module instead.
 ; Note: there is no color palette manipulation here, you have to do that yourself or use the "palette" module.
 ;
 ; NOTE: For sake of speed, NO BOUNDS CHECKING is performed in most routines!

compiler/res/prog8lib/cx16/monogfx.p8

@@ -2,9 +2,8 @@
 ; Using the full-screen 640x480 and 320x240 screen modes, in 1 bpp mode (black/white).
 ;
 ; No text layer is currently shown, but text can be drawn as part of the bitmap itself.
-; For color bitmap graphics, see the gfx2 library.
+; For color bitmap graphics, see the gfx_lores or gfx_hires4 libraries.
 ;
-; NOTE: a lot of the code here is similar or the same to that in gfx2
 ; NOTE: For sake of speed, NO BOUNDS CHECKING is performed in most routines!
 ;       You'll have to make sure yourself that you're not writing outside of bitmap boundaries!
 

docs/import-all-cx16.p8

@@ -10,7 +10,8 @@
 %import diskio
 %import emudbg
 %import floats
-%import gfx2
+%import gfx_hires4
+%import gfx_lores
 %import graphics
 %import math
 %import monogfx

docs/source/todo.rst

@@ -1,21 +1,19 @@
 TODO
 ====
 
-remove all remaining 'gfx2' references in code and docs
+-splitarrays option gets the compiler in an infinite loop sometimes (on examples/animals.p8 for example)
-
-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)
 
-for releasenotes: gfx2.width and gfx2.height got renamed as gfx_lores.WIDTH/HEIGHT or gfx_hires4.WIDTH/HEIGTH constants.
+for releasenotes: gfx2.width and gfx2.height got renamed as gfx_lores.WIDTH/HEIGHT or gfx_hires4.WIDTH/HEIGTH constants.  Screen mode routines also renamed.
 
 replace zsound example by a zsmkit example
 contribute a short how-to to the zsmkit repo for building a suitable blob
 write a howto for integrating third party library code like zsmkit and vtui
 
 
+regenerate symbol dump files
+
 
 Improve register load order in subroutine call args assignments:
 in certain situations, the "wrong" order of evaluation of function call arguments is done which results

syntax-files/Vim/prog8_builtins.vim

@@ -412,38 +412,6 @@ syn match prog8BuiltInFunc "\<floats\.FREADUY\>"
 syn match prog8BuiltInFunc "\<floats\.h\>"
 
 
-" cx16/gfx2.p8
-syn match prog8BuiltInVar "\<gfx2\.active_mode\>"
-syn match prog8BuiltInVar "\<gfx2\.width\>"
-syn match prog8BuiltInVar "\<gfx2\.height\>"
-syn match prog8BuiltInVar "\<gfx2\.bpp\>"
-syn match prog8BuiltInVar "\<gfx2\.monochrome_dont_stipple_flag\>"
-syn match prog8BuiltInFunc "\<gfx2\.screen_mode\>"
-syn match prog8BuiltInFunc "\<gfx2\.clear_screen\>"
-syn match prog8BuiltInFunc "\<gfx2\.monochrome_stipple\>"
-syn match prog8BuiltInFunc "\<gfx2\.rect\>"
-syn match prog8BuiltInFunc "\<gfx2\.fillrect\>"
-syn match prog8BuiltInFunc "\<gfx2\.horizontal_line\>"
-syn match prog8BuiltInFunc "\<gfx2\.vertical_line\>"
-syn match prog8BuiltInFunc "\<gfx2\.line\>"
-syn match prog8BuiltInFunc "\<gfx2\.circle\>"
-syn match prog8BuiltInFunc "\<gfx2\.disc\>"
-syn match prog8BuiltInFunc "\<gfx2\.plot\>"
-syn match prog8BuiltInFunc "\<gfx2\.position\>"
-syn match prog8BuiltInFunc "\<gfx2\.next_pixel\>"
-syn match prog8BuiltInFunc "\<gfx2\.next_pixels\>"
-syn match prog8BuiltInFunc "\<gfx2\.set_8_pixels_from_bits\>"
-syn match prog8BuiltInVar "\<gfx2\.charset_orig_bank\>"
-syn match prog8BuiltInVar "\<gfx2\.charset_orig_addr\>"
-syn match prog8BuiltInVar "\<gfx2\.charset_bank\>"
-syn match prog8BuiltInVar "\<gfx2\.charset_addr\>"
-syn match prog8BuiltInFunc "\<gfx2\.text_charset\>"
-syn match prog8BuiltInFunc "\<gfx2\.text\>"
-syn match prog8BuiltInFunc "\<gfx2\.cs_innerloop640\>"
-syn match prog8BuiltInFunc "\<gfx2\.addr_mul_24_for_highres_4c\>"
-syn match prog8BuiltInFunc "\<gfx2\.addr_mul_24_for_lores_256c\>"
-
-
 " cx16/graphics.p8
 syn match prog8BuiltInVar "\<graphics\.WIDTH\>"
 syn match prog8BuiltInVar "\<graphics\.HEIGHT\>"