Partial fix for issue #13 shader. Indexing def/defi constants not done yet.