!UPSTREAM: i965/gs: Fix gl_PrimitiveIDIn when using SW primitive restart.

TODO: We really ought to set _NEW_PROGRAM_CONSTANTS only when software
primitive restart is in use.  Currently we set it for hardware
primitive restart too.
i965/gs: Fix ordering of triangle strip vertices with primitive restart.

FOO!