windows fixes for opengl

Change-Id: I2ee3bcf9f87b46c14af26adb82eabd43d9164adb