Skip to content

A
angle
Commit 5faff91a by Cody Northrop Committed by Commit Bot
Options

texture3D: Codegen changes towards OES_texture_3D

Also accompanying hand edits to validationES2.cpp and Context.cpp to allow linking. Bug: angleproject:3188 Change-Id: I89832265092fabc71bade464f0171d65038d8b0e Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1648454 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 7d6923de
Showing with 295 additions and 18 deletions
scripts/entry_point_packed_gl_enums.json
......@@ -45,6 +45,9 @@
"glCompressedTexImage3D": {
"target": "TextureTarget"
},
"glCompressedTexImage3DOES": {
"target": "TextureTarget"
},
"glCompressedTexImage3DRobustANGLE": {
"target": "TextureTarget"
},
......@@ -57,6 +60,9 @@
"glCompressedTexSubImage3D": {
"target": "TextureTarget"
},
"glCompressedTexSubImage3DOES": {
"target": "TextureTarget"
},
"glCompressedTexSubImage3DRobustANGLE": {
"target": "TextureTarget"
},
......@@ -75,6 +81,9 @@
"glCopyTexSubImage3D": {
"target": "TextureTarget"
},
"glCopyTexSubImage3DOES": {
"target": "TextureTarget"
},
"glCopySubTexture3DANGLE": {
"destTarget": "TextureTarget"
},
......@@ -160,6 +169,12 @@
"glFramebufferTexture2DOES": {
"textarget": "TextureTarget"
},
"glFramebufferTexture3D": {
"textarget": "TextureTarget"
},
"glFramebufferTexture3DOES": {
"textarget": "TextureTarget"
},
"glGenerateMipmap": {
"target": "TextureType"
},
......@@ -400,6 +415,9 @@
"glTexImage3D": {
"target": "TextureTarget"
},
"glTexImage3DOES": {
"target": "TextureTarget"
},
"glTexImage3DRobustANGLE": {
"target": "TextureTarget"
},
......@@ -484,6 +502,9 @@
"glTexSubImage3D": {
"target": "TextureTarget"
},
"glTexSubImage3DOES": {
"target": "TextureTarget"
},
"glTexSubImage3DRobustANGLE": {
"target": "TextureTarget"
},
......
scripts/registry_xml.py
......@@ -73,6 +73,7 @@ gles_extensions = [
"GL_OES_EGL_image",
"GL_OES_get_program_binary",
"GL_OES_mapbuffer",
"GL_OES_texture_3D",
"GL_OES_texture_border_clamp",
"GL_OES_texture_storage_multisample_2d_array",
"GL_OES_vertex_array_object",
......
scripts/run_code_generation_hashes.json
......@@ -92,7 +92,7 @@
"GL/EGL entry points:scripts/egl_angle_ext.xml":
"fc2e249239fb1365f6d145cdf1a3cfcf",
"GL/EGL entry points:scripts/entry_point_packed_gl_enums.json":
"45513f3dd0e9cf5a93de3172b92636f4",
"6e27999e187876d388b365676b2e3cc6",
"GL/EGL entry points:scripts/generate_entry_points.py":
"1e493331ee0ab7d5e210a125cb248f0b",
"GL/EGL entry points:scripts/gl.xml":
......@@ -100,7 +100,7 @@
"GL/EGL entry points:scripts/gl_angle_ext.xml":
"bed6b56a38621721e689ebc19601a556",
"GL/EGL entry points:scripts/registry_xml.py":
"46adad992f005ee6b7d928029f3a3db9",
"044c8cd6601271bef56d257ff401597c",
"GL/EGL entry points:src/libANGLE/Context_gles_1_0_autogen.h":
"f30ed90e4ec23f886bda9344d82dd529",
"GL/EGL entry points:src/libANGLE/Context_gles_2_0_autogen.h":
......@@ -110,7 +110,7 @@
"GL/EGL entry points:src/libANGLE/Context_gles_3_1_autogen.h":
"5ccae982f020320b1e29cf8eecd8c303",
"GL/EGL entry points:src/libANGLE/Context_gles_ext_autogen.h":
"7f789cbaef14a93ad1e268d073b15435",
"a4159480e94e629b7ad5820464eab6ff",
"GL/EGL entry points:src/libANGLE/validationES1_autogen.h":
"8d3131d2bf2e6f521f46b44e64a6bff9",
"GL/EGL entry points:src/libANGLE/validationES2_autogen.h":
......@@ -120,9 +120,9 @@
"GL/EGL entry points:src/libANGLE/validationES3_autogen.h":
"4617942e5bf67fa5e35675daf66afc5c",
"GL/EGL entry points:src/libANGLE/validationESEXT_autogen.h":
"3042dcbfd5ba465df17668988601205e",
"e467045ae1b9f8671ced8aef794f06e0",
"GL/EGL entry points:src/libGLESv2/entry_points_enum_autogen.h":
"8d4af523c6da76ff7c47302c8dc5b30d",
"f8340d0bfde6bc581a508a47a54a6678",
"GL/EGL entry points:src/libGLESv2/entry_points_gles_1_0_autogen.cpp":
"153739031e8ae415fe42ecc9c132ffb2",
"GL/EGL entry points:src/libGLESv2/entry_points_gles_1_0_autogen.h":
......@@ -140,13 +140,13 @@
"GL/EGL entry points:src/libGLESv2/entry_points_gles_3_1_autogen.h":
"043d09a964c740067bf4279e0b544aed",
"GL/EGL entry points:src/libGLESv2/entry_points_gles_ext_autogen.cpp":
"b56592ebcd1bed250682e9a9230543ea",
"ea96fd970bb4f814199706c3663c44ab",
"GL/EGL entry points:src/libGLESv2/entry_points_gles_ext_autogen.h":
"ad2d05812814ba9016080ba56e6c4218",
"294cc52579b3439e99914c11bb7cd9f6",
"GL/EGL entry points:src/libGLESv2/libGLESv2_autogen.cpp":
"218d127d16fc6779b6cb74498ee47989",
"229577015686414a6d094533c2210cea",
"GL/EGL entry points:src/libGLESv2/libGLESv2_autogen.def":
"2b6c2e26533b1333b559c0dcf71d551d",
"5973958936850835cc48a57bba9bd33a",
"GL/EGL/WGL loader:scripts/egl.xml":
"842e24514c4cfe09fba703c17a0fd292",
"GL/EGL/WGL loader:scripts/egl_angle_ext.xml":
......@@ -154,7 +154,7 @@
"GL/EGL/WGL loader:scripts/generate_loader.py":
"5a7cd014230fe04664d9613e65399d42",
"GL/EGL/WGL loader:scripts/registry_xml.py":
"46adad992f005ee6b7d928029f3a3db9",
"044c8cd6601271bef56d257ff401597c",
"GL/EGL/WGL loader:scripts/wgl.xml":
"aa96419c582af2f6673430e2847693f4",
"GL/EGL/WGL loader:src/libEGL/egl_loader_autogen.cpp":
......@@ -166,9 +166,9 @@
"GL/EGL/WGL loader:util/egl_loader_autogen.h":
"a4f0d640554d9c2b4f90f1f2271a1104",
"GL/EGL/WGL loader:util/gles_loader_autogen.cpp":
"be57173aa677109e6a644320d5a4430d",
"335463406e64c6dc9bf00502cb25d53c",
"GL/EGL/WGL loader:util/gles_loader_autogen.h":
"164c35a3faf87a9f86b41ed2899ea1a5",
"d5217a3555be800443bd673e479d8443",
"GL/EGL/WGL loader:util/windows/wgl_loader_autogen.cpp":
"12ffb44e5e743c826e4d84ac65cdba82",
"GL/EGL/WGL loader:util/windows/wgl_loader_autogen.h":
......@@ -460,11 +460,11 @@
"proc table:scripts/gl_angle_ext.xml":
"bed6b56a38621721e689ebc19601a556",
"proc table:scripts/registry_xml.py":
"46adad992f005ee6b7d928029f3a3db9",
"044c8cd6601271bef56d257ff401597c",
"proc table:src/libGLESv2/gen_proc_table.py":
"c3e4abfa19077cea098cb19bbfed4471",
"proc table:src/libGLESv2/proc_table_autogen.cpp":
"e82a9970d6059a7c8b562726e3f219a4",
"eaedb2059fc6e499760a2b90da0510cf",
"uniform type:src/common/gen_uniform_type_table.py":
"a741cc301b1617ab0e4d29b35f1d3b96",
"uniform type:src/common/uniform_type_info_autogen.cpp":
......
src/libANGLE/Context.cpp
......@@ -3807,6 +3807,16 @@ void Context::framebufferTexture2D(GLenum target,
mState.setObjectDirty(target);
}
void Context::framebufferTexture3D(GLenum target,
GLenum attachment,
TextureTarget textargetPacked,
GLuint texture,
GLint level,
GLint zoffset)
{
UNIMPLEMENTED();
}
void Context::framebufferRenderbuffer(GLenum target,
GLenum attachment,
GLenum renderbuffertarget,
......
src/libANGLE/Context_gles_ext_autogen.h
......@@ -387,6 +387,9 @@
/* GL_OES_get_program_binary */ \
/* GL_OES_mapbuffer */ \
void *mapBuffer(BufferBinding targetPacked, GLenum access); \
/* GL_OES_texture_3D */ \
void framebufferTexture3D(GLenum target, GLenum attachment, TextureTarget textargetPacked, \
GLuint texture, GLint level, GLint zoffset); \
/* GL_OES_texture_border_clamp */ \
void getSamplerParameterIiv(GLuint sampler, GLenum pname, GLint *params); \
void getSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint *params); \
......
src/libANGLE/validationES2.cpp
......@@ -2918,6 +2918,23 @@ bool ValidateTexSubImage2DRobustANGLE(Context *context,
pixels);
}
bool ValidateTexSubImage3DOES(Context *context,
TextureTarget target,
GLint level,
GLint xoffset,
GLint yoffset,
GLint zoffset,
GLsizei width,
GLsizei height,
GLsizei depth,
GLenum format,
GLenum type,
const void *pixels)
{
return ValidateTexSubImage3D(context, target, level, xoffset, yoffset, zoffset, width, height,
depth, format, type, pixels);
}
bool ValidateCompressedTexImage2D(Context *context,
TextureTarget target,
GLint level,
......@@ -2991,6 +3008,21 @@ bool ValidateCompressedTexImage2DRobustANGLE(Context *context,
border, imageSize, data);
}
bool ValidateCompressedTexImage3DOES(Context *context,
TextureTarget target,
GLint level,
GLenum internalformat,
GLsizei width,
GLsizei height,
GLsizei depth,
GLint border,
GLsizei imageSize,
const void *data)
{
return ValidateCompressedTexImage3D(context, target, level, internalformat, width, height,
depth, border, imageSize, data);
}
bool ValidateCompressedTexSubImage2DRobustANGLE(Context *context,
TextureTarget target,
GLint level,
......@@ -3059,6 +3091,23 @@ bool ValidateCompressedTexSubImage2D(Context *context,
return true;
}
bool ValidateCompressedTexSubImage3DOES(Context *context,
TextureTarget target,
GLint level,
GLint xoffset,
GLint yoffset,
GLint zoffset,
GLsizei width,
GLsizei height,
GLsizei depth,
GLenum format,
GLsizei imageSize,
const void *data)
{
return ValidateCompressedTexSubImage3D(context, target, level, xoffset, yoffset, zoffset, width,
height, depth, format, imageSize, data);
}
bool ValidateGetBufferPointervOES(Context *context,
BufferBinding target,
GLenum pname,
......@@ -6149,6 +6198,21 @@ bool ValidateCopyTexSubImage2D(Context *context,
yoffset, 0, x, y, width, height, 0);
}
bool ValidateCopyTexSubImage3DOES(Context *context,
TextureTarget target,
GLint level,
GLint xoffset,
GLint yoffset,
GLint zoffset,
GLint x,
GLint y,
GLsizei width,
GLsizei height)
{
return ValidateCopyTexSubImage3D(context, target, level, xoffset, yoffset, zoffset, x, y, width,
height);
}
bool ValidateDeleteBuffers(Context *context, GLint n, const GLuint *)
{
return ValidateGenOrDelete(context, n);
......@@ -6336,6 +6400,18 @@ bool ValidateFramebufferTexture2D(Context *context,
return true;
}
bool ValidateFramebufferTexture3DOES(Context *context,
GLenum target,
GLenum attachment,
TextureTarget textargetPacked,
GLuint texture,
GLint level,
GLint zoffset)
{
UNIMPLEMENTED();
return false;
}
bool ValidateGenBuffers(Context *context, GLint n, GLuint *)
{
return ValidateGenOrDelete(context, n);
......@@ -6925,7 +7001,7 @@ bool ValidateVertexAttribDivisorEXT(Context *context, GLuint index, GLuint divis
}
bool ValidateTexImage3DOES(Context *context,
GLenum target,
TextureTarget target,
GLint level,
GLenum internalformat,
GLsizei width,
......@@ -6936,8 +7012,8 @@ bool ValidateTexImage3DOES(Context *context,
GLenum type,
const void *pixels)
{
UNIMPLEMENTED(); // FIXME
return false;
return ValidateTexImage3D(context, target, level, internalformat, width, height, depth, border,
format, type, pixels);
}
bool ValidatePopGroupMarkerEXT(Context *context)
......
src/libANGLE/validationESEXT_autogen.h
......@@ -1131,6 +1131,70 @@ bool ValidatePointSizePointerOES(Context *context,
// GL_OES_query_matrix
bool ValidateQueryMatrixxOES(Context *context, GLfixed *mantissa, GLint *exponent);
// GL_OES_texture_3D
bool ValidateCompressedTexImage3DOES(Context *context,
TextureTarget targetPacked,
GLint level,
GLenum internalformat,
GLsizei width,
GLsizei height,
GLsizei depth,
GLint border,
GLsizei imageSize,
const void *data);
bool ValidateCompressedTexSubImage3DOES(Context *context,
TextureTarget targetPacked,
GLint level,
GLint xoffset,
GLint yoffset,
GLint zoffset,
GLsizei width,
GLsizei height,
GLsizei depth,
GLenum format,
GLsizei imageSize,
const void *data);
bool ValidateCopyTexSubImage3DOES(Context *context,
TextureTarget targetPacked,
GLint level,
GLint xoffset,
GLint yoffset,
GLint zoffset,
GLint x,
GLint y,
GLsizei width,
GLsizei height);
bool ValidateFramebufferTexture3DOES(Context *context,
GLenum target,
GLenum attachment,
TextureTarget textargetPacked,
GLuint texture,
GLint level,
GLint zoffset);
bool ValidateTexImage3DOES(Context *context,
TextureTarget targetPacked,
GLint level,
GLenum internalformat,
GLsizei width,
GLsizei height,
GLsizei depth,
GLint border,
GLenum format,
GLenum type,
const void *pixels);
bool ValidateTexSubImage3DOES(Context *context,
TextureTarget targetPacked,
GLint level,
GLint xoffset,
GLint yoffset,
GLint zoffset,
GLsizei width,
GLsizei height,
GLsizei depth,
GLenum format,
GLenum type,
const void *pixels);
// GL_OES_texture_border_clamp
bool ValidateGetSamplerParameterIivOES(Context *context,
GLuint sampler,
......
src/libGLESv2/entry_points_enum_autogen.h
......@@ -80,10 +80,12 @@ enum class EntryPoint
CompressedTexImage2D,
CompressedTexImage2DRobustANGLE,
CompressedTexImage3D,
CompressedTexImage3DOES,
CompressedTexImage3DRobustANGLE,
CompressedTexSubImage2D,
CompressedTexSubImage2DRobustANGLE,
CompressedTexSubImage3D,
CompressedTexSubImage3DOES,
CompressedTexSubImage3DRobustANGLE,
CopyBufferSubData,
CopySubTexture3DANGLE,
......@@ -91,6 +93,7 @@ enum class EntryPoint
CopyTexImage2D,
CopyTexSubImage2D,
CopyTexSubImage3D,
CopyTexSubImage3DOES,
CopyTexture3DANGLE,
CopyTextureCHROMIUM,
CoverFillPathCHROMIUM,
......@@ -182,6 +185,7 @@ enum class EntryPoint
FramebufferRenderbufferOES,
FramebufferTexture2D,
FramebufferTexture2DOES,
FramebufferTexture3DOES,
FramebufferTextureEXT,
FramebufferTextureLayer,
FramebufferTextureMultiviewOVR,
......@@ -566,6 +570,7 @@ enum class EntryPoint
TexImage2DExternalANGLE,
TexImage2DRobustANGLE,
TexImage3D,
TexImage3DOES,
TexImage3DRobustANGLE,
TexParameterIivOES,
TexParameterIivRobustANGLE,
......@@ -594,6 +599,7 @@ enum class EntryPoint
TexSubImage2D,
TexSubImage2DRobustANGLE,
TexSubImage3D,
TexSubImage3DOES,
TexSubImage3DRobustANGLE,
TransformFeedbackVaryings,
Translatef,
......
src/libGLESv2/libGLESv2_autogen.def
......@@ -726,6 +726,14 @@ EXPORTS
; GL_OES_query_matrix
glQueryMatrixxOES
; GL_OES_texture_3D
glCompressedTexImage3DOES
glCompressedTexSubImage3DOES
glCopyTexSubImage3DOES
glFramebufferTexture3DOES
glTexImage3DOES
glTexSubImage3DOES
; GL_OES_texture_border_clamp
glGetSamplerParameterIivOES
glGetSamplerParameterIuivOES
......@@ -826,10 +834,12 @@ EXPORTS
glCompressedTexImage2DContextANGLE
glCompressedTexImage2DRobustANGLEContextANGLE
glCompressedTexImage3DContextANGLE
glCompressedTexImage3DOESContextANGLE
glCompressedTexImage3DRobustANGLEContextANGLE
glCompressedTexSubImage2DContextANGLE
glCompressedTexSubImage2DRobustANGLEContextANGLE
glCompressedTexSubImage3DContextANGLE
glCompressedTexSubImage3DOESContextANGLE
glCompressedTexSubImage3DRobustANGLEContextANGLE
glCopyBufferSubDataContextANGLE
glCopySubTexture3DANGLEContextANGLE
......@@ -837,6 +847,7 @@ EXPORTS
glCopyTexImage2DContextANGLE
glCopyTexSubImage2DContextANGLE
glCopyTexSubImage3DContextANGLE
glCopyTexSubImage3DOESContextANGLE
glCopyTexture3DANGLEContextANGLE
glCopyTextureCHROMIUMContextANGLE
glCoverFillPathCHROMIUMContextANGLE
......@@ -928,6 +939,7 @@ EXPORTS
glFramebufferRenderbufferOESContextANGLE
glFramebufferTexture2DContextANGLE
glFramebufferTexture2DOESContextANGLE
glFramebufferTexture3DOESContextANGLE
glFramebufferTextureEXTContextANGLE
glFramebufferTextureLayerContextANGLE
glFramebufferTextureMultiviewOVRContextANGLE
......@@ -1312,6 +1324,7 @@ EXPORTS
glTexImage2DExternalANGLEContextANGLE
glTexImage2DRobustANGLEContextANGLE
glTexImage3DContextANGLE
glTexImage3DOESContextANGLE
glTexImage3DRobustANGLEContextANGLE
glTexParameterIivOESContextANGLE
glTexParameterIivRobustANGLEContextANGLE
......@@ -1340,6 +1353,7 @@ EXPORTS
glTexSubImage2DContextANGLE
glTexSubImage2DRobustANGLEContextANGLE
glTexSubImage3DContextANGLE
glTexSubImage3DOESContextANGLE
glTexSubImage3DRobustANGLEContextANGLE
glTransformFeedbackVaryingsContextANGLE
glTranslatefContextANGLE
......
src/libGLESv2/proc_table_autogen.cpp
......@@ -251,6 +251,8 @@ ProcEntry g_procTable[] = {
P(gl::CompressedTexImage2DRobustANGLEContextANGLE)},
{"glCompressedTexImage3D", P(gl::CompressedTexImage3D)},
{"glCompressedTexImage3DContextANGLE", P(gl::CompressedTexImage3DContextANGLE)},
{"glCompressedTexImage3DOES", P(gl::CompressedTexImage3DOES)},
{"glCompressedTexImage3DOESContextANGLE", P(gl::CompressedTexImage3DOESContextANGLE)},
{"glCompressedTexImage3DRobustANGLE", P(gl::CompressedTexImage3DRobustANGLE)},
{"glCompressedTexImage3DRobustANGLEContextANGLE",
P(gl::CompressedTexImage3DRobustANGLEContextANGLE)},
......@@ -261,6 +263,8 @@ ProcEntry g_procTable[] = {
P(gl::CompressedTexSubImage2DRobustANGLEContextANGLE)},
{"glCompressedTexSubImage3D", P(gl::CompressedTexSubImage3D)},
{"glCompressedTexSubImage3DContextANGLE", P(gl::CompressedTexSubImage3DContextANGLE)},
{"glCompressedTexSubImage3DOES", P(gl::CompressedTexSubImage3DOES)},
{"glCompressedTexSubImage3DOESContextANGLE", P(gl::CompressedTexSubImage3DOESContextANGLE)},
{"glCompressedTexSubImage3DRobustANGLE", P(gl::CompressedTexSubImage3DRobustANGLE)},
{"glCompressedTexSubImage3DRobustANGLEContextANGLE",
P(gl::CompressedTexSubImage3DRobustANGLEContextANGLE)},
......@@ -276,6 +280,8 @@ ProcEntry g_procTable[] = {
{"glCopyTexSubImage2DContextANGLE", P(gl::CopyTexSubImage2DContextANGLE)},
{"glCopyTexSubImage3D", P(gl::CopyTexSubImage3D)},
{"glCopyTexSubImage3DContextANGLE", P(gl::CopyTexSubImage3DContextANGLE)},
{"glCopyTexSubImage3DOES", P(gl::CopyTexSubImage3DOES)},
{"glCopyTexSubImage3DOESContextANGLE", P(gl::CopyTexSubImage3DOESContextANGLE)},
{"glCopyTexture3DANGLE", P(gl::CopyTexture3DANGLE)},
{"glCopyTexture3DANGLEContextANGLE", P(gl::CopyTexture3DANGLEContextANGLE)},
{"glCopyTextureCHROMIUM", P(gl::CopyTextureCHROMIUM)},
......@@ -461,6 +467,8 @@ ProcEntry g_procTable[] = {
{"glFramebufferTexture2DContextANGLE", P(gl::FramebufferTexture2DContextANGLE)},
{"glFramebufferTexture2DOES", P(gl::FramebufferTexture2DOES)},
{"glFramebufferTexture2DOESContextANGLE", P(gl::FramebufferTexture2DOESContextANGLE)},
{"glFramebufferTexture3DOES", P(gl::FramebufferTexture3DOES)},
{"glFramebufferTexture3DOESContextANGLE", P(gl::FramebufferTexture3DOESContextANGLE)},
{"glFramebufferTextureEXT", P(gl::FramebufferTextureEXT)},
{"glFramebufferTextureEXTContextANGLE", P(gl::FramebufferTextureEXTContextANGLE)},
{"glFramebufferTextureLayer", P(gl::FramebufferTextureLayer)},
......@@ -1278,6 +1286,8 @@ ProcEntry g_procTable[] = {
{"glTexImage2DRobustANGLEContextANGLE", P(gl::TexImage2DRobustANGLEContextANGLE)},
{"glTexImage3D", P(gl::TexImage3D)},
{"glTexImage3DContextANGLE", P(gl::TexImage3DContextANGLE)},
{"glTexImage3DOES", P(gl::TexImage3DOES)},
{"glTexImage3DOESContextANGLE", P(gl::TexImage3DOESContextANGLE)},
{"glTexImage3DRobustANGLE", P(gl::TexImage3DRobustANGLE)},
{"glTexImage3DRobustANGLEContextANGLE", P(gl::TexImage3DRobustANGLEContextANGLE)},
{"glTexParameterIivOES", P(gl::TexParameterIivOES)},
......@@ -1336,6 +1346,8 @@ ProcEntry g_procTable[] = {
{"glTexSubImage2DRobustANGLEContextANGLE", P(gl::TexSubImage2DRobustANGLEContextANGLE)},
{"glTexSubImage3D", P(gl::TexSubImage3D)},
{"glTexSubImage3DContextANGLE", P(gl::TexSubImage3DContextANGLE)},
{"glTexSubImage3DOES", P(gl::TexSubImage3DOES)},
{"glTexSubImage3DOESContextANGLE", P(gl::TexSubImage3DOESContextANGLE)},
{"glTexSubImage3DRobustANGLE", P(gl::TexSubImage3DRobustANGLE)},
{"glTexSubImage3DRobustANGLEContextANGLE", P(gl::TexSubImage3DRobustANGLEContextANGLE)},
{"glTransformFeedbackVaryings", P(gl::TransformFeedbackVaryings)},
......@@ -1477,5 +1489,5 @@ ProcEntry g_procTable[] = {
{"glWeightPointerOES", P(gl::WeightPointerOES)},
{"glWeightPointerOESContextANGLE", P(gl::WeightPointerOESContextANGLE)}};
size_t g_numProcs = 1388;
size_t g_numProcs = 1400;
} // namespace egl
util/gles_loader_autogen.cpp
......@@ -615,6 +615,12 @@ ANGLE_UTIL_EXPORT PFNGLPROGRAMBINARYOESPROC glProgramBinaryOES;
ANGLE_UTIL_EXPORT PFNGLGETBUFFERPOINTERVOESPROC glGetBufferPointervOES;
ANGLE_UTIL_EXPORT PFNGLMAPBUFFEROESPROC glMapBufferOES;
ANGLE_UTIL_EXPORT PFNGLUNMAPBUFFEROESPROC glUnmapBufferOES;
ANGLE_UTIL_EXPORT PFNGLCOMPRESSEDTEXIMAGE3DOESPROC glCompressedTexImage3DOES;
ANGLE_UTIL_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE3DOESPROC glCompressedTexSubImage3DOES;
ANGLE_UTIL_EXPORT PFNGLCOPYTEXSUBIMAGE3DOESPROC glCopyTexSubImage3DOES;
ANGLE_UTIL_EXPORT PFNGLFRAMEBUFFERTEXTURE3DOESPROC glFramebufferTexture3DOES;
ANGLE_UTIL_EXPORT PFNGLTEXIMAGE3DOESPROC glTexImage3DOES;
ANGLE_UTIL_EXPORT PFNGLTEXSUBIMAGE3DOESPROC glTexSubImage3DOES;
ANGLE_UTIL_EXPORT PFNGLGETSAMPLERPARAMETERIIVOESPROC glGetSamplerParameterIivOES;
ANGLE_UTIL_EXPORT PFNGLGETSAMPLERPARAMETERIUIVOESPROC glGetSamplerParameterIuivOES;
ANGLE_UTIL_EXPORT PFNGLGETTEXPARAMETERIIVOESPROC glGetTexParameterIivOES;
......@@ -1400,6 +1406,15 @@ ANGLE_UTIL_EXPORT PFNGLPROGRAMBINARYOESCONTEXTANGLEPROC glProgramBinaryOESContex
ANGLE_UTIL_EXPORT PFNGLGETBUFFERPOINTERVOESCONTEXTANGLEPROC glGetBufferPointervOESContextANGLE;
ANGLE_UTIL_EXPORT PFNGLMAPBUFFEROESCONTEXTANGLEPROC glMapBufferOESContextANGLE;
ANGLE_UTIL_EXPORT PFNGLUNMAPBUFFEROESCONTEXTANGLEPROC glUnmapBufferOESContextANGLE;
ANGLE_UTIL_EXPORT PFNGLCOMPRESSEDTEXIMAGE3DOESCONTEXTANGLEPROC
glCompressedTexImage3DOESContextANGLE;
ANGLE_UTIL_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE3DOESCONTEXTANGLEPROC
glCompressedTexSubImage3DOESContextANGLE;
ANGLE_UTIL_EXPORT PFNGLCOPYTEXSUBIMAGE3DOESCONTEXTANGLEPROC glCopyTexSubImage3DOESContextANGLE;
ANGLE_UTIL_EXPORT PFNGLFRAMEBUFFERTEXTURE3DOESCONTEXTANGLEPROC
glFramebufferTexture3DOESContextANGLE;
ANGLE_UTIL_EXPORT PFNGLTEXIMAGE3DOESCONTEXTANGLEPROC glTexImage3DOESContextANGLE;
ANGLE_UTIL_EXPORT PFNGLTEXSUBIMAGE3DOESCONTEXTANGLEPROC glTexSubImage3DOESContextANGLE;
ANGLE_UTIL_EXPORT PFNGLGETSAMPLERPARAMETERIIVOESCONTEXTANGLEPROC
glGetSamplerParameterIivOESContextANGLE;
ANGLE_UTIL_EXPORT PFNGLGETSAMPLERPARAMETERIUIVOESCONTEXTANGLEPROC
......@@ -2430,6 +2445,17 @@ void LoadGLES(LoadProc loadProc)
reinterpret_cast<PFNGLGETBUFFERPOINTERVOESPROC>(loadProc("glGetBufferPointervOES"));
glMapBufferOES = reinterpret_cast<PFNGLMAPBUFFEROESPROC>(loadProc("glMapBufferOES"));
glUnmapBufferOES = reinterpret_cast<PFNGLUNMAPBUFFEROESPROC>(loadProc("glUnmapBufferOES"));
glCompressedTexImage3DOES =
reinterpret_cast<PFNGLCOMPRESSEDTEXIMAGE3DOESPROC>(loadProc("glCompressedTexImage3DOES"));
glCompressedTexSubImage3DOES = reinterpret_cast<PFNGLCOMPRESSEDTEXSUBIMAGE3DOESPROC>(
loadProc("glCompressedTexSubImage3DOES"));
glCopyTexSubImage3DOES =
reinterpret_cast<PFNGLCOPYTEXSUBIMAGE3DOESPROC>(loadProc("glCopyTexSubImage3DOES"));
glFramebufferTexture3DOES =
reinterpret_cast<PFNGLFRAMEBUFFERTEXTURE3DOESPROC>(loadProc("glFramebufferTexture3DOES"));
glTexImage3DOES = reinterpret_cast<PFNGLTEXIMAGE3DOESPROC>(loadProc("glTexImage3DOES"));
glTexSubImage3DOES =
reinterpret_cast<PFNGLTEXSUBIMAGE3DOESPROC>(loadProc("glTexSubImage3DOES"));
glGetSamplerParameterIivOES = reinterpret_cast<PFNGLGETSAMPLERPARAMETERIIVOESPROC>(
loadProc("glGetSamplerParameterIivOES"));
glGetSamplerParameterIuivOES = reinterpret_cast<PFNGLGETSAMPLERPARAMETERIUIVOESPROC>(
......@@ -3917,6 +3943,22 @@ void LoadGLES(LoadProc loadProc)
reinterpret_cast<PFNGLMAPBUFFEROESCONTEXTANGLEPROC>(loadProc("glMapBufferOESContextANGLE"));
glUnmapBufferOESContextANGLE = reinterpret_cast<PFNGLUNMAPBUFFEROESCONTEXTANGLEPROC>(
loadProc("glUnmapBufferOESContextANGLE"));
glCompressedTexImage3DOESContextANGLE =
reinterpret_cast<PFNGLCOMPRESSEDTEXIMAGE3DOESCONTEXTANGLEPROC>(
loadProc("glCompressedTexImage3DOESContextANGLE"));
glCompressedTexSubImage3DOESContextANGLE =
reinterpret_cast<PFNGLCOMPRESSEDTEXSUBIMAGE3DOESCONTEXTANGLEPROC>(
loadProc("glCompressedTexSubImage3DOESContextANGLE"));
glCopyTexSubImage3DOESContextANGLE =
reinterpret_cast<PFNGLCOPYTEXSUBIMAGE3DOESCONTEXTANGLEPROC>(
loadProc("glCopyTexSubImage3DOESContextANGLE"));
glFramebufferTexture3DOESContextANGLE =
reinterpret_cast<PFNGLFRAMEBUFFERTEXTURE3DOESCONTEXTANGLEPROC>(
loadProc("glFramebufferTexture3DOESContextANGLE"));
glTexImage3DOESContextANGLE = reinterpret_cast<PFNGLTEXIMAGE3DOESCONTEXTANGLEPROC>(
loadProc("glTexImage3DOESContextANGLE"));
glTexSubImage3DOESContextANGLE = reinterpret_cast<PFNGLTEXSUBIMAGE3DOESCONTEXTANGLEPROC>(
loadProc("glTexSubImage3DOESContextANGLE"));
glGetSamplerParameterIivOESContextANGLE =
reinterpret_cast<PFNGLGETSAMPLERPARAMETERIIVOESCONTEXTANGLEPROC>(
loadProc("glGetSamplerParameterIivOESContextANGLE"));
......
util/gles_loader_autogen.h
......@@ -643,6 +643,12 @@ ANGLE_UTIL_EXPORT extern PFNGLPROGRAMBINARYOESPROC glProgramBinaryOES;
ANGLE_UTIL_EXPORT extern PFNGLGETBUFFERPOINTERVOESPROC glGetBufferPointervOES;
ANGLE_UTIL_EXPORT extern PFNGLMAPBUFFEROESPROC glMapBufferOES;
ANGLE_UTIL_EXPORT extern PFNGLUNMAPBUFFEROESPROC glUnmapBufferOES;
ANGLE_UTIL_EXPORT extern PFNGLCOMPRESSEDTEXIMAGE3DOESPROC glCompressedTexImage3DOES;
ANGLE_UTIL_EXPORT extern PFNGLCOMPRESSEDTEXSUBIMAGE3DOESPROC glCompressedTexSubImage3DOES;
ANGLE_UTIL_EXPORT extern PFNGLCOPYTEXSUBIMAGE3DOESPROC glCopyTexSubImage3DOES;
ANGLE_UTIL_EXPORT extern PFNGLFRAMEBUFFERTEXTURE3DOESPROC glFramebufferTexture3DOES;
ANGLE_UTIL_EXPORT extern PFNGLTEXIMAGE3DOESPROC glTexImage3DOES;
ANGLE_UTIL_EXPORT extern PFNGLTEXSUBIMAGE3DOESPROC glTexSubImage3DOES;
ANGLE_UTIL_EXPORT extern PFNGLGETSAMPLERPARAMETERIIVOESPROC glGetSamplerParameterIivOES;
ANGLE_UTIL_EXPORT extern PFNGLGETSAMPLERPARAMETERIUIVOESPROC glGetSamplerParameterIuivOES;
ANGLE_UTIL_EXPORT extern PFNGLGETTEXPARAMETERIIVOESPROC glGetTexParameterIivOES;
......@@ -1500,6 +1506,16 @@ ANGLE_UTIL_EXPORT extern PFNGLGETBUFFERPOINTERVOESCONTEXTANGLEPROC
glGetBufferPointervOESContextANGLE;
ANGLE_UTIL_EXPORT extern PFNGLMAPBUFFEROESCONTEXTANGLEPROC glMapBufferOESContextANGLE;
ANGLE_UTIL_EXPORT extern PFNGLUNMAPBUFFEROESCONTEXTANGLEPROC glUnmapBufferOESContextANGLE;
ANGLE_UTIL_EXPORT extern PFNGLCOMPRESSEDTEXIMAGE3DOESCONTEXTANGLEPROC
glCompressedTexImage3DOESContextANGLE;
ANGLE_UTIL_EXPORT extern PFNGLCOMPRESSEDTEXSUBIMAGE3DOESCONTEXTANGLEPROC
glCompressedTexSubImage3DOESContextANGLE;
ANGLE_UTIL_EXPORT extern PFNGLCOPYTEXSUBIMAGE3DOESCONTEXTANGLEPROC
glCopyTexSubImage3DOESContextANGLE;
ANGLE_UTIL_EXPORT extern PFNGLFRAMEBUFFERTEXTURE3DOESCONTEXTANGLEPROC
glFramebufferTexture3DOESContextANGLE;
ANGLE_UTIL_EXPORT extern PFNGLTEXIMAGE3DOESCONTEXTANGLEPROC glTexImage3DOESContextANGLE;
ANGLE_UTIL_EXPORT extern PFNGLTEXSUBIMAGE3DOESCONTEXTANGLEPROC glTexSubImage3DOESContextANGLE;
ANGLE_UTIL_EXPORT extern PFNGLGETSAMPLERPARAMETERIIVOESCONTEXTANGLEPROC
glGetSamplerParameterIivOESContextANGLE;
ANGLE_UTIL_EXPORT extern PFNGLGETSAMPLERPARAMETERIUIVOESCONTEXTANGLEPROC
......
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