diff options
| author | pph34r@gmail.com <pph34r@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-01 17:16:16 +0000 |
|---|---|---|
| committer | pph34r@gmail.com <pph34r@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-01 17:16:16 +0000 |
| commit | 7a751e6107c160ec326c88d10193589459cef3f7 (patch) | |
| tree | daf3b46b0bd79ccc94e9aefc8bf9810e35e5b720 /gpu | |
| parent | e865b36b87c44b419886035f898ae1c13a54f91b (diff) | |
| download | chromium_src-7a751e6107c160ec326c88d10193589459cef3f7.zip chromium_src-7a751e6107c160ec326c88d10193589459cef3f7.tar.gz chromium_src-7a751e6107c160ec326c88d10193589459cef3f7.tar.bz2 | |
GCC 4.6 -Wunused-but-set-variable cleanup.
BUG=87490
TEST=None
Review URL: http://codereview.chromium.org/7264013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91314 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/client/gles2_implementation.cc | 2 | ||||
| -rw-r--r-- | gpu/command_buffer/service/buffer_manager.cc | 3 | ||||
| -rw-r--r-- | gpu/command_buffer/service/gpu_scheduler.cc | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc index 6a215a4..ef711db 100644 --- a/gpu/command_buffer/client/gles2_implementation.cc +++ b/gpu/command_buffer/client/gles2_implementation.cc @@ -1870,6 +1870,7 @@ void* GLES2Implementation::MapBufferSubDataCHROMIUM( mem, MappedBuffer( access, shm_id, mem, shm_offset, target, offset, size))); + GPU_DCHECK(result.second); GPU_CLIENT_LOG(" returned " << mem); return mem; } @@ -1938,6 +1939,7 @@ void* GLES2Implementation::MapTexSubImage2DCHROMIUM( MappedTexture( access, shm_id, mem, shm_offset, target, level, xoffset, yoffset, width, height, format, type))); + GPU_DCHECK(result.second); GPU_CLIENT_LOG(" returned " << mem); return mem; } diff --git a/gpu/command_buffer/service/buffer_manager.cc b/gpu/command_buffer/service/buffer_manager.cc index e5f1fbd..3c1d09b 100644 --- a/gpu/command_buffer/service/buffer_manager.cc +++ b/gpu/command_buffer/service/buffer_manager.cc @@ -173,8 +173,7 @@ bool BufferManager::BufferInfo::GetMaxValueForRange( NOTREACHED(); // should never get here by validation. break; } - std::pair<RangeToMaxValueMap::iterator, bool> result = - range_set_.insert(std::make_pair(range, max_v)); + range_set_.insert(std::make_pair(range, max_v)); *max_value = max_v; return true; } diff --git a/gpu/command_buffer/service/gpu_scheduler.cc b/gpu/command_buffer/service/gpu_scheduler.cc index 1ff60d4..0a7d1dd 100644 --- a/gpu/command_buffer/service/gpu_scheduler.cc +++ b/gpu/command_buffer/service/gpu_scheduler.cc @@ -120,9 +120,8 @@ bool GpuScheduler::InitializeCommon( } void GpuScheduler::DestroyCommon() { - bool have_context = false; if (decoder_.get()) { - have_context = decoder_->MakeCurrent(); + decoder_->MakeCurrent(); decoder_->Destroy(); decoder_.reset(); } |