Chromium Code Reviews| Index: content/renderer/media/renderer_gpu_video_decoder_factories.cc |
| diff --git a/content/renderer/media/renderer_gpu_video_decoder_factories.cc b/content/renderer/media/renderer_gpu_video_decoder_factories.cc |
| index adf8a44c2e3c3045907046bc14045e665a3fce3b..91ffb30d4b72d9a3264ac81e9eb0728a79648b03 100644 |
| --- a/content/renderer/media/renderer_gpu_video_decoder_factories.cc |
| +++ b/content/renderer/media/renderer_gpu_video_decoder_factories.cc |
| @@ -4,6 +4,9 @@ |
| #include "content/renderer/media/renderer_gpu_video_decoder_factories.h" |
| +#include <GLES2/gl2.h> |
| +#include <GLES2/gl2ext.h> |
| + |
| #include "base/bind.h" |
| #include "base/synchronization/waitable_event.h" |
| #include "content/common/child_thread.h" |
| @@ -109,8 +112,10 @@ void RendererGpuVideoDecoderFactories::AsyncCreateTextures( |
| gles2->TexParameteri(texture_target, GL_TEXTURE_MAG_FILTER, GL_LINEAR); |
| gles2->TexParameterf(texture_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); |
| gles2->TexParameterf(texture_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); |
| - gles2->TexImage2D(texture_target, 0, GL_RGBA, size.width(), size.height(), |
| - 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); |
| + if (texture_target != GL_TEXTURE_RECTANGLE_ARB) { |
|
Ami GONE FROM CHROMIUM
2012/07/13 17:24:21
Should this instead be == _2D?
sail
2012/07/13 17:30:51
It has to be RECTANGLE_ARB since we _2D works fine
Ami GONE FROM CHROMIUM
2012/07/13 17:34:14
I mean that instead of conditionalizing the TexIma
sail
2012/07/13 17:59:34
Oops, sorry. Fixed.
|
| + gles2->TexImage2D(texture_target, 0, GL_RGBA, size.width(), size.height(), |
| + 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); |
| + } |
| } |
| // We need a glFlush here to guarantee the decoder (in the GPU process) can |
| // use the texture ids we return here. Since textures are expected to be |