swrast: Add glBlitFramebuffer to commands affected by conditional rendering

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
i965: Fix component mask and varying_to_slot mapping for gl_Layer

gl_Layer doesn't get its own varying slot. It is stored in VARYING_SLOT_PSIZ.y.
gen7_upload_3dstate_so_decl_list() function is shared by gen7 and gen8.
So, the patch fixes the issue on both platforms.

Fixes failures in OpenGL Khronos CTS test transform_feedback_builtins.

Cc: <mesa-stable@lists.freedesktop.org>
Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
i965: Fix component mask and varying_to_slot mapping for gl_ViewportIndex

gl_ViewportIndex doesn't get its own varying slot. It is stored in VARYING_SLOT_PSIZ.z.
gen7_upload_3dstate_so_decl_list() function is shared by gen7 and gen8.
So, the patch fixes the issue on both platforms.

Fixes failures in OpenGL Khronos CTS test transform_feedback_builtins.

Cc: <mesa-stable@lists.freedesktop.org>
Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>