Attachment #340634 for bug #455762

View | Details | Raw Unified | Return to bug 455762
Collapse All | Expand All

Lines 355-361 void GLES2ShaderBinary( Link Here

(-)chromium-27.0.1423.0/gpu/command_buffer/client/gles2_c_lib_autogen.h (-1 / +1 lines)
355	n, shaders, binaryformat, binary, length);	355	n, shaders, binaryformat, binary, length);
356	}	356	}
357	void GLES2ShaderSource(	357	void GLES2ShaderSource(
358	GLuint shader, GLsizei count, const char** str, const GLint* length) {	358	GLuint shader, GLsizei count, const GLchar* const* str, const GLint* length) {
359	gles2::GetGLContext()->ShaderSource(shader, count, str, length);	359	gles2::GetGLContext()->ShaderSource(shader, count, str, length);
360	}	360	}
361	void GLES2StencilFunc(GLenum func, GLint ref, GLuint mask) {	361	void GLES2StencilFunc(GLenum func, GLint ref, GLuint mask) {

Lines 1173-1179 void GLES2Implementation::VertexAttribDi Link Here

(-)chromium-27.0.1423.0/gpu/command_buffer/client/gles2_implementation.cc (-1 / +1 lines)
1173	}	1173	}
1174		1174
1175	void GLES2Implementation::ShaderSource(	1175	void GLES2Implementation::ShaderSource(
1176	GLuint shader, GLsizei count, const char** source, const GLint* length) {	1176	GLuint shader, GLsizei count, const GLchar* const* source, const GLint* length) {
1177	GPU_CLIENT_SINGLE_THREAD_CHECK();	1177	GPU_CLIENT_SINGLE_THREAD_CHECK();
1178	GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glShaderSource("	1178	GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glShaderSource("
1179	<< shader << ", " << count << ", "	1179	<< shader << ", " << count << ", "

Lines 253-259 virtual void ShaderBinary( Link Here

(-)chromium-27.0.1423.0/gpu/command_buffer/client/gles2_implementation_autogen.h (-1 / +1 lines)
253	GLsizei length) OVERRIDE;	253	GLsizei length) OVERRIDE;
254		254
255	virtual void ShaderSource(	255	virtual void ShaderSource(
256	GLuint shader, GLsizei count, const char** str,	256	GLuint shader, GLsizei count, const GLchar* const* str,
257	const GLint* length) OVERRIDE;	257	const GLint* length) OVERRIDE;
258		258
259	virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) OVERRIDE;	259	virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) OVERRIDE;

Lines 152-158 virtual void ShaderBinary( Link Here

(-)chromium-27.0.1423.0/gpu/command_buffer/client/gles2_interface_autogen.h (-1 / +1 lines)
152	GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary,	152	GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary,
153	GLsizei length) = 0;	153	GLsizei length) = 0;
154	virtual void ShaderSource(	154	virtual void ShaderSource(
155	GLuint shader, GLsizei count, const char** str, const GLint* length) = 0;	155	GLuint shader, GLsizei count, const GLchar* const* str, const GLint* length) = 0;
156	virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) = 0;	156	virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) = 0;
157	virtual void StencilFuncSeparate(	157	virtual void StencilFuncSeparate(
158	GLenum face, GLenum func, GLint ref, GLuint mask) = 0;	158	GLenum face, GLenum func, GLint ref, GLuint mask) = 0;

Lines 163-169 virtual void ShaderBinary( Link Here

(-)chromium-27.0.1423.0/gpu/command_buffer/client/gles2_interface_stub_autogen.h (-1 / +1 lines)
163	GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary,	163	GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary,
164	GLsizei length) OVERRIDE;	164	GLsizei length) OVERRIDE;
165	virtual void ShaderSource(	165	virtual void ShaderSource(
166	GLuint shader, GLsizei count, const char** str,	166	GLuint shader, GLsizei count, const GLchar* const* str,
167	const GLint* length) OVERRIDE;	167	const GLint* length) OVERRIDE;
168	virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) OVERRIDE;	168	virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) OVERRIDE;
169	virtual void StencilFuncSeparate(	169	virtual void StencilFuncSeparate(

Lines 310-316 void GLES2InterfaceStub::ShaderBinary( Link Here

(-)chromium-27.0.1423.0/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h (-1 / +1 lines)
310	const void* /* binary /, GLsizei / length */) {	310	const void* /* binary /, GLsizei / length */) {
311	}	311	}
312	void GLES2InterfaceStub::ShaderSource(	312	void GLES2InterfaceStub::ShaderSource(
313	GLuint /* shader /, GLsizei / count /, const char* /* str */,	313	GLuint /* shader /, GLsizei / count /, const GLchar const* /* str */,
314	const GLint* /* length */) {	314	const GLint* /* length */) {
315	}	315	}
316	void GLES2InterfaceStub::StencilFunc(	316	void GLES2InterfaceStub::StencilFunc(

Lines 163-169 virtual void ShaderBinary( Link Here

(-)chromium-27.0.1423.0/gpu/command_buffer/client/gles2_trace_implementation_autogen.h (-1 / +1 lines)
163	GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary,	163	GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary,
164	GLsizei length) OVERRIDE;	164	GLsizei length) OVERRIDE;
165	virtual void ShaderSource(	165	virtual void ShaderSource(
166	GLuint shader, GLsizei count, const char** str,	166	GLuint shader, GLsizei count, const GLchar* const* str,
167	const GLint* length) OVERRIDE;	167	const GLint* length) OVERRIDE;
168	virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) OVERRIDE;	168	virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) OVERRIDE;
169	virtual void StencilFuncSeparate(	169	virtual void StencilFuncSeparate(

Lines 570-576 void GLES2TraceImplementation::ShaderBin Link Here

(-)chromium-27.0.1423.0/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h (-1 / +1 lines)
570	}	570	}
571		571
572	void GLES2TraceImplementation::ShaderSource(	572	void GLES2TraceImplementation::ShaderSource(
573	GLuint shader, GLsizei count, const char** str, const GLint* length) {	573	GLuint shader, GLsizei count, const GLchar* const* str, const GLint* length) {
574	TRACE_EVENT_BINARY_EFFICIENT0("gpu", "GLES2Trace::ShaderSource");	574	TRACE_EVENT_BINARY_EFFICIENT0("gpu", "GLES2Trace::ShaderSource");
575	gl_->ShaderSource(shader, count, str, length);	575	gl_->ShaderSource(shader, count, str, length);
576	}	576	}

Lines 570-576 GL_APICALL void GL_APIENTRY glRe Link Here

(-)chromium-27.0.1423.0/third_party/khronos/GLES2/gl2.h (-1 / +1 lines)
570	GL_APICALL void GL_APIENTRY glSampleCoverage (GLclampf value, GLboolean invert);	570	GL_APICALL void GL_APIENTRY glSampleCoverage (GLclampf value, GLboolean invert);
571	GL_APICALL void GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);	571	GL_APICALL void GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
572	GL_APICALL void GL_APIENTRY glShaderBinary (GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length);	572	GL_APICALL void GL_APIENTRY glShaderBinary (GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length);
573	GL_APICALL void GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar** string, const GLint* length);	573	GL_APICALL void GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length);
574	GL_APICALL void GL_APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask);	574	GL_APICALL void GL_APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask);
575	GL_APICALL void GL_APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask);	575	GL_APICALL void GL_APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask);
576	GL_APICALL void GL_APIENTRY glStencilMask (GLuint mask);	576	GL_APICALL void GL_APIENTRY glStencilMask (GLuint mask);

Lines 122-132 extern "C" { Link Here

(-)chromium-27.0.1423.0/third_party/skia/include/gpu/gl/GrGLFunctions.h (-4 / +4 lines)
122	typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLRenderbufferStorageMultisampleCoverageProc)(GrGLenum target, GrGLsizei coverageSamples, GrGLsizei colorSamples, GrGLenum internalformat, GrGLsizei width, GrGLsizei height);	122	typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLRenderbufferStorageMultisampleCoverageProc)(GrGLenum target, GrGLsizei coverageSamples, GrGLsizei colorSamples, GrGLenum internalformat, GrGLsizei width, GrGLsizei height);
123	typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLResolveMultisampleFramebufferProc)();	123	typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLResolveMultisampleFramebufferProc)();
124	typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLScissorProc)(GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height);	124	typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLScissorProc)(GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height);
125	#if GR_USE_NEW_GL_SHADER_SOURCE_SIGNATURE	125	//#if GR_USE_NEW_GL_SHADER_SOURCE_SIGNATURE
126	typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLShaderSourceProc)(GrGLuint shader, GrGLsizei count, const char* const * str, const GrGLint* length);	126	typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLShaderSourceProc)(GrGLuint shader, GrGLsizei count, const char* const * str, const GrGLint* length);
127	#else	127	//#else
128	typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLShaderSourceProc)(GrGLuint shader, GrGLsizei count, const char** str, const GrGLint* length);	128	//typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLShaderSourceProc)(GrGLuint shader, GrGLsizei count, const char** str, const GrGLint* length);
129	#endif	129	//#endif
130	typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilFuncProc)(GrGLenum func, GrGLint ref, GrGLuint mask);	130	typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilFuncProc)(GrGLenum func, GrGLint ref, GrGLuint mask);
131	typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilFuncSeparateProc)(GrGLenum face, GrGLenum func, GrGLint ref, GrGLuint mask);	131	typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilFuncSeparateProc)(GrGLenum face, GrGLenum func, GrGLint ref, GrGLuint mask);
132	typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilMaskProc)(GrGLuint mask);	132	typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilMaskProc)(GrGLuint mask);




{ 'return_type': 'void',
  'names': ['glShaderSource'],
  'arguments':
      'GLuint shader, GLsizei count, const GLchar* const* str, const GLint* length',
  'logging_code': """
  GL_SERVICE_LOG_CODE_BLOCK({
    for (GLsizei ii = 0; ii < count; ++ii) {

    file.write('static %s GL_BINDING_CALL Debug_%s(%s) {\n' %
        (return_type, names[0], arguments))
    argument_names = re.sub(
        r'(const )?[a-zA-Z0-9_]+\**( const\*)? ([a-zA-Z0-9_]+)', r'\3', arguments)
    argument_names = re.sub(
        r'(const )?[a-zA-Z0-9_]+\**( const\*)? ([a-zA-Z0-9_]+)', r'\3', argument_names)
    log_argument_names = re.sub(
        r'const char\* ([a-zA-Z0-9_]+)', r'CONSTCHAR_\1', arguments)
    log_argument_names = re.sub(

    log_argument_names = re.sub(
        r'(?<!E)GLboolean ([a-zA-Z0-9_]+)', r'GLboolean_\1', log_argument_names)
    log_argument_names = re.sub(
        r'(const )?[a-zA-Z0-9_]+\**( const\*)? ([a-zA-Z0-9_]+)', r'\3',
        log_argument_names)
    log_argument_names = re.sub(
        r'(const )?[a-zA-Z0-9_]+\**( const\*)? ([a-zA-Z0-9_]+)', r'\3',
        log_argument_names)
    log_argument_names = re.sub(
        r'CONSTVOID_([a-zA-Z0-9_]+)',

    file.write('\n')
    file.write('%s GL_BINDING_CALL Mock_%s(%s) {\n' %
        (func['return_type'], func['names'][0], func['arguments']))
    argument_names = re.sub(r'(const )?[a-zA-Z0-9]+\**( const\*)? ([a-zA-Z0-9]+)', r'\3',
                              func['arguments'])
    if argument_names == 'void':
      argument_names = ''

Lines 365-371 GLvoid StubGLScissor(GLint x, GLint y, G Link Here

(-)chromium-27.0.1423.0/ui/gl/gl_bindings_skia_in_process.cc (-1 / +1 lines)
365	glScissor(x, y, width, height);	365	glScissor(x, y, width, height);
366	}	366	}
367		367
368	GLvoid StubGLShaderSource(GLuint shader, GLsizei count, const char** str,	368	GLvoid StubGLShaderSource(GLuint shader, GLsizei count, const GLchar* const* str,
369	const GLint* length) {	369	const GLint* length) {
370	glShaderSource(shader, count, str, length);	370	glShaderSource(shader, count, str, length);
371	}	371	}

Return to bug 455762

Lines 482-488 GL_FUNCTIONS = [ Link Here

(-)chromium-27.0.1423.0/ui/gl/generate_bindings.py (-6 / +6 lines)
482	{ 'return_type': 'void',	482	{ 'return_type': 'void',
483	'names': ['glShaderSource'],	483	'names': ['glShaderSource'],
484	'arguments':	484	'arguments':
485	'GLuint shader, GLsizei count, const char** str, const GLint* length',	485	'GLuint shader, GLsizei count, const GLchar* const* str, const GLint* length',
486	'logging_code': """	486	'logging_code': """
487	GL_SERVICE_LOG_CODE_BLOCK({	487	GL_SERVICE_LOG_CODE_BLOCK({
488	for (GLsizei ii = 0; ii < count; ++ii) {	488	for (GLsizei ii = 0; ii < count; ++ii) {
Lines 1421-1429 namespace gfx { Link Here
1421	file.write('static %s GL_BINDING_CALL Debug_%s(%s) {\n' %	1421	file.write('static %s GL_BINDING_CALL Debug_%s(%s) {\n' %
1422	(return_type, names[0], arguments))	1422	(return_type, names[0], arguments))
1423	argument_names = re.sub(	1423	argument_names = re.sub(
1424	r'(const )?[a-zA-Z0-9_]+\** ([a-zA-Z0-9_]+)', r'\2', arguments)	1424	r'(const )?[a-zA-Z0-9_]+\*( const\)? ([a-zA-Z0-9_]+)', r'\3', arguments)
1425	argument_names = re.sub(	1425	argument_names = re.sub(
1426	r'(const )?[a-zA-Z0-9_]+\** ([a-zA-Z0-9_]+)', r'\2', argument_names)	1426	r'(const )?[a-zA-Z0-9_]+\*( const\)? ([a-zA-Z0-9_]+)', r'\3', argument_names)
1427	log_argument_names = re.sub(	1427	log_argument_names = re.sub(
1428	r'const char\* ([a-zA-Z0-9_]+)', r'CONSTCHAR_\1', arguments)	1428	r'const char\* ([a-zA-Z0-9_]+)', r'CONSTCHAR_\1', arguments)
1429	log_argument_names = re.sub(	1429	log_argument_names = re.sub(
Lines 1434-1443 namespace gfx { Link Here
1434	log_argument_names = re.sub(	1434	log_argument_names = re.sub(
1435	r'(?<!E)GLboolean ([a-zA-Z0-9_]+)', r'GLboolean_\1', log_argument_names)	1435	r'(?<!E)GLboolean ([a-zA-Z0-9_]+)', r'GLboolean_\1', log_argument_names)
1436	log_argument_names = re.sub(	1436	log_argument_names = re.sub(
1437	r'(const )?[a-zA-Z0-9_]+\** ([a-zA-Z0-9_]+)', r'\2',	1437	r'(const )?[a-zA-Z0-9_]+\*( const\)? ([a-zA-Z0-9_]+)', r'\3',
1438	log_argument_names)	1438	log_argument_names)
1439	log_argument_names = re.sub(	1439	log_argument_names = re.sub(
1440	r'(const )?[a-zA-Z0-9_]+\** ([a-zA-Z0-9_]+)', r'\2',	1440	r'(const )?[a-zA-Z0-9_]+\*( const\)? ([a-zA-Z0-9_]+)', r'\3',
1441	log_argument_names)	1441	log_argument_names)
1442	log_argument_names = re.sub(	1442	log_argument_names = re.sub(
1443	r'CONSTVOID_([a-zA-Z0-9_]+)',	1443	r'CONSTVOID_([a-zA-Z0-9_]+)',
Lines 1584-1590 namespace gfx { Link Here
1584	file.write('\n')	1584	file.write('\n')
1585	file.write('%s GL_BINDING_CALL Mock_%s(%s) {\n' %	1585	file.write('%s GL_BINDING_CALL Mock_%s(%s) {\n' %
1586	(func['return_type'], func['names'][0], func['arguments']))	1586	(func['return_type'], func['names'][0], func['arguments']))
1587	argument_names = re.sub(r'(const )?[a-zA-Z0-9]+\** ([a-zA-Z0-9]+)', r'\2',	1587	argument_names = re.sub(r'(const )?[a-zA-Z0-9]+\*( const\)? ([a-zA-Z0-9]+)', r'\3',
1588	func['arguments'])	1588	func['arguments'])
1589	if argument_names == 'void':	1589	if argument_names == 'void':
1590	argument_names = ''	1590	argument_names = ''