Updating texture validation to account for sampler objects in ES3

gpu/command_buffer/service/texture_definition.cc

 // Copyright 2014 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.
 
 #include "gpu/command_buffer/service/texture_definition.h"
 
 #include <list>
 
 #include "base/lazy_instance.h"
 #include "base/memory/linked_ptr.h"
@@ skipping 299 matching lines @@
 TextureDefinition::LevelInfo::~LevelInfo() {}
 
 TextureDefinition::TextureDefinition()
     : version_(0),
       target_(0),
       min_filter_(0),
       mag_filter_(0),
       wrap_s_(0),
       wrap_t_(0),
       usage_(0),
-      immutable_(true) {
+      immutable_(true),
+      is_es3_enabled_(false) {
 }
 
 TextureDefinition::TextureDefinition(
     Texture* texture,
     unsigned int version,
     const scoped_refptr<NativeImageBuffer>& image_buffer)
     : version_(version),
       target_(texture->target()),
       image_buffer_(image_buffer),
       min_filter_(texture->min_filter()),
       mag_filter_(texture->mag_filter()),
       wrap_s_(texture->wrap_s()),
       wrap_t_(texture->wrap_t()),
       usage_(texture->usage()),
       immutable_(texture->IsImmutable()),
-      defined_(texture->IsDefined()) {
+      defined_(texture->IsDefined()),
+      is_es3_enabled_(texture->IsES3Enabled()) {
   DCHECK(!image_buffer_.get() || defined_);
   if (!image_buffer_.get() && defined_) {
     image_buffer_ = NativeImageBuffer::Create(texture->service_id());
     DCHECK(image_buffer_.get());
   }
 
   const Texture::FaceInfo& first_face = texture->face_infos_[0];
   if (image_buffer_.get()) {
     scoped_refptr<gl::GLImage> gl_image(new GLImageSync(
         image_buffer_, gfx::Size(first_face.level_infos[0].width,
                                  first_face.level_infos[0].height)));
     texture->SetLevelImage(target_, 0, gl_image.get(), Texture::BOUND);
   }
 
   const Texture::LevelInfo& level = first_face.level_infos[0];
   level_info_ = LevelInfo(level.target, level.internal_format, level.width,
                           level.height, level.depth, level.border, level.format,
                           level.type, level.cleared_rect);
 }
 
 TextureDefinition::~TextureDefinition() {
 }
 
 Texture* TextureDefinition::CreateTexture() const {
   GLuint texture_id;
   glGenTextures(1, &texture_id);
 
-  Texture* texture(new Texture(texture_id));
+  Texture* texture(new Texture(texture_id, is_es3_enabled_));
   UpdateTextureInternal(texture);
 
   return texture;
 }
 
 void TextureDefinition::UpdateTextureInternal(Texture* texture) const {
   gfx::ScopedTextureBinder texture_binder(target_, texture->service_id());
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter_);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter_);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap_s_);
@@ skipping 20 matching lines @@
   if (image_buffer_.get()) {
     texture->SetLevelImage(
         target_, 0,
         new GLImageSync(image_buffer_,
                         gfx::Size(level_info_.width, level_info_.height)),
         Texture::BOUND);
   }
 
   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_;
 }
 
 void TextureDefinition::UpdateTexture(Texture* texture) const {
   GLuint old_service_id = 0u;
   if (image_buffer_.get() && g_avoid_egl_target_texture_reuse) {
     GLuint service_id = 0u;
     glGenTextures(1, &service_id);
     old_service_id = texture->service_id();
     texture->SetServiceId(service_id);
 
     DCHECK_EQ(static_cast<GLenum>(GL_TEXTURE_2D), target_);
     GLint bound_id = 0;
     glGetIntegerv(GL_TEXTURE_BINDING_2D, &bound_id);
     if (bound_id == static_cast<GLint>(old_service_id)) {
       glBindTexture(target_, service_id);
     }
     texture->SetLevelImage(target_, 0, NULL, Texture::UNBOUND);
   }
 
   UpdateTextureInternal(texture);
 
   if (old_service_id) {
     glDeleteTextures(1, &old_service_id);
   }
 }
 
 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;
   }
 
   // Texture became defined.
   if (!image_buffer_.get() && texture->IsDefined())
     return false;
 
   // All structural changes should have orphaned the texture.
   if (image_buffer_.get() && !texture->GetLevelImage(texture->target(), 0))
     return false;
 
   return true;
 }
 
 bool TextureDefinition::SafeToRenderFrom() const {
   return level_info_.cleared_rect.Contains(
       gfx::Rect(level_info_.width, level_info_.height));
 }
 
 }  // namespace gles2
 }  // namespace gpu