Skip to content

A
angle
Commit 416aaf95 by Brandon Jones Committed by Commit Bot
Options

Autogenerate ANGLE extension entry points

Modify autogeneration script to pull data from gl_ext.xml and generate entry_points_gles_2_0_ext_autogen.cpp/h as a replacement for entry_points_gles_2_0_ext.cpp/h Bug:angleproject:2263 Bug:angleproject:1309 Change-Id: Ie21079f8ec5f85c657b891f6d6d59306a4c3b5fe Reviewed-on: https://chromium-review.googlesource.com/1005409 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent c1e0268a
Showing with 161 additions and 40 deletions
scripts/generate_entry_points.py
...@@ -13,7 +13,19 @@ from datetime import date ...@@ -13,7 +13,19 @@ from datetime import date
# List of supported extensions. Add to this list to enable new extensions # List of supported extensions. Add to this list to enable new extensions
# available in gl.xml. # available in gl.xml.
# TODO(jmadill): Support extensions not in gl.xml.
angle_extensions = [
# ANGLE extensions
"GL_CHROMIUM_bind_uniform_location",
"GL_CHROMIUM_framebuffer_mixed_samples",
"GL_CHROMIUM_path_rendering",
"GL_CHROMIUM_copy_texture",
"GL_CHROMIUM_copy_compressed_texture",
"GL_ANGLE_request_extension",
"GL_ANGLE_robust_client_memory",
"GL_ANGLE_multiview",
]
gles1_extensions = [ gles1_extensions = [
# ES1 (Possibly the min set of extensions needed by Android) # ES1 (Possibly the min set of extensions needed by Android)
"GL_OES_draw_texture", "GL_OES_draw_texture",
...@@ -35,7 +47,7 @@ gles1_overloaded = [ ...@@ -35,7 +47,7 @@ gles1_overloaded = [
"glGetPointerv", "glGetPointerv",
] ]
supported_extensions = sorted(gles1_extensions + [ supported_extensions = sorted(angle_extensions + gles1_extensions + [
# ES2+ # ES2+
"GL_ANGLE_framebuffer_blit", "GL_ANGLE_framebuffer_blit",
"GL_ANGLE_framebuffer_multisample", "GL_ANGLE_framebuffer_multisample",
...@@ -66,7 +78,7 @@ no_event_marker_exceptions_list = sorted([ ...@@ -66,7 +78,7 @@ no_event_marker_exceptions_list = sorted([
]) ])
# Strip these suffixes from Context entry point names. NV is excluded (for now). # Strip these suffixes from Context entry point names. NV is excluded (for now).
strip_suffixes = ["ANGLE", "EXT", "KHR", "OES"] strip_suffixes = ["ANGLE", "EXT", "KHR", "OES", "CHROMIUM"]
template_entry_point_header = """// GENERATED FILE - DO NOT EDIT. template_entry_point_header = """// GENERATED FILE - DO NOT EDIT.
// Generated by {script_name} using data from {data_source_name}. // Generated by {script_name} using data from {data_source_name}.
...@@ -357,11 +369,11 @@ def get_gles1_decls(all_commands, gles_commands): ...@@ -357,11 +369,11 @@ def get_gles1_decls(all_commands, gles_commands):
return decls return decls
def write_file(annotation, comment, template, entry_points, suffix, includes): def write_file(annotation, comment, template, entry_points, suffix, includes, file):
content = template.format( content = template.format(
script_name = os.path.basename(sys.argv[0]), script_name = os.path.basename(sys.argv[0]),
data_source_name = "gl.xml", data_source_name = file,
year = date.today().year, year = date.today().year,
annotation_lower = annotation.lower(), annotation_lower = annotation.lower(),
annotation_upper = annotation.upper(), annotation_upper = annotation.upper(),
...@@ -401,6 +413,21 @@ def write_context_api_decls(annotation, template, decls): ...@@ -401,6 +413,21 @@ def write_context_api_decls(annotation, template, decls):
out.write(content) out.write(content)
out.close() out.close()
def append_angle_extensions(base_root):
angle_ext_tree = etree.parse(script_relative('gl_angle_ext.xml'))
angle_ext_root = angle_ext_tree.getroot()
insertion_point = base_root.findall("./commands")[0]
for command in angle_ext_root.iter('commands'):
insertion_point.extend(command)
insertion_point = base_root.findall("./extensions")[0]
for extension in angle_ext_root.iter('extensions'):
insertion_point.extend(extension)
return base_root
root = append_angle_extensions(root)
all_commands = root.findall('commands/command') all_commands = root.findall('commands/command')
all_cmd_names = [] all_cmd_names = []
...@@ -454,9 +481,9 @@ for major_version, minor_version in [[2, 0], [3, 0], [3, 1], [1, 0]]: ...@@ -454,9 +481,9 @@ for major_version, minor_version in [[2, 0], [3, 0], [3, 1], [1, 0]]:
annotation.lower(), major_version,minor_if_not_zero) annotation.lower(), major_version,minor_if_not_zero)
write_file(annotation, comment, template_entry_point_header, write_file(annotation, comment, template_entry_point_header,
"\n".join(decls), "h", header_includes) "\n".join(decls), "h", header_includes, "gl.xml")
write_file(annotation, comment, template_entry_point_source, write_file(annotation, comment, template_entry_point_source,
"\n".join(defs), "cpp", source_includes) "\n".join(defs), "cpp", source_includes, "gl.xml")
if is_gles1: if is_gles1:
gles1decls['core'] = get_gles1_decls(all_commands, gles_commands) gles1decls['core'] = get_gles1_decls(all_commands, gles_commands)
...@@ -547,9 +574,11 @@ source_includes += """ ...@@ -547,9 +574,11 @@ source_includes += """
""" """
write_file("ext", "extension", template_entry_point_header, write_file("ext", "extension", template_entry_point_header,
"\n".join([item for item in extension_decls]), "h", header_includes) "\n".join([item for item in extension_decls]), "h", header_includes,
"gl.xml and gl_angle_ext.xml")
write_file("ext", "extension", template_entry_point_source, write_file("ext", "extension", template_entry_point_source,
"\n".join([item for item in extension_defs]), "cpp", source_includes) "\n".join([item for item in extension_defs]), "cpp", source_includes,
"gl.xml and gl_angle_ext.xml")
write_context_api_decls("1_0", context_gles_header, gles1decls) write_context_api_decls("1_0", context_gles_header, gles1decls)
...@@ -557,7 +586,7 @@ sorted_cmd_names = ["Invalid"] + [cmd[2:] for cmd in sorted(all_cmd_names)] ...@@ -557,7 +586,7 @@ sorted_cmd_names = ["Invalid"] + [cmd[2:] for cmd in sorted(all_cmd_names)]
entry_points_enum = template_entry_points_enum_header.format( entry_points_enum = template_entry_points_enum_header.format(
script_name = os.path.basename(sys.argv[0]), script_name = os.path.basename(sys.argv[0]),
data_source_name = "gl.xml", data_source_name = "gl.xml and gl_angle_ext.xml",
year = date.today().year, year = date.today().year,
entry_points_list = ",\n".join([" " + cmd for cmd in sorted_cmd_names])) entry_points_list = ",\n".join([" " + cmd for cmd in sorted_cmd_names]))
......
src/libANGLE/entry_points_enum_autogen.h
// GENERATED FILE - DO NOT EDIT. // GENERATED FILE - DO NOT EDIT.
// Generated by generate_entry_points.py using data from gl.xml. // Generated by generate_entry_points.py using data from gl.xml and gl_angle_ext.xml.
// //
// Copyright 2018 The ANGLE Project Authors. All rights reserved. // Copyright 2018 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
...@@ -28,6 +28,7 @@ enum class EntryPoint ...@@ -28,6 +28,7 @@ enum class EntryPoint
BindBuffer, BindBuffer,
BindBufferBase, BindBufferBase,
BindBufferRange, BindBufferRange,
BindFragmentInputLocationCHROMIUM,
BindFramebuffer, BindFramebuffer,
BindFramebufferOES, BindFramebufferOES,
BindImageTexture, BindImageTexture,
...@@ -37,6 +38,7 @@ enum class EntryPoint ...@@ -37,6 +38,7 @@ enum class EntryPoint
BindSampler, BindSampler,
BindTexture, BindTexture,
BindTransformFeedback, BindTransformFeedback,
BindUniformLocationCHROMIUM,
BindVertexArray, BindVertexArray,
BindVertexArrayOES, BindVertexArrayOES,
BindVertexBuffer, BindVertexBuffer,
...@@ -71,14 +73,26 @@ enum class EntryPoint ...@@ -71,14 +73,26 @@ enum class EntryPoint
ColorMask, ColorMask,
ColorPointer, ColorPointer,
CompileShader, CompileShader,
CompressedCopyTextureCHROMIUM,
CompressedTexImage2D, CompressedTexImage2D,
CompressedTexImage2DRobustANGLE,
CompressedTexImage3D, CompressedTexImage3D,
CompressedTexImage3DRobustANGLE,
CompressedTexSubImage2D, CompressedTexSubImage2D,
CompressedTexSubImage2DRobustANGLE,
CompressedTexSubImage3D, CompressedTexSubImage3D,
CompressedTexSubImage3DRobustANGLE,
CopyBufferSubData, CopyBufferSubData,
CopySubTextureCHROMIUM,
CopyTexImage2D, CopyTexImage2D,
CopyTexSubImage2D, CopyTexSubImage2D,
CopyTexSubImage3D, CopyTexSubImage3D,
CopyTextureCHROMIUM,
CoverFillPathCHROMIUM,
CoverFillPathInstancedCHROMIUM,
CoverStrokePathCHROMIUM,
CoverStrokePathInstancedCHROMIUM,
CoverageModulationCHROMIUM,
CreateProgram, CreateProgram,
CreateShader, CreateShader,
CreateShaderProgramv, CreateShaderProgramv,
...@@ -91,6 +105,7 @@ enum class EntryPoint ...@@ -91,6 +105,7 @@ enum class EntryPoint
DeleteFencesNV, DeleteFencesNV,
DeleteFramebuffers, DeleteFramebuffers,
DeleteFramebuffersOES, DeleteFramebuffersOES,
DeletePathsCHROMIUM,
DeleteProgram, DeleteProgram,
DeleteProgramPipelines, DeleteProgramPipelines,
DeleteQueries, DeleteQueries,
...@@ -158,6 +173,8 @@ enum class EntryPoint ...@@ -158,6 +173,8 @@ enum class EntryPoint
FramebufferTexture2D, FramebufferTexture2D,
FramebufferTexture2DOES, FramebufferTexture2DOES,
FramebufferTextureLayer, FramebufferTextureLayer,
FramebufferTextureMultiviewLayeredANGLE,
FramebufferTextureMultiviewSideBySideANGLE,
FrontFace, FrontFace,
Frustumf, Frustumf,
Frustumx, Frustumx,
...@@ -165,6 +182,7 @@ enum class EntryPoint ...@@ -165,6 +182,7 @@ enum class EntryPoint
GenFencesNV, GenFencesNV,
GenFramebuffers, GenFramebuffers,
GenFramebuffersOES, GenFramebuffersOES,
GenPathsCHROMIUM,
GenProgramPipelines, GenProgramPipelines,
GenQueries, GenQueries,
GenQueriesEXT, GenQueriesEXT,
...@@ -181,15 +199,21 @@ enum class EntryPoint ...@@ -181,15 +199,21 @@ enum class EntryPoint
GetActiveUniform, GetActiveUniform,
GetActiveUniformBlockName, GetActiveUniformBlockName,
GetActiveUniformBlockiv, GetActiveUniformBlockiv,
GetActiveUniformBlockivRobustANGLE,
GetActiveUniformsiv, GetActiveUniformsiv,
GetAttachedShaders, GetAttachedShaders,
GetAttribLocation, GetAttribLocation,
GetBooleani_v, GetBooleani_v,
GetBooleani_vRobustANGLE,
GetBooleanv, GetBooleanv,
GetBooleanvRobustANGLE,
GetBufferParameteri64v, GetBufferParameteri64v,
GetBufferParameteri64vRobustANGLE,
GetBufferParameteriv, GetBufferParameteriv,
GetBufferParameterivRobustANGLE,
GetBufferPointerv, GetBufferPointerv,
GetBufferPointervOES, GetBufferPointervOES,
GetBufferPointervRobustANGLE,
GetClipPlanef, GetClipPlanef,
GetClipPlanex, GetClipPlanex,
GetDebugMessageLogKHR, GetDebugMessageLogKHR,
...@@ -197,29 +221,42 @@ enum class EntryPoint ...@@ -197,29 +221,42 @@ enum class EntryPoint
GetFenceivNV, GetFenceivNV,
GetFixedv, GetFixedv,
GetFloatv, GetFloatv,
GetFloatvRobustANGLE,
GetFragDataLocation, GetFragDataLocation,
GetFramebufferAttachmentParameteriv, GetFramebufferAttachmentParameteriv,
GetFramebufferAttachmentParameterivOES, GetFramebufferAttachmentParameterivOES,
GetFramebufferAttachmentParameterivRobustANGLE,
GetFramebufferParameteriv, GetFramebufferParameteriv,
GetFramebufferParameterivRobustANGLE,
GetGraphicsResetStatusEXT, GetGraphicsResetStatusEXT,
GetInteger64i_v, GetInteger64i_v,
GetInteger64i_vRobustANGLE,
GetInteger64v, GetInteger64v,
GetInteger64vRobustANGLE,
GetIntegeri_v, GetIntegeri_v,
GetIntegeri_vRobustANGLE,
GetIntegerv, GetIntegerv,
GetIntegervRobustANGLE,
GetInternalformativ, GetInternalformativ,
GetInternalformativRobustANGLE,
GetLightfv, GetLightfv,
GetLightxv, GetLightxv,
GetMaterialfv, GetMaterialfv,
GetMaterialxv, GetMaterialxv,
GetMultisamplefv, GetMultisamplefv,
GetMultisamplefvRobustANGLE,
GetObjectLabelKHR, GetObjectLabelKHR,
GetObjectPtrLabelKHR, GetObjectPtrLabelKHR,
GetPathParameterfvCHROMIUM,
GetPathParameterivCHROMIUM,
GetPointerv, GetPointerv,
GetPointervKHR, GetPointervKHR,
GetPointervRobustANGLERobustANGLE,
GetProgramBinary, GetProgramBinary,
GetProgramBinaryOES, GetProgramBinaryOES,
GetProgramInfoLog, GetProgramInfoLog,
GetProgramInterfaceiv, GetProgramInterfaceiv,
GetProgramInterfaceivRobustANGLE,
GetProgramPipelineInfoLog, GetProgramPipelineInfoLog,
GetProgramPipelineiv, GetProgramPipelineiv,
GetProgramResourceIndex, GetProgramResourceIndex,
...@@ -227,21 +264,33 @@ enum class EntryPoint ...@@ -227,21 +264,33 @@ enum class EntryPoint
GetProgramResourceName, GetProgramResourceName,
GetProgramResourceiv, GetProgramResourceiv,
GetProgramiv, GetProgramiv,
GetProgramivRobustANGLE,
GetQueryObjecti64vEXT, GetQueryObjecti64vEXT,
GetQueryObjecti64vRobustANGLE,
GetQueryObjectivEXT, GetQueryObjectivEXT,
GetQueryObjectivRobustANGLE,
GetQueryObjectui64vEXT, GetQueryObjectui64vEXT,
GetQueryObjectui64vRobustANGLE,
GetQueryObjectuiv, GetQueryObjectuiv,
GetQueryObjectuivEXT, GetQueryObjectuivEXT,
GetQueryObjectuivRobustANGLE,
GetQueryiv, GetQueryiv,
GetQueryivEXT, GetQueryivEXT,
GetQueryivRobustANGLE,
GetRenderbufferParameteriv, GetRenderbufferParameteriv,
GetRenderbufferParameterivOES, GetRenderbufferParameterivOES,
GetRenderbufferParameterivRobustANGLE,
GetSamplerParameterIivRobustANGLE,
GetSamplerParameterIuivRobustANGLE,
GetSamplerParameterfv, GetSamplerParameterfv,
GetSamplerParameterfvRobustANGLE,
GetSamplerParameteriv, GetSamplerParameteriv,
GetSamplerParameterivRobustANGLE,
GetShaderInfoLog, GetShaderInfoLog,
GetShaderPrecisionFormat, GetShaderPrecisionFormat,
GetShaderSource, GetShaderSource,
GetShaderiv, GetShaderiv,
GetShaderivRobustANGLE,
GetString, GetString,
GetStringi, GetStringi,
GetSynciv, GetSynciv,
...@@ -252,9 +301,15 @@ enum class EntryPoint ...@@ -252,9 +301,15 @@ enum class EntryPoint
GetTexGenivOES, GetTexGenivOES,
GetTexGenxvOES, GetTexGenxvOES,
GetTexLevelParameterfv, GetTexLevelParameterfv,
GetTexLevelParameterfvRobustANGLE,
GetTexLevelParameteriv, GetTexLevelParameteriv,
GetTexLevelParameterivRobustANGLE,
GetTexParameterIivRobustANGLE,
GetTexParameterIuivRobustANGLE,
GetTexParameterfv, GetTexParameterfv,
GetTexParameterfvRobustANGLE,
GetTexParameteriv, GetTexParameteriv,
GetTexParameterivRobustANGLE,
GetTexParameterxv, GetTexParameterxv,
GetTransformFeedbackVarying, GetTransformFeedbackVarying,
GetTranslatedShaderSourceANGLE, GetTranslatedShaderSourceANGLE,
...@@ -262,15 +317,26 @@ enum class EntryPoint ...@@ -262,15 +317,26 @@ enum class EntryPoint
GetUniformIndices, GetUniformIndices,
GetUniformLocation, GetUniformLocation,
GetUniformfv, GetUniformfv,
GetUniformfvRobustANGLE,
GetUniformiv, GetUniformiv,
GetUniformivRobustANGLE,
GetUniformuiv, GetUniformuiv,
GetUniformuivRobustANGLE,
GetVertexAttribIiv, GetVertexAttribIiv,
GetVertexAttribIivRobustANGLE,
GetVertexAttribIuiv, GetVertexAttribIuiv,
GetVertexAttribIuivRobustANGLE,
GetVertexAttribPointerv, GetVertexAttribPointerv,
GetVertexAttribPointervRobustANGLE,
GetVertexAttribfv, GetVertexAttribfv,
GetVertexAttribfvRobustANGLE,
GetVertexAttribiv, GetVertexAttribiv,
GetVertexAttribivRobustANGLE,
GetnUniformfvEXT, GetnUniformfvEXT,
GetnUniformfvRobustANGLE,
GetnUniformivEXT, GetnUniformivEXT,
GetnUniformivRobustANGLE,
GetnUniformuivRobustANGLE,
Hint, Hint,
InsertEventMarkerEXT, InsertEventMarkerEXT,
InvalidateFramebuffer, InvalidateFramebuffer,
...@@ -280,6 +346,7 @@ enum class EntryPoint ...@@ -280,6 +346,7 @@ enum class EntryPoint
IsFenceNV, IsFenceNV,
IsFramebuffer, IsFramebuffer,
IsFramebufferOES, IsFramebufferOES,
IsPathCHROMIUM,
IsProgram, IsProgram,
IsProgramPipeline, IsProgramPipeline,
IsQuery, IsQuery,
...@@ -317,6 +384,8 @@ enum class EntryPoint ...@@ -317,6 +384,8 @@ enum class EntryPoint
Materialx, Materialx,
Materialxv, Materialxv,
MatrixIndexPointerOES, MatrixIndexPointerOES,
MatrixLoadIdentityCHROMIUM,
MatrixLoadfCHROMIUM,
MatrixMode, MatrixMode,
MemoryBarrier, MemoryBarrier,
MemoryBarrierByRegion, MemoryBarrierByRegion,
...@@ -331,6 +400,10 @@ enum class EntryPoint ...@@ -331,6 +400,10 @@ enum class EntryPoint
ObjectPtrLabelKHR, ObjectPtrLabelKHR,
Orthof, Orthof,
Orthox, Orthox,
PathCommandsCHROMIUM,
PathParameterfCHROMIUM,
PathParameteriCHROMIUM,
PathStencilFuncCHROMIUM,
PauseTransformFeedback, PauseTransformFeedback,
PixelStorei, PixelStorei,
PointParameterf, PointParameterf,
...@@ -348,6 +421,7 @@ enum class EntryPoint ...@@ -348,6 +421,7 @@ enum class EntryPoint
ProgramBinary, ProgramBinary,
ProgramBinaryOES, ProgramBinaryOES,
ProgramParameteri, ProgramParameteri,
ProgramPathFragmentInputGenCHROMIUM,
ProgramUniform1f, ProgramUniform1f,
ProgramUniform1fv, ProgramUniform1fv,
ProgramUniform1i, ProgramUniform1i,
...@@ -388,22 +462,29 @@ enum class EntryPoint ...@@ -388,22 +462,29 @@ enum class EntryPoint
QueryMatrixxOES, QueryMatrixxOES,
ReadBuffer, ReadBuffer,
ReadPixels, ReadPixels,
ReadPixelsRobustANGLE,
ReadnPixelsEXT, ReadnPixelsEXT,
ReadnPixelsRobustANGLE,
ReleaseShaderCompiler, ReleaseShaderCompiler,
RenderbufferStorage, RenderbufferStorage,
RenderbufferStorageMultisample, RenderbufferStorageMultisample,
RenderbufferStorageMultisampleANGLE, RenderbufferStorageMultisampleANGLE,
RenderbufferStorageOES, RenderbufferStorageOES,
RequestExtensionANGLE,
ResumeTransformFeedback, ResumeTransformFeedback,
Rotatef, Rotatef,
Rotatex, Rotatex,
SampleCoverage, SampleCoverage,
SampleCoveragex, SampleCoveragex,
SampleMaski, SampleMaski,
SamplerParameterIivRobustANGLE,
SamplerParameterIuivRobustANGLE,
SamplerParameterf, SamplerParameterf,
SamplerParameterfv, SamplerParameterfv,
SamplerParameterfvRobustANGLE,
SamplerParameteri, SamplerParameteri,
SamplerParameteriv, SamplerParameteriv,
SamplerParameterivRobustANGLE,
Scalef, Scalef,
Scalex, Scalex,
Scissor, Scissor,
...@@ -411,12 +492,20 @@ enum class EntryPoint ...@@ -411,12 +492,20 @@ enum class EntryPoint
ShadeModel, ShadeModel,
ShaderBinary, ShaderBinary,
ShaderSource, ShaderSource,
StencilFillPathCHROMIUM,
StencilFillPathInstancedCHROMIUM,
StencilFunc, StencilFunc,
StencilFuncSeparate, StencilFuncSeparate,
StencilMask, StencilMask,
StencilMaskSeparate, StencilMaskSeparate,
StencilOp, StencilOp,
StencilOpSeparate, StencilOpSeparate,
StencilStrokePathCHROMIUM,
StencilStrokePathInstancedCHROMIUM,
StencilThenCoverFillPathCHROMIUM,
StencilThenCoverFillPathInstancedCHROMIUM,
StencilThenCoverStrokePathCHROMIUM,
StencilThenCoverStrokePathInstancedCHROMIUM,
TestFenceNV, TestFenceNV,
TexCoordPointer, TexCoordPointer,
TexEnvf, TexEnvf,
...@@ -432,11 +521,17 @@ enum class EntryPoint ...@@ -432,11 +521,17 @@ enum class EntryPoint
TexGenxOES, TexGenxOES,
TexGenxvOES, TexGenxvOES,
TexImage2D, TexImage2D,
TexImage2DRobustANGLE,
TexImage3D, TexImage3D,
TexImage3DRobustANGLE,
TexParameterIivRobustANGLE,
TexParameterIuivRobustANGLE,
TexParameterf, TexParameterf,
TexParameterfv, TexParameterfv,
TexParameterfvRobustANGLE,
TexParameteri, TexParameteri,
TexParameteriv, TexParameteriv,
TexParameterivRobustANGLE,
TexParameterx, TexParameterx,
TexParameterxv, TexParameterxv,
TexStorage1DEXT, TexStorage1DEXT,
...@@ -446,7 +541,9 @@ enum class EntryPoint ...@@ -446,7 +541,9 @@ enum class EntryPoint
TexStorage3D, TexStorage3D,
TexStorage3DEXT, TexStorage3DEXT,
TexSubImage2D, TexSubImage2D,
TexSubImage2DRobustANGLE,
TexSubImage3D, TexSubImage3D,
TexSubImage3DRobustANGLE,
TransformFeedbackVaryings, TransformFeedbackVaryings,
Translatef, Translatef,
Translatex, Translatex,
......
src/libANGLE/validationES.cpp
...@@ -4992,7 +4992,7 @@ bool ValidateGetActiveUniformBlockivRobustANGLE(Context *context, ...@@ -4992,7 +4992,7 @@ bool ValidateGetActiveUniformBlockivRobustANGLE(Context *context,
return true; return true;
} }
bool ValidateGetInternalFormativRobustANGLE(Context *context, bool ValidateGetInternalformativRobustANGLE(Context *context,
GLenum target, GLenum target,
GLenum internalformat, GLenum internalformat,
GLenum pname, GLenum pname,
......
src/libANGLE/validationES.h
...@@ -628,7 +628,7 @@ bool ValidateGetActiveUniformBlockivRobustANGLE(Context *context, ...@@ -628,7 +628,7 @@ bool ValidateGetActiveUniformBlockivRobustANGLE(Context *context,
GLsizei *length, GLsizei *length,
GLint *params); GLint *params);
bool ValidateGetInternalFormativRobustANGLE(Context *context, bool ValidateGetInternalformativRobustANGLE(Context *context,
GLenum target, GLenum target,
GLenum internalformat, GLenum internalformat,
GLenum pname, GLenum pname,
......
src/libANGLE/validationES2.cpp
...@@ -2623,17 +2623,17 @@ bool ValidateTexImage2D(Context *context, ...@@ -2623,17 +2623,17 @@ bool ValidateTexImage2D(Context *context,
pixels); pixels);
} }
bool ValidateTexImage2DRobust(Context *context, bool ValidateTexImage2DRobustANGLE(Context *context,
TextureTarget target, TextureTarget target,
GLint level, GLint level,
GLint internalformat, GLint internalformat,
GLsizei width, GLsizei width,
GLsizei height, GLsizei height,
GLint border, GLint border,
GLenum format, GLenum format,
GLenum type, GLenum type,
GLsizei bufSize, GLsizei bufSize,
const void *pixels) const void *pixels)
{ {
if (!ValidateRobustEntryPoint(context, bufSize)) if (!ValidateRobustEntryPoint(context, bufSize))
{ {
......
src/libANGLE/validationES2.h
...@@ -131,17 +131,17 @@ bool ValidateTexImage2D(Context *context, ...@@ -131,17 +131,17 @@ bool ValidateTexImage2D(Context *context,
GLenum format, GLenum format,
GLenum type, GLenum type,
const void *pixels); const void *pixels);
bool ValidateTexImage2DRobust(Context *context, bool ValidateTexImage2DRobustANGLE(Context *context,
TextureTarget target, TextureTarget target,
GLint level, GLint level,
GLint internalformat, GLint internalformat,
GLsizei width, GLsizei width,
GLsizei height, GLsizei height,
GLint border, GLint border,
GLenum format, GLenum format,
GLenum type, GLenum type,
GLsizei bufSize, GLsizei bufSize,
const void *pixels); const void *pixels);
bool ValidateTexSubImage2D(Context *context, bool ValidateTexSubImage2D(Context *context,
TextureTarget target, TextureTarget target,
GLint level, GLint level,
......
src/libGLESv2.gypi
...@@ -881,8 +881,6 @@ ...@@ -881,8 +881,6 @@
'libGLESv2/entry_points_gles_1_0_autogen.h', 'libGLESv2/entry_points_gles_1_0_autogen.h',
'libGLESv2/entry_points_gles_2_0_autogen.cpp', 'libGLESv2/entry_points_gles_2_0_autogen.cpp',
'libGLESv2/entry_points_gles_2_0_autogen.h', 'libGLESv2/entry_points_gles_2_0_autogen.h',
'libGLESv2/entry_points_gles_2_0_ext.cpp',
'libGLESv2/entry_points_gles_2_0_ext.h',
'libGLESv2/entry_points_gles_3_0_autogen.cpp', 'libGLESv2/entry_points_gles_3_0_autogen.cpp',
'libGLESv2/entry_points_gles_3_0_autogen.h', 'libGLESv2/entry_points_gles_3_0_autogen.h',
'libGLESv2/entry_points_gles_3_1_autogen.cpp', 'libGLESv2/entry_points_gles_3_1_autogen.cpp',
......
src/libGLESv2/entry_points_gles_ext_autogen.cpp
This source diff could not be displayed because it is too large. You can view the blob instead.
src/libGLESv2/gen_proc_table.py
...@@ -31,7 +31,6 @@ template_cpp = """// GENERATED FILE - DO NOT EDIT. ...@@ -31,7 +31,6 @@ template_cpp = """// GENERATED FILE - DO NOT EDIT.
#include "libGLESv2/entry_points_egl_ext.h" #include "libGLESv2/entry_points_egl_ext.h"
#include "libGLESv2/entry_points_gles_1_0_autogen.h" #include "libGLESv2/entry_points_gles_1_0_autogen.h"
#include "libGLESv2/entry_points_gles_2_0_autogen.h" #include "libGLESv2/entry_points_gles_2_0_autogen.h"
#include "libGLESv2/entry_points_gles_2_0_ext.h"
#include "libGLESv2/entry_points_gles_3_0_autogen.h" #include "libGLESv2/entry_points_gles_3_0_autogen.h"
#include "libGLESv2/entry_points_gles_3_1_autogen.h" #include "libGLESv2/entry_points_gles_3_1_autogen.h"
#include "libGLESv2/entry_points_gles_ext_autogen.h" #include "libGLESv2/entry_points_gles_ext_autogen.h"
......
src/libGLESv2/libGLESv2.cpp
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include "libGLESv2/entry_points_gles_1_0_autogen.h" #include "libGLESv2/entry_points_gles_1_0_autogen.h"
#include "libGLESv2/entry_points_gles_2_0_autogen.h" #include "libGLESv2/entry_points_gles_2_0_autogen.h"
#include "libGLESv2/entry_points_gles_2_0_ext.h"
#include "libGLESv2/entry_points_gles_3_0_autogen.h" #include "libGLESv2/entry_points_gles_3_0_autogen.h"
#include "libGLESv2/entry_points_gles_3_1_autogen.h" #include "libGLESv2/entry_points_gles_3_1_autogen.h"
#include "libGLESv2/entry_points_gles_ext_autogen.h" #include "libGLESv2/entry_points_gles_ext_autogen.h"
......
src/libGLESv2/proc_table_autogen.cpp
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#include "libGLESv2/entry_points_egl_ext.h" #include "libGLESv2/entry_points_egl_ext.h"
#include "libGLESv2/entry_points_gles_1_0_autogen.h" #include "libGLESv2/entry_points_gles_1_0_autogen.h"
#include "libGLESv2/entry_points_gles_2_0_autogen.h" #include "libGLESv2/entry_points_gles_2_0_autogen.h"
#include "libGLESv2/entry_points_gles_2_0_ext.h"
#include "libGLESv2/entry_points_gles_3_0_autogen.h" #include "libGLESv2/entry_points_gles_3_0_autogen.h"
#include "libGLESv2/entry_points_gles_3_1_autogen.h" #include "libGLESv2/entry_points_gles_3_1_autogen.h"
#include "libGLESv2/entry_points_gles_ext_autogen.h" #include "libGLESv2/entry_points_gles_ext_autogen.h"
......
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