Plumb texture target to VideoDecodeAccelerator::Client

content/common/gpu/media/rendering_helper_egl.cc

 // Copyright (c) 2012 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 "content/common/gpu/media/rendering_helper.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
@@ skipping 39 matching lines @@
   virtual ~RenderingHelperEGL();
 
   // Implement RenderingHelper.
   virtual void Initialize(bool suppress_swap_to_display,
                           int num_windows,
                           int width,
                           int height,
                           base::WaitableEvent* done) OVERRIDE;
   virtual void UnInitialize(base::WaitableEvent* done) OVERRIDE;
   virtual void CreateTexture(int window_id,
+                             uint32 texture_target,
                              uint32* texture_id,
                              base::WaitableEvent* done) OVERRIDE;
   virtual void RenderTexture(uint32 texture_id) OVERRIDE;
   virtual void DeleteTexture(uint32 texture_id) OVERRIDE;
   virtual void* GetGLContext() OVERRIDE;
   virtual void* GetGLDisplay() OVERRIDE;
 
  private:
   void Clear();
 
@@ skipping 168 matching lines @@
                        EGL_NO_CONTEXT)) << eglGetError();
   CHECK(eglDestroyContext(egl_display_, egl_context_));
   for (size_t i = 0; i < egl_surfaces_.size(); ++i)
     CHECK(eglDestroySurface(egl_display_, egl_surfaces_[i]));
   CHECK(eglTerminate(egl_display_));
   Clear();
   done->Signal();
 }
 
 void RenderingHelperEGL::CreateTexture(int window_id,
+                                       uint32 texture_target,
                                        uint32* texture_id,
                                        base::WaitableEvent* done) {
   if (MessageLoop::current() != message_loop_) {
     message_loop_->PostTask(
         FROM_HERE,
         base::Bind(&RenderingHelper::CreateTexture, base::Unretained(this),
-                   window_id, texture_id, done));
+                   window_id, texture_target, texture_id, done));
     return;
   }
+  CHECK_EQ(static_cast<uint32>(GL_TEXTURE_2D), texture_target);
   CHECK(eglMakeCurrent(egl_display_, egl_surfaces_[window_id],
                        egl_surfaces_[window_id], egl_context_))
       << eglGetError();
   glGenTextures(1, texture_id);
   glBindTexture(GL_TEXTURE_2D, *texture_id);
   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width_, height_, 0, GL_RGBA,
                GL_UNSIGNED_BYTE, NULL);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
   // OpenGLES2.0.25 section 3.8.2 requires CLAMP_TO_EDGE for NPOT textures.
@@ skipping 112 matching lines @@
   x_windows_.push_back(x_window);
   XStoreName(x_display_, x_window, "VideoDecodeAcceleratorTest");
   XSelectInput(x_display_, x_window, ExposureMask);
   XMapWindow(x_display_, x_window);
   return x_window;
 }
 
 #endif  // OS_WIN
 
 }  // namespace video_test_util