Skip to content

A
angle
Commit ff161f83 by Jamie Madill Committed by Commit Bot
Options

Fix EP generation event output format for uint.

This should be %u not %d. BUG=angleproject:1309 Change-Id: I1fe1b8df9ea4f9123fc05e9ff58afa1f7723692c Reviewed-on: https://chromium-review.googlesource.com/636521Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent a42a4e5e
Showing with 53 additions and 53 deletions
scripts/generate_entry_points.py
......@@ -142,7 +142,7 @@ format_dict = {
"GLsizei": "%d",
"GLsizeiptr": "%d",
"GLsync": "0x%0.8p",
"GLuint": "%d",
"GLuint": "%u",
"GLuint64": "%llu"
}
......
src/libGLESv2/entry_points_gles_2_0_autogen.cpp
......@@ -32,7 +32,7 @@ void GL_APIENTRY ActiveTexture(GLenum texture)
void GL_APIENTRY AttachShader(GLuint program, GLuint shader)
{
EVENT("(GLuint program = %d, GLuint shader = %d)", program, shader);
EVENT("(GLuint program = %u, GLuint shader = %u)", program, shader);
Context *context = GetValidGlobalContext();
if (context)
......@@ -48,7 +48,7 @@ void GL_APIENTRY AttachShader(GLuint program, GLuint shader)
void GL_APIENTRY BindAttribLocation(GLuint program, GLuint index, const GLchar *name)
{
EVENT("(GLuint program = %d, GLuint index = %d, const GLchar *name = 0x%0.8p)", program, index,
EVENT("(GLuint program = %u, GLuint index = %u, const GLchar *name = 0x%0.8p)", program, index,
name);
Context *context = GetValidGlobalContext();
......@@ -65,7 +65,7 @@ void GL_APIENTRY BindAttribLocation(GLuint program, GLuint index, const GLchar *
void GL_APIENTRY BindBuffer(GLenum target, GLuint buffer)
{
EVENT("(GLenum target = 0x%X, GLuint buffer = %d)", target, buffer);
EVENT("(GLenum target = 0x%X, GLuint buffer = %u)", target, buffer);
Context *context = GetValidGlobalContext();
if (context)
......@@ -81,7 +81,7 @@ void GL_APIENTRY BindBuffer(GLenum target, GLuint buffer)
void GL_APIENTRY BindFramebuffer(GLenum target, GLuint framebuffer)
{
EVENT("(GLenum target = 0x%X, GLuint framebuffer = %d)", target, framebuffer);
EVENT("(GLenum target = 0x%X, GLuint framebuffer = %u)", target, framebuffer);
Context *context = GetValidGlobalContext();
if (context)
......@@ -97,7 +97,7 @@ void GL_APIENTRY BindFramebuffer(GLenum target, GLuint framebuffer)
void GL_APIENTRY BindRenderbuffer(GLenum target, GLuint renderbuffer)
{
EVENT("(GLenum target = 0x%X, GLuint renderbuffer = %d)", target, renderbuffer);
EVENT("(GLenum target = 0x%X, GLuint renderbuffer = %u)", target, renderbuffer);
Context *context = GetValidGlobalContext();
if (context)
......@@ -113,7 +113,7 @@ void GL_APIENTRY BindRenderbuffer(GLenum target, GLuint renderbuffer)
void GL_APIENTRY BindTexture(GLenum target, GLuint texture)
{
EVENT("(GLenum target = 0x%X, GLuint texture = %d)", target, texture);
EVENT("(GLenum target = 0x%X, GLuint texture = %u)", target, texture);
Context *context = GetValidGlobalContext();
if (context)
......@@ -356,7 +356,7 @@ void GL_APIENTRY ColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboo
void GL_APIENTRY CompileShader(GLuint shader)
{
EVENT("(GLuint shader = %d)", shader);
EVENT("(GLuint shader = %u)", shader);
Context *context = GetValidGlobalContext();
if (context)
......@@ -576,7 +576,7 @@ void GL_APIENTRY DeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
void GL_APIENTRY DeleteProgram(GLuint program)
{
EVENT("(GLuint program = %d)", program);
EVENT("(GLuint program = %u)", program);
Context *context = GetValidGlobalContext();
if (context)
......@@ -608,7 +608,7 @@ void GL_APIENTRY DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
void GL_APIENTRY DeleteShader(GLuint shader)
{
EVENT("(GLuint shader = %d)", shader);
EVENT("(GLuint shader = %u)", shader);
Context *context = GetValidGlobalContext();
if (context)
......@@ -688,7 +688,7 @@ void GL_APIENTRY DepthRangef(GLfloat n, GLfloat f)
void GL_APIENTRY DetachShader(GLuint program, GLuint shader)
{
EVENT("(GLuint program = %d, GLuint shader = %d)", program, shader);
EVENT("(GLuint program = %u, GLuint shader = %u)", program, shader);
Context *context = GetValidGlobalContext();
if (context)
......@@ -720,7 +720,7 @@ void GL_APIENTRY Disable(GLenum cap)
void GL_APIENTRY DisableVertexAttribArray(GLuint index)
{
EVENT("(GLuint index = %d)", index);
EVENT("(GLuint index = %u)", index);
Context *context = GetValidGlobalContext();
if (context)
......@@ -787,7 +787,7 @@ void GL_APIENTRY Enable(GLenum cap)
void GL_APIENTRY EnableVertexAttribArray(GLuint index)
{
EVENT("(GLuint index = %d)", index);
EVENT("(GLuint index = %u)", index);
Context *context = GetValidGlobalContext();
if (context)
......@@ -840,7 +840,7 @@ void GL_APIENTRY FramebufferRenderbuffer(GLenum target,
{
EVENT(
"(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum renderbuffertarget = 0x%X, GLuint "
"renderbuffer = %d)",
"renderbuffer = %u)",
target, attachment, renderbuffertarget, renderbuffer);
Context *context = GetValidGlobalContext();
......@@ -866,7 +866,7 @@ void GL_APIENTRY FramebufferTexture2D(GLenum target,
{
EVENT(
"(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum textarget = 0x%X, GLuint texture "
"= %d, GLint level = %d)",
"= %u, GLint level = %d)",
target, attachment, textarget, texture, level);
Context *context = GetValidGlobalContext();
......@@ -988,7 +988,7 @@ void GL_APIENTRY GetActiveAttrib(GLuint program,
GLchar *name)
{
EVENT(
"(GLuint program = %d, GLuint index = %d, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, "
"(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, "
"GLint *size = 0x%0.8p, GLenum *type = 0x%0.8p, GLchar *name = 0x%0.8p)",
program, index, bufSize, length, size, type, name);
......@@ -1015,7 +1015,7 @@ void GL_APIENTRY GetActiveUniform(GLuint program,
GLchar *name)
{
EVENT(
"(GLuint program = %d, GLuint index = %d, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, "
"(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, "
"GLint *size = 0x%0.8p, GLenum *type = 0x%0.8p, GLchar *name = 0x%0.8p)",
program, index, bufSize, length, size, type, name);
......@@ -1039,7 +1039,7 @@ void GL_APIENTRY GetAttachedShaders(GLuint program,
GLuint *shaders)
{
EVENT(
"(GLuint program = %d, GLsizei maxCount = %d, GLsizei *count = 0x%0.8p, GLuint *shaders = "
"(GLuint program = %u, GLsizei maxCount = %d, GLsizei *count = 0x%0.8p, GLuint *shaders = "
"0x%0.8p)",
program, maxCount, count, shaders);
......@@ -1058,7 +1058,7 @@ void GL_APIENTRY GetAttachedShaders(GLuint program,
GLint GL_APIENTRY GetAttribLocation(GLuint program, const GLchar *name)
{
EVENT("(GLuint program = %d, const GLchar *name = 0x%0.8p)", program, name);
EVENT("(GLuint program = %u, const GLchar *name = 0x%0.8p)", program, name);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1184,7 +1184,7 @@ void GL_APIENTRY GetIntegerv(GLenum pname, GLint *data)
void GL_APIENTRY GetProgramiv(GLuint program, GLenum pname, GLint *params)
{
EVENT("(GLuint program = %d, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", program, pname,
EVENT("(GLuint program = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", program, pname,
params);
Context *context = GetValidGlobalContext();
......@@ -1205,7 +1205,7 @@ void GL_APIENTRY GetProgramInfoLog(GLuint program,
GLchar *infoLog)
{
EVENT(
"(GLuint program = %d, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar *infoLog = "
"(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar *infoLog = "
"0x%0.8p)",
program, bufSize, length, infoLog);
......@@ -1242,7 +1242,7 @@ void GL_APIENTRY GetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *
void GL_APIENTRY GetShaderiv(GLuint shader, GLenum pname, GLint *params)
{
EVENT("(GLuint shader = %d, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", shader, pname,
EVENT("(GLuint shader = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", shader, pname,
params);
Context *context = GetValidGlobalContext();
......@@ -1260,7 +1260,7 @@ void GL_APIENTRY GetShaderiv(GLuint shader, GLenum pname, GLint *params)
void GL_APIENTRY GetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
{
EVENT(
"(GLuint shader = %d, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar *infoLog = "
"(GLuint shader = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar *infoLog = "
"0x%0.8p)",
shader, bufSize, length, infoLog);
......@@ -1304,7 +1304,7 @@ void GL_APIENTRY GetShaderPrecisionFormat(GLenum shadertype,
void GL_APIENTRY GetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)
{
EVENT(
"(GLuint shader = %d, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar *source = "
"(GLuint shader = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar *source = "
"0x%0.8p)",
shader, bufSize, length, source);
......@@ -1375,7 +1375,7 @@ void GL_APIENTRY GetTexParameteriv(GLenum target, GLenum pname, GLint *params)
void GL_APIENTRY GetUniformfv(GLuint program, GLint location, GLfloat *params)
{
EVENT("(GLuint program = %d, GLint location = %d, GLfloat *params = 0x%0.8p)", program,
EVENT("(GLuint program = %u, GLint location = %d, GLfloat *params = 0x%0.8p)", program,
location, params);
Context *context = GetValidGlobalContext();
......@@ -1392,7 +1392,7 @@ void GL_APIENTRY GetUniformfv(GLuint program, GLint location, GLfloat *params)
void GL_APIENTRY GetUniformiv(GLuint program, GLint location, GLint *params)
{
EVENT("(GLuint program = %d, GLint location = %d, GLint *params = 0x%0.8p)", program, location,
EVENT("(GLuint program = %u, GLint location = %d, GLint *params = 0x%0.8p)", program, location,
params);
Context *context = GetValidGlobalContext();
......@@ -1409,7 +1409,7 @@ void GL_APIENTRY GetUniformiv(GLuint program, GLint location, GLint *params)
GLint GL_APIENTRY GetUniformLocation(GLuint program, const GLchar *name)
{
EVENT("(GLuint program = %d, const GLchar *name = 0x%0.8p)", program, name);
EVENT("(GLuint program = %u, const GLchar *name = 0x%0.8p)", program, name);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1427,7 +1427,7 @@ GLint GL_APIENTRY GetUniformLocation(GLuint program, const GLchar *name)
void GL_APIENTRY GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
{
EVENT("(GLuint index = %d, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", index, pname,
EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", index, pname,
params);
Context *context = GetValidGlobalContext();
......@@ -1444,7 +1444,7 @@ void GL_APIENTRY GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
void GL_APIENTRY GetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
{
EVENT("(GLuint index = %d, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", index, pname,
EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", index, pname,
params);
Context *context = GetValidGlobalContext();
......@@ -1461,7 +1461,7 @@ void GL_APIENTRY GetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
void GL_APIENTRY GetVertexAttribPointerv(GLuint index, GLenum pname, void **pointer)
{
EVENT("(GLuint index = %d, GLenum pname = 0x%X, void **pointer = 0x%0.8p)", index, pname,
EVENT("(GLuint index = %u, GLenum pname = 0x%X, void **pointer = 0x%0.8p)", index, pname,
pointer);
Context *context = GetValidGlobalContext();
......@@ -1495,7 +1495,7 @@ void GL_APIENTRY Hint(GLenum target, GLenum mode)
GLboolean GL_APIENTRY IsBuffer(GLuint buffer)
{
EVENT("(GLuint buffer = %d)", buffer);
EVENT("(GLuint buffer = %u)", buffer);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1531,7 +1531,7 @@ GLboolean GL_APIENTRY IsEnabled(GLenum cap)
GLboolean GL_APIENTRY IsFramebuffer(GLuint framebuffer)
{
EVENT("(GLuint framebuffer = %d)", framebuffer);
EVENT("(GLuint framebuffer = %u)", framebuffer);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1549,7 +1549,7 @@ GLboolean GL_APIENTRY IsFramebuffer(GLuint framebuffer)
GLboolean GL_APIENTRY IsProgram(GLuint program)
{
EVENT("(GLuint program = %d)", program);
EVENT("(GLuint program = %u)", program);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1567,7 +1567,7 @@ GLboolean GL_APIENTRY IsProgram(GLuint program)
GLboolean GL_APIENTRY IsRenderbuffer(GLuint renderbuffer)
{
EVENT("(GLuint renderbuffer = %d)", renderbuffer);
EVENT("(GLuint renderbuffer = %u)", renderbuffer);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1585,7 +1585,7 @@ GLboolean GL_APIENTRY IsRenderbuffer(GLuint renderbuffer)
GLboolean GL_APIENTRY IsShader(GLuint shader)
{
EVENT("(GLuint shader = %d)", shader);
EVENT("(GLuint shader = %u)", shader);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1603,7 +1603,7 @@ GLboolean GL_APIENTRY IsShader(GLuint shader)
GLboolean GL_APIENTRY IsTexture(GLuint texture)
{
EVENT("(GLuint texture = %d)", texture);
EVENT("(GLuint texture = %u)", texture);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1637,7 +1637,7 @@ void GL_APIENTRY LineWidth(GLfloat width)
void GL_APIENTRY LinkProgram(GLuint program)
{
EVENT("(GLuint program = %d)", program);
EVENT("(GLuint program = %u)", program);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1813,7 +1813,7 @@ void GL_APIENTRY ShaderSource(GLuint shader,
const GLint *length)
{
EVENT(
"(GLuint shader = %d, GLsizei count = %d, const GLchar *const*string = 0x%0.8p, const "
"(GLuint shader = %u, GLsizei count = %d, const GLchar *const*string = 0x%0.8p, const "
"GLint *length = 0x%0.8p)",
shader, count, string, length);
......@@ -1832,7 +1832,7 @@ void GL_APIENTRY ShaderSource(GLuint shader,
void GL_APIENTRY StencilFunc(GLenum func, GLint ref, GLuint mask)
{
EVENT("(GLenum func = 0x%X, GLint ref = %d, GLuint mask = %d)", func, ref, mask);
EVENT("(GLenum func = 0x%X, GLint ref = %d, GLuint mask = %u)", func, ref, mask);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1848,7 +1848,7 @@ void GL_APIENTRY StencilFunc(GLenum func, GLint ref, GLuint mask)
void GL_APIENTRY StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
{
EVENT("(GLenum face = 0x%X, GLenum func = 0x%X, GLint ref = %d, GLuint mask = %d)", face, func,
EVENT("(GLenum face = 0x%X, GLenum func = 0x%X, GLint ref = %d, GLuint mask = %u)", face, func,
ref, mask);
Context *context = GetValidGlobalContext();
......@@ -1866,7 +1866,7 @@ void GL_APIENTRY StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint
void GL_APIENTRY StencilMask(GLuint mask)
{
EVENT("(GLuint mask = %d)", mask);
EVENT("(GLuint mask = %u)", mask);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1882,7 +1882,7 @@ void GL_APIENTRY StencilMask(GLuint mask)
void GL_APIENTRY StencilMaskSeparate(GLenum face, GLuint mask)
{
EVENT("(GLenum face = 0x%X, GLuint mask = %d)", face, mask);
EVENT("(GLenum face = 0x%X, GLuint mask = %u)", face, mask);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2400,7 +2400,7 @@ void GL_APIENTRY UniformMatrix4fv(GLint location,
void GL_APIENTRY UseProgram(GLuint program)
{
EVENT("(GLuint program = %d)", program);
EVENT("(GLuint program = %u)", program);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2416,7 +2416,7 @@ void GL_APIENTRY UseProgram(GLuint program)
void GL_APIENTRY ValidateProgram(GLuint program)
{
EVENT("(GLuint program = %d)", program);
EVENT("(GLuint program = %u)", program);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2432,7 +2432,7 @@ void GL_APIENTRY ValidateProgram(GLuint program)
void GL_APIENTRY VertexAttrib1f(GLuint index, GLfloat x)
{
EVENT("(GLuint index = %d, GLfloat x = %f)", index, x);
EVENT("(GLuint index = %u, GLfloat x = %f)", index, x);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2448,7 +2448,7 @@ void GL_APIENTRY VertexAttrib1f(GLuint index, GLfloat x)
void GL_APIENTRY VertexAttrib1fv(GLuint index, const GLfloat *v)
{
EVENT("(GLuint index = %d, const GLfloat *v = 0x%0.8p)", index, v);
EVENT("(GLuint index = %u, const GLfloat *v = 0x%0.8p)", index, v);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2464,7 +2464,7 @@ void GL_APIENTRY VertexAttrib1fv(GLuint index, const GLfloat *v)
void GL_APIENTRY VertexAttrib2f(GLuint index, GLfloat x, GLfloat y)
{
EVENT("(GLuint index = %d, GLfloat x = %f, GLfloat y = %f)", index, x, y);
EVENT("(GLuint index = %u, GLfloat x = %f, GLfloat y = %f)", index, x, y);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2480,7 +2480,7 @@ void GL_APIENTRY VertexAttrib2f(GLuint index, GLfloat x, GLfloat y)
void GL_APIENTRY VertexAttrib2fv(GLuint index, const GLfloat *v)
{
EVENT("(GLuint index = %d, const GLfloat *v = 0x%0.8p)", index, v);
EVENT("(GLuint index = %u, const GLfloat *v = 0x%0.8p)", index, v);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2496,7 +2496,7 @@ void GL_APIENTRY VertexAttrib2fv(GLuint index, const GLfloat *v)
void GL_APIENTRY VertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)
{
EVENT("(GLuint index = %d, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", index, x, y, z);
EVENT("(GLuint index = %u, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", index, x, y, z);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2512,7 +2512,7 @@ void GL_APIENTRY VertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)
void GL_APIENTRY VertexAttrib3fv(GLuint index, const GLfloat *v)
{
EVENT("(GLuint index = %d, const GLfloat *v = 0x%0.8p)", index, v);
EVENT("(GLuint index = %u, const GLfloat *v = 0x%0.8p)", index, v);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2528,7 +2528,7 @@ void GL_APIENTRY VertexAttrib3fv(GLuint index, const GLfloat *v)
void GL_APIENTRY VertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
{
EVENT("(GLuint index = %d, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f, GLfloat w = %f)",
EVENT("(GLuint index = %u, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f, GLfloat w = %f)",
index, x, y, z, w);
Context *context = GetValidGlobalContext();
......@@ -2545,7 +2545,7 @@ void GL_APIENTRY VertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, G
void GL_APIENTRY VertexAttrib4fv(GLuint index, const GLfloat *v)
{
EVENT("(GLuint index = %d, const GLfloat *v = 0x%0.8p)", index, v);
EVENT("(GLuint index = %u, const GLfloat *v = 0x%0.8p)", index, v);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2567,7 +2567,7 @@ void GL_APIENTRY VertexAttribPointer(GLuint index,
const void *pointer)
{
EVENT(
"(GLuint index = %d, GLint size = %d, GLenum type = 0x%X, GLboolean normalized = %u, "
"(GLuint index = %u, GLint size = %d, GLenum type = 0x%X, GLboolean normalized = %u, "
"GLsizei stride = %d, const void *pointer = 0x%0.8p)",
index, size, type, normalized, stride, pointer);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment