Skip to content

A
angle
Commit 31fbf981 by Jonah Ryan-Davis Committed by Commit Bot
Options

GL: Entry points for GL_OES_texture_cube_map_array

This extension is made core in GLES3.2. This CL adds the necessary entry points to the frontend. Bug: angleproject:3584 Change-Id: Icaaa0b298898f3360819966a7f67b5feaf05124b Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2215305 Commit-Queue: Jonah Ryan-Davis <jonahr@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 6789018a
Showing with 50 additions and 13 deletions
scripts/code_generation_hashes/GL_EGL_WGL_loader.json
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"scripts/gl_angle_ext.xml": "scripts/gl_angle_ext.xml":
"079cc4829de7ce638faf7bbf66e141ad", "079cc4829de7ce638faf7bbf66e141ad",
"scripts/registry_xml.py": "scripts/registry_xml.py":
"b2902e02f495a9cc85082c47e7b73ac9", "7e38cd315a93dce57645283ab2ee80d5",
"scripts/wgl.xml": "scripts/wgl.xml":
"aa96419c582af2f6673430e2847693f4", "aa96419c582af2f6673430e2847693f4",
"src/libEGL/egl_loader_autogen.cpp": "src/libEGL/egl_loader_autogen.cpp":
......
scripts/code_generation_hashes/GL_EGL_entry_points.json
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
"scripts/gl_angle_ext.xml": "scripts/gl_angle_ext.xml":
"079cc4829de7ce638faf7bbf66e141ad", "079cc4829de7ce638faf7bbf66e141ad",
"scripts/registry_xml.py": "scripts/registry_xml.py":
"b2902e02f495a9cc85082c47e7b73ac9", "7e38cd315a93dce57645283ab2ee80d5",
"scripts/wgl.xml": "scripts/wgl.xml":
"aa96419c582af2f6673430e2847693f4", "aa96419c582af2f6673430e2847693f4",
"src/libANGLE/Context_gl_1_0_autogen.h": "src/libANGLE/Context_gl_1_0_autogen.h":
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"src/libANGLE/Context_gles_3_2_autogen.h": "src/libANGLE/Context_gles_3_2_autogen.h":
"e26f7ee7b59a89a4f5337171816b8336", "e26f7ee7b59a89a4f5337171816b8336",
"src/libANGLE/Context_gles_ext_autogen.h": "src/libANGLE/Context_gles_ext_autogen.h":
"70b088f16d539f1fe7f3ec39a2fd2c34", "612224fcc2fad9b416ac97f91ee5c997",
"src/libANGLE/capture_gles_1_0_autogen.cpp": "src/libANGLE/capture_gles_1_0_autogen.cpp":
"96fc0f501e2e696ab911dad8b400dfb2", "96fc0f501e2e696ab911dad8b400dfb2",
"src/libANGLE/capture_gles_1_0_autogen.h": "src/libANGLE/capture_gles_1_0_autogen.h":
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
"src/libANGLE/capture_gles_ext_autogen.cpp": "src/libANGLE/capture_gles_ext_autogen.cpp":
"96cb5043ebfce349c89ece3afec6d9f8", "96cb5043ebfce349c89ece3afec6d9f8",
"src/libANGLE/capture_gles_ext_autogen.h": "src/libANGLE/capture_gles_ext_autogen.h":
"2993ff4c127fb3dca52c96b4a86d7f69", "c9f5522755fb58bd544e5faf27c09771",
"src/libANGLE/entry_points_enum_autogen.cpp": "src/libANGLE/entry_points_enum_autogen.cpp":
"66f09d4f9e6f8e83f2f6f0cf8fc3f3d9", "66f09d4f9e6f8e83f2f6f0cf8fc3f3d9",
"src/libANGLE/entry_points_enum_autogen.h": "src/libANGLE/entry_points_enum_autogen.h":
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
"src/libANGLE/validationES3_autogen.h": "src/libANGLE/validationES3_autogen.h":
"86ba503835328438158d9a464943f3bd", "86ba503835328438158d9a464943f3bd",
"src/libANGLE/validationESEXT_autogen.h": "src/libANGLE/validationESEXT_autogen.h":
"9a7f7c129e12ab2660f1ef5d6dd73cd5", "5ce1c63470531137fbd327a1d6f1d6e9",
"src/libANGLE/validationGL11_autogen.h": "src/libANGLE/validationGL11_autogen.h":
"aadd145c1404de9c34d6b7c00404f10f", "aadd145c1404de9c34d6b7c00404f10f",
"src/libANGLE/validationGL12_autogen.h": "src/libANGLE/validationGL12_autogen.h":
...@@ -250,15 +250,15 @@ ...@@ -250,15 +250,15 @@
"src/libGLESv2/entry_points_gles_3_2_autogen.h": "src/libGLESv2/entry_points_gles_3_2_autogen.h":
"5798aa0a73af1d4ba5dfe99b6217a247", "5798aa0a73af1d4ba5dfe99b6217a247",
"src/libGLESv2/entry_points_gles_ext_autogen.cpp": "src/libGLESv2/entry_points_gles_ext_autogen.cpp":
"f24b9311081f4307a4b02cec669753b9", "404a6ba3715aa03a3595aa4a232d4ba3",
"src/libGLESv2/entry_points_gles_ext_autogen.h": "src/libGLESv2/entry_points_gles_ext_autogen.h":
"97bdf48e620471b21e3d250254ac847f", "de27fde4dca5559e594d5aa4589afa36",
"src/libGLESv2/libGLESv2_autogen.cpp": "src/libGLESv2/libGLESv2_autogen.cpp":
"0d79a167f0e86a7adcdebfe26ed331a9", "60649d6c45cb07f341f8f06f4bd7d101",
"src/libGLESv2/libGLESv2_autogen.def": "src/libGLESv2/libGLESv2_autogen.def":
"ff7562ae9bdf8763fea7ba09e5cbb1b4", "2ae49d834d225ee5e117b4a6e81ec9de",
"src/libGLESv2/libGLESv2_no_capture_autogen.def": "src/libGLESv2/libGLESv2_no_capture_autogen.def":
"affecd039c50674887d6c7bd9b06d4ce", "564f1da48701f02110e4c7949de5e4c2",
"src/libGLESv2/libGLESv2_with_capture_autogen.def": "src/libGLESv2/libGLESv2_with_capture_autogen.def":
"5a9fce5f01b3b2150cbce447f02e7873" "5e67a80bbebfd45c53b2758e9b30e49b"
} }
\ No newline at end of file
scripts/code_generation_hashes/GLenum_value_to_string_map.json
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"scripts/gl_angle_ext.xml": "scripts/gl_angle_ext.xml":
"079cc4829de7ce638faf7bbf66e141ad", "079cc4829de7ce638faf7bbf66e141ad",
"scripts/registry_xml.py": "scripts/registry_xml.py":
"b2902e02f495a9cc85082c47e7b73ac9", "7e38cd315a93dce57645283ab2ee80d5",
"src/libANGLE/gl_enum_utils_autogen.cpp": "src/libANGLE/gl_enum_utils_autogen.cpp":
"48627c0865d15bf4014327de5858d3c5", "48627c0865d15bf4014327de5858d3c5",
"src/libANGLE/gl_enum_utils_autogen.h": "src/libANGLE/gl_enum_utils_autogen.h":
......
scripts/code_generation_hashes/proc_table.json
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"scripts/gl_angle_ext.xml": "scripts/gl_angle_ext.xml":
"079cc4829de7ce638faf7bbf66e141ad", "079cc4829de7ce638faf7bbf66e141ad",
"scripts/registry_xml.py": "scripts/registry_xml.py":
"b2902e02f495a9cc85082c47e7b73ac9", "7e38cd315a93dce57645283ab2ee80d5",
"scripts/wgl.xml": "scripts/wgl.xml":
"aa96419c582af2f6673430e2847693f4", "aa96419c582af2f6673430e2847693f4",
"src/libGL/proc_table_wgl_autogen.cpp": "src/libGL/proc_table_wgl_autogen.cpp":
......
scripts/registry_xml.py
...@@ -86,6 +86,7 @@ gles_extensions = [ ...@@ -86,6 +86,7 @@ gles_extensions = [
"GL_EXT_texture_compression_rgtc", "GL_EXT_texture_compression_rgtc",
"GL_EXT_texture_compression_s3tc", "GL_EXT_texture_compression_s3tc",
"GL_EXT_texture_compression_s3tc_srgb", "GL_EXT_texture_compression_s3tc_srgb",
"GL_EXT_texture_cube_map_array",
"GL_EXT_texture_filter_anisotropic", "GL_EXT_texture_filter_anisotropic",
"GL_EXT_texture_format_BGRA8888", "GL_EXT_texture_format_BGRA8888",
"GL_EXT_texture_storage", "GL_EXT_texture_storage",
...@@ -103,6 +104,7 @@ gles_extensions = [ ...@@ -103,6 +104,7 @@ gles_extensions = [
"GL_OES_mapbuffer", "GL_OES_mapbuffer",
"GL_OES_texture_3D", "GL_OES_texture_3D",
"GL_OES_texture_border_clamp", "GL_OES_texture_border_clamp",
"GL_OES_texture_cube_map_array",
"GL_OES_texture_half_float", "GL_OES_texture_half_float",
"GL_OES_texture_storage_multisample_2d_array", "GL_OES_texture_storage_multisample_2d_array",
"GL_OES_vertex_array_object", "GL_OES_vertex_array_object",
......
src/libANGLE/Context_gles_ext_autogen.h
...@@ -358,6 +358,7 @@ ...@@ -358,6 +358,7 @@
/* GL_EXT_texture_compression_rgtc */ \ /* GL_EXT_texture_compression_rgtc */ \
/* GL_EXT_texture_compression_s3tc */ \ /* GL_EXT_texture_compression_s3tc */ \
/* GL_EXT_texture_compression_s3tc_srgb */ \ /* GL_EXT_texture_compression_s3tc_srgb */ \
/* GL_EXT_texture_cube_map_array */ \
/* GL_EXT_texture_filter_anisotropic */ \ /* GL_EXT_texture_filter_anisotropic */ \
/* GL_EXT_texture_format_BGRA8888 */ \ /* GL_EXT_texture_format_BGRA8888 */ \
/* GL_EXT_texture_sRGB_R8 */ \ /* GL_EXT_texture_sRGB_R8 */ \
...@@ -388,6 +389,7 @@ ...@@ -388,6 +389,7 @@
void framebufferTexture3D(GLenum target, GLenum attachment, TextureTarget textargetPacked, \ void framebufferTexture3D(GLenum target, GLenum attachment, TextureTarget textargetPacked, \
TextureID texturePacked, GLint level, GLint zoffset); \ TextureID texturePacked, GLint level, GLint zoffset); \
/* GL_OES_texture_border_clamp */ \ /* GL_OES_texture_border_clamp */ \
/* GL_OES_texture_cube_map_array */ \
/* GL_OES_texture_half_float */ \ /* GL_OES_texture_half_float */ \
/* GL_OES_texture_storage_multisample_2d_array */ \ /* GL_OES_texture_storage_multisample_2d_array */ \
/* GL_OES_vertex_array_object */ \ /* GL_OES_vertex_array_object */ \
......
src/libANGLE/capture_gles_ext_autogen.h
...@@ -1230,6 +1230,8 @@ angle::CallCapture CaptureImportSemaphoreFdEXT(const State &glState, ...@@ -1230,6 +1230,8 @@ angle::CallCapture CaptureImportSemaphoreFdEXT(const State &glState,
// GL_EXT_texture_compression_s3tc_srgb // GL_EXT_texture_compression_s3tc_srgb
// GL_EXT_texture_cube_map_array
// GL_EXT_texture_filter_anisotropic // GL_EXT_texture_filter_anisotropic
// GL_EXT_texture_format_BGRA8888 // GL_EXT_texture_format_BGRA8888
...@@ -1778,6 +1780,8 @@ angle::CallCapture CaptureTexGenxvOES(const State &glState, ...@@ -1778,6 +1780,8 @@ angle::CallCapture CaptureTexGenxvOES(const State &glState,
GLenum pname, GLenum pname,
const GLfixed *params); const GLfixed *params);
// GL_OES_texture_cube_map_array
// GL_OES_texture_half_float // GL_OES_texture_half_float
// GL_OES_texture_storage_multisample_2d_array // GL_OES_texture_storage_multisample_2d_array
......
src/libANGLE/validationESEXT_autogen.h
...@@ -1009,6 +1009,8 @@ bool ValidateImportSemaphoreFdEXT(const Context *context, ...@@ -1009,6 +1009,8 @@ bool ValidateImportSemaphoreFdEXT(const Context *context,
// GL_EXT_texture_compression_s3tc_srgb // GL_EXT_texture_compression_s3tc_srgb
// GL_EXT_texture_cube_map_array
// GL_EXT_texture_filter_anisotropic // GL_EXT_texture_filter_anisotropic
// GL_EXT_texture_format_BGRA8888 // GL_EXT_texture_format_BGRA8888
...@@ -1406,6 +1408,8 @@ bool ValidateTexGenivOES(const Context *context, GLenum coord, GLenum pname, con ...@@ -1406,6 +1408,8 @@ bool ValidateTexGenivOES(const Context *context, GLenum coord, GLenum pname, con
bool ValidateTexGenxOES(const Context *context, GLenum coord, GLenum pname, GLfixed param); bool ValidateTexGenxOES(const Context *context, GLenum coord, GLenum pname, GLfixed param);
bool ValidateTexGenxvOES(const Context *context, GLenum coord, GLenum pname, const GLfixed *params); bool ValidateTexGenxvOES(const Context *context, GLenum coord, GLenum pname, const GLfixed *params);
// GL_OES_texture_cube_map_array
// GL_OES_texture_half_float // GL_OES_texture_half_float
// GL_OES_texture_storage_multisample_2d_array // GL_OES_texture_storage_multisample_2d_array
......
src/libGLESv2/entry_points_gles_ext_autogen.cpp
...@@ -4826,6 +4826,8 @@ void GL_APIENTRY ImportSemaphoreFdEXT(GLuint semaphore, GLenum handleType, GLint ...@@ -4826,6 +4826,8 @@ void GL_APIENTRY ImportSemaphoreFdEXT(GLuint semaphore, GLenum handleType, GLint
// GL_EXT_texture_compression_s3tc_srgb // GL_EXT_texture_compression_s3tc_srgb
// GL_EXT_texture_cube_map_array
// GL_EXT_texture_filter_anisotropic // GL_EXT_texture_filter_anisotropic
// GL_EXT_texture_format_BGRA8888 // GL_EXT_texture_format_BGRA8888
...@@ -7110,6 +7112,8 @@ void GL_APIENTRY TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params) ...@@ -7110,6 +7112,8 @@ void GL_APIENTRY TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params)
} }
} }
// GL_OES_texture_cube_map_array
// GL_OES_texture_half_float // GL_OES_texture_half_float
// GL_OES_texture_storage_multisample_2d_array // GL_OES_texture_storage_multisample_2d_array
src/libGLESv2/entry_points_gles_ext_autogen.h
...@@ -843,6 +843,8 @@ ANGLE_EXPORT void GL_APIENTRY ImportSemaphoreFdEXT(GLuint semaphore, GLenum hand ...@@ -843,6 +843,8 @@ ANGLE_EXPORT void GL_APIENTRY ImportSemaphoreFdEXT(GLuint semaphore, GLenum hand
// GL_EXT_texture_compression_s3tc_srgb // GL_EXT_texture_compression_s3tc_srgb
// GL_EXT_texture_cube_map_array
// GL_EXT_texture_filter_anisotropic // GL_EXT_texture_filter_anisotropic
// GL_EXT_texture_format_BGRA8888 // GL_EXT_texture_format_BGRA8888
...@@ -1132,6 +1134,8 @@ ANGLE_EXPORT void GL_APIENTRY TexGenivOES(GLenum coord, GLenum pname, const GLin ...@@ -1132,6 +1134,8 @@ ANGLE_EXPORT void GL_APIENTRY TexGenivOES(GLenum coord, GLenum pname, const GLin
ANGLE_EXPORT void GL_APIENTRY TexGenxOES(GLenum coord, GLenum pname, GLfixed param); ANGLE_EXPORT void GL_APIENTRY TexGenxOES(GLenum coord, GLenum pname, GLfixed param);
ANGLE_EXPORT void GL_APIENTRY TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params); ANGLE_EXPORT void GL_APIENTRY TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params);
// GL_OES_texture_cube_map_array
// GL_OES_texture_half_float // GL_OES_texture_half_float
// GL_OES_texture_storage_multisample_2d_array // GL_OES_texture_storage_multisample_2d_array
......
src/libGLESv2/libGLESv2_autogen.cpp
...@@ -4183,6 +4183,8 @@ void GL_APIENTRY glImportSemaphoreFdEXT(GLuint semaphore, GLenum handleType, GLi ...@@ -4183,6 +4183,8 @@ void GL_APIENTRY glImportSemaphoreFdEXT(GLuint semaphore, GLenum handleType, GLi
// GL_EXT_texture_compression_s3tc_srgb // GL_EXT_texture_compression_s3tc_srgb
// GL_EXT_texture_cube_map_array
// GL_EXT_texture_filter_anisotropic // GL_EXT_texture_filter_anisotropic
// GL_EXT_texture_format_BGRA8888 // GL_EXT_texture_format_BGRA8888
...@@ -4804,6 +4806,8 @@ void GL_APIENTRY glTexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params ...@@ -4804,6 +4806,8 @@ void GL_APIENTRY glTexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params
return gl::TexGenxvOES(coord, pname, params); return gl::TexGenxvOES(coord, pname, params);
} }
// GL_OES_texture_cube_map_array
// GL_OES_texture_half_float // GL_OES_texture_half_float
// GL_OES_texture_storage_multisample_2d_array // GL_OES_texture_storage_multisample_2d_array
......
src/libGLESv2/libGLESv2_autogen.def
...@@ -718,6 +718,8 @@ EXPORTS ...@@ -718,6 +718,8 @@ EXPORTS
; GL_EXT_texture_compression_s3tc_srgb ; GL_EXT_texture_compression_s3tc_srgb
; GL_EXT_texture_cube_map_array
; GL_EXT_texture_filter_anisotropic ; GL_EXT_texture_filter_anisotropic
; GL_EXT_texture_format_BGRA8888 ; GL_EXT_texture_format_BGRA8888
...@@ -854,6 +856,8 @@ EXPORTS ...@@ -854,6 +856,8 @@ EXPORTS
glTexGenxOES glTexGenxOES
glTexGenxvOES glTexGenxvOES
; GL_OES_texture_cube_map_array
; GL_OES_texture_half_float ; GL_OES_texture_half_float
; GL_OES_texture_storage_multisample_2d_array ; GL_OES_texture_storage_multisample_2d_array
......
src/libGLESv2/libGLESv2_no_capture_autogen.def
...@@ -718,6 +718,8 @@ EXPORTS ...@@ -718,6 +718,8 @@ EXPORTS
; GL_EXT_texture_compression_s3tc_srgb ; GL_EXT_texture_compression_s3tc_srgb
; GL_EXT_texture_cube_map_array
; GL_EXT_texture_filter_anisotropic ; GL_EXT_texture_filter_anisotropic
; GL_EXT_texture_format_BGRA8888 ; GL_EXT_texture_format_BGRA8888
...@@ -854,6 +856,8 @@ EXPORTS ...@@ -854,6 +856,8 @@ EXPORTS
glTexGenxOES glTexGenxOES
glTexGenxvOES glTexGenxvOES
; GL_OES_texture_cube_map_array
; GL_OES_texture_half_float ; GL_OES_texture_half_float
; GL_OES_texture_storage_multisample_2d_array ; GL_OES_texture_storage_multisample_2d_array
......
src/libGLESv2/libGLESv2_with_capture_autogen.def
...@@ -718,6 +718,8 @@ EXPORTS ...@@ -718,6 +718,8 @@ EXPORTS
; GL_EXT_texture_compression_s3tc_srgb ; GL_EXT_texture_compression_s3tc_srgb
; GL_EXT_texture_cube_map_array
; GL_EXT_texture_filter_anisotropic ; GL_EXT_texture_filter_anisotropic
; GL_EXT_texture_format_BGRA8888 ; GL_EXT_texture_format_BGRA8888
...@@ -854,6 +856,8 @@ EXPORTS ...@@ -854,6 +856,8 @@ EXPORTS
glTexGenxOES glTexGenxOES
glTexGenxvOES glTexGenxvOES
; GL_OES_texture_cube_map_array
; GL_OES_texture_half_float ; GL_OES_texture_half_float
; GL_OES_texture_storage_multisample_2d_array ; GL_OES_texture_storage_multisample_2d_array
......
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