Revert "Fix Mac build"

This reverts commit 11b8fc1311ea9cd493960025af60d15326a6b4ab.

This revert should probably be deleted later...
on-demand tracing: prevent duplicate shaders from being added to a program.
* std::list::unique() does not appear to work on OS X.
on-demand tracing: OS X does not like the use of GLuint when GLhandleARB should be used
on-demand tracing: Fix include paths for OS X and Linux state snapshots
on-demand tracing: Fix issues that appeared while testing with GpuTest
* Add GL_MULTISAMPLE to state which can be enabled and disabled
* Fix attribute binding that happens as part of glLinkProgram. It was using sizeof() which was not returning the proper size of the character array, so the queried names would be truncated and their location could not be found. Thus the attributes were not being bound in the trace file, and the program could not be retraced properly.