Bug b/31913614
Bug b/32087196

Change-Id: I45c06c7cb907ae1f1efc57c6302044334159c828
Reviewed-on: https://swiftshader-review.googlesource.com/7734Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>