Revert "Only use flat varyings for integer texIndex."

This reverts commit eadb9f9a55.

Reason for revert: Causing issues with NexusPlayer Vulkan.

Original change's description:
> Only use flat varyings for integer texIndex.
> 
> Flat varyings aren't supported with ES 2.0, so just
> fall back to non-flat if we can only handle float.
> 
> Change-Id: Id47a773b86666c46916efe5bcb1c629743977ccf
> Reviewed-on: https://skia-review.googlesource.com/73800
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Jim Van Verth <jvanverth@google.com>

TBR=jvanverth@google.com,bsalomon@google.com

Change-Id: I5becf5addea1f0bd1ef0fd100d1fc8fd3c503f91
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/74000
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
This commit is contained in:
Jim Van Verth 2017-11-20 22:11:06 +00:00 committed by Skia Commit-Bot
parent 0eef674a5e
commit 575e06cd9b

View File

@ -40,11 +40,7 @@ static void append_index_uv_varyings(GrGLSLPrimitiveProcessor::EmitArgs& args,
args.fVaryingHandler->addVarying("TextureCoords", uv);
args.fVertBuilder->codeAppendf("%s = intCoords * %s;", uv->vsOut(), atlasSizeInvName);
if (args.fShaderCaps->integerSupport()) {
args.fVaryingHandler->addFlatVarying("TexIndex", texIdx);
} else {
args.fVaryingHandler->addVarying("TexIndex", texIdx);
}
args.fVaryingHandler->addFlatVarying("TexIndex", texIdx);
args.fVertBuilder->codeAppendf("%s = texIdx;", texIdx->vsOut());
if (st) {