summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorreveman <reveman@chromium.org>2014-09-08 22:15:08 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-09 05:43:53 +0000
commitd9e330dcd5906b9df3ba004bf91a0a8f72739be0 (patch)
tree00066e1f9bb10e1981ee732ba257c5c39a9e4983 /gpu
parent2b2540c1d0b6c32c7c7f98615c0d3e8a4f646e6e (diff)
downloadchromium_src-d9e330dcd5906b9df3ba004bf91a0a8f72739be0.zip
chromium_src-d9e330dcd5906b9df3ba004bf91a0a8f72739be0.tar.gz
chromium_src-d9e330dcd5906b9df3ba004bf91a0a8f72739be0.tar.bz2
gpu: Allow CopyTexImage to be called with StreamTextures and GLImageSync.
BUG=374962 R=sievers@chromium.org Review URL: https://codereview.chromium.org/549253003 Cr-Commit-Position: refs/heads/master@{#293855}
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/service/stream_texture_manager_in_process_android.cc1
-rw-r--r--gpu/command_buffer/service/texture_definition.cc1
2 files changed, 0 insertions, 2 deletions
diff --git a/gpu/command_buffer/service/stream_texture_manager_in_process_android.cc b/gpu/command_buffer/service/stream_texture_manager_in_process_android.cc
index cf6f591..b59cf5c 100644
--- a/gpu/command_buffer/service/stream_texture_manager_in_process_android.cc
+++ b/gpu/command_buffer/service/stream_texture_manager_in_process_android.cc
@@ -74,7 +74,6 @@ void GLImageImpl::ReleaseTexImage(unsigned target) {
}
bool GLImageImpl::CopyTexImage(unsigned target) {
- NOTREACHED();
return false;
}
diff --git a/gpu/command_buffer/service/texture_definition.cc b/gpu/command_buffer/service/texture_definition.cc
index 5928bd2..08af4aa 100644
--- a/gpu/command_buffer/service/texture_definition.cc
+++ b/gpu/command_buffer/service/texture_definition.cc
@@ -85,7 +85,6 @@ void GLImageSync::ReleaseTexImage(unsigned target) {
}
bool GLImageSync::CopyTexImage(unsigned target) {
- NOTREACHED();
return false;
}