Fix some AMD shader errors.

023_waves: Redeclaration of 'w'.
031_brick_torus.cpp: illegal variable name 'input'.