Skip to content
  • Kenneth Graunke's avatar
    glsl: Make lower_constant_arrays_to_uniforms require dereferences. · 60f011af
    Kenneth Graunke authored
    
    
    Ilia noticed that my lowering pass was converting the constant array
    used by textureGatherOffsets' offsets parameter to a uniform.  This
    broke textureGather for Nouveau, and is generally a horrible plan,
    since it violates the GLSL constraint that offsets must be an
    immediate constant.
    
    When I wrote this pass, I neglected to consider whole array assignment.
    I figured opt_array_splitting would handle constant indexing, so this
    pass was really about fixing variable indexing.
    
    textureGatherOffsets is an example of whole array access that we really
    don't want to touch.  Whole array copies don't appear to benefit from
    this either - they're most likely initializers for temporary arrays
    which are going to be mutated anyway.  Since you're copying, you may
    as well copy from immediates, not uniforms.
    
    This patch makes the pass look for ir_dereference_arrays of
    ir_constants, rather than looking for any ir_constant directly.
    This way, it ignores whole array assignment.
    
    No shader-db changes or Piglit regressions on Haswell.  Some Piglit
    tests generate different code (fixing textureGatherOffsets on Nouveau).
    
    Signed-off-by: Kenneth Graunke's avatarKenneth Graunke <kenneth@whitecape.org>
    Tested-by: default avatarIlia Mirkin <imirkin@alum.mit.edu>
    Reviewed-by: default avatarMatt Turner <mattst88@gmail.com>
    Cc: "10.4" <mesa-stable@lists.freedesktop.org>
    60f011af