Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "PaweA Hajdan (phajdan.jr)" <phajdan.jr@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/chromium/files: chromium-mesa-r0.patch chromium-mesa-r1.patch
Date: Sun, 03 Mar 2013 23:46:26
Message-Id: 20130303234622.EA3022171E@flycatcher.gentoo.org
1 phajdan.jr 13/03/03 23:46:22
2
3 Added: chromium-mesa-r0.patch chromium-mesa-r1.patch
4 Log:
5 Fix build with mesa-9.1, bug #455762 by Anthony Parsons.
6
7 (Portage version: 2.1.11.50/cvs/Linux i686, signed Manifest commit with key 30427902)
8
9 Revision Changes Path
10 1.1 www-client/chromium/files/chromium-mesa-r0.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-mesa-r0.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-mesa-r0.patch?rev=1.1&content-type=text/plain
14
15 Index: chromium-mesa-r0.patch
16 ===================================================================
17 Index: gpu/command_buffer/client/gles2_c_lib_autogen.h
18 diff --git a/gpu/command_buffer/client/gles2_c_lib_autogen.h b/gpu/command_buffer/client/gles2_c_lib_autogen.h
19 index 80a4d230ad4b82abbaa82f2c328286b9d89da329..d56df6fdb0d851125148a1aac0bedbc487320682 100644
20 --- a/gpu/command_buffer/client/gles2_c_lib_autogen.h
21 +++ b/gpu/command_buffer/client/gles2_c_lib_autogen.h
22 @@ -355,7 +355,8 @@ void GLES2ShaderBinary(
23 n, shaders, binaryformat, binary, length);
24 }
25 void GLES2ShaderSource(
26 - GLuint shader, GLsizei count, const char** str, const GLint* length) {
27 + GLuint shader, GLsizei count, const GLchar* const* str,
28 + const GLint* length) {
29 gles2::GetGLContext()->ShaderSource(shader, count, str, length);
30 }
31 void GLES2StencilFunc(GLenum func, GLint ref, GLuint mask) {
32 Index: gpu/command_buffer/client/gles2_implementation.cc
33 diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc
34 index b6c354819ce5d556ff91f7b5273875c3cec83f7a..600c02f3751a2ab72eed498be7ee0f02e628130d 100644
35 --- a/gpu/command_buffer/client/gles2_implementation.cc
36 +++ b/gpu/command_buffer/client/gles2_implementation.cc
37 @@ -1173,7 +1173,7 @@ void GLES2Implementation::VertexAttribDivisorANGLE(
38 }
39
40 void GLES2Implementation::ShaderSource(
41 - GLuint shader, GLsizei count, const char** source, const GLint* length) {
42 + GLuint shader, GLsizei count, const GLchar* const* source, const GLint* length) {
43 GPU_CLIENT_SINGLE_THREAD_CHECK();
44 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glShaderSource("
45 << shader << ", " << count << ", "
46 Index: gpu/command_buffer/client/gles2_implementation_autogen.h
47 diff --git a/gpu/command_buffer/client/gles2_implementation_autogen.h b/gpu/command_buffer/client/gles2_implementation_autogen.h
48 index febcaf45bb5446393c7785196c9ef4a329438d0f..e4a63822ae6b3b9c950b7f9b05f173ce1ecfdb87 100644
49 --- a/gpu/command_buffer/client/gles2_implementation_autogen.h
50 +++ b/gpu/command_buffer/client/gles2_implementation_autogen.h
51 @@ -253,7 +253,7 @@ virtual void ShaderBinary(
52 GLsizei length) OVERRIDE;
53
54 virtual void ShaderSource(
55 - GLuint shader, GLsizei count, const char** str,
56 + GLuint shader, GLsizei count, const GLchar* const* str,
57 const GLint* length) OVERRIDE;
58
59 virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) OVERRIDE;
60 Index: gpu/command_buffer/client/gles2_interface_autogen.h
61 diff --git a/gpu/command_buffer/client/gles2_interface_autogen.h b/gpu/command_buffer/client/gles2_interface_autogen.h
62 index b84dd71bd9139ac487a40847ddb746f839cf3593..8aafc7fd45891be4e2aa61f5825c20d0ccd1dc76 100644
63 --- a/gpu/command_buffer/client/gles2_interface_autogen.h
64 +++ b/gpu/command_buffer/client/gles2_interface_autogen.h
65 @@ -152,7 +152,8 @@ virtual void ShaderBinary(
66 GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary,
67 GLsizei length) = 0;
68 virtual void ShaderSource(
69 - GLuint shader, GLsizei count, const char** str, const GLint* length) = 0;
70 + GLuint shader, GLsizei count, const GLchar* const* str,
71 + const GLint* length) = 0;
72 virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) = 0;
73 virtual void StencilFuncSeparate(
74 GLenum face, GLenum func, GLint ref, GLuint mask) = 0;
75 Index: gpu/command_buffer/client/gles2_interface_stub_autogen.h
76 diff --git a/gpu/command_buffer/client/gles2_interface_stub_autogen.h b/gpu/command_buffer/client/gles2_interface_stub_autogen.h
77 index 3c1c6696b08923142c879aa591b3902339e5874c..80e6c1003ae1be90fcd1a2871ffdde58f7237bff 100644
78 --- a/gpu/command_buffer/client/gles2_interface_stub_autogen.h
79 +++ b/gpu/command_buffer/client/gles2_interface_stub_autogen.h
80 @@ -163,7 +163,7 @@ virtual void ShaderBinary(
81 GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary,
82 GLsizei length) OVERRIDE;
83 virtual void ShaderSource(
84 - GLuint shader, GLsizei count, const char** str,
85 + GLuint shader, GLsizei count, const GLchar* const* str,
86 const GLint* length) OVERRIDE;
87 virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) OVERRIDE;
88 virtual void StencilFuncSeparate(
89 Index: gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h
90 diff --git a/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h b/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h
91 index dce39c0def3ec52499c712afe1f792809c00db28..f097e8cba8e4d13af9027122a36b93f2ec28ae46 100644
92 --- a/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h
93 +++ b/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h
94 @@ -310,7 +310,7 @@ void GLES2InterfaceStub::ShaderBinary(
95 const void* /* binary */, GLsizei /* length */) {
96 }
97 void GLES2InterfaceStub::ShaderSource(
98 - GLuint /* shader */, GLsizei /* count */, const char** /* str */,
99 + GLuint /* shader */, GLsizei /* count */, const GLchar* const* /* str */,
100 const GLint* /* length */) {
101 }
102 void GLES2InterfaceStub::StencilFunc(
103 Index: gpu/command_buffer/client/gles2_trace_implementation_autogen.h
104 diff --git a/gpu/command_buffer/client/gles2_trace_implementation_autogen.h b/gpu/command_buffer/client/gles2_trace_implementation_autogen.h
105 index 46cbdccccd0e3e4074b1fd919fc6b91d95fe04a5..da02881f9d180bd26f5a2bad2d4e814a9ca085b3 100644
106 --- a/gpu/command_buffer/client/gles2_trace_implementation_autogen.h
107 +++ b/gpu/command_buffer/client/gles2_trace_implementation_autogen.h
108 @@ -163,7 +163,7 @@ virtual void ShaderBinary(
109 GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary,
110 GLsizei length) OVERRIDE;
111 virtual void ShaderSource(
112 - GLuint shader, GLsizei count, const char** str,
113 + GLuint shader, GLsizei count, const GLchar* const* str,
114 const GLint* length) OVERRIDE;
115 virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) OVERRIDE;
116 virtual void StencilFuncSeparate(
117 Index: gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h
118 diff --git a/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h b/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h
119 index 8aff42a6711c38b76e8767057b41fa31fe89f168..8f87a40da0f26f0dd71772e5fbcf519c8b02ad12 100644
120 --- a/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h
121 +++ b/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h
122 @@ -570,7 +570,8 @@ void GLES2TraceImplementation::ShaderBinary(
123 }
124
125 void GLES2TraceImplementation::ShaderSource(
126 - GLuint shader, GLsizei count, const char** str, const GLint* length) {
127 + GLuint shader, GLsizei count, const GLchar* const* str,
128 + const GLint* length) {
129 TRACE_EVENT0("gpu", "GLES2Trace::ShaderSource");
130 gl_->ShaderSource(shader, count, str, length);
131 }
132 Index: gpu/command_buffer/cmd_buffer_functions.txt
133 diff --git a/gpu/command_buffer/cmd_buffer_functions.txt b/gpu/command_buffer/cmd_buffer_functions.txt
134 index 2ad875a4aeaf86566c5f0334090f6583468c4781..08d33d963e3450d6fe442b333fb88089b184d86b 100644
135 --- a/gpu/command_buffer/cmd_buffer_functions.txt
136 +++ b/gpu/command_buffer/cmd_buffer_functions.txt
137 @@ -103,7 +103,7 @@ GL_APICALL void GL_APIENTRY glRenderbufferStorage (GLenumRenderBufferTar
138 GL_APICALL void GL_APIENTRY glSampleCoverage (GLclampf value, GLboolean invert);
139 GL_APICALL void GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
140 GL_APICALL void GL_APIENTRY glShaderBinary (GLsizeiNotNegative n, const GLuint* shaders, GLenumShaderBinaryFormat binaryformat, const void* binary, GLsizeiNotNegative length);
141 -GL_APICALL void GL_APIENTRY glShaderSource (GLidShader shader, GLsizeiNotNegative count, const char** str, const GLint* length);
142 +GL_APICALL void GL_APIENTRY glShaderSource (GLidShader shader, GLsizeiNotNegative count, const GLchar* const* str, const GLint* length);
143 GL_APICALL void GL_APIENTRY glStencilFunc (GLenumCmpFunction func, GLint ref, GLuint mask);
144 GL_APICALL void GL_APIENTRY glStencilFuncSeparate (GLenumFaceType face, GLenumCmpFunction func, GLint ref, GLuint mask);
145 GL_APICALL void GL_APIENTRY glStencilMask (GLuint mask);
146 Index: third_party/khronos/GLES2/gl2.h
147 diff --git a/third_party/khronos/GLES2/gl2.h b/third_party/khronos/GLES2/gl2.h
148 index edebb8b23a56f6a67bb1ecfe5304bb5b372745e6..7aef573b6af7f4e3c76bdfb741374521b2f1eca4 100644
149 --- a/third_party/khronos/GLES2/gl2.h
150 +++ b/third_party/khronos/GLES2/gl2.h
151 @@ -1,7 +1,7 @@
152 #ifndef __gl2_h_
153 #define __gl2_h_
154
155 -/* $Revision: 1.1 $ on $Date: 2013/03/03 23:46:22 $ */
156 +/* $Revision: 1.1 $ on $Date: 2013/03/03 23:46:22 $ */
157
158 #include <GLES2/gl2chromium.h>
159 #include <GLES2/gl2platform.h>
160 @@ -160,7 +160,6 @@ typedef khronos_ssize_t GLsizeiptr;
161 #define GL_INVALID_VALUE 0x0501
162 #define GL_INVALID_OPERATION 0x0502
163 #define GL_OUT_OF_MEMORY 0x0505
164 -#define GL_CONTEXT_LOST 0x300E // TODO(gman): What value?
165
166 /* FrontFaceDirection */
167 #define GL_CW 0x0900
168 @@ -529,7 +528,7 @@ GL_APICALL void GL_APIENTRY glGenTextures (GLsizei n, GLuint* textures);
169 GL_APICALL void GL_APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
170 GL_APICALL void GL_APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
171 GL_APICALL void GL_APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);
172 -GL_APICALL int GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name);
173 +GL_APICALL GLint GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name);
174 GL_APICALL void GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean* params);
175 GL_APICALL void GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint* params);
176 GL_APICALL GLenum GL_APIENTRY glGetError (void);
177 @@ -548,7 +547,7 @@ GL_APICALL void GL_APIENTRY glGetTexParameterfv (GLenum target, GLenum p
178 GL_APICALL void GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint* params);
179 GL_APICALL void GL_APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat* params);
180 GL_APICALL void GL_APIENTRY glGetUniformiv (GLuint program, GLint location, GLint* params);
181 -GL_APICALL int GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name);
182 +GL_APICALL GLint GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name);
183 GL_APICALL void GL_APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat* params);
184 GL_APICALL void GL_APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint* params);
185 GL_APICALL void GL_APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid** pointer);
186 @@ -570,7 +569,7 @@ GL_APICALL void GL_APIENTRY glRenderbufferStorage (GLenum target, GLenum
187 GL_APICALL void GL_APIENTRY glSampleCoverage (GLclampf value, GLboolean invert);
188 GL_APICALL void GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
189 GL_APICALL void GL_APIENTRY glShaderBinary (GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length);
190 -GL_APICALL void GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar** string, const GLint* length);
191 +GL_APICALL void GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length);
192 GL_APICALL void GL_APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask);
193 GL_APICALL void GL_APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask);
194 GL_APICALL void GL_APIENTRY glStencilMask (GLuint mask);
195 Index: third_party/khronos/README.chromium
196 diff --git a/third_party/khronos/README.chromium b/third_party/khronos/README.chromium
197 index b47cb038c3cc5b51181194a55869842118bf7a56..da2e6c511e33767a458da1a17bd1b78e87779439 100644
198 --- a/third_party/khronos/README.chromium
199 +++ b/third_party/khronos/README.chromium
200 @@ -20,7 +20,6 @@ NOTE: Please add Chromium-specific declarations to files in gpu/{GL,EGL,GLES2}
201 and not here.
202
203 GLES2/gl2.h
204 - - Added GL_CONTEXT_LOST constant.
205 - Added include of gl2chromium.h
206 GLES2/gl2ext.h
207 - Added Chromium and Angle extensions.
208 Index: ui/gl/generate_bindings.py
209 diff --git a/ui/gl/generate_bindings.py b/ui/gl/generate_bindings.py
210 index 16f89984bc3d1dc967d6ea3d2c4c1ed799716f8e..8422bbc8baf049f6431cea602a179296698f12b3 100755
211 --- a/ui/gl/generate_bindings.py
212 +++ b/ui/gl/generate_bindings.py
213 @@ -482,7 +482,7 @@ GL_FUNCTIONS = [
214 { 'return_type': 'void',
215 'names': ['glShaderSource'],
216 'arguments':
217 - 'GLuint shader, GLsizei count, const char** str, const GLint* length',
218 + 'GLuint shader, GLsizei count, const char* const* str, const GLint* length',
219 'logging_code': """
220 GL_SERVICE_LOG_CODE_BLOCK({
221 for (GLsizei ii = 0; ii < count; ++ii) {
222 @@ -1584,7 +1584,7 @@ namespace gfx {
223 file.write('\n')
224 file.write('%s GL_BINDING_CALL Mock_%s(%s) {\n' %
225 (func['return_type'], func['names'][0], func['arguments']))
226 - argument_names = re.sub(r'(const )?[a-zA-Z0-9]+\** ([a-zA-Z0-9]+)', r'\2',
227 + argument_names = re.sub(r'(const )?[a-zA-Z0-9]+((\s*const\s*)?\*)* ([a-zA-Z0-9]+)', r'\4',
228 func['arguments'])
229 if argument_names == 'void':
230 argument_names = ''
231 Index: ui/gl/gl_bindings_skia_in_process.cc
232 diff --git a/ui/gl/gl_bindings_skia_in_process.cc b/ui/gl/gl_bindings_skia_in_process.cc
233 index f45626616ed6ff8e8de0c59b25165e6b51f3668d..115eac8d8a57e7abc000935e20c8eb311cd404e8 100644
234 --- a/ui/gl/gl_bindings_skia_in_process.cc
235 +++ b/ui/gl/gl_bindings_skia_in_process.cc
236 @@ -365,7 +365,7 @@ GLvoid StubGLScissor(GLint x, GLint y, GLsizei width, GLsizei height) {
237 glScissor(x, y, width, height);
238 }
239
240 -GLvoid StubGLShaderSource(GLuint shader, GLsizei count, const char** str,
241 +GLvoid StubGLShaderSource(GLuint shader, GLsizei count, const char* const* str,
242 const GLint* length) {
243 glShaderSource(shader, count, str, length);
244 }
245 Index: third_party/skia/include/gpu/gl/GrGLConfig_chrome.h
246 ===================================================================
247 --- a/third_party/skia/include/gpu/gl/GrGLConfig_chrome.h (revision 7840)
248 +++ b/third_party/skia/include/gpu/gl/GrGLConfig_chrome.h (working copy)
249 @@ -37,4 +37,8 @@
250 // Non-VBO vertices and indices are not allowed in Chromium.
251 #define GR_GL_MUST_USE_VBO 1
252
253 +// Use updated Khronos signature for glShaderSource
254 +// (const char* const instead of char**).
255 +#define GR_USE_NEW_GL_SHADER_SOURCE_SIGNATURE 1
256 +
257 #endif
258
259
260
261 1.1 www-client/chromium/files/chromium-mesa-r1.patch
262
263 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-mesa-r1.patch?rev=1.1&view=markup
264 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-mesa-r1.patch?rev=1.1&content-type=text/plain
265
266 Index: chromium-mesa-r1.patch
267 ===================================================================
268 Index: gpu/command_buffer/client/gles2_c_lib_autogen.h
269 diff --git a/gpu/command_buffer/client/gles2_c_lib_autogen.h b/gpu/command_buffer/client/gles2_c_lib_autogen.h
270 index 80a4d230ad4b82abbaa82f2c328286b9d89da329..d56df6fdb0d851125148a1aac0bedbc487320682 100644
271 --- a/gpu/command_buffer/client/gles2_c_lib_autogen.h
272 +++ b/gpu/command_buffer/client/gles2_c_lib_autogen.h
273 @@ -355,7 +355,8 @@ void GLES2ShaderBinary(
274 n, shaders, binaryformat, binary, length);
275 }
276 void GLES2ShaderSource(
277 - GLuint shader, GLsizei count, const char** str, const GLint* length) {
278 + GLuint shader, GLsizei count, const GLchar* const* str,
279 + const GLint* length) {
280 gles2::GetGLContext()->ShaderSource(shader, count, str, length);
281 }
282 void GLES2StencilFunc(GLenum func, GLint ref, GLuint mask) {
283 Index: gpu/command_buffer/client/gles2_implementation.cc
284 diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc
285 index b6c354819ce5d556ff91f7b5273875c3cec83f7a..600c02f3751a2ab72eed498be7ee0f02e628130d 100644
286 --- a/gpu/command_buffer/client/gles2_implementation.cc
287 +++ b/gpu/command_buffer/client/gles2_implementation.cc
288 @@ -1173,7 +1173,7 @@ void GLES2Implementation::VertexAttribDivisorANGLE(
289 }
290
291 void GLES2Implementation::ShaderSource(
292 - GLuint shader, GLsizei count, const char** source, const GLint* length) {
293 + GLuint shader, GLsizei count, const GLchar* const* source, const GLint* length) {
294 GPU_CLIENT_SINGLE_THREAD_CHECK();
295 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glShaderSource("
296 << shader << ", " << count << ", "
297 Index: gpu/command_buffer/client/gles2_implementation_autogen.h
298 diff --git a/gpu/command_buffer/client/gles2_implementation_autogen.h b/gpu/command_buffer/client/gles2_implementation_autogen.h
299 index febcaf45bb5446393c7785196c9ef4a329438d0f..e4a63822ae6b3b9c950b7f9b05f173ce1ecfdb87 100644
300 --- a/gpu/command_buffer/client/gles2_implementation_autogen.h
301 +++ b/gpu/command_buffer/client/gles2_implementation_autogen.h
302 @@ -253,7 +253,7 @@ virtual void ShaderBinary(
303 GLsizei length) OVERRIDE;
304
305 virtual void ShaderSource(
306 - GLuint shader, GLsizei count, const char** str,
307 + GLuint shader, GLsizei count, const GLchar* const* str,
308 const GLint* length) OVERRIDE;
309
310 virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) OVERRIDE;
311 Index: gpu/command_buffer/client/gles2_interface_autogen.h
312 diff --git a/gpu/command_buffer/client/gles2_interface_autogen.h b/gpu/command_buffer/client/gles2_interface_autogen.h
313 index b84dd71bd9139ac487a40847ddb746f839cf3593..8aafc7fd45891be4e2aa61f5825c20d0ccd1dc76 100644
314 --- a/gpu/command_buffer/client/gles2_interface_autogen.h
315 +++ b/gpu/command_buffer/client/gles2_interface_autogen.h
316 @@ -152,7 +152,8 @@ virtual void ShaderBinary(
317 GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary,
318 GLsizei length) = 0;
319 virtual void ShaderSource(
320 - GLuint shader, GLsizei count, const char** str, const GLint* length) = 0;
321 + GLuint shader, GLsizei count, const GLchar* const* str,
322 + const GLint* length) = 0;
323 virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) = 0;
324 virtual void StencilFuncSeparate(
325 GLenum face, GLenum func, GLint ref, GLuint mask) = 0;
326 Index: gpu/command_buffer/client/gles2_interface_stub_autogen.h
327 diff --git a/gpu/command_buffer/client/gles2_interface_stub_autogen.h b/gpu/command_buffer/client/gles2_interface_stub_autogen.h
328 index 3c1c6696b08923142c879aa591b3902339e5874c..80e6c1003ae1be90fcd1a2871ffdde58f7237bff 100644
329 --- a/gpu/command_buffer/client/gles2_interface_stub_autogen.h
330 +++ b/gpu/command_buffer/client/gles2_interface_stub_autogen.h
331 @@ -163,7 +163,7 @@ virtual void ShaderBinary(
332 GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary,
333 GLsizei length) OVERRIDE;
334 virtual void ShaderSource(
335 - GLuint shader, GLsizei count, const char** str,
336 + GLuint shader, GLsizei count, const GLchar* const* str,
337 const GLint* length) OVERRIDE;
338 virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) OVERRIDE;
339 virtual void StencilFuncSeparate(
340 Index: gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h
341 diff --git a/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h b/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h
342 index dce39c0def3ec52499c712afe1f792809c00db28..f097e8cba8e4d13af9027122a36b93f2ec28ae46 100644
343 --- a/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h
344 +++ b/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h
345 @@ -310,7 +310,7 @@ void GLES2InterfaceStub::ShaderBinary(
346 const void* /* binary */, GLsizei /* length */) {
347 }
348 void GLES2InterfaceStub::ShaderSource(
349 - GLuint /* shader */, GLsizei /* count */, const char** /* str */,
350 + GLuint /* shader */, GLsizei /* count */, const GLchar* const* /* str */,
351 const GLint* /* length */) {
352 }
353 void GLES2InterfaceStub::StencilFunc(
354 Index: gpu/command_buffer/client/gles2_trace_implementation_autogen.h
355 diff --git a/gpu/command_buffer/client/gles2_trace_implementation_autogen.h b/gpu/command_buffer/client/gles2_trace_implementation_autogen.h
356 index 46cbdccccd0e3e4074b1fd919fc6b91d95fe04a5..da02881f9d180bd26f5a2bad2d4e814a9ca085b3 100644
357 --- a/gpu/command_buffer/client/gles2_trace_implementation_autogen.h
358 +++ b/gpu/command_buffer/client/gles2_trace_implementation_autogen.h
359 @@ -163,7 +163,7 @@ virtual void ShaderBinary(
360 GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary,
361 GLsizei length) OVERRIDE;
362 virtual void ShaderSource(
363 - GLuint shader, GLsizei count, const char** str,
364 + GLuint shader, GLsizei count, const GLchar* const* str,
365 const GLint* length) OVERRIDE;
366 virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) OVERRIDE;
367 virtual void StencilFuncSeparate(
368 Index: gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h
369 diff --git a/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h b/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h
370 index 8aff42a6711c38b76e8767057b41fa31fe89f168..8f87a40da0f26f0dd71772e5fbcf519c8b02ad12 100644
371 --- a/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h
372 +++ b/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h
373 @@ -570,7 +570,8 @@ void GLES2TraceImplementation::ShaderBinary(
374 }
375
376 void GLES2TraceImplementation::ShaderSource(
377 - GLuint shader, GLsizei count, const char** str, const GLint* length) {
378 + GLuint shader, GLsizei count, const GLchar* const* str,
379 + const GLint* length) {
380 TRACE_EVENT_BINARY_EFFICIENT0("gpu", "GLES2Trace::ShaderSource");
381 gl_->ShaderSource(shader, count, str, length);
382 }
383 Index: gpu/command_buffer/cmd_buffer_functions.txt
384 diff --git a/gpu/command_buffer/cmd_buffer_functions.txt b/gpu/command_buffer/cmd_buffer_functions.txt
385 index 2ad875a4aeaf86566c5f0334090f6583468c4781..08d33d963e3450d6fe442b333fb88089b184d86b 100644
386 --- a/gpu/command_buffer/cmd_buffer_functions.txt
387 +++ b/gpu/command_buffer/cmd_buffer_functions.txt
388 @@ -103,7 +103,7 @@ GL_APICALL void GL_APIENTRY glRenderbufferStorage (GLenumRenderBufferTar
389 GL_APICALL void GL_APIENTRY glSampleCoverage (GLclampf value, GLboolean invert);
390 GL_APICALL void GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
391 GL_APICALL void GL_APIENTRY glShaderBinary (GLsizeiNotNegative n, const GLuint* shaders, GLenumShaderBinaryFormat binaryformat, const void* binary, GLsizeiNotNegative length);
392 -GL_APICALL void GL_APIENTRY glShaderSource (GLidShader shader, GLsizeiNotNegative count, const char** str, const GLint* length);
393 +GL_APICALL void GL_APIENTRY glShaderSource (GLidShader shader, GLsizeiNotNegative count, const GLchar* const* str, const GLint* length);
394 GL_APICALL void GL_APIENTRY glStencilFunc (GLenumCmpFunction func, GLint ref, GLuint mask);
395 GL_APICALL void GL_APIENTRY glStencilFuncSeparate (GLenumFaceType face, GLenumCmpFunction func, GLint ref, GLuint mask);
396 GL_APICALL void GL_APIENTRY glStencilMask (GLuint mask);
397 Index: third_party/khronos/GLES2/gl2.h
398 diff --git a/third_party/khronos/GLES2/gl2.h b/third_party/khronos/GLES2/gl2.h
399 index edebb8b23a56f6a67bb1ecfe5304bb5b372745e6..7aef573b6af7f4e3c76bdfb741374521b2f1eca4 100644
400 --- a/third_party/khronos/GLES2/gl2.h
401 +++ b/third_party/khronos/GLES2/gl2.h
402 @@ -1,7 +1,7 @@
403 #ifndef __gl2_h_
404 #define __gl2_h_
405
406 -/* $Revision: 1.1 $ on $Date: 2013/03/03 23:46:22 $ */
407 +/* $Revision: 1.1 $ on $Date: 2013/03/03 23:46:22 $ */
408
409 #include <GLES2/gl2chromium.h>
410 #include <GLES2/gl2platform.h>
411 @@ -160,7 +160,6 @@ typedef khronos_ssize_t GLsizeiptr;
412 #define GL_INVALID_VALUE 0x0501
413 #define GL_INVALID_OPERATION 0x0502
414 #define GL_OUT_OF_MEMORY 0x0505
415 -#define GL_CONTEXT_LOST 0x300E // TODO(gman): What value?
416
417 /* FrontFaceDirection */
418 #define GL_CW 0x0900
419 @@ -529,7 +528,7 @@ GL_APICALL void GL_APIENTRY glGenTextures (GLsizei n, GLuint* textures);
420 GL_APICALL void GL_APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
421 GL_APICALL void GL_APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
422 GL_APICALL void GL_APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);
423 -GL_APICALL int GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name);
424 +GL_APICALL GLint GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name);
425 GL_APICALL void GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean* params);
426 GL_APICALL void GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint* params);
427 GL_APICALL GLenum GL_APIENTRY glGetError (void);
428 @@ -548,7 +547,7 @@ GL_APICALL void GL_APIENTRY glGetTexParameterfv (GLenum target, GLenum p
429 GL_APICALL void GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint* params);
430 GL_APICALL void GL_APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat* params);
431 GL_APICALL void GL_APIENTRY glGetUniformiv (GLuint program, GLint location, GLint* params);
432 -GL_APICALL int GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name);
433 +GL_APICALL GLint GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name);
434 GL_APICALL void GL_APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat* params);
435 GL_APICALL void GL_APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint* params);
436 GL_APICALL void GL_APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid** pointer);
437 @@ -570,7 +569,7 @@ GL_APICALL void GL_APIENTRY glRenderbufferStorage (GLenum target, GLenum
438 GL_APICALL void GL_APIENTRY glSampleCoverage (GLclampf value, GLboolean invert);
439 GL_APICALL void GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
440 GL_APICALL void GL_APIENTRY glShaderBinary (GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length);
441 -GL_APICALL void GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar** string, const GLint* length);
442 +GL_APICALL void GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length);
443 GL_APICALL void GL_APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask);
444 GL_APICALL void GL_APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask);
445 GL_APICALL void GL_APIENTRY glStencilMask (GLuint mask);
446 Index: third_party/khronos/README.chromium
447 diff --git a/third_party/khronos/README.chromium b/third_party/khronos/README.chromium
448 index b47cb038c3cc5b51181194a55869842118bf7a56..da2e6c511e33767a458da1a17bd1b78e87779439 100644
449 --- a/third_party/khronos/README.chromium
450 +++ b/third_party/khronos/README.chromium
451 @@ -20,7 +20,6 @@ NOTE: Please add Chromium-specific declarations to files in gpu/{GL,EGL,GLES2}
452 and not here.
453
454 GLES2/gl2.h
455 - - Added GL_CONTEXT_LOST constant.
456 - Added include of gl2chromium.h
457 GLES2/gl2ext.h
458 - Added Chromium and Angle extensions.
459 Index: ui/gl/generate_bindings.py
460 diff --git a/ui/gl/generate_bindings.py b/ui/gl/generate_bindings.py
461 index 16f89984bc3d1dc967d6ea3d2c4c1ed799716f8e..8422bbc8baf049f6431cea602a179296698f12b3 100755
462 --- a/ui/gl/generate_bindings.py
463 +++ b/ui/gl/generate_bindings.py
464 @@ -482,7 +482,7 @@ GL_FUNCTIONS = [
465 { 'return_type': 'void',
466 'names': ['glShaderSource'],
467 'arguments':
468 - 'GLuint shader, GLsizei count, const char** str, const GLint* length',
469 + 'GLuint shader, GLsizei count, const char* const* str, const GLint* length',
470 'logging_code': """
471 GL_SERVICE_LOG_CODE_BLOCK({
472 for (GLsizei ii = 0; ii < count; ++ii) {
473 @@ -1584,7 +1584,7 @@ namespace gfx {
474 file.write('\n')
475 file.write('%s GL_BINDING_CALL Mock_%s(%s) {\n' %
476 (func['return_type'], func['names'][0], func['arguments']))
477 - argument_names = re.sub(r'(const )?[a-zA-Z0-9]+\** ([a-zA-Z0-9]+)', r'\2',
478 + argument_names = re.sub(r'(const )?[a-zA-Z0-9]+((\s*const\s*)?\*)* ([a-zA-Z0-9]+)', r'\4',
479 func['arguments'])
480 if argument_names == 'void':
481 argument_names = ''
482 Index: ui/gl/gl_bindings_skia_in_process.cc
483 diff --git a/ui/gl/gl_bindings_skia_in_process.cc b/ui/gl/gl_bindings_skia_in_process.cc
484 index f45626616ed6ff8e8de0c59b25165e6b51f3668d..115eac8d8a57e7abc000935e20c8eb311cd404e8 100644
485 --- a/ui/gl/gl_bindings_skia_in_process.cc
486 +++ b/ui/gl/gl_bindings_skia_in_process.cc
487 @@ -365,7 +365,7 @@ GLvoid StubGLScissor(GLint x, GLint y, GLsizei width, GLsizei height) {
488 glScissor(x, y, width, height);
489 }
490
491 -GLvoid StubGLShaderSource(GLuint shader, GLsizei count, const char** str,
492 +GLvoid StubGLShaderSource(GLuint shader, GLsizei count, const char* const* str,
493 const GLint* length) {
494 glShaderSource(shader, count, str, length);
495 }
496 Index: third_party/skia/include/gpu/gl/GrGLConfig_chrome.h
497 ===================================================================
498 --- a/third_party/skia/include/gpu/gl/GrGLConfig_chrome.h (revision 7840)
499 +++ b/third_party/skia/include/gpu/gl/GrGLConfig_chrome.h (working copy)
500 @@ -37,4 +37,8 @@
501 // Non-VBO vertices and indices are not allowed in Chromium.
502 #define GR_GL_MUST_USE_VBO 1
503
504 +// Use updated Khronos signature for glShaderSource
505 +// (const char* const instead of char**).
506 +#define GR_USE_NEW_GL_SHADER_SOURCE_SIGNATURE 1
507 +
508 #endif
Report Message
Find on MARC Find on Google Groups