Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(748)

Unified Diff: gpu/command_buffer/service/texture_definition.cc

Issue 1401423003: Re-land: ui: Move GLImage::BindTexImage fallback from GLImage implementations to GLES2CmdDecoder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix stream texture issue Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/service/texture_definition.cc
diff --git a/gpu/command_buffer/service/texture_definition.cc b/gpu/command_buffer/service/texture_definition.cc
index 1f1372a711be8fb85ae9044508c5aa5e96915238..ad9fe8a9a105bc17d20492acfa2756310a933a3f 100644
--- a/gpu/command_buffer/service/texture_definition.cc
+++ b/gpu/command_buffer/service/texture_definition.cc
@@ -36,13 +36,10 @@ class GLImageSync : public gfx::GLImage {
unsigned GetInternalFormat() override;
bool BindTexImage(unsigned target) override;
void ReleaseTexImage(unsigned target) override;
+ bool CopyTexImage(unsigned target) override;
bool CopyTexSubImage(unsigned target,
const gfx::Point& offset,
const gfx::Rect& rect) override;
- void WillUseTexImage() override;
- void WillModifyTexImage() override;
- void DidModifyTexImage() override;
- void DidUseTexImage() override;
bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
int z_order,
gfx::OverlayTransform transform,
@@ -94,24 +91,16 @@ void GLImageSync::ReleaseTexImage(unsigned target) {
NOTREACHED();
}
+bool GLImageSync::CopyTexImage(unsigned target) {
+ return false;
+}
+
bool GLImageSync::CopyTexSubImage(unsigned target,
const gfx::Point& offset,
const gfx::Rect& rect) {
return false;
}
-void GLImageSync::WillUseTexImage() {
-}
-
-void GLImageSync::DidUseTexImage() {
-}
-
-void GLImageSync::WillModifyTexImage() {
-}
-
-void GLImageSync::DidModifyTexImage() {
-}
-
bool GLImageSync::ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
int z_order,
gfx::OverlayTransform transform,
@@ -357,7 +346,7 @@ TextureDefinition::TextureDefinition(
new GLImageSync(image_buffer_,
gfx::Size(first_face.level_infos[0].width,
first_face.level_infos[0].height)));
- texture->SetLevelImage(NULL, target_, 0, gl_image.get());
+ texture->SetLevelImage(target_, 0, gl_image.get(), Texture::BOUND);
}
const Texture::LevelInfo& level = first_face.level_infos[0];
@@ -406,12 +395,10 @@ void TextureDefinition::UpdateTextureInternal(Texture* texture) const {
if (image_buffer_.get()) {
texture->SetLevelImage(
- NULL,
- target_,
- 0,
- new GLImageSync(
- image_buffer_,
- gfx::Size(level_info_.width, level_info_.height)));
+ target_, 0,
+ new GLImageSync(image_buffer_,
+ gfx::Size(level_info_.width, level_info_.height)),
+ Texture::BOUND);
}
texture->target_ = target_;
@@ -437,7 +424,7 @@ void TextureDefinition::UpdateTexture(Texture* texture) const {
if (bound_id == static_cast<GLint>(old_service_id)) {
glBindTexture(target_, service_id);
}
- texture->SetLevelImage(NULL, target_, 0, NULL);
+ texture->SetLevelImage(target_, 0, NULL, Texture::UNBOUND);
}
UpdateTextureInternal(texture);
« no previous file with comments | « gpu/command_buffer/service/stream_texture_manager_in_process_android.cc ('k') | gpu/command_buffer/service/texture_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698