Updating texture validation to account for sampler objects in ES3

gpu/command_buffer/service/texture_definition.cc

Index: gpu/command_buffer/service/texture_definition.cc
diff --git a/gpu/command_buffer/service/texture_definition.cc b/gpu/command_buffer/service/texture_definition.cc
index e9d52aaf5856397bde8d50398a4f923f16768025..dbdc06b4ec0d709a1b0e043fca61f2a10dd10535 100644
--- a/gpu/command_buffer/service/texture_definition.cc
+++ b/gpu/command_buffer/service/texture_definition.cc
@@ -405,10 +405,10 @@ void TextureDefinition::UpdateTextureInternal(Texture* texture) const {
 
   texture->target_ = target_;
   texture->SetImmutable(immutable_);
-  texture->min_filter_ = min_filter_;
-  texture->mag_filter_ = mag_filter_;
-  texture->wrap_s_ = wrap_s_;
-  texture->wrap_t_ = wrap_t_;
+  texture->sampler_state_.min_filter = min_filter_;
+  texture->sampler_state_.mag_filter = mag_filter_;
+  texture->sampler_state_.wrap_s = wrap_s_;
+  texture->sampler_state_.wrap_t = wrap_t_;
   texture->usage_ = usage_;
 }
 
@@ -438,10 +438,10 @@ void TextureDefinition::UpdateTexture(Texture* texture) const {
 
 bool TextureDefinition::Matches(const Texture* texture) const {
   DCHECK(target_ == texture->target());
-  if (texture->min_filter_ != min_filter_ ||
-      texture->mag_filter_ != mag_filter_ ||
-      texture->wrap_s_ != wrap_s_ ||
-      texture->wrap_t_ != wrap_t_ ||
+  if (texture->sampler_state_.min_filter != min_filter_ ||
+      texture->sampler_state_.mag_filter != mag_filter_ ||
+      texture->sampler_state_.wrap_s != wrap_s_ ||
+      texture->sampler_state_.wrap_t != wrap_t_ ||
       texture->SafeToRenderFrom() != SafeToRenderFrom()) {
     return false;
   }