Commit e4576126 authored by lukasza's avatar lukasza Committed by Commit bot

Revert of Apply the Surface Texture transformation matrix during texture copy....

Revert of Apply the Surface Texture transformation matrix during texture copy. (patchset #7 id:140001 of https://codereview.chromium.org/1536713002/ )

Reason for revert:
The CL was/is the main suspect for causing crbug.com/574811.

Original issue's description:
> Apply the Surface Texture transformation matrix during texture copy.
>
> Android Surface Textures have an associated UV transform matrix that can
> potentially vary from frame to frame. If the texture is copied, it is
> useful for the copy to have a consistent orientation, rather than having
> to propagate the UV transformation matrix with the copy as well.
>
> Because the Surface Texture is meant to be used with (0,0) meaning
> the bottom left of the texture, the result of this operation from the
> perspective of Chromium is a y-flipped texture.
>
> BUG=226218
>
> Committed: https://crrev.com/907d1b74f2f3b50d77577c8d83c0cd2472400b3f
> Cr-Commit-Position: refs/heads/master@{#367714}

TBR=reveman@chromium.org,sievers@chromium.org,kbr@chromium.org,ccameron@chromium.org,tobiasjs@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=226218

Review URL: https://codereview.chromium.org/1569543002

Cr-Commit-Position: refs/heads/master@{#367844}
parent 39923162
...@@ -14,10 +14,6 @@ ...@@ -14,10 +14,6 @@
#include "ui/gl/android/surface_texture.h" #include "ui/gl/android/surface_texture.h"
#include "ui/gl/gl_image.h" #include "ui/gl/gl_image.h"
namespace ui {
class ScopedMakeCurrent;
}
namespace gfx { namespace gfx {
class Size; class Size;
} }
...@@ -60,10 +56,6 @@ class StreamTexture : public gl::GLImage, ...@@ -60,10 +56,6 @@ class StreamTexture : public gl::GLImage,
// GpuCommandBufferStub::DestructionObserver implementation. // GpuCommandBufferStub::DestructionObserver implementation.
void OnWillDestroyStub() override; void OnWillDestroyStub() override;
scoped_ptr<ui::ScopedMakeCurrent> MakeStubCurrent();
void UpdateTexImage();
// Called when a new frame is available for the SurfaceTexture. // Called when a new frame is available for the SurfaceTexture.
void OnFrameAvailable(); void OnFrameAvailable();
...@@ -94,13 +86,6 @@ class StreamTexture : public gl::GLImage, ...@@ -94,13 +86,6 @@ class StreamTexture : public gl::GLImage,
bool has_listener_; bool has_listener_;
uint32_t texture_id_; uint32_t texture_id_;
unsigned framebuffer_;
unsigned vertex_shader_;
unsigned fragment_shader_;
unsigned program_;
unsigned vertex_buffer_;
int u_xform_location_;
base::WeakPtrFactory<StreamTexture> weak_factory_; base::WeakPtrFactory<StreamTexture> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(StreamTexture); DISALLOW_COPY_AND_ASSIGN(StreamTexture);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment