summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/service/gpu_scheduler.h
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-30 00:47:55 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-30 00:47:55 +0000
commit5f4f2a73f0a14bc9438525d1d4d85e704ec6d590 (patch)
treee9e566254a6805a30aa79e4ec09b51c774836bda /gpu/command_buffer/service/gpu_scheduler.h
parent44920a8e4f22a850b998f712a0e4585f7e4a20bb (diff)
downloadchromium_src-5f4f2a73f0a14bc9438525d1d4d85e704ec6d590.zip
chromium_src-5f4f2a73f0a14bc9438525d1d4d85e704ec6d590.tar.gz
chromium_src-5f4f2a73f0a14bc9438525d1d4d85e704ec6d590.tar.bz2
Revert 94743 - Allow the renderer process to map textures from one context into another.
This is on an individual resource basis rather than general share groups in order to hide be able to hide the full namespace from untrusted plugins. Accelerated 2D canvas now no longer needs to copy its backing store on every page composite and the redundant backing texture is not needed, saving video memory. Unit tests for the GPU service to follow. Patch to delete copyTextureToParentTexture extensions from gpu/ to follow. BUG=90714 Review URL: http://codereview.chromium.org/7529015 TBR=apatrick@chromium.org Review URL: http://codereview.chromium.org/7518016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94808 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service/gpu_scheduler.h')
-rw-r--r--gpu/command_buffer/service/gpu_scheduler.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/gpu/command_buffer/service/gpu_scheduler.h b/gpu/command_buffer/service/gpu_scheduler.h
index 04b6f3b..75ccc63 100644
--- a/gpu/command_buffer/service/gpu_scheduler.h
+++ b/gpu/command_buffer/service/gpu_scheduler.h
@@ -15,7 +15,6 @@
#include "base/shared_memory.h"
#include "base/task.h"
#include "gpu/command_buffer/common/command_buffer.h"
-#include "gpu/command_buffer/common/constants.h"
#include "gpu/command_buffer/service/cmd_buffer_engine.h"
#include "gpu/command_buffer/service/cmd_parser.h"
#include "gpu/command_buffer/service/gles2_cmd_decoder.h"
@@ -76,11 +75,6 @@ class GpuScheduler : public CommandBufferEngine {
void Destroy();
void DestroyCommon();
- bool MapExternalResource(resource_type::ResourceType resource_type,
- uint32 resource_source_id,
- GpuScheduler* source_scheduler,
- uint32 resource_dest_id);
-
bool SetParent(GpuScheduler* parent_scheduler, uint32 parent_texture_id);
void PutChanged();