From 5e2d5705d11a2c0043004d8a56c2cd58b6341825 Mon Sep 17 00:00:00 2001 From: "tommi@chromium.org" Date: Fri, 1 Mar 2013 10:48:50 +0000 Subject: Revert 185332 Speculative revert. All the GPU bots are currently red, failing at the compile stage. This time also reverting the skia roll even though a more recent version had been rolled. > Update khronos GLES2/gl2.h header > > BUG=178589 > > Review URL: https://codereview.chromium.org/12313140 TBR=phajdan.jr@chromium.org Review URL: https://codereview.chromium.org/12383047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185521 0039d316-1c4b-4281-b951-d872f2087c98 --- gpu/command_buffer/client/gles2_c_lib_autogen.h | 3 +-- gpu/command_buffer/client/gles2_implementation.cc | 2 +- gpu/command_buffer/client/gles2_implementation_autogen.h | 2 +- gpu/command_buffer/client/gles2_interface_autogen.h | 3 +-- gpu/command_buffer/client/gles2_interface_stub_autogen.h | 2 +- gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h | 2 +- gpu/command_buffer/client/gles2_trace_implementation_autogen.h | 2 +- gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h | 3 +-- gpu/command_buffer/cmd_buffer_functions.txt | 2 +- 9 files changed, 9 insertions(+), 12 deletions(-) (limited to 'gpu') diff --git a/gpu/command_buffer/client/gles2_c_lib_autogen.h b/gpu/command_buffer/client/gles2_c_lib_autogen.h index d56df6f..80a4d23 100644 --- a/gpu/command_buffer/client/gles2_c_lib_autogen.h +++ b/gpu/command_buffer/client/gles2_c_lib_autogen.h @@ -355,8 +355,7 @@ void GLES2ShaderBinary( n, shaders, binaryformat, binary, length); } void GLES2ShaderSource( - GLuint shader, GLsizei count, const GLchar* const* str, - const GLint* length) { + GLuint shader, GLsizei count, const char** str, const GLint* length) { gles2::GetGLContext()->ShaderSource(shader, count, str, length); } void GLES2StencilFunc(GLenum func, GLint ref, GLuint mask) { diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc index 600c02f..b6c3548 100644 --- a/gpu/command_buffer/client/gles2_implementation.cc +++ b/gpu/command_buffer/client/gles2_implementation.cc @@ -1173,7 +1173,7 @@ void GLES2Implementation::VertexAttribDivisorANGLE( } void GLES2Implementation::ShaderSource( - GLuint shader, GLsizei count, const GLchar* const* source, const GLint* length) { + GLuint shader, GLsizei count, const char** source, const GLint* length) { GPU_CLIENT_SINGLE_THREAD_CHECK(); GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glShaderSource(" << shader << ", " << count << ", " diff --git a/gpu/command_buffer/client/gles2_implementation_autogen.h b/gpu/command_buffer/client/gles2_implementation_autogen.h index e4a63822..febcaf4 100644 --- a/gpu/command_buffer/client/gles2_implementation_autogen.h +++ b/gpu/command_buffer/client/gles2_implementation_autogen.h @@ -253,7 +253,7 @@ virtual void ShaderBinary( GLsizei length) OVERRIDE; virtual void ShaderSource( - GLuint shader, GLsizei count, const GLchar* const* str, + GLuint shader, GLsizei count, const char** str, const GLint* length) OVERRIDE; virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) OVERRIDE; diff --git a/gpu/command_buffer/client/gles2_interface_autogen.h b/gpu/command_buffer/client/gles2_interface_autogen.h index 8aafc7f..b84dd71 100644 --- a/gpu/command_buffer/client/gles2_interface_autogen.h +++ b/gpu/command_buffer/client/gles2_interface_autogen.h @@ -152,8 +152,7 @@ virtual void ShaderBinary( GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLsizei length) = 0; virtual void ShaderSource( - GLuint shader, GLsizei count, const GLchar* const* str, - const GLint* length) = 0; + GLuint shader, GLsizei count, const char** str, const GLint* length) = 0; virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) = 0; virtual void StencilFuncSeparate( GLenum face, GLenum func, GLint ref, GLuint mask) = 0; diff --git a/gpu/command_buffer/client/gles2_interface_stub_autogen.h b/gpu/command_buffer/client/gles2_interface_stub_autogen.h index 80e6c10..3c1c669 100644 --- a/gpu/command_buffer/client/gles2_interface_stub_autogen.h +++ b/gpu/command_buffer/client/gles2_interface_stub_autogen.h @@ -163,7 +163,7 @@ virtual void ShaderBinary( GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLsizei length) OVERRIDE; virtual void ShaderSource( - GLuint shader, GLsizei count, const GLchar* const* str, + GLuint shader, GLsizei count, const char** str, const GLint* length) OVERRIDE; virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) OVERRIDE; virtual void StencilFuncSeparate( diff --git a/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h b/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h index f097e8c..dce39c0 100644 --- a/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h +++ b/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h @@ -310,7 +310,7 @@ void GLES2InterfaceStub::ShaderBinary( const void* /* binary */, GLsizei /* length */) { } void GLES2InterfaceStub::ShaderSource( - GLuint /* shader */, GLsizei /* count */, const GLchar* const* /* str */, + GLuint /* shader */, GLsizei /* count */, const char** /* str */, const GLint* /* length */) { } void GLES2InterfaceStub::StencilFunc( diff --git a/gpu/command_buffer/client/gles2_trace_implementation_autogen.h b/gpu/command_buffer/client/gles2_trace_implementation_autogen.h index da02881..46cbdcc 100644 --- a/gpu/command_buffer/client/gles2_trace_implementation_autogen.h +++ b/gpu/command_buffer/client/gles2_trace_implementation_autogen.h @@ -163,7 +163,7 @@ virtual void ShaderBinary( GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLsizei length) OVERRIDE; virtual void ShaderSource( - GLuint shader, GLsizei count, const GLchar* const* str, + GLuint shader, GLsizei count, const char** str, const GLint* length) OVERRIDE; virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) OVERRIDE; virtual void StencilFuncSeparate( diff --git a/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h b/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h index 8f87a40..8aff42a 100644 --- a/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h +++ b/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h @@ -570,8 +570,7 @@ void GLES2TraceImplementation::ShaderBinary( } void GLES2TraceImplementation::ShaderSource( - GLuint shader, GLsizei count, const GLchar* const* str, - const GLint* length) { + GLuint shader, GLsizei count, const char** str, const GLint* length) { TRACE_EVENT_BINARY_EFFICIENT0("gpu", "GLES2Trace::ShaderSource"); gl_->ShaderSource(shader, count, str, length); } diff --git a/gpu/command_buffer/cmd_buffer_functions.txt b/gpu/command_buffer/cmd_buffer_functions.txt index 08d33d9..2ad875a 100644 --- a/gpu/command_buffer/cmd_buffer_functions.txt +++ b/gpu/command_buffer/cmd_buffer_functions.txt @@ -103,7 +103,7 @@ GL_APICALL void GL_APIENTRY glRenderbufferStorage (GLenumRenderBufferTar GL_APICALL void GL_APIENTRY glSampleCoverage (GLclampf value, GLboolean invert); GL_APICALL void GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height); GL_APICALL void GL_APIENTRY glShaderBinary (GLsizeiNotNegative n, const GLuint* shaders, GLenumShaderBinaryFormat binaryformat, const void* binary, GLsizeiNotNegative length); -GL_APICALL void GL_APIENTRY glShaderSource (GLidShader shader, GLsizeiNotNegative count, const GLchar* const* str, const GLint* length); +GL_APICALL void GL_APIENTRY glShaderSource (GLidShader shader, GLsizeiNotNegative count, const char** str, const GLint* length); GL_APICALL void GL_APIENTRY glStencilFunc (GLenumCmpFunction func, GLint ref, GLuint mask); GL_APICALL void GL_APIENTRY glStencilFuncSeparate (GLenumFaceType face, GLenumCmpFunction func, GLint ref, GLuint mask); GL_APICALL void GL_APIENTRY glStencilMask (GLuint mask); -- cgit v1.1