Revert "i965: get PrimitiveMode from the program rather than the shader struct"
authorAndres Gomez <agomez@igalia.com>
Wed, 29 Jun 2016 13:02:27 +0000 (16:02 +0300)
committerAndres Gomez <agomez@igalia.com>
Thu, 30 Jun 2016 13:20:22 +0000 (16:20 +0300)
commitc4e47ab971f8a7ee5e6c34e3e29a6fc3d06d4414
tree892631d902fb19751bc6fe0d18722261f2c34689
parent1591e668e162daf4057a0d44df4e70f19b94fc76
Revert "i965: get PrimitiveMode from the program rather than the shader struct"

This reverts commit 644e015f0b9236e955d679cac4bcc7a1523fc475.

PrimitiveMode from the program doesn't always hold a valid value that
is neither of GL_TRIANGLES, GL_QUADS nor GL_ISOLINES when reaching
this code. This caused regressions in the following CTS tests:
  GL44-CTS.stencil_texturing.functional
  GL44-CTS.shading_language_420pack.binding_images
  GL44-CTS.shading_language_420pack.binding_samplers
  GL44-CTS.shading_language_420pack.binding_uniform_single_block
  GL44-CTS.shading_language_420pack.implicit_conversions
  GL44-CTS.shading_language_420pack.initializer_list
  GL44-CTS.shading_language_420pack.length_of_vector_and_matrix
  GL44-CTS.shading_language_420pack.line_continuation

Hence, we rather take it from the linked shader.

Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
Signed-off-by: Andres Gomez <agomez@igalia.com>
src/mesa/drivers/dri/i965/brw_tcs.c