summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/client
diff options
context:
space:
mode:
authordspringer@google.com <dspringer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-16 13:56:12 +0000
committerdspringer@google.com <dspringer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-16 13:56:12 +0000
commit92c4a81f28a463cd71d782f7ae9b768c91e59d10 (patch)
tree38396d79f4f155b88b5a8393a5ed9e383f5ed144 /gpu/command_buffer/client
parent2a0641aaf1f7828d8b2c3ce451d29455b4c9a466 (diff)
downloadchromium_src-92c4a81f28a463cd71d782f7ae9b768c91e59d10.zip
chromium_src-92c4a81f28a463cd71d782f7ae9b768c91e59d10.tar.gz
chromium_src-92c4a81f28a463cd71d782f7ae9b768c91e59d10.tar.bz2
Change a couple of LOG/CHECK macros to GPU_LOG/GPU_CHECK, which means I can
use this code as-is to build a GPU client outside of the Chromium tree. This is required for debugging NaCl modules as trusted plugins in the NaCl SDK. Review URL: http://codereview.chromium.org/1000002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41719 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/client')
-rw-r--r--gpu/command_buffer/client/cmd_buffer_helper.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gpu/command_buffer/client/cmd_buffer_helper.cc b/gpu/command_buffer/client/cmd_buffer_helper.cc
index 4f9d725..994c838 100644
--- a/gpu/command_buffer/client/cmd_buffer_helper.cc
+++ b/gpu/command_buffer/client/cmd_buffer_helper.cc
@@ -83,7 +83,7 @@ void CommandBufferHelper::WaitForToken(int32 token) {
Flush();
while (last_token_read_ < token) {
if (get_ == put_) {
- LOG(FATAL) << "Empty command buffer while waiting on a token.";
+ GPU_LOG(FATAL) << "Empty command buffer while waiting on a token.";
return;
}
// Do not loop forever if the flush fails, meaning the command buffer reader
@@ -99,7 +99,7 @@ void CommandBufferHelper::WaitForToken(int32 token) {
// The function will return early if an error occurs, in which case the
// available space may not be available.
void CommandBufferHelper::WaitForAvailableEntries(int32 count) {
- CHECK(count < entry_count_);
+ GPU_CHECK(count < entry_count_);
if (put_ + count > entry_count_) {
// There's not enough room between the current put and the end of the
// buffer, so we need to wrap. We will add noops all the way to the end,