Chromium Code Reviews Chromium Code Reviews
Issue 10836185:
Implement GL_EXT_debug_marker (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src| 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 8fa305d401515027eeec23e6582f01a930e93770..c6ee4342e9ff5da8fea7e5b5ea233a53b1edf567 100644 |
| --- a/gpu/command_buffer/client/gles2_implementation.cc |
| +++ b/gpu/command_buffer/client/gles2_implementation.cc |
| @@ -10,6 +10,8 @@ |
| #include <map> |
| #include <queue> |
| #include <set> |
| +#include <stdio.h> |
| +#include <string.h> |
| #include <GLES2/gl2ext.h> |
| #include "../client/mapped_memory.h" |
| #include "../client/program_info_manager.h" |
| @@ -409,6 +411,11 @@ GLES2Implementation::GLES2Implementation( |
| context_lost_(false) { |
| GPU_DCHECK(helper); |
| GPU_DCHECK(transfer_buffer); |
| + |
| + char temp[128]; |
| + sprintf(temp, "%p", this); |
| + this_in_hex_ = std::string(temp); |
|
apatrick_chromium
2012/08/10 19:29:31
There's a function in base/stringprintf.h that let
greggman
2012/08/11 00:17:30
I can't use base here :-(
|
| + |
| GPU_CLIENT_LOG_CODE_BLOCK({ |
| debug_ = CommandLine::ForCurrentProcess()->HasSwitch( |
| switches::kEnableGPUClientLogging); |
| @@ -589,9 +596,14 @@ bool GLES2Implementation::IsAnglePackReverseRowOrderAvailable() { |
| } |
| } |
| +const std::string& GLES2Implementation::GetLogPrefix() const { |
| + const std::string& prefix(debug_marker_manager_.GetMarker()); |
| + return prefix.empty() ? this_in_hex_ : prefix; |
| +} |
| + |
| GLenum GLES2Implementation::GetError() { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glGetError()"); |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetError()"); |
| GLenum err = GetGLError(); |
| GPU_CLIENT_LOG("returned " << GLES2Util::GetStringError(err)); |
| return err; |
| @@ -637,7 +649,7 @@ GLenum GLES2Implementation::GetGLError() { |
| void GLES2Implementation::SetGLError( |
| GLenum error, const char* function_name, const char* msg) { |
| - GPU_CLIENT_LOG("[" << this << "] Client Synthesized Error: " |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] Client Synthesized Error: " |
| << GLES2Util::GetStringError(error) << ": " |
| << function_name << ": " << msg); |
| if (msg) { |
| @@ -789,7 +801,7 @@ bool GLES2Implementation::SetCapabilityState(GLenum cap, bool enabled) { |
| void GLES2Implementation::Disable(GLenum cap) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glDisable(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDisable(" |
| << GLES2Util::GetStringCapability(cap) << ")"); |
| SetCapabilityState(cap, false); |
| helper_->Disable(cap); |
| @@ -797,7 +809,7 @@ void GLES2Implementation::Disable(GLenum cap) { |
| void GLES2Implementation::Enable(GLenum cap) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glEnable(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glEnable(" |
| << GLES2Util::GetStringCapability(cap) << ")"); |
| SetCapabilityState(cap, true); |
| helper_->Enable(cap); |
| @@ -805,7 +817,7 @@ void GLES2Implementation::Enable(GLenum cap) { |
| GLboolean GLES2Implementation::IsEnabled(GLenum cap) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glIsEnabled(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glIsEnabled(" |
| << GLES2Util::GetStringCapability(cap) << ")"); |
| bool state = false; |
| switch (cap) { |
| @@ -976,7 +988,7 @@ GLuint GLES2Implementation::GetMaxValueInBufferCHROMIUMHelper( |
| GLuint GLES2Implementation::GetMaxValueInBufferCHROMIUM( |
| GLuint buffer_id, GLsizei count, GLenum type, GLuint offset) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glGetMaxValueInBufferCHROMIUM(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetMaxValueInBufferCHROMIUM(" |
| << buffer_id << ", " << count << ", " |
| << GLES2Util::GetStringGetMaxIndexType(type) |
| << ", " << offset << ")"); |
| @@ -988,14 +1000,14 @@ GLuint GLES2Implementation::GetMaxValueInBufferCHROMIUM( |
| void GLES2Implementation::Clear(GLbitfield mask) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glClear(" << mask << ")"); |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glClear(" << mask << ")"); |
| helper_->Clear(mask); |
| } |
| void GLES2Implementation::DrawElements( |
| GLenum mode, GLsizei count, GLenum type, const void* indices) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glDrawElements(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDrawElements(" |
| << GLES2Util::GetStringDrawMode(mode) << ", " |
| << count << ", " |
| << GLES2Util::GetStringIndexType(type) << ", " |
| @@ -1048,7 +1060,7 @@ void GLES2Implementation::DrawElements( |
| void GLES2Implementation::Flush() { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glFlush()"); |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glFlush()"); |
| // Insert the cmd to call glFlush |
| helper_->Flush(); |
| // Flush our command buffer |
| @@ -1058,7 +1070,7 @@ void GLES2Implementation::Flush() { |
| void GLES2Implementation::ShallowFlushCHROMIUM() { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glShallowFlushCHROMIUM()"); |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glShallowFlushCHROMIUM()"); |
| // Flush our command buffer |
| // (tell the service to execute up to the flush cmd.) |
| helper_->CommandBufferHelper::Flush(); |
| @@ -1079,7 +1091,7 @@ bool GLES2Implementation::MustBeContextLost() { |
| } |
| void GLES2Implementation::FinishHelper() { |
| - GPU_CLIENT_LOG("[" << this << "] glFinish()"); |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glFinish()"); |
| TRACE_EVENT0("gpu", "GLES2::Finish"); |
| // Insert the cmd to call glFinish |
| helper_->Finish(); |
| @@ -1091,7 +1103,7 @@ void GLES2Implementation::FinishHelper() { |
| void GLES2Implementation::SwapBuffers() { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glSwapBuffers()"); |
| + 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 |
| @@ -1112,7 +1124,7 @@ void GLES2Implementation::SwapBuffers() { |
| void GLES2Implementation::GenSharedIdsCHROMIUM( |
| GLuint namespace_id, GLuint id_offset, GLsizei n, GLuint* ids) { |
| - GPU_CLIENT_LOG("[" << this << "] glGenSharedIdsCHROMIUM(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenSharedIdsCHROMIUM(" |
| << namespace_id << ", " << id_offset << ", " << n << ", " << |
| static_cast<void*>(ids) << ")"); |
| TRACE_EVENT0("gpu", "GLES2::GenSharedIdsCHROMIUM"); |
| @@ -1140,7 +1152,7 @@ void GLES2Implementation::GenSharedIdsCHROMIUM( |
| void GLES2Implementation::DeleteSharedIdsCHROMIUM( |
| GLuint namespace_id, GLsizei n, const GLuint* ids) { |
| - GPU_CLIENT_LOG("[" << this << "] glDeleteSharedIdsCHROMIUM(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDeleteSharedIdsCHROMIUM(" |
| << namespace_id << ", " << n << ", " |
| << static_cast<const void*>(ids) << ")"); |
| GPU_CLIENT_LOG_CODE_BLOCK({ |
| @@ -1166,7 +1178,7 @@ void GLES2Implementation::DeleteSharedIdsCHROMIUM( |
| void GLES2Implementation::RegisterSharedIdsCHROMIUM( |
| GLuint namespace_id, GLsizei n, const GLuint* ids) { |
| - GPU_CLIENT_LOG("[" << this << "] glRegisterSharedIdsCHROMIUM(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glRegisterSharedIdsCHROMIUM(" |
| << namespace_id << ", " << n << ", " |
| << static_cast<const void*>(ids) << ")"); |
| GPU_CLIENT_LOG_CODE_BLOCK({ |
| @@ -1193,8 +1205,8 @@ void GLES2Implementation::RegisterSharedIdsCHROMIUM( |
| void GLES2Implementation::BindAttribLocation( |
| GLuint program, GLuint index, const char* name) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glBindAttribLocation(" << program << ", " |
| - << index << ", " << name << ")"); |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glBindAttribLocation(" |
| + << program << ", " << index << ", " << name << ")"); |
| SetBucketAsString(kResultBucketId, name); |
| helper_->BindAttribLocationBucket(program, index, kResultBucketId); |
| helper_->SetBucketSize(kResultBucketId, 0); |
| @@ -1203,7 +1215,7 @@ void GLES2Implementation::BindAttribLocation( |
| void GLES2Implementation::BindUniformLocationCHROMIUM( |
| GLuint program, GLint location, const char* name) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glBindUniformLocationCHROMIUM(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glBindUniformLocationCHROMIUM(" |
| << program << ", " << location << ", " << name << ")"); |
| SetBucketAsString(kResultBucketId, name); |
| helper_->BindUniformLocationCHROMIUMBucket( |
| @@ -1214,8 +1226,8 @@ void GLES2Implementation::BindUniformLocationCHROMIUM( |
| void GLES2Implementation::GetVertexAttribPointerv( |
| GLuint index, GLenum pname, void** ptr) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glGetVertexAttribPointer(" << index << ", " |
| - << GLES2Util::GetStringVertexPointer(pname) << ", " |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetVertexAttribPointer(" |
| + << index << ", " << GLES2Util::GetStringVertexPointer(pname) << ", " |
| << static_cast<void*>(ptr) << ")"); |
| #if defined(GLES2_SUPPORT_CLIENT_SIDE_ARRAYS) |
| @@ -1299,7 +1311,7 @@ GLint GLES2Implementation::GetAttribLocationHelper( |
| GLint GLES2Implementation::GetAttribLocation( |
| GLuint program, const char* name) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glGetAttribLocation(" << program |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetAttribLocation(" << program |
| << ", " << name << ")"); |
| TRACE_EVENT0("gpu", "GLES2::GetAttribLocation"); |
| GLint loc = share_group_->program_info_manager()->GetAttribLocation( |
| @@ -1327,7 +1339,7 @@ GLint GLES2Implementation::GetUniformLocationHelper( |
| GLint GLES2Implementation::GetUniformLocation( |
| GLuint program, const char* name) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glGetUniformLocation(" << program |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetUniformLocation(" << program |
| << ", " << name << ")"); |
| TRACE_EVENT0("gpu", "GLES2::GetUniformLocation"); |
| GLint loc = share_group_->program_info_manager()->GetUniformLocation( |
| @@ -1350,7 +1362,7 @@ bool GLES2Implementation::GetProgramivHelper( |
| void GLES2Implementation::LinkProgram(GLuint program) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glLinkProgram(" << program << ")"); |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glLinkProgram(" << program << ")"); |
| helper_->LinkProgram(program); |
| share_group_->program_info_manager()->CreateInfo(program); |
| } |
| @@ -1359,7 +1371,7 @@ void GLES2Implementation::ShaderBinary( |
| GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary, |
| GLsizei length) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glShaderBinary(" << n << ", " |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glShaderBinary(" << n << ", " |
| << static_cast<const void*>(shaders) << ", " |
| << GLES2Util::GetStringEnum(binaryformat) << ", " |
| << static_cast<const void*>(binary) << ", " |
| @@ -1396,7 +1408,7 @@ void GLES2Implementation::ShaderBinary( |
| void GLES2Implementation::PixelStorei(GLenum pname, GLint param) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glPixelStorei(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glPixelStorei(" |
| << GLES2Util::GetStringPixelStore(pname) << ", " |
| << param << ")"); |
| switch (pname) { |
| @@ -1433,7 +1445,7 @@ void GLES2Implementation::VertexAttribPointer( |
| GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, |
| const void* ptr) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glVertexAttribPointer(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glVertexAttribPointer(" |
| << index << ", " |
| << size << ", " |
| << GLES2Util::GetStringVertexAttribType(type) << ", " |
| @@ -1458,7 +1470,7 @@ void GLES2Implementation::VertexAttribPointer( |
| void GLES2Implementation::VertexAttribDivisorANGLE( |
| GLuint index, GLuint divisor) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glVertexAttribDivisorANGLE(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glVertexAttribDivisorANGLE(" |
| << index << ", " |
| << divisor << ") "); |
| #if defined(GLES2_SUPPORT_CLIENT_SIDE_ARRAYS) |
| @@ -1471,7 +1483,7 @@ void GLES2Implementation::VertexAttribDivisorANGLE( |
| void GLES2Implementation::ShaderSource( |
| GLuint shader, GLsizei count, const char** source, const GLint* length) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glShaderSource(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glShaderSource(" |
| << shader << ", " << count << ", " |
| << static_cast<const void*>(source) << ", " |
| << static_cast<const void*>(length) << ")"); |
| @@ -1578,7 +1590,7 @@ void GLES2Implementation::BufferDataHelper( |
| void GLES2Implementation::BufferData( |
| GLenum target, GLsizeiptr size, const void* data, GLenum usage) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glBufferData(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glBufferData(" |
| << GLES2Util::GetStringBufferTarget(target) << ", " |
| << size << ", " |
| << static_cast<const void*>(data) << ", " |
| @@ -1628,7 +1640,7 @@ void GLES2Implementation::BufferSubDataHelperImpl( |
| void GLES2Implementation::BufferSubData( |
| GLenum target, GLintptr offset, GLsizeiptr size, const void* data) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glBufferSubData(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glBufferSubData(" |
| << GLES2Util::GetStringBufferTarget(target) << ", " |
| << offset << ", " << size << ", " |
| << static_cast<const void*>(data) << ")"); |
| @@ -1639,7 +1651,7 @@ 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("[" << this << "] glCompressedTexImage2D(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glCompressedTexImage2D(" |
| << GLES2Util::GetStringTextureTarget(target) << ", " |
| << level << ", " |
| << GLES2Util::GetStringCompressedTextureFormat(internalformat) << ", " |
| @@ -1666,7 +1678,7 @@ 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("[" << this << "] glCompressedTexSubImage2D(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glCompressedTexSubImage2D(" |
| << GLES2Util::GetStringTextureTarget(target) << ", " |
| << level << ", " |
| << xoffset << ", " << yoffset << ", " |
| @@ -1727,7 +1739,7 @@ void GLES2Implementation::TexImage2D( |
| GLsizei height, GLint border, GLenum format, GLenum type, |
| const void* pixels) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glTexImage2D(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glTexImage2D(" |
| << GLES2Util::GetStringTextureTarget(target) << ", " |
| << level << ", " |
| << GLES2Util::GetStringTextureInternalFormat(internalformat) << ", " |
| @@ -1809,7 +1821,7 @@ 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("[" << this << "] glTexSubImage2D(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glTexSubImage2D(" |
| << GLES2Util::GetStringTextureTarget(target) << ", " |
| << level << ", " |
| << xoffset << ", " << yoffset << ", " |
| @@ -1961,7 +1973,7 @@ 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("[" << this << "] glGetActiveAttrib(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetActiveAttrib(" |
| << program << ", " << index << ", " << bufsize << ", " |
| << static_cast<const void*>(length) << ", " |
| << static_cast<const void*>(size) << ", " |
| @@ -2031,7 +2043,7 @@ 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("[" << this << "] glGetActiveUniform(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetActiveUniform(" |
| << program << ", " << index << ", " << bufsize << ", " |
| << static_cast<const void*>(length) << ", " |
| << static_cast<const void*>(size) << ", " |
| @@ -2060,7 +2072,7 @@ void GLES2Implementation::GetActiveUniform( |
| void GLES2Implementation::GetAttachedShaders( |
| GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glGetAttachedShaders(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetAttachedShaders(" |
| << program << ", " << maxcount << ", " |
| << static_cast<const void*>(count) << ", " |
| << static_cast<const void*>(shaders) << ", "); |
| @@ -2098,7 +2110,7 @@ void GLES2Implementation::GetAttachedShaders( |
| void GLES2Implementation::GetShaderPrecisionFormat( |
| GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glGetShaderPrecisionFormat(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetShaderPrecisionFormat(" |
| << GLES2Util::GetStringShaderType(shadertype) << ", " |
| << GLES2Util::GetStringShaderPrecision(precisiontype) << ", " |
| << static_cast<const void*>(range) << ", " |
| @@ -2174,7 +2186,7 @@ const GLubyte* GLES2Implementation::GetStringHelper(GLenum name) { |
| const GLubyte* GLES2Implementation::GetString(GLenum name) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glGetString(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetString(" |
| << GLES2Util::GetStringStringType(name) << ")"); |
| const GLubyte* result = GetStringHelper(name); |
| GPU_CLIENT_LOG(" returned " << reinterpret_cast<const char*>(result)); |
| @@ -2184,7 +2196,7 @@ const GLubyte* GLES2Implementation::GetString(GLenum name) { |
| void GLES2Implementation::GetUniformfv( |
| GLuint program, GLint location, GLfloat* params) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glGetUniformfv(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetUniformfv(" |
| << program << ", " << location << ", " |
| << static_cast<const void*>(params) << ")"); |
| TRACE_EVENT0("gpu", "GLES2::GetUniformfv"); |
| @@ -2208,7 +2220,7 @@ void GLES2Implementation::GetUniformfv( |
| void GLES2Implementation::GetUniformiv( |
| GLuint program, GLint location, GLint* params) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glGetUniformiv(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetUniformiv(" |
| << program << ", " << location << ", " |
| << static_cast<const void*>(params) << ")"); |
| TRACE_EVENT0("gpu", "GLES2::GetUniformiv"); |
| @@ -2233,7 +2245,7 @@ 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("[" << this << "] glReadPixels(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glReadPixels(" |
| << xoffset << ", " << yoffset << ", " |
| << width << ", " << height << ", " |
| << GLES2Util::GetStringReadPixelFormat(format) << ", " |
| @@ -2321,7 +2333,7 @@ void GLES2Implementation::ReadPixels( |
| void GLES2Implementation::ActiveTexture(GLenum texture) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glActiveTexture(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glActiveTexture(" |
| << GLES2Util::GetStringEnum(texture) << ")"); |
| GLuint texture_index = texture - GL_TEXTURE0; |
| if (texture_index >= static_cast<GLuint>( |
| @@ -2522,7 +2534,7 @@ void GLES2Implementation::DeleteTexturesStub( |
| void GLES2Implementation::DisableVertexAttribArray(GLuint index) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| GPU_CLIENT_LOG( |
| - "[" << this << "] glDisableVertexAttribArray(" << index << ")"); |
| + "[" << GetLogPrefix() << "] glDisableVertexAttribArray(" << index << ")"); |
| #if defined(GLES2_SUPPORT_CLIENT_SIDE_ARRAYS) |
| client_side_buffer_helper_->SetAttribEnable(index, false); |
| #endif |
| @@ -2531,7 +2543,8 @@ void GLES2Implementation::DisableVertexAttribArray(GLuint index) { |
| void GLES2Implementation::EnableVertexAttribArray(GLuint index) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glEnableVertexAttribArray(" << index << ")"); |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glEnableVertexAttribArray(" |
| + << index << ")"); |
| #if defined(GLES2_SUPPORT_CLIENT_SIDE_ARRAYS) |
| client_side_buffer_helper_->SetAttribEnable(index, true); |
| #endif |
| @@ -2540,7 +2553,7 @@ void GLES2Implementation::EnableVertexAttribArray(GLuint index) { |
| void GLES2Implementation::DrawArrays(GLenum mode, GLint first, GLsizei count) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glDrawArrays(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDrawArrays(" |
| << GLES2Util::GetStringDrawMode(mode) << ", " |
| << first << ", " << count << ")"); |
| if (count < 0) { |
| @@ -2605,7 +2618,7 @@ bool GLES2Implementation::GetVertexAttribHelper( |
| void GLES2Implementation::GetVertexAttribfv( |
| GLuint index, GLenum pname, GLfloat* params) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glGetVertexAttribfv(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetVertexAttribfv(" |
| << index << ", " |
| << GLES2Util::GetStringVertexAttribute(pname) << ", " |
| << static_cast<const void*>(params) << ")"); |
| @@ -2637,7 +2650,7 @@ void GLES2Implementation::GetVertexAttribfv( |
| void GLES2Implementation::GetVertexAttribiv( |
| GLuint index, GLenum pname, GLint* params) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glGetVertexAttribiv(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetVertexAttribiv(" |
| << index << ", " |
| << GLES2Util::GetStringVertexAttribute(pname) << ", " |
| << static_cast<const void*>(params) << ")"); |
| @@ -2669,7 +2682,7 @@ void GLES2Implementation::GetVertexAttribiv( |
| GLboolean GLES2Implementation::EnableFeatureCHROMIUM( |
| const char* feature) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glEnableFeatureCHROMIUM(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glEnableFeatureCHROMIUM(" |
| << feature << ")"); |
| TRACE_EVENT0("gpu", "GLES2::EnableFeatureCHROMIUM"); |
| typedef EnableFeatureCHROMIUM::Result Result; |
| @@ -2690,7 +2703,7 @@ GLboolean GLES2Implementation::EnableFeatureCHROMIUM( |
| void* GLES2Implementation::MapBufferSubDataCHROMIUM( |
| GLuint target, GLintptr offset, GLsizeiptr size, GLenum access) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glMapBufferSubDataCHROMIUM(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glMapBufferSubDataCHROMIUM(" |
| << target << ", " << offset << ", " << size << ", " |
| << GLES2Util::GetStringEnum(access) << ")"); |
| // NOTE: target is NOT checked because the service will check it |
| @@ -2725,7 +2738,7 @@ void* GLES2Implementation::MapBufferSubDataCHROMIUM( |
| void GLES2Implementation::UnmapBufferSubDataCHROMIUM(const void* mem) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| GPU_CLIENT_LOG( |
| - "[" << this << "] glUnmapBufferSubDataCHROMIUM(" << mem << ")"); |
| + "[" << GetLogPrefix() << "] glUnmapBufferSubDataCHROMIUM(" << mem << ")"); |
| MappedBufferMap::iterator it = mapped_buffers_.find(mem); |
| if (it == mapped_buffers_.end()) { |
| SetGLError( |
| @@ -2750,7 +2763,7 @@ void* GLES2Implementation::MapTexSubImage2DCHROMIUM( |
| GLenum type, |
| GLenum access) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glMapTexSubImage2DCHROMIUM(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glMapTexSubImage2DCHROMIUM(" |
| << target << ", " << level << ", " |
| << xoffset << ", " << yoffset << ", " |
| << width << ", " << height << ", " |
| @@ -2798,7 +2811,7 @@ void* GLES2Implementation::MapTexSubImage2DCHROMIUM( |
| void GLES2Implementation::UnmapTexSubImage2DCHROMIUM(const void* mem) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| GPU_CLIENT_LOG( |
| - "[" << this << "] glUnmapTexSubImage2DCHROMIUM(" << mem << ")"); |
| + "[" << GetLogPrefix() << "] glUnmapTexSubImage2DCHROMIUM(" << mem << ")"); |
| MappedTextureMap::iterator it = mapped_textures_.find(mem); |
| if (it == mapped_textures_.end()) { |
| SetGLError( |
| @@ -2815,14 +2828,15 @@ void GLES2Implementation::UnmapTexSubImage2DCHROMIUM(const void* mem) { |
| void GLES2Implementation::ResizeCHROMIUM(GLuint width, GLuint height) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glResizeCHROMIUM(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glResizeCHROMIUM(" |
| << width << ", " << height << ")"); |
| helper_->ResizeCHROMIUM(width, height); |
| } |
| const GLchar* GLES2Implementation::GetRequestableExtensionsCHROMIUM() { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glGetRequestableExtensionsCHROMIUM()"); |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() |
| + << "] glGetRequestableExtensionsCHROMIUM()"); |
| TRACE_EVENT0("gpu", |
| "GLES2Implementation::GetRequestableExtensionsCHROMIUM()"); |
| const char* result = NULL; |
| @@ -2852,7 +2866,7 @@ const GLchar* GLES2Implementation::GetRequestableExtensionsCHROMIUM() { |
| void GLES2Implementation::RequestExtensionCHROMIUM(const char* extension) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glRequestExtensionCHROMIUM(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glRequestExtensionCHROMIUM(" |
| << extension << ")"); |
| SetBucketAsCString(kResultBucketId, extension); |
| helper_->RequestExtensionCHROMIUM(kResultBucketId); |
| @@ -2865,7 +2879,7 @@ void GLES2Implementation::RequestExtensionCHROMIUM(const char* extension) { |
| void GLES2Implementation::RateLimitOffscreenContextCHROMIUM() { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glRateLimitOffscreenCHROMIUM()"); |
| + 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()); |
| @@ -2877,7 +2891,7 @@ void GLES2Implementation::RateLimitOffscreenContextCHROMIUM() { |
| void GLES2Implementation::GetMultipleIntegervCHROMIUM( |
| const GLenum* pnames, GLuint count, GLint* results, GLsizeiptr size) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glGetMultipleIntegervCHROMIUM(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetMultipleIntegervCHROMIUM(" |
| << static_cast<const void*>(pnames) << ", " |
| << count << ", " << results << ", " << size << ")"); |
| GPU_CLIENT_LOG_CODE_BLOCK({ |
| @@ -2978,7 +2992,7 @@ void GLES2Implementation::GetProgramInfoCHROMIUM( |
| GLuint GLES2Implementation::CreateStreamTextureCHROMIUM(GLuint texture) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] CreateStreamTextureCHROMIUM(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] CreateStreamTextureCHROMIUM(" |
| << texture << ")"); |
| TRACE_EVENT0("gpu", "GLES2::CreateStreamTextureCHROMIUM"); |
| typedef CreateStreamTextureCHROMIUM::Result Result; |
| @@ -2998,7 +3012,7 @@ GLuint GLES2Implementation::CreateStreamTextureCHROMIUM(GLuint texture) { |
| void GLES2Implementation::DestroyStreamTextureCHROMIUM(GLuint texture) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] DestroyStreamTextureCHROMIUM(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] DestroyStreamTextureCHROMIUM(" |
| << texture << ")"); |
| TRACE_EVENT0("gpu", "GLES2::DestroyStreamTextureCHROMIUM"); |
| helper_->DestroyStreamTextureCHROMIUM(texture); |
| @@ -3007,7 +3021,7 @@ void GLES2Implementation::DestroyStreamTextureCHROMIUM(GLuint texture) { |
| void GLES2Implementation::PostSubBufferCHROMIUM( |
| GLint x, GLint y, GLint width, GLint height) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] PostSubBufferCHROMIUM(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] PostSubBufferCHROMIUM(" |
| << x << ", " << y << ", " << width << ", " << height << ")"); |
| TRACE_EVENT0("gpu", "GLES2::PostSubBufferCHROMIUM"); |
| @@ -3071,7 +3085,7 @@ void GLES2Implementation::DeleteQueriesStub( |
| GLboolean GLES2Implementation::IsQueryEXT(GLuint id) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] IsQueryEXT(" << id << ")"); |
| + 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 |
| @@ -3081,7 +3095,7 @@ GLboolean GLES2Implementation::IsQueryEXT(GLuint id) { |
| void GLES2Implementation::BeginQueryEXT(GLenum target, GLuint id) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] BeginQueryEXT(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] BeginQueryEXT(" |
| << GLES2Util::GetStringQueryTarget(target) |
| << ", " << id << ")"); |
| @@ -3121,7 +3135,7 @@ void GLES2Implementation::BeginQueryEXT(GLenum target, GLuint id) { |
| void GLES2Implementation::EndQueryEXT(GLenum target) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] EndQueryEXT(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] EndQueryEXT(" |
| << GLES2Util::GetStringQueryTarget(target) << ")"); |
| // Don't do anything if the context is lost. |
| if (context_lost_) { |
| @@ -3146,7 +3160,7 @@ void GLES2Implementation::EndQueryEXT(GLenum target) { |
| void GLES2Implementation::GetQueryivEXT( |
| GLenum target, GLenum pname, GLint* params) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] GetQueryivEXT(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] GetQueryivEXT(" |
| << GLES2Util::GetStringQueryTarget(target) << ", " |
| << GLES2Util::GetStringQueryParameter(pname) << ", " |
| << static_cast<const void*>(params) << ")"); |
| @@ -3163,7 +3177,7 @@ void GLES2Implementation::GetQueryivEXT( |
| void GLES2Implementation::GetQueryObjectuivEXT( |
| GLuint id, GLenum pname, GLuint* params) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] GetQueryivEXT(" << id << ", " |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] GetQueryivEXT(" << id << ", " |
| << GLES2Util::GetStringQueryObjectParameter(pname) << ", " |
| << static_cast<const void*>(params) << ")"); |
| @@ -3217,7 +3231,7 @@ void GLES2Implementation::GetQueryObjectuivEXT( |
| void GLES2Implementation::DrawArraysInstancedANGLE( |
| GLenum mode, GLint first, GLsizei count, GLsizei primcount) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glDrawArraysInstancedANGLE(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDrawArraysInstancedANGLE(" |
| << GLES2Util::GetStringDrawMode(mode) << ", " |
| << first << ", " << count << ", " << primcount << ")"); |
| if (count < 0) { |
| @@ -3252,7 +3266,7 @@ void GLES2Implementation::DrawElementsInstancedANGLE( |
| GLenum mode, GLsizei count, GLenum type, const void* indices, |
| GLsizei primcount) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glDrawElementsInstancedANGLE(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDrawElementsInstancedANGLE(" |
| << GLES2Util::GetStringDrawMode(mode) << ", " |
| << count << ", " |
| << GLES2Util::GetStringIndexType(type) << ", " |
| @@ -3317,7 +3331,7 @@ void GLES2Implementation::DrawElementsInstancedANGLE( |
| void GLES2Implementation::GenMailboxCHROMIUM( |
| GLbyte* mailbox) { |
| GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| - GPU_CLIENT_LOG("[" << this << "] glGenMailboxCHROMIUM(" |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenMailboxCHROMIUM(" |
| << static_cast<const void*>(mailbox) << ")"); |
| TRACE_EVENT0("gpu", "GLES2::GenMailboxCHROMIUM"); |
| @@ -3329,5 +3343,46 @@ void GLES2Implementation::GenMailboxCHROMIUM( |
| std::copy(result.begin(), result.end(), mailbox); |
| } |
| +void GLES2Implementation::PushGroupMarkerEXT( |
| + GLsizei length, const GLchar* marker) { |
| + GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glPushGroupMarkerEXT(" |
| + << length << ", " << marker << ")"); |
| + if (!marker) { |
| + marker = ""; |
| + } |
| + SetBucketAsString( |
| + kResultBucketId, |
| + (length ? std::string(marker, length) : std::string(marker))); |
| + helper_->PushGroupMarkerEXT(kResultBucketId); |
| + helper_->SetBucketSize(kResultBucketId, 0); |
| + debug_marker_manager_.PushGroup( |
| + length ? std::string(marker, length) : std::string(marker)); |
| +} |
| + |
| +void GLES2Implementation::InsertEventMarkerEXT( |
| + GLsizei length, const GLchar* marker) { |
| + GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glInsertEventMarkerEXT(" |
| + << length << ", " << marker << ")"); |
| + if (!marker) { |
| + marker = ""; |
| + } |
| + SetBucketAsString( |
| + kResultBucketId, |
| + (length ? std::string(marker, length) : std::string(marker))); |
| + helper_->InsertEventMarkerEXT(kResultBucketId); |
| + helper_->SetBucketSize(kResultBucketId, 0); |
| + debug_marker_manager_.SetMarker( |
| + length ? std::string(marker, length) : std::string(marker)); |
| +} |
| + |
| +void GLES2Implementation::PopGroupMarkerEXT() { |
| + GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glPopGroupMarkerEXT()"); |
| + helper_->PopGroupMarkerEXT(); |
| + debug_marker_manager_.PopGroup(); |
| +} |
| + |
| } // namespace gles2 |
| } // namespace gpu |
