Revert of Updating texture validation to account for sampler objects in ES3

Revert of Updating texture validation to account for sampler objects in ES3 (patchset #9 id:160001 of https://codereview.chromium.org/1505343003/ )

Reason for revert:
Suspected for failures on Android/Nexus in WebglConformance.conformance_extensions_oes_texture_float

Starting in https://build.chromium.org/p/chromium.gpu/builders/Android%20Debug%20%28Nexus%205%29/builds/5308

Failing tests:
[  FAILED  ] 3 tests, listed below:
[  FAILED  ]  WebglConformance.conformance_extensions_oes_texture_float_with_image_data
[  FAILED  ]  WebglConformance.conformance_extensions_oes_texture_float_with_image
[  FAILED  ]  WebglConformance.conformance_extensions_oes_texture_float

See
BUG=580908
Original issue's description:
> Updating texture validation to account for sampler objects in ES3
>
> BUG=563613
>
> Committed: https://crrev.com/838ca1836eae1357a3b9135e808266d7d28bd3fa
> Cr-Commit-Position: refs/heads/master@{#371062}

TBR=kbr@chromium.org,zmo@chromium.org,piman@chromium.org,vmiura@chromium.org,bajones@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=563613
Committed: https://crrev.com/69777e8436a274cd8b3752f0ec430267a421ffe6
Cr-Commit-Position: refs/heads/master@{#371176}

[tapted, 2016-01-24 23:20:09]

Created Revert of Updating texture validation to account for sampler objects in
ES3

[commit-bot: I haz the power, 2016-01-24 23:20:17]

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

[commit-bot: I haz the power, 2016-01-24 23:32:23]

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

[commit-bot: I haz the power, 2016-01-25 00:01:20]

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

[commit-bot: I haz the power, 2016-01-25 00:32:29]

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

[commit-bot: I haz the power, 2016-01-25 00:36:45]

Description was changed from

==========
Revert of Updating texture validation to account for sampler objects in ES3
(patchset #9 id:160001 of https://codereview.chromium.org/1505343003/ )

Reason for revert:
Suspected for failures on Android/Nexus in
WebglConformance.conformance_extensions_oes_texture_float

Starting in
https://build.chromium.org/p/chromium.gpu/builders/Android%20Debug%20%28Nexus...

Failing tests:
[  FAILED  ] 3 tests, listed below:
[  FAILED  ] 
WebglConformance.conformance_extensions_oes_texture_float_with_image_data
[  FAILED  ] 
WebglConformance.conformance_extensions_oes_texture_float_with_image
[  FAILED  ]  WebglConformance.conformance_extensions_oes_texture_float

See
BUG=580908

Original issue's description:
> Updating texture validation to account for sampler objects in ES3
> 
> BUG=563613
> 
> Committed: https://crrev.com/838ca1836eae1357a3b9135e808266d7d28bd3fa
> Cr-Commit-Position: refs/heads/master@{#371062}

TBR=kbr@chromium.org,zmo@chromium.org,piman@chromium.org,vmiura@chromium.org,...
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=563613
==========

to

==========
Revert of Updating texture validation to account for sampler objects in ES3
(patchset #9 id:160001 of https://codereview.chromium.org/1505343003/ )

Reason for revert:
Suspected for failures on Android/Nexus in
WebglConformance.conformance_extensions_oes_texture_float

Starting in
https://build.chromium.org/p/chromium.gpu/builders/Android%20Debug%20%28Nexus...

Failing tests:
[  FAILED  ] 3 tests, listed below:
[  FAILED  ] 
WebglConformance.conformance_extensions_oes_texture_float_with_image_data
[  FAILED  ] 
WebglConformance.conformance_extensions_oes_texture_float_with_image
[  FAILED  ]  WebglConformance.conformance_extensions_oes_texture_float

See
BUG=580908

Original issue's description:
> Updating texture validation to account for sampler objects in ES3
> 
> BUG=563613
> 
> Committed: https://crrev.com/838ca1836eae1357a3b9135e808266d7d28bd3fa
> Cr-Commit-Position: refs/heads/master@{#371062}

TBR=kbr@chromium.org,zmo@chromium.org,piman@chromium.org,vmiura@chromium.org,...
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=563613
==========

[commit-bot: I haz the power, 2016-01-25 00:36:46]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-01-25 00:37:02]

Failed to apply patch for gpu/command_buffer/service/gles2_cmd_decoder.cc:
While running git apply --index -3 -p1;
  error: patch failed: gpu/command_buffer/service/gles2_cmd_decoder.cc:1882
  error: repository lacks the necessary blob to fall back on 3-way merge.
  error: gpu/command_buffer/service/gles2_cmd_decoder.cc: patch does not apply

Patch:       gpu/command_buffer/service/gles2_cmd_decoder.cc
Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc
b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index
bba2e3c71f991f942c6bb2c01c5c7e4ea078f3b9..34601eb6ccbbbed9401a20ccd98b78bf10f2d091
100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -1882,8 +1882,6 @@
   // will rebind all external textures to match their current service_id.
   void RestoreAllExternalTextureBindingsIfNeeded() override;
 
-  const SamplerState& GetSamplerStateForTextureUnit(GLenum target, GLuint
unit);
-
   // Generate a member function prototype for each command in an automated and
   // typesafe way.
 #define GLES2_CMD_OP(name) \
@@ -2090,8 +2088,6 @@
   bool force_shader_name_hashing_for_test;
 
   GLfloat line_width_range_[2];
-
-  SamplerState default_sampler_state_;
 
   DISALLOW_COPY_AND_ASSIGN(GLES2DecoderImpl);
 };
@@ -7614,6 +7610,10 @@
 
 bool GLES2DecoderImpl::PrepareTexturesForRender() {
   DCHECK(state_.current_program.get());
+  if (!texture_manager()->HaveUnrenderableTextures() &&
+      !texture_manager()->HaveImages()) {
+    return true;
+  }
   bool textures_set = false;
   const Program::SamplerIndices& sampler_indices =
      state_.current_program->sampler_indices();
@@ -7628,11 +7628,7 @@
         TextureRef* texture_ref =
             texture_unit.GetInfoForSamplerType(uniform_info->type).get();
         GLenum textarget = GetBindTargetForSamplerType(uniform_info->type);
-        const SamplerState& sampler_state = GetSamplerStateForTextureUnit(
-            uniform_info->type, texture_unit_index);
-        if (!texture_ref ||
-            !texture_manager()->CanRenderWithSampler(
-                texture_ref, sampler_state)) {
+        if (!texture_ref || !texture_manager()->CanRender(texture_ref)) {
           textures_set = true;
           glActiveTexture(GL_TEXTURE0 + texture_unit_index);
           glBindTexture(
@@ -7688,11 +7684,7 @@
         TextureUnit& texture_unit = state_.texture_units[texture_unit_index];
         TextureRef* texture_ref =
             texture_unit.GetInfoForSamplerType(uniform_info->type).get();
-        const SamplerState& sampler_state = GetSamplerStateForTextureUnit(
-            uniform_info->type, texture_unit_index);
-        if (!texture_ref ||
-            !texture_manager()->CanRenderWithSampler(
-                texture_ref, sampler_state)) {
+        if (!texture_ref || !texture_manager()->CanRender(texture_ref)) {
           glActiveTexture(GL_TEXTURE0 + texture_unit_index);
           // Get the texture_ref info that was previously bound here.
           texture_ref =
@@ -15465,21 +15457,6 @@
   program->SetFragmentInputLocationBinding(name, location);
 }
 
-const SamplerState& GLES2DecoderImpl::GetSamplerStateForTextureUnit(
-    GLenum target, GLuint unit) {
-  if (features().enable_samplers) {
-    Sampler* sampler = state_.sampler_units[unit].get();
-    if (sampler)
-      return sampler->sampler_state();
-  }
-  TextureUnit& texture_unit = state_.texture_units[unit];
-  TextureRef* texture_ref = texture_unit.GetInfoForSamplerType(target).get();
-  if (texture_ref)
-    return texture_ref->texture()->sampler_state();
-
-  return default_sampler_state_;
-}
-
 error::Error GLES2DecoderImpl::HandleBindFragmentInputLocationCHROMIUMBucket(
     uint32_t immediate_data_size,
     const void* cmd_data) {

[commit-bot: I haz the power, 2016-01-25 00:38:16]

Description was changed from

==========
Revert of Updating texture validation to account for sampler objects in ES3
(patchset #9 id:160001 of https://codereview.chromium.org/1505343003/ )

Reason for revert:
Suspected for failures on Android/Nexus in
WebglConformance.conformance_extensions_oes_texture_float

Starting in
https://build.chromium.org/p/chromium.gpu/builders/Android%20Debug%20%28Nexus...

Failing tests:
[  FAILED  ] 3 tests, listed below:
[  FAILED  ] 
WebglConformance.conformance_extensions_oes_texture_float_with_image_data
[  FAILED  ] 
WebglConformance.conformance_extensions_oes_texture_float_with_image
[  FAILED  ]  WebglConformance.conformance_extensions_oes_texture_float

See
BUG=580908

Original issue's description:
> Updating texture validation to account for sampler objects in ES3
> 
> BUG=563613
> 
> Committed: https://crrev.com/838ca1836eae1357a3b9135e808266d7d28bd3fa
> Cr-Commit-Position: refs/heads/master@{#371062}

TBR=kbr@chromium.org,zmo@chromium.org,piman@chromium.org,vmiura@chromium.org,...
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=563613
==========

to

==========
Revert of Updating texture validation to account for sampler objects in ES3
(patchset #9 id:160001 of https://codereview.chromium.org/1505343003/ )

Reason for revert:
Suspected for failures on Android/Nexus in
WebglConformance.conformance_extensions_oes_texture_float

Starting in
https://build.chromium.org/p/chromium.gpu/builders/Android%20Debug%20%28Nexus...

Failing tests:
[  FAILED  ] 3 tests, listed below:
[  FAILED  ] 
WebglConformance.conformance_extensions_oes_texture_float_with_image_data
[  FAILED  ] 
WebglConformance.conformance_extensions_oes_texture_float_with_image
[  FAILED  ]  WebglConformance.conformance_extensions_oes_texture_float

See
BUG=580908

Original issue's description:
> Updating texture validation to account for sampler objects in ES3
>
> BUG=563613
>
> Committed: https://crrev.com/838ca1836eae1357a3b9135e808266d7d28bd3fa
> Cr-Commit-Position: refs/heads/master@{#371062}

TBR=kbr@chromium.org,zmo@chromium.org,piman@chromium.org,vmiura@chromium.org,...
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=563613

Committed: https://crrev.com/69777e8436a274cd8b3752f0ec430267a421ffe6
Cr-Commit-Position: refs/heads/master@{#371176}
==========

[commit-bot: I haz the power, 2016-01-25 00:38:17]

Patchset 1 (id:??) landed as
https://crrev.com/69777e8436a274cd8b3752f0ec430267a421ffe6
Cr-Commit-Position: refs/heads/master@{#371176}