Revert of Refactor how we store and use samplers in Ganesh

Revert of Refactor how we store and use samplers in Ganesh (patchset #7 id:120001 of https://codereview.chromium.org/1885863004/ )

Reason for revert:
breaking bots

Original issue's description:
> Refactor how we store and use samplers in Ganesh
> 
> The main goal of this refactorization is to allow Vulkan to use separate
> sampler and texture objects in the shader and descriptor sets and combine
> them into a sampler2d in the shader where needed.
> 
> A large part of this is separating how we store samplers and uniforms in the
> UniformHandler. We no longer need to store handles to samplers besides when
> we are initially emitting code. After we emit code all we ever do is loop over
> all samplers and do some processor independent work on them, so we have no need
> for direct access to individual samplers.
> 
> In the GLProgram all we ever do is set the sampler uniforms in the ctor and never
> touch them again, so no need to save sampler info there. The texture access on
> program reuse just assume that they come in the same order as we set the texture
> units for the samplers
> 
> For Vulkan, it is a similar story. We create the descriptor set layouts with the samplers,
> then when we get new textures, we just assume they come in in the same order as we
> set the samplers on the descriptor sets. Thus no need to save direct vulkan info.
> 
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1885863004
> 
> Committed: https://skia.googlesource.com/skia/+/45b61a1c4c0be896e7b12fd1405abfece799114f

TBR=bsalomon@google.com,jvanverth@google.com,cdalton@nvidia.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Committed: https://skia.googlesource.com/skia/+/b800248c73c75b02ab808c5bdb53e19e6abc3adc

[egdaniel, 2016-04-19 22:24:15]

Created Revert of Refactor how we store and use samplers in Ganesh

[commit-bot: I haz the power, 2016-04-19 22:24:19]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1896013003/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1896013003/1

[commit-bot: I haz the power, 2016-04-19 22:24:31]

Description was changed from

==========
Revert of Refactor how we store and use samplers in Ganesh (patchset #7
id:120001 of https://codereview.chromium.org/1885863004/ )

Reason for revert:
breaking bots

Original issue's description:
> Refactor how we store and use samplers in Ganesh
> 
> The main goal of this refactorization is to allow Vulkan to use separate
> sampler and texture objects in the shader and descriptor sets and combine
> them into a sampler2d in the shader where needed.
> 
> A large part of this is separating how we store samplers and uniforms in the
> UniformHandler. We no longer need to store handles to samplers besides when
> we are initially emitting code. After we emit code all we ever do is loop over
> all samplers and do some processor independent work on them, so we have no
need
> for direct access to individual samplers.
> 
> In the GLProgram all we ever do is set the sampler uniforms in the ctor and
never
> touch them again, so no need to save sampler info there. The texture access on
> program reuse just assume that they come in the same order as we set the
texture
> units for the samplers
> 
> For Vulkan, it is a similar story. We create the descriptor set layouts with
the samplers,
> then when we get new textures, we just assume they come in in the same order
as we
> set the samplers on the descriptor sets. Thus no need to save direct vulkan
info.
> 
> BUG=skia:
> GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
> 
> Committed:
https://skia.googlesource.com/skia/+/45b61a1c4c0be896e7b12fd1405abfece799114f

TBR=bsalomon@google.com,jvanverth@google.com,cdalton@nvidia.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
==========

to

==========
Revert of Refactor how we store and use samplers in Ganesh (patchset #7
id:120001 of https://codereview.chromium.org/1885863004/ )

Reason for revert:
breaking bots

Original issue's description:
> Refactor how we store and use samplers in Ganesh
> 
> The main goal of this refactorization is to allow Vulkan to use separate
> sampler and texture objects in the shader and descriptor sets and combine
> them into a sampler2d in the shader where needed.
> 
> A large part of this is separating how we store samplers and uniforms in the
> UniformHandler. We no longer need to store handles to samplers besides when
> we are initially emitting code. After we emit code all we ever do is loop over
> all samplers and do some processor independent work on them, so we have no
need
> for direct access to individual samplers.
> 
> In the GLProgram all we ever do is set the sampler uniforms in the ctor and
never
> touch them again, so no need to save sampler info there. The texture access on
> program reuse just assume that they come in the same order as we set the
texture
> units for the samplers
> 
> For Vulkan, it is a similar story. We create the descriptor set layouts with
the samplers,
> then when we get new textures, we just assume they come in in the same order
as we
> set the samplers on the descriptor sets. Thus no need to save direct vulkan
info.
> 
> BUG=skia:
> GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
> 
> Committed:
https://skia.googlesource.com/skia/+/45b61a1c4c0be896e7b12fd1405abfece799114f

TBR=bsalomon@google.com,jvanverth@google.com,cdalton@nvidia.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Committed:
https://skia.googlesource.com/skia/+/b800248c73c75b02ab808c5bdb53e19e6abc3adc
==========

[commit-bot: I haz the power, 2016-04-19 22:24:32]

Committed patchset #1 (id:1) as
https://skia.googlesource.com/skia/+/b800248c73c75b02ab808c5bdb53e19e6abc3adc