Skip to content

A
angle
Commit e357535f by Jamie Madill
Options

Fix entry points.

A race broke the ANGLE tree due to an entry point formatting change. Bug: angleproject:2890 Bug: angleproject:2928 Change-Id: I08cc4e13c9d5bd1888c0d891113d3042759d43dc Reviewed-on: https://chromium-review.googlesource.com/c/1302534Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent b8543630
Showing with 39 additions and 36 deletions
scripts/run_code_generation_hashes.json
...@@ -48,9 +48,9 @@ ...@@ -48,9 +48,9 @@
"GL copy conversion table:src/libANGLE/gen_copy_conversion_table.py": "GL copy conversion table:src/libANGLE/gen_copy_conversion_table.py":
"ac1afe23d9578bd1d2ef74f4a7aa927a", "ac1afe23d9578bd1d2ef74f4a7aa927a",
"GL entry point:scripts/entry_point_packed_gl_enums.json": "GL entry point:scripts/entry_point_packed_gl_enums.json":
"ba1357601681349bce690b1ec0a5d698", "cc1985ce86341a3ff0f5a278eae0fa8f",
"GL entry point:scripts/generate_entry_points.py": "GL entry point:scripts/generate_entry_points.py":
"dfed35491db714b47010ac29f9dfd6a9", "9f2dda92feb508e98c62931a0466f5cd",
"GL entry point:scripts/gl.xml": "GL entry point:scripts/gl.xml":
"b470cb06b06cbbe7adb2c8129ec85708", "b470cb06b06cbbe7adb2c8129ec85708",
"GL format map:src/libANGLE/es3_format_type_combinations.json": "GL format map:src/libANGLE/es3_format_type_combinations.json":
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
"proc table:src/libGLESv2/gen_proc_table.py": "proc table:src/libGLESv2/gen_proc_table.py":
"027bfd5a8a8dffe91f492bf199029cde", "027bfd5a8a8dffe91f492bf199029cde",
"proc table:src/libGLESv2/proc_table_data.json": "proc table:src/libGLESv2/proc_table_data.json":
"036399be5b2c527fa31eca68198be5fc", "8e3456750bc5511a677b75b8458d1a7e",
"uniform type:src/common/gen_uniform_type_table.py": "uniform type:src/common/gen_uniform_type_table.py":
"59cb4ffd0f584c4bd37f2f4ff59a2b93" "59cb4ffd0f584c4bd37f2f4ff59a2b93"
} }
\ No newline at end of file
src/libGLESv2/entry_points_gles_ext_autogen.cpp
...@@ -4642,8 +4642,8 @@ GLbitfield GL_APIENTRY QueryMatrixxOES(GLfixed *mantissa, GLint *exponent) ...@@ -4642,8 +4642,8 @@ GLbitfield GL_APIENTRY QueryMatrixxOES(GLfixed *mantissa, GLint *exponent)
void GL_APIENTRY GetSamplerParameterIivOES(GLuint sampler, GLenum pname, GLint *params) void GL_APIENTRY GetSamplerParameterIivOES(GLuint sampler, GLenum pname, GLint *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", sampler, pname, EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", sampler,
params); pname, (uintptr_t)params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -4661,8 +4661,8 @@ void GL_APIENTRY GetSamplerParameterIivOES(GLuint sampler, GLenum pname, GLint * ...@@ -4661,8 +4661,8 @@ void GL_APIENTRY GetSamplerParameterIivOES(GLuint sampler, GLenum pname, GLint *
void GL_APIENTRY GetSamplerParameterIuivOES(GLuint sampler, GLenum pname, GLuint *params) void GL_APIENTRY GetSamplerParameterIuivOES(GLuint sampler, GLenum pname, GLuint *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLuint *params = 0x%0.8p)", sampler, pname, EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLuint *params = 0x%016" PRIxPTR ")", sampler,
params); pname, (uintptr_t)params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -4680,8 +4680,8 @@ void GL_APIENTRY GetSamplerParameterIuivOES(GLuint sampler, GLenum pname, GLuint ...@@ -4680,8 +4680,8 @@ void GL_APIENTRY GetSamplerParameterIuivOES(GLuint sampler, GLenum pname, GLuint
void GL_APIENTRY GetTexParameterIivOES(GLenum target, GLenum pname, GLint *params) void GL_APIENTRY GetTexParameterIivOES(GLenum target, GLenum pname, GLint *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname, EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
params); pname, (uintptr_t)params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -4700,8 +4700,8 @@ void GL_APIENTRY GetTexParameterIivOES(GLenum target, GLenum pname, GLint *param ...@@ -4700,8 +4700,8 @@ void GL_APIENTRY GetTexParameterIivOES(GLenum target, GLenum pname, GLint *param
void GL_APIENTRY GetTexParameterIuivOES(GLenum target, GLenum pname, GLuint *params) void GL_APIENTRY GetTexParameterIuivOES(GLenum target, GLenum pname, GLuint *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLuint *params = 0x%0.8p)", target, pname, EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLuint *params = 0x%016" PRIxPTR ")", target,
params); pname, (uintptr_t)params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -4720,8 +4720,8 @@ void GL_APIENTRY GetTexParameterIuivOES(GLenum target, GLenum pname, GLuint *par ...@@ -4720,8 +4720,8 @@ void GL_APIENTRY GetTexParameterIuivOES(GLenum target, GLenum pname, GLuint *par
void GL_APIENTRY SamplerParameterIivOES(GLuint sampler, GLenum pname, const GLint *param) void GL_APIENTRY SamplerParameterIivOES(GLuint sampler, GLenum pname, const GLint *param)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLint *param = 0x%0.8p)", sampler, EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLint *param = 0x%016" PRIxPTR ")",
pname, param); sampler, pname, (uintptr_t)param);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -4739,8 +4739,8 @@ void GL_APIENTRY SamplerParameterIivOES(GLuint sampler, GLenum pname, const GLin ...@@ -4739,8 +4739,8 @@ void GL_APIENTRY SamplerParameterIivOES(GLuint sampler, GLenum pname, const GLin
void GL_APIENTRY SamplerParameterIuivOES(GLuint sampler, GLenum pname, const GLuint *param) void GL_APIENTRY SamplerParameterIuivOES(GLuint sampler, GLenum pname, const GLuint *param)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLuint *param = 0x%0.8p)", sampler, EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLuint *param = 0x%016" PRIxPTR ")",
pname, param); sampler, pname, (uintptr_t)param);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -4758,8 +4758,8 @@ void GL_APIENTRY SamplerParameterIuivOES(GLuint sampler, GLenum pname, const GLu ...@@ -4758,8 +4758,8 @@ void GL_APIENTRY SamplerParameterIuivOES(GLuint sampler, GLenum pname, const GLu
void GL_APIENTRY TexParameterIivOES(GLenum target, GLenum pname, const GLint *params) void GL_APIENTRY TexParameterIivOES(GLenum target, GLenum pname, const GLint *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLint *params = 0x%0.8p)", target, EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLint *params = 0x%016" PRIxPTR ")",
pname, params); target, pname, (uintptr_t)params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -4778,8 +4778,8 @@ void GL_APIENTRY TexParameterIivOES(GLenum target, GLenum pname, const GLint *pa ...@@ -4778,8 +4778,8 @@ void GL_APIENTRY TexParameterIivOES(GLenum target, GLenum pname, const GLint *pa
void GL_APIENTRY TexParameterIuivOES(GLenum target, GLenum pname, const GLuint *params) void GL_APIENTRY TexParameterIuivOES(GLenum target, GLenum pname, const GLuint *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLuint *params = 0x%0.8p)", target, EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLuint *params = 0x%016" PRIxPTR ")",
pname, params); target, pname, (uintptr_t)params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -10094,8 +10094,8 @@ void GL_APIENTRY GetSamplerParameterIivOESContextANGLE(GLeglContext ctx, ...@@ -10094,8 +10094,8 @@ void GL_APIENTRY GetSamplerParameterIivOESContextANGLE(GLeglContext ctx,
GLint *params) GLint *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", sampler, pname, EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", sampler,
params); pname, (uintptr_t)params);
Context *context = static_cast<gl::Context *>(ctx); Context *context = static_cast<gl::Context *>(ctx);
if (context) if (context)
...@@ -10117,8 +10117,8 @@ void GL_APIENTRY GetSamplerParameterIuivOESContextANGLE(GLeglContext ctx, ...@@ -10117,8 +10117,8 @@ void GL_APIENTRY GetSamplerParameterIuivOESContextANGLE(GLeglContext ctx,
GLuint *params) GLuint *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLuint *params = 0x%0.8p)", sampler, pname, EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLuint *params = 0x%016" PRIxPTR ")", sampler,
params); pname, (uintptr_t)params);
Context *context = static_cast<gl::Context *>(ctx); Context *context = static_cast<gl::Context *>(ctx);
if (context) if (context)
...@@ -10548,8 +10548,8 @@ void GL_APIENTRY GetTexParameterIivOESContextANGLE(GLeglContext ctx, ...@@ -10548,8 +10548,8 @@ void GL_APIENTRY GetTexParameterIivOESContextANGLE(GLeglContext ctx,
GLint *params) GLint *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname, EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
params); pname, (uintptr_t)params);
Context *context = static_cast<gl::Context *>(ctx); Context *context = static_cast<gl::Context *>(ctx);
if (context) if (context)
...@@ -10572,8 +10572,8 @@ void GL_APIENTRY GetTexParameterIuivOESContextANGLE(GLeglContext ctx, ...@@ -10572,8 +10572,8 @@ void GL_APIENTRY GetTexParameterIuivOESContextANGLE(GLeglContext ctx,
GLuint *params) GLuint *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLuint *params = 0x%0.8p)", target, pname, EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLuint *params = 0x%016" PRIxPTR ")", target,
params); pname, (uintptr_t)params);
Context *context = static_cast<gl::Context *>(ctx); Context *context = static_cast<gl::Context *>(ctx);
if (context) if (context)
...@@ -13926,8 +13926,8 @@ void GL_APIENTRY SamplerParameterIivOESContextANGLE(GLeglContext ctx, ...@@ -13926,8 +13926,8 @@ void GL_APIENTRY SamplerParameterIivOESContextANGLE(GLeglContext ctx,
const GLint *param) const GLint *param)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLint *param = 0x%0.8p)", sampler, EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLint *param = 0x%016" PRIxPTR ")",
pname, param); sampler, pname, (uintptr_t)param);
Context *context = static_cast<gl::Context *>(ctx); Context *context = static_cast<gl::Context *>(ctx);
if (context) if (context)
...@@ -13949,8 +13949,8 @@ void GL_APIENTRY SamplerParameterIuivOESContextANGLE(GLeglContext ctx, ...@@ -13949,8 +13949,8 @@ void GL_APIENTRY SamplerParameterIuivOESContextANGLE(GLeglContext ctx,
const GLuint *param) const GLuint *param)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLuint *param = 0x%0.8p)", sampler, EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLuint *param = 0x%016" PRIxPTR ")",
pname, param); sampler, pname, (uintptr_t)param);
Context *context = static_cast<gl::Context *>(ctx); Context *context = static_cast<gl::Context *>(ctx);
if (context) if (context)
...@@ -14697,8 +14697,8 @@ void GL_APIENTRY TexParameterIivOESContextANGLE(GLeglContext ctx, ...@@ -14697,8 +14697,8 @@ void GL_APIENTRY TexParameterIivOESContextANGLE(GLeglContext ctx,
const GLint *params) const GLint *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLint *params = 0x%0.8p)", target, EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLint *params = 0x%016" PRIxPTR ")",
pname, params); target, pname, (uintptr_t)params);
Context *context = static_cast<gl::Context *>(ctx); Context *context = static_cast<gl::Context *>(ctx);
if (context) if (context)
...@@ -14721,8 +14721,8 @@ void GL_APIENTRY TexParameterIuivOESContextANGLE(GLeglContext ctx, ...@@ -14721,8 +14721,8 @@ void GL_APIENTRY TexParameterIuivOESContextANGLE(GLeglContext ctx,
const GLuint *params) const GLuint *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLuint *params = 0x%0.8p)", target, EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLuint *params = 0x%016" PRIxPTR ")",
pname, params); target, pname, (uintptr_t)params);
Context *context = static_cast<gl::Context *>(ctx); Context *context = static_cast<gl::Context *>(ctx);
if (context) if (context)
......
src/libGLESv2/proc_table_autogen.cpp
...@@ -1112,6 +1112,8 @@ ProcEntry g_procTable[] = { ...@@ -1112,6 +1112,8 @@ ProcEntry g_procTable[] = {
{"glTexStorage2DEXT", P(gl::TexStorage2DEXT)}, {"glTexStorage2DEXT", P(gl::TexStorage2DEXT)},
{"glTexStorage2DEXTContextANGLE", P(gl::TexStorage2DEXTContextANGLE)}, {"glTexStorage2DEXTContextANGLE", P(gl::TexStorage2DEXTContextANGLE)},
{"glTexStorage2DMultisample", P(gl::TexStorage2DMultisample)}, {"glTexStorage2DMultisample", P(gl::TexStorage2DMultisample)},
{"glTexStorage2DMultisampleANGLE", P(gl::TexStorage2DMultisampleANGLE)},
{"glTexStorage2DMultisampleANGLEContextANGLE", P(gl::TexStorage2DMultisampleANGLEContextANGLE)},
{"glTexStorage2DMultisampleContextANGLE", P(gl::TexStorage2DMultisampleContextANGLE)}, {"glTexStorage2DMultisampleContextANGLE", P(gl::TexStorage2DMultisampleContextANGLE)},
{"glTexStorage3D", P(gl::TexStorage3D)}, {"glTexStorage3D", P(gl::TexStorage3D)},
{"glTexStorage3DContextANGLE", P(gl::TexStorage3DContextANGLE)}, {"glTexStorage3DContextANGLE", P(gl::TexStorage3DContextANGLE)},
...@@ -1262,5 +1264,5 @@ ProcEntry g_procTable[] = { ...@@ -1262,5 +1264,5 @@ ProcEntry g_procTable[] = {
{"glWeightPointerOES", P(gl::WeightPointerOES)}, {"glWeightPointerOES", P(gl::WeightPointerOES)},
{"glWeightPointerOESContextANGLE", P(gl::WeightPointerOESContextANGLE)}}; {"glWeightPointerOESContextANGLE", P(gl::WeightPointerOESContextANGLE)}};
size_t g_numProcs = 1194; size_t g_numProcs = 1196;
} // namespace egl } // namespace egl
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