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

gpu/command_buffer/service/sampler_manager.h

 // Copyright (c) 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_SAMPLER_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_SAMPLER_MANAGER_H_
 
 #include <vector>
 #include "base/containers/hash_tables.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/gpu_export.h"
 
 namespace gpu {
 
 namespace gles2 {
 
 class SamplerManager;
 
-struct SamplerState {
-  SamplerState();
-
-  GLenum min_filter;
-  GLenum mag_filter;
-  GLenum wrap_r;
-  GLenum wrap_s;
-  GLenum wrap_t;
-  GLenum compare_func;
-  GLenum compare_mode;
-  GLfloat max_lod;
-  GLfloat min_lod;
-};
-
 class GPU_EXPORT Sampler : public base::RefCounted<Sampler> {
  public:
   Sampler(SamplerManager* manager, GLuint service_id);
 
   // The service side OpenGL id of the texture.
   GLuint service_id() const {
     return service_id_;
   }
 
-  const SamplerState& sampler_state() const {
-    return sampler_state_;
-  }
-
   // Sampler parameters
   GLenum min_filter() const {
-    return sampler_state_.min_filter;
+    return min_filter_;
   }
 
   GLenum mag_filter() const {
-    return sampler_state_.mag_filter;
+    return mag_filter_;
   }
 
   GLenum wrap_r() const {
-    return sampler_state_.wrap_r;
+    return wrap_r_;
   }
 
   GLenum wrap_s() const {
-    return sampler_state_.wrap_s;
+    return wrap_s_;
   }
 
   GLenum wrap_t() const {
-    return sampler_state_.wrap_t;
+    return wrap_t_;
   }
 
   GLenum compare_func() const {
-    return sampler_state_.compare_func;
+    return compare_func_;
   }
 
   GLenum compare_mode() const {
-    return sampler_state_.compare_mode;
+    return compare_mode_;
   }
 
   GLfloat max_lod() const {
-    return sampler_state_.max_lod;
+    return max_lod_;
   }
 
   GLfloat min_lod() const {
-    return sampler_state_.min_lod;
+    return min_lod_;
   }
 
   bool IsDeleted() const {
     return deleted_;
   }
 
  protected:
   virtual ~Sampler();
 
   SamplerManager* manager() const {
@@ skipping 14 matching lines @@
       const FeatureInfo* feature_info, GLenum pname, GLint param);
   GLenum SetParameterf(
       const FeatureInfo* feature_info, GLenum pname, GLfloat param);
 
   // The manager that owns this Sampler.
   SamplerManager* manager_;
 
     // The id of the texure
   GLuint service_id_;
 
-  // Sampler parameters.
-  SamplerState sampler_state_;
+  // Texture parameters.
+  GLenum min_filter_;
+  GLenum mag_filter_;
+  GLenum wrap_r_;
+  GLenum wrap_s_;
+  GLenum wrap_t_;
+  GLenum compare_func_;
+  GLenum compare_mode_;
+  GLfloat max_lod_;
+  GLfloat min_lod_;
 
   // True if deleted.
   bool deleted_;
 };
 
 // This class keeps track of the samplers and their state.
 class GPU_EXPORT SamplerManager {
  public:
   SamplerManager(FeatureInfo* feature_info);
   ~SamplerManager();
@@ skipping 30 matching lines @@
 
   bool have_context_;
 
   DISALLOW_COPY_AND_ASSIGN(SamplerManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_SAMPLER_MANAGER_H_