Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(844)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gpu/command_buffer/client/gles2_implementation.cc

Issue 90333003: Remove --enable-gpu-service-logging and --enable-gpu-client-logging (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/client/gles2_implementation.h ('k') | gpu/command_buffer/client/gles2_implementation_impl_autogen.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/client/gles2_implementation.cc
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc
index df70976be7307f30265a1d898ce2aad47e9e3e44..eed825455c2136ed5d7b9b18248cbd6463c2b301 100644
--- a/gpu/command_buffer/client/gles2_implementation.cc
+++ b/gpu/command_buffer/client/gles2_implementation.cc
@@ -30,11 +30,6 @@
#define GLES2_SUPPORT_CLIENT_SIDE_ARRAYS
#endif
-#if defined(GPU_CLIENT_DEBUG)
-#include "ui/gl/gl_switches.h"
-#include "base/command_line.h"
-#endif
-
namespace gpu {
namespace gles2 {
@@ -107,7 +102,6 @@ GLES2Implementation::GLES2Implementation(
bound_pixel_pack_transfer_buffer_id_(0),
bound_pixel_unpack_transfer_buffer_id_(0),
error_bits_(0),
- debug_(false),
use_count_(0),
current_query_(NULL),
error_message_callback_(NULL),
@@ -121,11 +115,6 @@ GLES2Implementation::GLES2Implementation(
sprintf(temp, "%p", static_cast<void*>(this));
this_in_hex_ = std::string(temp);
- GPU_CLIENT_LOG_CODE_BLOCK({
- debug_ = CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableGPUClientLogging);
- });
-
share_group_ =
(share_group ? share_group : new ShareGroup(bind_generates_resource));
@@ -400,9 +389,7 @@ const std::string& GLES2Implementation::GetLogPrefix() const {
GLenum GLES2Implementation::GetError() {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetError()");
GLenum err = GetGLError();
- GPU_CLIENT_LOG("returned " << GLES2Util::GetStringError(err));
return err;
}
@@ -458,9 +445,6 @@ void GLES2Implementation::CheckGLError() {
void GLES2Implementation::SetGLError(
GLenum error, const char* function_name, const char* msg) {
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] Client Synthesized Error: "
- << GLES2Util::GetStringError(error) << ": "
- << function_name << ": " << msg);
FailGLError(error);
if (msg) {
last_error_ = msg;
@@ -584,8 +568,6 @@ void GLES2Implementation::SetBucketAsString(
void GLES2Implementation::Disable(GLenum cap) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDisable("
- << GLES2Util::GetStringCapability(cap) << ")");
bool changed = false;
if (!state_.SetCapabilityState(cap, false, &changed) || changed) {
helper_->Disable(cap);
@@ -595,8 +577,6 @@ void GLES2Implementation::Disable(GLenum cap) {
void GLES2Implementation::Enable(GLenum cap) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glEnable("
- << GLES2Util::GetStringCapability(cap) << ")");
bool changed = false;
if (!state_.SetCapabilityState(cap, true, &changed) || changed) {
helper_->Enable(cap);
@@ -606,8 +586,6 @@ void GLES2Implementation::Enable(GLenum cap) {
GLboolean GLES2Implementation::IsEnabled(GLenum cap) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glIsEnabled("
- << GLES2Util::GetStringCapability(cap) << ")");
bool state = false;
if (!state_.GetEnabled(cap, &state)) {
typedef cmds::IsEnabled::Result Result;
@@ -621,7 +599,6 @@ GLboolean GLES2Implementation::IsEnabled(GLenum cap) {
state = (*result) != 0;
}
- GPU_CLIENT_LOG("returned " << state);
CheckGLError();
return state;
}
@@ -770,13 +747,8 @@ GLuint GLES2Implementation::GetMaxValueInBufferCHROMIUMHelper(
GLuint GLES2Implementation::GetMaxValueInBufferCHROMIUM(
GLuint buffer_id, GLsizei count, GLenum type, GLuint offset) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetMaxValueInBufferCHROMIUM("
- << buffer_id << ", " << count << ", "
- << GLES2Util::GetStringGetMaxIndexType(type)
- << ", " << offset << ")");
GLuint result = GetMaxValueInBufferCHROMIUMHelper(
buffer_id, count, type, offset);
- GPU_CLIENT_LOG("returned " << result);
CheckGLError();
return result;
}
@@ -802,11 +774,6 @@ void GLES2Implementation::RestoreArrayBuffer(bool restore) {
void GLES2Implementation::DrawElements(
GLenum mode, GLsizei count, GLenum type, const void* indices) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDrawElements("
- << GLES2Util::GetStringDrawMode(mode) << ", "
- << count << ", "
- << GLES2Util::GetStringIndexType(type) << ", "
- << static_cast<const void*>(indices) << ")");
if (count < 0) {
SetGLError(GL_INVALID_VALUE, "glDrawElements", "count less than 0.");
return;
@@ -828,7 +795,6 @@ void GLES2Implementation::DrawElements(
void GLES2Implementation::Flush() {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glFlush()");
// Insert the cmd to call glFlush
helper_->Flush();
// Flush our command buffer
@@ -838,7 +804,6 @@ void GLES2Implementation::Flush() {
void GLES2Implementation::ShallowFlushCHROMIUM() {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glShallowFlushCHROMIUM()");
// Flush our command buffer
// (tell the service to execute up to the flush cmd.)
helper_->CommandBufferHelper::Flush();
@@ -867,7 +832,6 @@ bool GLES2Implementation::MustBeContextLost() {
}
void GLES2Implementation::FinishHelper() {
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glFinish()");
TRACE_EVENT0("gpu", "GLES2::Finish");
// Insert the cmd to call glFinish
helper_->Finish();
@@ -879,7 +843,6 @@ void GLES2Implementation::FinishHelper() {
void GLES2Implementation::SwapBuffers() {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glSwapBuffers()");
// TODO(piman): Strictly speaking we'd want to insert the token after the
// swap, but the state update with the updated token might not have happened
// by the time the SwapBuffer callback gets called, forcing us to synchronize
@@ -900,9 +863,6 @@ void GLES2Implementation::SwapBuffers() {
void GLES2Implementation::GenSharedIdsCHROMIUM(
GLuint namespace_id, GLuint id_offset, GLsizei n, GLuint* ids) {
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenSharedIdsCHROMIUM("
- << namespace_id << ", " << id_offset << ", " << n << ", " <<
- static_cast<void*>(ids) << ")");
TRACE_EVENT0("gpu", "GLES2::GenSharedIdsCHROMIUM");
GLsizei num = n;
GLuint* dst = ids;
@@ -919,23 +879,10 @@ void GLES2Implementation::GenSharedIdsCHROMIUM(
num -= id_buffer.num_elements();
dst += id_buffer.num_elements();
}
- GPU_CLIENT_LOG_CODE_BLOCK({
- for (GLsizei i = 0; i < n; ++i) {
- GPU_CLIENT_LOG(" " << i << ": " << namespace_id << ", " << ids[i]);
- }
- });
}
void GLES2Implementation::DeleteSharedIdsCHROMIUM(
GLuint namespace_id, GLsizei n, const GLuint* ids) {
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDeleteSharedIdsCHROMIUM("
- << namespace_id << ", " << n << ", "
- << static_cast<const void*>(ids) << ")");
- GPU_CLIENT_LOG_CODE_BLOCK({
- for (GLsizei i = 0; i < n; ++i) {
- GPU_CLIENT_LOG(" " << i << ": " << namespace_id << ", " << ids[i]);
- }
- });
TRACE_EVENT0("gpu", "GLES2::DeleteSharedIdsCHROMIUM");
while (n) {
ScopedTransferBufferArray<GLint> id_buffer(n, helper_, transfer_buffer_);
@@ -954,14 +901,6 @@ void GLES2Implementation::DeleteSharedIdsCHROMIUM(
void GLES2Implementation::RegisterSharedIdsCHROMIUM(
GLuint namespace_id, GLsizei n, const GLuint* ids) {
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glRegisterSharedIdsCHROMIUM("
- << namespace_id << ", " << n << ", "
- << static_cast<const void*>(ids) << ")");
- GPU_CLIENT_LOG_CODE_BLOCK({
- for (GLsizei i = 0; i < n; ++i) {
- GPU_CLIENT_LOG(" " << i << ": " << namespace_id << ", " << ids[i]);
- }
- });
TRACE_EVENT0("gpu", "GLES2::RegisterSharedIdsCHROMIUM");
while (n) {
ScopedTransferBufferArray<GLint> id_buffer(n, helper_, transfer_buffer_);
@@ -981,8 +920,6 @@ void GLES2Implementation::RegisterSharedIdsCHROMIUM(
void GLES2Implementation::BindAttribLocation(
GLuint program, GLuint index, const char* name) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glBindAttribLocation("
- << program << ", " << index << ", " << name << ")");
SetBucketAsString(kResultBucketId, name);
helper_->BindAttribLocationBucket(program, index, kResultBucketId);
helper_->SetBucketSize(kResultBucketId, 0);
@@ -992,8 +929,6 @@ void GLES2Implementation::BindAttribLocation(
void GLES2Implementation::BindUniformLocationCHROMIUM(
GLuint program, GLint location, const char* name) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glBindUniformLocationCHROMIUM("
- << program << ", " << location << ", " << name << ")");
SetBucketAsString(kResultBucketId, name);
helper_->BindUniformLocationCHROMIUMBucket(
program, location, kResultBucketId);
@@ -1004,10 +939,6 @@ void GLES2Implementation::BindUniformLocationCHROMIUM(
void GLES2Implementation::GetVertexAttribPointerv(
GLuint index, GLenum pname, void** ptr) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetVertexAttribPointer("
- << index << ", " << GLES2Util::GetStringVertexPointer(pname) << ", "
- << static_cast<void*>(ptr) << ")");
- GPU_CLIENT_LOG_CODE_BLOCK(int32 num_results = 1);
if (!vertex_array_object_manager_->GetAttribPointer(index, pname, ptr)) {
TRACE_EVENT0("gpu", "GLES2::GetVertexAttribPointerv");
typedef cmds::GetVertexAttribPointerv::Result Result;
@@ -1020,13 +951,7 @@ void GLES2Implementation::GetVertexAttribPointerv(
index, pname, GetResultShmId(), GetResultShmOffset());
WaitForCmd();
result->CopyResult(ptr);
- GPU_CLIENT_LOG_CODE_BLOCK(num_results = result->GetNumResults());
}
- GPU_CLIENT_LOG_CODE_BLOCK({
- for (int32 i = 0; i < num_results; ++i) {
- GPU_CLIENT_LOG(" " << i << ": " << ptr[i]);
- }
- });
CheckGLError();
}
@@ -1089,12 +1014,9 @@ GLint GLES2Implementation::GetAttribLocationHelper(
GLint GLES2Implementation::GetAttribLocation(
GLuint program, const char* name) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetAttribLocation(" << program
- << ", " << name << ")");
TRACE_EVENT0("gpu", "GLES2::GetAttribLocation");
GLint loc = share_group_->program_info_manager()->GetAttribLocation(
this, program, name);
- GPU_CLIENT_LOG("returned " << loc);
CheckGLError();
return loc;
}
@@ -1118,19 +1040,15 @@ GLint GLES2Implementation::GetUniformLocationHelper(
GLint GLES2Implementation::GetUniformLocation(
GLuint program, const char* name) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetUniformLocation(" << program
- << ", " << name << ")");
TRACE_EVENT0("gpu", "GLES2::GetUniformLocation");
GLint loc = share_group_->program_info_manager()->GetUniformLocation(
this, program, name);
- GPU_CLIENT_LOG("returned " << loc);
CheckGLError();
return loc;
}
void GLES2Implementation::UseProgram(GLuint program) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glUseProgram(" << program << ")");
if (current_program_ != program) {
current_program_ = program;
helper_->UseProgram(program);
@@ -1142,17 +1060,11 @@ bool GLES2Implementation::GetProgramivHelper(
GLuint program, GLenum pname, GLint* params) {
bool got_value = share_group_->program_info_manager()->GetProgramiv(
this, program, pname, params);
- GPU_CLIENT_LOG_CODE_BLOCK({
- if (got_value) {
- GPU_CLIENT_LOG(" 0: " << *params);
- }
- });
return got_value;
}
void GLES2Implementation::LinkProgram(GLuint program) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glLinkProgram(" << program << ")");
helper_->LinkProgram(program);
share_group_->program_info_manager()->CreateInfo(program);
CheckGLError();
@@ -1162,11 +1074,6 @@ void GLES2Implementation::ShaderBinary(
GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary,
GLsizei length) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glShaderBinary(" << n << ", "
- << static_cast<const void*>(shaders) << ", "
- << GLES2Util::GetStringEnum(binaryformat) << ", "
- << static_cast<const void*>(binary) << ", "
- << length << ")");
if (n < 0) {
SetGLError(GL_INVALID_VALUE, "glShaderBinary", "n < 0.");
return;
@@ -1200,9 +1107,6 @@ void GLES2Implementation::ShaderBinary(
void GLES2Implementation::PixelStorei(GLenum pname, GLint param) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glPixelStorei("
- << GLES2Util::GetStringPixelStore(pname) << ", "
- << param << ")");
switch (pname) {
case GL_PACK_ALIGNMENT:
pack_alignment_ = param;
@@ -1238,13 +1142,6 @@ void GLES2Implementation::VertexAttribPointer(
GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride,
const void* ptr) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glVertexAttribPointer("
- << index << ", "
- << size << ", "
- << GLES2Util::GetStringVertexAttribType(type) << ", "
- << GLES2Util::GetStringBool(normalized) << ", "
- << stride << ", "
- << static_cast<const void*>(ptr) << ")");
// Record the info on the client side.
if (!vertex_array_object_manager_->SetAttribPointer(
bound_array_buffer_id_, index, size, type, normalized, stride, ptr)) {
@@ -1268,9 +1165,6 @@ void GLES2Implementation::VertexAttribPointer(
void GLES2Implementation::VertexAttribDivisorANGLE(
GLuint index, GLuint divisor) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glVertexAttribDivisorANGLE("
- << index << ", "
- << divisor << ") ");
// Record the info on the client side.
vertex_array_object_manager_->SetAttribDivisor(index, divisor);
helper_->VertexAttribDivisorANGLE(index, divisor);
@@ -1280,24 +1174,6 @@ void GLES2Implementation::VertexAttribDivisorANGLE(
void GLES2Implementation::ShaderSource(
GLuint shader, GLsizei count, const GLchar* const* source, const GLint* length) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glShaderSource("
- << shader << ", " << count << ", "
- << static_cast<const void*>(source) << ", "
- << static_cast<const void*>(length) << ")");
- GPU_CLIENT_LOG_CODE_BLOCK({
- for (GLsizei ii = 0; ii < count; ++ii) {
- if (source[ii]) {
- if (length && length[ii] >= 0) {
- std::string str(source[ii], length[ii]);
- GPU_CLIENT_LOG(" " << ii << ": ---\n" << str << "\n---");
- } else {
- GPU_CLIENT_LOG(" " << ii << ": ---\n" << source[ii] << "\n---");
- }
- } else {
- GPU_CLIENT_LOG(" " << ii << ": NULL");
- }
- }
- });
if (count < 0) {
SetGLError(GL_INVALID_VALUE, "glShaderSource", "count < 0");
return;
@@ -1412,11 +1288,6 @@ void GLES2Implementation::BufferDataHelper(
void GLES2Implementation::BufferData(
GLenum target, GLsizeiptr size, const void* data, GLenum usage) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glBufferData("
- << GLES2Util::GetStringBufferTarget(target) << ", "
- << size << ", "
- << static_cast<const void*>(data) << ", "
- << GLES2Util::GetStringBufferUsage(usage) << ")");
BufferDataHelper(target, size, data, usage);
CheckGLError();
}
@@ -1486,10 +1357,6 @@ void GLES2Implementation::BufferSubDataHelperImpl(
void GLES2Implementation::BufferSubData(
GLenum target, GLintptr offset, GLsizeiptr size, const void* data) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glBufferSubData("
- << GLES2Util::GetStringBufferTarget(target) << ", "
- << offset << ", " << size << ", "
- << static_cast<const void*>(data) << ")");
BufferSubDataHelper(target, offset, size, data);
CheckGLError();
}
@@ -1544,13 +1411,6 @@ void GLES2Implementation::CompressedTexImage2D(
GLenum target, GLint level, GLenum internalformat, GLsizei width,
GLsizei height, GLint border, GLsizei image_size, const void* data) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glCompressedTexImage2D("
- << GLES2Util::GetStringTextureTarget(target) << ", "
- << level << ", "
- << GLES2Util::GetStringCompressedTextureFormat(internalformat) << ", "
- << width << ", " << height << ", " << border << ", "
- << image_size << ", "
- << static_cast<const void*>(data) << ")");
if (width < 0 || height < 0 || level < 0) {
SetGLError(GL_INVALID_VALUE, "glCompressedTexImage2D", "dimension < 0");
return;
@@ -1587,14 +1447,6 @@ void GLES2Implementation::CompressedTexSubImage2D(
GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
GLsizei height, GLenum format, GLsizei image_size, const void* data) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glCompressedTexSubImage2D("
- << GLES2Util::GetStringTextureTarget(target) << ", "
- << level << ", "
- << xoffset << ", " << yoffset << ", "
- << width << ", " << height << ", "
- << GLES2Util::GetStringCompressedTextureFormat(format) << ", "
- << image_size << ", "
- << static_cast<const void*>(data) << ")");
if (width < 0 || height < 0 || level < 0) {
SetGLError(GL_INVALID_VALUE, "glCompressedTexSubImage2D", "dimension < 0");
return;
@@ -1665,14 +1517,6 @@ void GLES2Implementation::TexImage2D(
GLsizei height, GLint border, GLenum format, GLenum type,
const void* pixels) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glTexImage2D("
- << GLES2Util::GetStringTextureTarget(target) << ", "
- << level << ", "
- << GLES2Util::GetStringTextureInternalFormat(internalformat) << ", "
- << width << ", " << height << ", " << border << ", "
- << GLES2Util::GetStringTextureFormat(format) << ", "
- << GLES2Util::GetStringPixelType(type) << ", "
- << static_cast<const void*>(pixels) << ")");
if (level < 0 || height < 0 || width < 0) {
SetGLError(GL_INVALID_VALUE, "glTexImage2D", "dimension < 0");
return;
@@ -1766,14 +1610,6 @@ void GLES2Implementation::TexSubImage2D(
GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
GLsizei height, GLenum format, GLenum type, const void* pixels) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glTexSubImage2D("
- << GLES2Util::GetStringTextureTarget(target) << ", "
- << level << ", "
- << xoffset << ", " << yoffset << ", "
- << width << ", " << height << ", "
- << GLES2Util::GetStringTextureFormat(format) << ", "
- << GLES2Util::GetStringPixelType(type) << ", "
- << static_cast<const void*>(pixels) << ")");
if (level < 0 || height < 0 || width < 0) {
SetGLError(GL_INVALID_VALUE, "glTexSubImage2D", "dimension < 0");
@@ -1935,30 +1771,13 @@ void GLES2Implementation::GetActiveAttrib(
GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size,
GLenum* type, char* name) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetActiveAttrib("
- << program << ", " << index << ", " << bufsize << ", "
- << static_cast<const void*>(length) << ", "
- << static_cast<const void*>(size) << ", "
- << static_cast<const void*>(type) << ", "
- << static_cast<const void*>(name) << ", ");
if (bufsize < 0) {
SetGLError(GL_INVALID_VALUE, "glGetActiveAttrib", "bufsize < 0");
return;
}
TRACE_EVENT0("gpu", "GLES2::GetActiveAttrib");
- bool success = share_group_->program_info_manager()->GetActiveAttrib(
- this, program, index, bufsize, length, size, type, name);
- if (success) {
- if (size) {
- GPU_CLIENT_LOG(" size: " << *size);
- }
- if (type) {
- GPU_CLIENT_LOG(" type: " << GLES2Util::GetStringEnum(*type));
- }
- if (name) {
- GPU_CLIENT_LOG(" name: " << name);
- }
- }
+ share_group_->program_info_manager()->GetActiveAttrib(
+ this, program, index, bufsize, length, size, type, name);
CheckGLError();
}
@@ -2006,40 +1825,19 @@ void GLES2Implementation::GetActiveUniform(
GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size,
GLenum* type, char* name) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetActiveUniform("
- << program << ", " << index << ", " << bufsize << ", "
- << static_cast<const void*>(length) << ", "
- << static_cast<const void*>(size) << ", "
- << static_cast<const void*>(type) << ", "
- << static_cast<const void*>(name) << ", ");
if (bufsize < 0) {
SetGLError(GL_INVALID_VALUE, "glGetActiveUniform", "bufsize < 0");
return;
}
TRACE_EVENT0("gpu", "GLES2::GetActiveUniform");
- bool success = share_group_->program_info_manager()->GetActiveUniform(
+ share_group_->program_info_manager()->GetActiveUniform(
this, program, index, bufsize, length, size, type, name);
- if (success) {
- if (size) {
- GPU_CLIENT_LOG(" size: " << *size);
- }
- if (type) {
- GPU_CLIENT_LOG(" type: " << GLES2Util::GetStringEnum(*type));
- }
- if (name) {
- GPU_CLIENT_LOG(" name: " << name);
- }
- }
CheckGLError();
}
void GLES2Implementation::GetAttachedShaders(
GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetAttachedShaders("
- << program << ", " << maxcount << ", "
- << static_cast<const void*>(count) << ", "
- << static_cast<const void*>(shaders) << ", ");
if (maxcount < 0) {
SetGLError(GL_INVALID_VALUE, "glGetAttachedShaders", "maxcount < 0");
return;
@@ -2063,11 +1861,6 @@ void GLES2Implementation::GetAttachedShaders(
*count = result->GetNumResults();
}
result->CopyResult(shaders);
- GPU_CLIENT_LOG_CODE_BLOCK({
- for (int32 i = 0; i < result->GetNumResults(); ++i) {
- GPU_CLIENT_LOG(" " << i << ": " << result->GetData()[i]);
- }
- });
transfer_buffer_->FreePendingToken(result, token);
CheckGLError();
}
@@ -2075,11 +1868,6 @@ void GLES2Implementation::GetAttachedShaders(
void GLES2Implementation::GetShaderPrecisionFormat(
GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetShaderPrecisionFormat("
- << GLES2Util::GetStringShaderType(shadertype) << ", "
- << GLES2Util::GetStringShaderPrecision(precisiontype) << ", "
- << static_cast<const void*>(range) << ", "
- << static_cast<const void*>(precision) << ", ");
TRACE_EVENT0("gpu", "GLES2::GetShaderPrecisionFormat");
typedef cmds::GetShaderPrecisionFormat::Result Result;
Result* result = GetResultAs<Result*>();
@@ -2105,12 +1893,9 @@ void GLES2Implementation::GetShaderPrecisionFormat(
if (range) {
range[0] = result->min_range;
range[1] = result->max_range;
- GPU_CLIENT_LOG(" min_range: " << range[0]);
- GPU_CLIENT_LOG(" min_range: " << range[1]);
}
if (precision) {
precision[0] = result->precision;
- GPU_CLIENT_LOG(" min_range: " << precision[0]);
}
}
CheckGLError();
@@ -2167,11 +1952,8 @@ const GLubyte* GLES2Implementation::GetStringHelper(GLenum name) {
const GLubyte* GLES2Implementation::GetString(GLenum name) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetString("
- << GLES2Util::GetStringStringType(name) << ")");
TRACE_EVENT0("gpu", "GLES2::GetString");
const GLubyte* result = GetStringHelper(name);
- GPU_CLIENT_LOG(" returned " << reinterpret_cast<const char*>(result));
CheckGLError();
return result;
}
@@ -2179,9 +1961,6 @@ const GLubyte* GLES2Implementation::GetString(GLenum name) {
void GLES2Implementation::GetUniformfv(
GLuint program, GLint location, GLfloat* params) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetUniformfv("
- << program << ", " << location << ", "
- << static_cast<const void*>(params) << ")");
TRACE_EVENT0("gpu", "GLES2::GetUniformfv");
typedef cmds::GetUniformfv::Result Result;
Result* result = GetResultAs<Result*>();
@@ -2193,20 +1972,12 @@ void GLES2Implementation::GetUniformfv(
program, location, GetResultShmId(), GetResultShmOffset());
WaitForCmd();
result->CopyResult(params);
- GPU_CLIENT_LOG_CODE_BLOCK({
- for (int32 i = 0; i < result->GetNumResults(); ++i) {
- GPU_CLIENT_LOG(" " << i << ": " << result->GetData()[i]);
- }
- });
CheckGLError();
}
void GLES2Implementation::GetUniformiv(
GLuint program, GLint location, GLint* params) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetUniformiv("
- << program << ", " << location << ", "
- << static_cast<const void*>(params) << ")");
TRACE_EVENT0("gpu", "GLES2::GetUniformiv");
typedef cmds::GetUniformiv::Result Result;
Result* result = GetResultAs<Result*>();
@@ -2218,11 +1989,6 @@ void GLES2Implementation::GetUniformiv(
program, location, GetResultShmId(), GetResultShmOffset());
WaitForCmd();
GetResultAs<cmds::GetUniformfv::Result*>()->CopyResult(params);
- GPU_CLIENT_LOG_CODE_BLOCK({
- for (int32 i = 0; i < result->GetNumResults(); ++i) {
- GPU_CLIENT_LOG(" " << i << ": " << result->GetData()[i]);
- }
- });
CheckGLError();
}
@@ -2230,12 +1996,6 @@ void GLES2Implementation::ReadPixels(
GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format,
GLenum type, void* pixels) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glReadPixels("
- << xoffset << ", " << yoffset << ", "
- << width << ", " << height << ", "
- << GLES2Util::GetStringReadPixelFormat(format) << ", "
- << GLES2Util::GetStringPixelType(type) << ", "
- << static_cast<const void*>(pixels) << ")");
if (width < 0 || height < 0) {
SetGLError(GL_INVALID_VALUE, "glReadPixels", "dimensions < 0");
return;
@@ -2340,8 +2100,6 @@ void GLES2Implementation::ReadPixels(
void GLES2Implementation::ActiveTexture(GLenum texture) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glActiveTexture("
- << GLES2Util::GetStringEnum(texture) << ")");
GLuint texture_index = texture - GL_TEXTURE0;
if (texture_index >= static_cast<GLuint>(
static_state_.int_state.max_combined_texture_image_units)) {
@@ -2662,8 +2420,6 @@ void GLES2Implementation::DeleteTexturesStub(
void GLES2Implementation::DisableVertexAttribArray(GLuint index) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG(
- "[" << GetLogPrefix() << "] glDisableVertexAttribArray(" << index << ")");
vertex_array_object_manager_->SetAttribEnable(index, false);
helper_->DisableVertexAttribArray(index);
CheckGLError();
@@ -2671,8 +2427,6 @@ void GLES2Implementation::DisableVertexAttribArray(GLuint index) {
void GLES2Implementation::EnableVertexAttribArray(GLuint index) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glEnableVertexAttribArray("
- << index << ")");
vertex_array_object_manager_->SetAttribEnable(index, true);
helper_->EnableVertexAttribArray(index);
CheckGLError();
@@ -2680,9 +2434,6 @@ void GLES2Implementation::EnableVertexAttribArray(GLuint index) {
void GLES2Implementation::DrawArrays(GLenum mode, GLint first, GLsizei count) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDrawArrays("
- << GLES2Util::GetStringDrawMode(mode) << ", "
- << first << ", " << count << ")");
if (count < 0) {
SetGLError(GL_INVALID_VALUE, "glDrawArrays", "count < 0");
return;
@@ -2700,10 +2451,6 @@ void GLES2Implementation::DrawArrays(GLenum mode, GLint first, GLsizei count) {
void GLES2Implementation::GetVertexAttribfv(
GLuint index, GLenum pname, GLfloat* params) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetVertexAttribfv("
- << index << ", "
- << GLES2Util::GetStringVertexAttribute(pname) << ", "
- << static_cast<const void*>(params) << ")");
uint32 value = 0;
if (vertex_array_object_manager_->GetVertexAttrib(index, pname, &value)) {
*params = static_cast<float>(value);
@@ -2720,21 +2467,12 @@ void GLES2Implementation::GetVertexAttribfv(
index, pname, GetResultShmId(), GetResultShmOffset());
WaitForCmd();
result->CopyResult(params);
- GPU_CLIENT_LOG_CODE_BLOCK({
- for (int32 i = 0; i < result->GetNumResults(); ++i) {
- GPU_CLIENT_LOG(" " << i << ": " << result->GetData()[i]);
- }
- });
CheckGLError();
}
void GLES2Implementation::GetVertexAttribiv(
GLuint index, GLenum pname, GLint* params) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetVertexAttribiv("
- << index << ", "
- << GLES2Util::GetStringVertexAttribute(pname) << ", "
- << static_cast<const void*>(params) << ")");
uint32 value = 0;
if (vertex_array_object_manager_->GetVertexAttrib(index, pname, &value)) {
*params = value;
@@ -2751,19 +2489,12 @@ void GLES2Implementation::GetVertexAttribiv(
index, pname, GetResultShmId(), GetResultShmOffset());
WaitForCmd();
result->CopyResult(params);
- GPU_CLIENT_LOG_CODE_BLOCK({
- for (int32 i = 0; i < result->GetNumResults(); ++i) {
- GPU_CLIENT_LOG(" " << i << ": " << result->GetData()[i]);
- }
- });
CheckGLError();
}
GLboolean GLES2Implementation::EnableFeatureCHROMIUM(
const char* feature) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glEnableFeatureCHROMIUM("
- << feature << ")");
TRACE_EVENT0("gpu", "GLES2::EnableFeatureCHROMIUM");
typedef cmds::EnableFeatureCHROMIUM::Result Result;
Result* result = GetResultAs<Result*>();
@@ -2776,16 +2507,12 @@ GLboolean GLES2Implementation::EnableFeatureCHROMIUM(
kResultBucketId, GetResultShmId(), GetResultShmOffset());
WaitForCmd();
helper_->SetBucketSize(kResultBucketId, 0);
- GPU_CLIENT_LOG(" returned " << GLES2Util::GetStringBool(*result));
return *result;
}
void* GLES2Implementation::MapBufferSubDataCHROMIUM(
GLuint target, GLintptr offset, GLsizeiptr size, GLenum access) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glMapBufferSubDataCHROMIUM("
- << target << ", " << offset << ", " << size << ", "
- << GLES2Util::GetStringEnum(access) << ")");
// NOTE: target is NOT checked because the service will check it
// and we don't know what targets are valid.
if (access != GL_WRITE_ONLY) {
@@ -2811,14 +2538,11 @@ void* GLES2Implementation::MapBufferSubDataCHROMIUM(
MappedBuffer(
access, shm_id, mem, shm_offset, target, offset, size)));
DCHECK(result.second);
- GPU_CLIENT_LOG(" returned " << mem);
return mem;
}
void GLES2Implementation::UnmapBufferSubDataCHROMIUM(const void* mem) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG(
- "[" << GetLogPrefix() << "] glUnmapBufferSubDataCHROMIUM(" << mem << ")");
MappedBufferMap::iterator it = mapped_buffers_.find(mem);
if (it == mapped_buffers_.end()) {
SetGLError(
@@ -2844,13 +2568,6 @@ void* GLES2Implementation::MapTexSubImage2DCHROMIUM(
GLenum type,
GLenum access) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glMapTexSubImage2DCHROMIUM("
- << target << ", " << level << ", "
- << xoffset << ", " << yoffset << ", "
- << width << ", " << height << ", "
- << GLES2Util::GetStringTextureFormat(format) << ", "
- << GLES2Util::GetStringPixelType(type) << ", "
- << GLES2Util::GetStringEnum(access) << ")");
if (access != GL_WRITE_ONLY) {
SetGLErrorInvalidEnum(
"glMapTexSubImage2DCHROMIUM", access, "access");
@@ -2885,14 +2602,11 @@ void* GLES2Implementation::MapTexSubImage2DCHROMIUM(
access, shm_id, mem, shm_offset,
target, level, xoffset, yoffset, width, height, format, type)));
DCHECK(result.second);
- GPU_CLIENT_LOG(" returned " << mem);
return mem;
}
void GLES2Implementation::UnmapTexSubImage2DCHROMIUM(const void* mem) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG(
- "[" << GetLogPrefix() << "] glUnmapTexSubImage2DCHROMIUM(" << mem << ")");
MappedTextureMap::iterator it = mapped_textures_.find(mem);
if (it == mapped_textures_.end()) {
SetGLError(
@@ -2911,16 +2625,12 @@ void GLES2Implementation::UnmapTexSubImage2DCHROMIUM(const void* mem) {
void GLES2Implementation::ResizeCHROMIUM(GLuint width, GLuint height,
float scale_factor) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glResizeCHROMIUM("
- << width << ", " << height << ", " << scale_factor << ")");
helper_->ResizeCHROMIUM(width, height, scale_factor);
CheckGLError();
}
const GLchar* GLES2Implementation::GetRequestableExtensionsCHROMIUM() {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix()
- << "] glGetRequestableExtensionsCHROMIUM()");
TRACE_EVENT0("gpu",
"GLES2Implementation::GetRequestableExtensionsCHROMIUM()");
const char* result = NULL;
@@ -2944,7 +2654,6 @@ const GLchar* GLES2Implementation::GetRequestableExtensionsCHROMIUM() {
result = insert_result.first->c_str();
}
}
- GPU_CLIENT_LOG(" returned " << result);
return reinterpret_cast<const GLchar*>(result);
}
@@ -2952,8 +2661,6 @@ const GLchar* GLES2Implementation::GetRequestableExtensionsCHROMIUM() {
// with VirtualGL contexts.
void GLES2Implementation::RequestExtensionCHROMIUM(const char* extension) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glRequestExtensionCHROMIUM("
- << extension << ")");
SetBucketAsCString(kResultBucketId, extension);
helper_->RequestExtensionCHROMIUM(kResultBucketId);
helper_->SetBucketSize(kResultBucketId, 0);
@@ -2984,7 +2691,6 @@ void GLES2Implementation::RequestExtensionCHROMIUM(const char* extension) {
void GLES2Implementation::RateLimitOffscreenContextCHROMIUM() {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glRateLimitOffscreenCHROMIUM()");
// Wait if this would add too many rate limit tokens.
if (rate_limit_tokens_.size() == kMaxSwapBuffers) {
helper_->WaitForToken(rate_limit_tokens_.front());
@@ -2996,16 +2702,6 @@ void GLES2Implementation::RateLimitOffscreenContextCHROMIUM() {
void GLES2Implementation::GetMultipleIntegervCHROMIUM(
const GLenum* pnames, GLuint count, GLint* results, GLsizeiptr size) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetMultipleIntegervCHROMIUM("
- << static_cast<const void*>(pnames) << ", "
- << count << ", " << results << ", "
- << size << ")");
- GPU_CLIENT_LOG_CODE_BLOCK({
- for (GLuint i = 0; i < count; ++i) {
- GPU_CLIENT_LOG(
- " " << i << ": " << GLES2Util::GetStringGLState(pnames[i]));
- }
- });
GetMultipleIntegervState state(pnames, count, results, size);
if (!GetMultipleIntegervSetup(&state)) {
@@ -3021,13 +2717,6 @@ void GLES2Implementation::GetMultipleIntegervCHROMIUM(
WaitForCmd();
GetMultipleIntegervOnCompleted(&state);
- GPU_CLIENT_LOG(" returned");
- GPU_CLIENT_LOG_CODE_BLOCK({
- for (int i = 0; i < state.num_results; ++i) {
- GPU_CLIENT_LOG(" " << i << ": " << (results[i]));
- }
- });
-
// TODO(gman): We should be able to free without a token.
transfer_buffer_->FreePendingToken(state.buffer, helper_->InsertToken());
CheckGLError();
@@ -3163,8 +2852,6 @@ void GLES2Implementation::GetProgramInfoCHROMIUM(
GLuint GLES2Implementation::CreateStreamTextureCHROMIUM(GLuint texture) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] CreateStreamTextureCHROMIUM("
- << texture << ")");
TRACE_EVENT0("gpu", "GLES2::CreateStreamTextureCHROMIUM");
typedef cmds::CreateStreamTextureCHROMIUM::Result Result;
Result* result = GetResultAs<Result*>();
@@ -3184,8 +2871,6 @@ GLuint GLES2Implementation::CreateStreamTextureCHROMIUM(GLuint texture) {
void GLES2Implementation::DestroyStreamTextureCHROMIUM(GLuint texture) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] DestroyStreamTextureCHROMIUM("
- << texture << ")");
TRACE_EVENT0("gpu", "GLES2::DestroyStreamTextureCHROMIUM");
helper_->DestroyStreamTextureCHROMIUM(texture);
CheckGLError();
@@ -3194,8 +2879,6 @@ void GLES2Implementation::DestroyStreamTextureCHROMIUM(GLuint texture) {
void GLES2Implementation::PostSubBufferCHROMIUM(
GLint x, GLint y, GLint width, GLint height) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] PostSubBufferCHROMIUM("
- << x << ", " << y << ", " << width << ", " << height << ")");
TRACE_EVENT2("gpu", "GLES2::PostSubBufferCHROMIUM",
"width", width, "height", height);
@@ -3233,7 +2916,6 @@ void GLES2Implementation::DeleteQueriesStub(
GLboolean GLES2Implementation::IsQueryEXT(GLuint id) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] IsQueryEXT(" << id << ")");
// TODO(gman): To be spec compliant IDs from other contexts sharing
// resources need to return true here even though you can't share
@@ -3243,9 +2925,6 @@ GLboolean GLES2Implementation::IsQueryEXT(GLuint id) {
void GLES2Implementation::BeginQueryEXT(GLenum target, GLuint id) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] BeginQueryEXT("
- << GLES2Util::GetStringQueryTarget(target)
- << ", " << id << ")");
// if any outstanding queries INV_OP
if (current_query_) {
@@ -3284,8 +2963,6 @@ void GLES2Implementation::BeginQueryEXT(GLenum target, GLuint id) {
void GLES2Implementation::EndQueryEXT(GLenum target) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] EndQueryEXT("
- << GLES2Util::GetStringQueryTarget(target) << ")");
// Don't do anything if the context is lost.
if (helper_->IsContextLost()) {
return;
@@ -3310,10 +2987,6 @@ void GLES2Implementation::EndQueryEXT(GLenum target) {
void GLES2Implementation::GetQueryivEXT(
GLenum target, GLenum pname, GLint* params) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] GetQueryivEXT("
- << GLES2Util::GetStringQueryTarget(target) << ", "
- << GLES2Util::GetStringQueryParameter(pname) << ", "
- << static_cast<const void*>(params) << ")");
if (pname != GL_CURRENT_QUERY_EXT) {
SetGLErrorInvalidEnum("glGetQueryivEXT", pname, "pname");
@@ -3321,16 +2994,12 @@ void GLES2Implementation::GetQueryivEXT(
}
*params = (current_query_ && current_query_->target() == target) ?
current_query_->id() : 0;
- GPU_CLIENT_LOG(" " << *params);
CheckGLError();
}
void GLES2Implementation::GetQueryObjectuivEXT(
GLuint id, GLenum pname, GLuint* params) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] GetQueryivEXT(" << id << ", "
- << GLES2Util::GetStringQueryObjectParameter(pname) << ", "
- << static_cast<const void*>(params) << ")");
QueryTracker::Query* query = query_tracker_->GetQuery(id);
if (!query) {
@@ -3371,16 +3040,12 @@ void GLES2Implementation::GetQueryObjectuivEXT(
SetGLErrorInvalidEnum("glQueryObjectuivEXT", pname, "pname");
break;
}
- GPU_CLIENT_LOG(" " << *params);
CheckGLError();
}
void GLES2Implementation::DrawArraysInstancedANGLE(
GLenum mode, GLint first, GLsizei count, GLsizei primcount) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDrawArraysInstancedANGLE("
- << GLES2Util::GetStringDrawMode(mode) << ", "
- << first << ", " << count << ", " << primcount << ")");
if (count < 0) {
SetGLError(GL_INVALID_VALUE, "glDrawArraysInstancedANGLE", "count < 0");
return;
@@ -3407,12 +3072,6 @@ void GLES2Implementation::DrawElementsInstancedANGLE(
GLenum mode, GLsizei count, GLenum type, const void* indices,
GLsizei primcount) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDrawElementsInstancedANGLE("
- << GLES2Util::GetStringDrawMode(mode) << ", "
- << count << ", "
- << GLES2Util::GetStringIndexType(type) << ", "
- << static_cast<const void*>(indices) << ", "
- << primcount << ")");
if (count < 0) {
SetGLError(GL_INVALID_VALUE,
"glDrawElementsInstancedANGLE", "count less than 0.");
@@ -3444,8 +3103,6 @@ void GLES2Implementation::DrawElementsInstancedANGLE(
void GLES2Implementation::GenMailboxCHROMIUM(
GLbyte* mailbox) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenMailboxCHROMIUM("
- << static_cast<const void*>(mailbox) << ")");
TRACE_EVENT0("gpu", "GLES2::GenMailboxCHROMIUM");
std::vector<gpu::Mailbox> names;
@@ -3459,8 +3116,6 @@ void GLES2Implementation::GenMailboxCHROMIUM(
void GLES2Implementation::PushGroupMarkerEXT(
GLsizei length, const GLchar* marker) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glPushGroupMarkerEXT("
- << length << ", " << marker << ")");
if (!marker) {
marker = "";
}
@@ -3476,8 +3131,6 @@ void GLES2Implementation::PushGroupMarkerEXT(
void GLES2Implementation::InsertEventMarkerEXT(
GLsizei length, const GLchar* marker) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glInsertEventMarkerEXT("
- << length << ", " << marker << ")");
if (!marker) {
marker = "";
}
@@ -3492,15 +3145,12 @@ void GLES2Implementation::InsertEventMarkerEXT(
void GLES2Implementation::PopGroupMarkerEXT() {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glPopGroupMarkerEXT()");
helper_->PopGroupMarkerEXT();
debug_marker_manager_.PopGroup();
}
void GLES2Implementation::TraceBeginCHROMIUM(const char* name) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glTraceBeginCHROMIUM("
- << name << ")");
if (current_trace_name_.get()) {
SetGLError(GL_INVALID_OPERATION, "glTraceBeginCHROMIUM",
"trace already running");
@@ -3515,7 +3165,6 @@ void GLES2Implementation::TraceBeginCHROMIUM(const char* name) {
void GLES2Implementation::TraceEndCHROMIUM() {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glTraceEndCHROMIUM(" << ")");
if (!current_trace_name_.get()) {
SetGLError(GL_INVALID_OPERATION, "glTraceEndCHROMIUM",
"missing begin trace");
@@ -3528,8 +3177,6 @@ void GLES2Implementation::TraceEndCHROMIUM() {
void* GLES2Implementation::MapBufferCHROMIUM(GLuint target, GLenum access) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glMapBufferCHROMIUM("
- << target << ", " << GLES2Util::GetStringEnum(access) << ")");
switch (target) {
case GL_PIXEL_PACK_TRANSFER_BUFFER_CHROMIUM:
if (access != GL_READ_ONLY) {
@@ -3573,15 +3220,12 @@ void* GLES2Implementation::MapBufferCHROMIUM(GLuint target, GLenum access) {
}
buffer->set_mapped(true);
- GPU_CLIENT_LOG(" returned " << buffer->address());
CheckGLError();
return buffer->address();
}
GLboolean GLES2Implementation::UnmapBufferCHROMIUM(GLuint target) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG(
- "[" << GetLogPrefix() << "] glUnmapBufferCHROMIUM(" << target << ")");
GLuint buffer_id;
if (!GetBoundPixelTransferBuffer(target, "glMapBufferCHROMIUM", &buffer_id)) {
SetGLError(GL_INVALID_ENUM, "glUnmapBufferCHROMIUM", "invalid target");
@@ -3608,14 +3252,6 @@ void GLES2Implementation::AsyncTexImage2DCHROMIUM(
GLsizei height, GLint border, GLenum format, GLenum type,
const void* pixels) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glTexImage2D("
- << GLES2Util::GetStringTextureTarget(target) << ", "
- << level << ", "
- << GLES2Util::GetStringTextureInternalFormat(internalformat) << ", "
- << width << ", " << height << ", " << border << ", "
- << GLES2Util::GetStringTextureFormat(format) << ", "
- << GLES2Util::GetStringPixelType(type) << ", "
- << static_cast<const void*>(pixels) << ")");
if (level < 0 || height < 0 || width < 0) {
SetGLError(GL_INVALID_VALUE, "glTexImage2D", "dimension < 0");
return;
@@ -3657,14 +3293,6 @@ void GLES2Implementation::AsyncTexSubImage2DCHROMIUM(
GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
GLsizei height, GLenum format, GLenum type, const void* pixels) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glAsyncTexSubImage2DCHROMIUM("
- << GLES2Util::GetStringTextureTarget(target) << ", "
- << level << ", "
- << xoffset << ", " << yoffset << ", "
- << width << ", " << height << ", "
- << GLES2Util::GetStringTextureFormat(format) << ", "
- << GLES2Util::GetStringPixelType(type) << ", "
- << static_cast<const void*>(pixels) << ")");
if (level < 0 || height < 0 || width < 0) {
SetGLError(
GL_INVALID_VALUE, "glAsyncTexSubImage2DCHROMIUM", "dimension < 0");
@@ -3699,15 +3327,12 @@ void GLES2Implementation::AsyncTexSubImage2DCHROMIUM(
void GLES2Implementation::WaitAsyncTexImage2DCHROMIUM(GLenum target) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glWaitAsyncTexImage2DCHROMIUM("
- << GLES2Util::GetStringTextureTarget(target) << ")");
helper_->WaitAsyncTexImage2DCHROMIUM(target);
CheckGLError();
}
GLuint GLES2Implementation::InsertSyncPointCHROMIUM() {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glInsertSyncPointCHROMIUM");
helper_->CommandBufferHelper::Flush();
return gpu_control_->InsertSyncPoint();
}
@@ -3740,10 +3365,6 @@ GLuint GLES2Implementation::CreateImageCHROMIUMHelper(
GLuint GLES2Implementation::CreateImageCHROMIUM(
GLsizei width, GLsizei height, GLenum internalformat) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glCreateImageCHROMIUM("
- << width << ", "
- << height << ", "
- << GLES2Util::GetStringTextureInternalFormat(internalformat) << ")");
GLuint image_id = CreateImageCHROMIUMHelper(width, height, internalformat);
CheckGLError();
return image_id;
@@ -3765,8 +3386,6 @@ void GLES2Implementation::DestroyImageCHROMIUMHelper(GLuint image_id) {
void GLES2Implementation::DestroyImageCHROMIUM(GLuint image_id) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDestroyImageCHROMIUM("
- << image_id << ")");
DestroyImageCHROMIUMHelper(image_id);
CheckGLError();
}
@@ -3788,9 +3407,6 @@ void GLES2Implementation::UnmapImageCHROMIUMHelper(GLuint image_id) {
void GLES2Implementation::UnmapImageCHROMIUM(GLuint image_id) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glUnmapImageCHROMIUM("
- << image_id << ")");
-
UnmapImageCHROMIUMHelper(image_id);
CheckGLError();
}
@@ -3833,10 +3449,6 @@ void* GLES2Implementation::MapImageCHROMIUMHelper(GLuint image_id,
void* GLES2Implementation::MapImageCHROMIUM(
GLuint image_id, GLenum access) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glMapImageCHROMIUM("
- << image_id << ", "
- << GLES2Util::GetStringEnum(access) << ")");
-
void* mapped = MapImageCHROMIUMHelper(image_id, access);
CheckGLError();
return mapped;
@@ -3865,10 +3477,6 @@ void GLES2Implementation::GetImageParameterivCHROMIUM(
GLuint image_id, GLenum pname, GLint* params) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
GPU_CLIENT_VALIDATE_DESTINATION_INITALIZATION(GLint, params);
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glImageParameterivCHROMIUM("
- << image_id << ", "
- << GLES2Util::GetStringBufferParameter(pname) << ", "
- << static_cast<const void*>(params) << ")");
GetImageParameterivCHROMIUMHelper(image_id, pname, params);
CheckGLError();
}
« no previous file with comments | « gpu/command_buffer/client/gles2_implementation.h ('k') | gpu/command_buffer/client/gles2_implementation_impl_autogen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698