Fix shadowed variable warning.

Change-Id: I9bea1c5d76edc4635ea7f8cffadb441bb10d9126
A number of Parallel and MPI fixes for OpenGL2

Fixed a compile issue and a bunch of failing tests for
Parallel and MPI. Had to add support for hardware off
screen windows back in.  Basically just updated the code
that is in OpenGL1 for OpenGL2. Also needed a couple other
minor fixes that these tests identified.

Change-Id: I2365fe7024248607e70dc763599ab4c7db1495d8
Fix edge color with composite polydata mapper 2

Change-Id: I88a945b3f1da0733b411c24027452e16d30ddbc7
Merge topic 'edge_vis_cpdm2' into master

893c3c5c Fix edge color with composite polydata mapper 2
Added some ifdef needed for OpenGL ES 20

Change-Id: I19b5acbec07a1ee4493876e9fedbda2befe749ad
Merge topic 'opengles_fixes' into master

f497ed3a Added some ifdef needed for OpenGL ES 20
Merge topic 'silence-warning' into master

eff2e37f Fix shadowed variable warning.
ENH: Added support for ClampToBorder (as it was in OpenGL)

Change-Id: I92fa3a2a9acc8b82327651ae76413444a32a0631
ENH: Added support for border color
Merge topic 'OpenGL2-Texture-ClampBorder' into master

0b64c2e2 ENH: Added support for ClampToBorder (as it was in OpenGL)
Merge topic 'parallel_fixes' into master

022ae36a A number of Parallel and MPI fixes for OpenGL2
Fix a bad merge

Change-Id: Ic2e9859bd4f4e525bddd42ee4bac8ac92385ea36
Merge topic 'fix_bad_merge' into master

e1d90d07 Fix a bad merge
Fix RenderingParallel when wrapped and fix a compiler warning

Change-Id: Ib01b1477250a9aab64c7d32f16537558f1f988a6
Merge topic 'wrap_parallel_fix' into master

896b83f8 Fix RenderingParallel when wrapped and fix a compiler warning