OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 // A class to emulate GLES2 over command buffers. | 5 // A class to emulate GLES2 over command buffers. |
6 | 6 |
7 #include "../client/gles2_implementation.h" | 7 #include "../client/gles2_implementation.h" |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <map> | 10 #include <map> |
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
421 error_bits_(0), | 421 error_bits_(0), |
422 debug_(false), | 422 debug_(false), |
423 use_count_(0), | 423 use_count_(0), |
424 current_query_(NULL), | 424 current_query_(NULL), |
425 error_message_callback_(NULL), | 425 error_message_callback_(NULL), |
426 context_lost_(false) { | 426 context_lost_(false) { |
427 GPU_DCHECK(helper); | 427 GPU_DCHECK(helper); |
428 GPU_DCHECK(transfer_buffer); | 428 GPU_DCHECK(transfer_buffer); |
429 | 429 |
430 char temp[128]; | 430 char temp[128]; |
431 sprintf(temp, "%p", this); | 431 sprintf(temp, "%p", static_cast<void*>(this)); |
432 this_in_hex_ = std::string(temp); | 432 this_in_hex_ = std::string(temp); |
433 | 433 |
434 GPU_CLIENT_LOG_CODE_BLOCK({ | 434 GPU_CLIENT_LOG_CODE_BLOCK({ |
435 debug_ = CommandLine::ForCurrentProcess()->HasSwitch( | 435 debug_ = CommandLine::ForCurrentProcess()->HasSwitch( |
436 switches::kEnableGPUClientLogging); | 436 switches::kEnableGPUClientLogging); |
437 }); | 437 }); |
438 | 438 |
439 share_group_ = (share_group ? share_group : new ShareGroup( | 439 share_group_ = (share_group ? share_group : new ShareGroup( |
440 share_resources, bind_generates_resource)); | 440 share_resources, bind_generates_resource)); |
441 | 441 |
(...skipping 2952 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3394 | 3394 |
3395 void GLES2Implementation::PopGroupMarkerEXT() { | 3395 void GLES2Implementation::PopGroupMarkerEXT() { |
3396 GPU_CLIENT_SINGLE_THREAD_CHECK(); | 3396 GPU_CLIENT_SINGLE_THREAD_CHECK(); |
3397 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glPopGroupMarkerEXT()"); | 3397 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glPopGroupMarkerEXT()"); |
3398 helper_->PopGroupMarkerEXT(); | 3398 helper_->PopGroupMarkerEXT(); |
3399 debug_marker_manager_.PopGroup(); | 3399 debug_marker_manager_.PopGroup(); |
3400 } | 3400 } |
3401 | 3401 |
3402 } // namespace gles2 | 3402 } // namespace gles2 |
3403 } // namespace gpu | 3403 } // namespace gpu |
OLD | NEW |