summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DEPS2
-rw-r--r--gpu/command_buffer/client/gles2_c_lib_autogen.h3
-rw-r--r--gpu/command_buffer/client/gles2_implementation.cc2
-rw-r--r--gpu/command_buffer/client/gles2_implementation_autogen.h2
-rw-r--r--gpu/command_buffer/client/gles2_interface_autogen.h3
-rw-r--r--gpu/command_buffer/client/gles2_interface_stub_autogen.h2
-rw-r--r--gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h2
-rw-r--r--gpu/command_buffer/client/gles2_trace_implementation_autogen.h2
-rw-r--r--gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h3
-rw-r--r--gpu/command_buffer/cmd_buffer_functions.txt2
-rw-r--r--third_party/khronos/GLES2/gl2.h9
-rw-r--r--third_party/khronos/README.chromium1
-rwxr-xr-xui/gl/generate_bindings.py4
-rw-r--r--ui/gl/gl_bindings_skia_in_process.cc2
14 files changed, 19 insertions, 20 deletions
diff --git a/DEPS b/DEPS
index 285d8dd..0c8d444 100644
--- a/DEPS
+++ b/DEPS
@@ -29,7 +29,7 @@ vars = {
"ffmpeg_hash": "bb82a38d45e65c1fba378c15180b98ad76ebe1ca",
"sfntly_revision": "134",
- "skia_revision": "7909",
+ "skia_revision": "7896",
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Skia
# and V8 without interference from each other.
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);
diff --git a/third_party/khronos/GLES2/gl2.h b/third_party/khronos/GLES2/gl2.h
index 7aef573..edebb8b 100644
--- a/third_party/khronos/GLES2/gl2.h
+++ b/third_party/khronos/GLES2/gl2.h
@@ -1,7 +1,7 @@
#ifndef __gl2_h_
#define __gl2_h_
-/* $Revision: 20555 $ on $Date:: 2013-02-12 14:32:47 -0800 #$ */
+/* $Revision: 16803 $ on $Date:: 2012-02-02 09:49:18 -0800 #$ */
#include <GLES2/gl2chromium.h>
#include <GLES2/gl2platform.h>
@@ -160,6 +160,7 @@ typedef khronos_ssize_t GLsizeiptr;
#define GL_INVALID_VALUE 0x0501
#define GL_INVALID_OPERATION 0x0502
#define GL_OUT_OF_MEMORY 0x0505
+#define GL_CONTEXT_LOST 0x300E // TODO(gman): What value?
/* FrontFaceDirection */
#define GL_CW 0x0900
@@ -528,7 +529,7 @@ GL_APICALL void GL_APIENTRY glGenTextures (GLsizei n, GLuint* textures);
GL_APICALL void GL_APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
GL_APICALL void GL_APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
GL_APICALL void GL_APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);
-GL_APICALL GLint GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name);
+GL_APICALL int GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name);
GL_APICALL void GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean* params);
GL_APICALL void GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint* params);
GL_APICALL GLenum GL_APIENTRY glGetError (void);
@@ -547,7 +548,7 @@ GL_APICALL void GL_APIENTRY glGetTexParameterfv (GLenum target, GLenum p
GL_APICALL void GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint* params);
GL_APICALL void GL_APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat* params);
GL_APICALL void GL_APIENTRY glGetUniformiv (GLuint program, GLint location, GLint* params);
-GL_APICALL GLint GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name);
+GL_APICALL int GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name);
GL_APICALL void GL_APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat* params);
GL_APICALL void GL_APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint* params);
GL_APICALL void GL_APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid** pointer);
@@ -569,7 +570,7 @@ GL_APICALL void GL_APIENTRY glRenderbufferStorage (GLenum target, GLenum
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 (GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length);
-GL_APICALL void GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length);
+GL_APICALL void GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar** string, const GLint* length);
GL_APICALL void GL_APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask);
GL_APICALL void GL_APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask);
GL_APICALL void GL_APIENTRY glStencilMask (GLuint mask);
diff --git a/third_party/khronos/README.chromium b/third_party/khronos/README.chromium
index da2e6c5..b47cb03 100644
--- a/third_party/khronos/README.chromium
+++ b/third_party/khronos/README.chromium
@@ -20,6 +20,7 @@ NOTE: Please add Chromium-specific declarations to files in gpu/{GL,EGL,GLES2}
and not here.
GLES2/gl2.h
+ - Added GL_CONTEXT_LOST constant.
- Added include of gl2chromium.h
GLES2/gl2ext.h
- Added Chromium and Angle extensions.
diff --git a/ui/gl/generate_bindings.py b/ui/gl/generate_bindings.py
index 8422bbc..16f8998 100755
--- a/ui/gl/generate_bindings.py
+++ b/ui/gl/generate_bindings.py
@@ -482,7 +482,7 @@ GL_FUNCTIONS = [
{ 'return_type': 'void',
'names': ['glShaderSource'],
'arguments':
- 'GLuint shader, GLsizei count, const char* const* str, const GLint* length',
+ 'GLuint shader, GLsizei count, const char** str, const GLint* length',
'logging_code': """
GL_SERVICE_LOG_CODE_BLOCK({
for (GLsizei ii = 0; ii < count; ++ii) {
@@ -1584,7 +1584,7 @@ namespace gfx {
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]+((\s*const\s*)?\*)* ([a-zA-Z0-9]+)', r'\4',
+ argument_names = re.sub(r'(const )?[a-zA-Z0-9]+\** ([a-zA-Z0-9]+)', r'\2',
func['arguments'])
if argument_names == 'void':
argument_names = ''
diff --git a/ui/gl/gl_bindings_skia_in_process.cc b/ui/gl/gl_bindings_skia_in_process.cc
index 115eac8..f456266 100644
--- a/ui/gl/gl_bindings_skia_in_process.cc
+++ b/ui/gl/gl_bindings_skia_in_process.cc
@@ -365,7 +365,7 @@ GLvoid StubGLScissor(GLint x, GLint y, GLsizei width, GLsizei height) {
glScissor(x, y, width, height);
}
-GLvoid StubGLShaderSource(GLuint shader, GLsizei count, const char* const* str,
+GLvoid StubGLShaderSource(GLuint shader, GLsizei count, const char** str,
const GLint* length) {
glShaderSource(shader, count, str, length);
}
generated by cgit v1.1 at 2025-02-19 07:16:58 +0000