finish merge of gpu 2d and cmdline control for gpu

Signed-off-by: Bryan Smith <zarboz@gmail.com>