diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-14 10:05:11 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-14 10:05:11 +0000 |
| commit | 5a96ecfcc8368dc6e2b1b5717e5ec968d102bbec (patch) | |
| tree | 64b8e1c797f7d4f44d894cc2f42b2480087bd328 | |
| parent | ee7945e1b23cb7c7f92c40ec69deadfcd4799270 (diff) | |
| download | chromium_src-5a96ecfcc8368dc6e2b1b5717e5ec968d102bbec.zip chromium_src-5a96ecfcc8368dc6e2b1b5717e5ec968d102bbec.tar.gz chromium_src-5a96ecfcc8368dc6e2b1b5717e5ec968d102bbec.tar.bz2 | |
Fix scons build of gpu command buffer.
BUG=none
R=gman@chromium.org
TBR=nfullagar@google.com
Review URL: https://chromiumcodereview.appspot.com/10829307
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151450 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | gpu/command_buffer/client/gles2_implementation.cc | 2 | ||||
| -rw-r--r-- | gpu/command_buffer/common/debug_marker_manager.cc | 2 | ||||
| -rw-r--r-- | ppapi/native_client/src/shared/ppapi_proxy/nacl.scons | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc index c0e1a01..1f31f8c 100644 --- a/gpu/command_buffer/client/gles2_implementation.cc +++ b/gpu/command_buffer/client/gles2_implementation.cc @@ -428,7 +428,7 @@ GLES2Implementation::GLES2Implementation( GPU_DCHECK(transfer_buffer); char temp[128]; - sprintf(temp, "%p", this); + sprintf(temp, "%p", static_cast<void*>(this)); this_in_hex_ = std::string(temp); GPU_CLIENT_LOG_CODE_BLOCK({ diff --git a/gpu/command_buffer/common/debug_marker_manager.cc b/gpu/command_buffer/common/debug_marker_manager.cc index f0127d5..c6336f9 100644 --- a/gpu/command_buffer/common/debug_marker_manager.cc +++ b/gpu/command_buffer/common/debug_marker_manager.cc @@ -22,7 +22,7 @@ void DebugMarkerManager::Group::SetMarker(const std::string& marker) { DebugMarkerManager::DebugMarkerManager() { // Push root group. group_stack_.push(Group(std::string(""))); -}; +} DebugMarkerManager::~DebugMarkerManager() { } diff --git a/ppapi/native_client/src/shared/ppapi_proxy/nacl.scons b/ppapi/native_client/src/shared/ppapi_proxy/nacl.scons index 0d8a46d..094d162 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/nacl.scons +++ b/ppapi/native_client/src/shared/ppapi_proxy/nacl.scons @@ -20,6 +20,7 @@ env.Append(CCFLAGS=['-Wno-long-long']) command_buffer_common_srcs = [ 'command_buffer/common/cmd_buffer_common.cc', + 'command_buffer/common/debug_marker_manager.cc', 'command_buffer/common/gles2_cmd_format.cc', 'command_buffer/common/gles2_cmd_utils.cc', 'command_buffer/common/logging.cc', |