From a2d9abef043b3eb44798241983d63785a9aad6fc Mon Sep 17 00:00:00 2001 From: Mohan Maiya Date: Thu, 1 Oct 2020 16:28:59 -0700 Subject: [PATCH] Vulkan: Add OES_sample_shading extension entry points Addition of just the entry points for OES_sample_shading extension. Bug: angleproject:3587 Change-Id: I7ef5ceb846d130c2d1e0b4ea7dcbe92452b5d7d3 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2444212 Commit-Queue: Mohan Maiya Reviewed-by: Jamie Madill Reviewed-by: Shahbaz Youssefi --- .../GLES2/gl2ext_explicit_context_autogen.inc | 2 + .../GL_EGL_WGL_loader.json | 10 ++--- .../GL_EGL_entry_points.json | 26 ++++++------ .../GLenum_value_to_string_map.json | 2 +- .../code_generation_hashes/proc_table.json | 4 +- scripts/registry_xml.py | 1 + src/libANGLE/Context_gles_ext_autogen.h | 1 + src/libANGLE/capture_gles_ext_autogen.cpp | 9 +++++ src/libANGLE/capture_gles_ext_autogen.h | 5 +++ src/libANGLE/entry_points_enum_autogen.cpp | 2 + src/libANGLE/entry_points_enum_autogen.h | 1 + src/libANGLE/validationES31.cpp | 6 +++ src/libANGLE/validationESEXT_autogen.h | 3 ++ .../entry_points_gles_ext_autogen.cpp | 40 +++++++++++++++++++ src/libGLESv2/entry_points_gles_ext_autogen.h | 4 ++ src/libGLESv2/libGLESv2_autogen.cpp | 11 +++++ src/libGLESv2/libGLESv2_autogen.def | 4 ++ .../libGLESv2_no_capture_autogen.def | 4 ++ .../libGLESv2_with_capture_autogen.def | 4 ++ src/libGLESv2/proc_table_egl_autogen.cpp | 4 +- .../trace_gles_loader_autogen.cpp | 7 ++++ .../trace_gles_loader_autogen.h | 5 +++ util/gles_loader_autogen.cpp | 7 ++++ util/gles_loader_autogen.h | 5 +++ 24 files changed, 145 insertions(+), 22 deletions(-) diff --git a/include/GLES2/gl2ext_explicit_context_autogen.inc b/include/GLES2/gl2ext_explicit_context_autogen.inc index 6807f6955..31f9cdeb0 100644 --- a/include/GLES2/gl2ext_explicit_context_autogen.inc +++ b/include/GLES2/gl2ext_explicit_context_autogen.inc @@ -249,6 +249,7 @@ typedef void *(GL_APIENTRYP PFNGLMAPBUFFEROESCONTEXTANGLEPROC)(GLeglContext ctx, typedef void *(GL_APIENTRYP PFNGLMAPBUFFERRANGEEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); typedef void (GL_APIENTRYP PFNGLMAXSHADERCOMPILERTHREADSKHRCONTEXTANGLEPROC)(GLeglContext ctx, GLuint count); typedef void (GL_APIENTRYP PFNGLMEMORYOBJECTPARAMETERIVEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint memoryObject, GLenum pname, const GLint *params); +typedef void (GL_APIENTRYP PFNGLMINSAMPLESHADINGOESCONTEXTANGLEPROC)(GLeglContext ctx, GLfloat value); typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex); typedef void (GL_APIENTRYP PFNGLOBJECTLABELKHRCONTEXTANGLEPROC)(GLeglContext ctx, GLenum identifier, GLuint name, GLsizei length, const GLchar *label); typedef void (GL_APIENTRYP PFNGLOBJECTPTRLABELKHRCONTEXTANGLEPROC)(GLeglContext ctx, const void *ptr, GLsizei length, const GLchar *label); @@ -627,6 +628,7 @@ GL_APICALL void *GL_APIENTRY glMapBufferOESContextANGLE(GLeglContext ctx, GLenum GL_APICALL void *GL_APIENTRY glMapBufferRangeEXTContextANGLE(GLeglContext ctx, GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); GL_APICALL void GL_APIENTRY glMaxShaderCompilerThreadsKHRContextANGLE(GLeglContext ctx, GLuint count); GL_APICALL void GL_APIENTRY glMemoryObjectParameterivEXTContextANGLE(GLeglContext ctx, GLuint memoryObject, GLenum pname, const GLint *params); +GL_APICALL void GL_APIENTRY glMinSampleShadingOESContextANGLE(GLeglContext ctx, GLfloat value); GL_APICALL void GL_APIENTRY glMultiDrawElementsBaseVertexEXTContextANGLE(GLeglContext ctx, GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex); GL_APICALL void GL_APIENTRY glObjectLabelKHRContextANGLE(GLeglContext ctx, GLenum identifier, GLuint name, GLsizei length, const GLchar *label); GL_APICALL void GL_APIENTRY glObjectPtrLabelKHRContextANGLE(GLeglContext ctx, const void *ptr, GLsizei length, const GLchar *label); diff --git a/scripts/code_generation_hashes/GL_EGL_WGL_loader.json b/scripts/code_generation_hashes/GL_EGL_WGL_loader.json index 4b3679ec6..c4ec5e5dc 100644 --- a/scripts/code_generation_hashes/GL_EGL_WGL_loader.json +++ b/scripts/code_generation_hashes/GL_EGL_WGL_loader.json @@ -10,7 +10,7 @@ "scripts/gl_angle_ext.xml": "5b91263f1099308e4e75f89d85be564e", "scripts/registry_xml.py": - "f421eb939974ca5fe3c2301acffb4985", + "e2e5d79fa0e069f8cfb00af8648899ed", "scripts/wgl.xml": "aa96419c582af2f6673430e2847693f4", "src/libEGL/egl_loader_autogen.cpp": @@ -22,17 +22,17 @@ "src/tests/restricted_traces/trace_egl_loader_autogen.h": "af2eb06cc8de3456b7bfde497b04c0c4", "src/tests/restricted_traces/trace_gles_loader_autogen.cpp": - "042b15665e979a934595f1a01dad0a1a", + "71c3cbbec732feb81a2f835f115e8c4a", "src/tests/restricted_traces/trace_gles_loader_autogen.h": - "27b0c9d7536604047c0795aa03a16b8d", + "0990dda962925179f017ece0c3c4406a", "util/egl_loader_autogen.cpp": "e10da66fdf789e6c52dee1f9e1cd5a68", "util/egl_loader_autogen.h": "5e2ac71185c91139c6768adf8615b3c7", "util/gles_loader_autogen.cpp": - "1f0bf4b10f18d59bc5d0d556aa0aaebb", + "dbc93fd694ff3a3bd35b58061d4510b5", "util/gles_loader_autogen.h": - "8a8ef0e937a3d27732aee63a8ac6d780", + "0a523b24fd90422d053387d3664a3283", "util/windows/wgl_loader_autogen.cpp": "60a40fba3ffddd40063fe6131bc67ba5", "util/windows/wgl_loader_autogen.h": diff --git a/scripts/code_generation_hashes/GL_EGL_entry_points.json b/scripts/code_generation_hashes/GL_EGL_entry_points.json index 10f6c6bf8..462085c0e 100644 --- a/scripts/code_generation_hashes/GL_EGL_entry_points.json +++ b/scripts/code_generation_hashes/GL_EGL_entry_points.json @@ -12,7 +12,7 @@ "scripts/gl_angle_ext.xml": "5b91263f1099308e4e75f89d85be564e", "scripts/registry_xml.py": - "f421eb939974ca5fe3c2301acffb4985", + "e2e5d79fa0e069f8cfb00af8648899ed", "scripts/wgl.xml": "aa96419c582af2f6673430e2847693f4", "src/libANGLE/Context_gl_1_0_autogen.h": @@ -64,7 +64,7 @@ "src/libANGLE/Context_gles_3_2_autogen.h": "48567dca16fd881dfe6d61fee0e3106f", "src/libANGLE/Context_gles_ext_autogen.h": - "d5f4caa9a62ea98fbbe384ff37ea7844", + "89dc281ce4f8fbfcfdff1d6263882dd7", "src/libANGLE/capture_gles_1_0_autogen.cpp": "1ee3e4aceb1afa9585aa458c600665a9", "src/libANGLE/capture_gles_1_0_autogen.h": @@ -86,13 +86,13 @@ "src/libANGLE/capture_gles_3_2_autogen.h": "3d8f561944c8e5c06c7c9e68559ff364", "src/libANGLE/capture_gles_ext_autogen.cpp": - "701406c4e0704c416e3577fa2766de2b", + "e4142af478cbb131c8fbca7504deb55b", "src/libANGLE/capture_gles_ext_autogen.h": - "0ea709677f797f58ed77294c63c27997", + "9df761d3f7a430b4f885690411cc54c5", "src/libANGLE/entry_points_enum_autogen.cpp": - "6eba92f7df9d0896ed6e6e633704ad2d", + "03edfd547bea911b82a0b1c32b3a03fc", "src/libANGLE/entry_points_enum_autogen.h": - "5bfe6a82d530ef5ff020239e24dbfb57", + "c4db2fc61fe36b316315e55aa05f2554", "src/libANGLE/frame_capture_replay_autogen.cpp": "09901bfdd8b16c9e888380179b53aa7a", "src/libANGLE/frame_capture_utils_autogen.cpp": @@ -110,7 +110,7 @@ "src/libANGLE/validationES3_autogen.h": "86ba503835328438158d9a464943f3bd", "src/libANGLE/validationESEXT_autogen.h": - "d88620e6be6b7ad6fca01616902fbd92", + "1d49be6883ef711ead0254757ae60830", "src/libANGLE/validationGL11_autogen.h": "aadd145c1404de9c34d6b7c00404f10f", "src/libANGLE/validationGL12_autogen.h": @@ -250,15 +250,15 @@ "src/libGLESv2/entry_points_gles_3_2_autogen.h": "5798aa0a73af1d4ba5dfe99b6217a247", "src/libGLESv2/entry_points_gles_ext_autogen.cpp": - "d474603d5950bbfc42dae4a1d91c9c2b", + "f305a1ba1ca268ac647a77f38b994455", "src/libGLESv2/entry_points_gles_ext_autogen.h": - "6d115fefeb5f3ceb605d7525d8b55be2", + "879ce9d1859bb776a032678f877a259e", "src/libGLESv2/libGLESv2_autogen.cpp": - "86697d38957d11fffe0ea83bb7bf26e0", + "b826634aed8a38cd8020ea2bd728b7c7", "src/libGLESv2/libGLESv2_autogen.def": - "1c6935497f1be9a224f6cf6f7f692ab2", + "242b12062e4f970c775463f9281d99bb", "src/libGLESv2/libGLESv2_no_capture_autogen.def": - "44a505badd1a6f08dcdd142023d4e5b9", + "82d1f68d8e73e2bdace1cab075e2d984", "src/libGLESv2/libGLESv2_with_capture_autogen.def": - "cc6ede0180e2882d8836a2f0940b3d3d" + "8d2c8ca8af7ac94e1786c5d6a601d738" } \ No newline at end of file diff --git a/scripts/code_generation_hashes/GLenum_value_to_string_map.json b/scripts/code_generation_hashes/GLenum_value_to_string_map.json index 5620178ed..9ce802879 100644 --- a/scripts/code_generation_hashes/GLenum_value_to_string_map.json +++ b/scripts/code_generation_hashes/GLenum_value_to_string_map.json @@ -6,7 +6,7 @@ "scripts/gl_angle_ext.xml": "5b91263f1099308e4e75f89d85be564e", "scripts/registry_xml.py": - "f421eb939974ca5fe3c2301acffb4985", + "e2e5d79fa0e069f8cfb00af8648899ed", "src/libANGLE/gl_enum_utils_autogen.cpp": "375cbe993124522fc0668b9feb74f234", "src/libANGLE/gl_enum_utils_autogen.h": diff --git a/scripts/code_generation_hashes/proc_table.json b/scripts/code_generation_hashes/proc_table.json index e019849df..75b5644fa 100644 --- a/scripts/code_generation_hashes/proc_table.json +++ b/scripts/code_generation_hashes/proc_table.json @@ -10,11 +10,11 @@ "scripts/gl_angle_ext.xml": "5b91263f1099308e4e75f89d85be564e", "scripts/registry_xml.py": - "f421eb939974ca5fe3c2301acffb4985", + "e2e5d79fa0e069f8cfb00af8648899ed", "scripts/wgl.xml": "aa96419c582af2f6673430e2847693f4", "src/libGL/proc_table_wgl_autogen.cpp": "253f59ef3aa9ccfcab1364ae5101dbe2", "src/libGLESv2/proc_table_egl_autogen.cpp": - "829888d1aae6ad492614581f0e88b4b0" + "8940c4746d3bce34bcc7f90d3320f650" } \ No newline at end of file diff --git a/scripts/registry_xml.py b/scripts/registry_xml.py index e596e8ae7..648f86672 100644 --- a/scripts/registry_xml.py +++ b/scripts/registry_xml.py @@ -106,6 +106,7 @@ gles_extensions = [ "GL_OES_EGL_image", "GL_OES_get_program_binary", "GL_OES_mapbuffer", + "GL_OES_sample_shading", "GL_OES_texture_3D", "GL_OES_texture_border_clamp", "GL_OES_texture_buffer", diff --git a/src/libANGLE/Context_gles_ext_autogen.h b/src/libANGLE/Context_gles_ext_autogen.h index f2d05c856..3b70fb9ec 100644 --- a/src/libANGLE/Context_gles_ext_autogen.h +++ b/src/libANGLE/Context_gles_ext_autogen.h @@ -410,6 +410,7 @@ /* GL_OES_get_program_binary */ \ /* GL_OES_mapbuffer */ \ void *mapBuffer(BufferBinding targetPacked, GLenum access); \ + /* GL_OES_sample_shading */ \ /* GL_OES_texture_3D */ \ void framebufferTexture3D(GLenum target, GLenum attachment, TextureTarget textargetPacked, \ TextureID texturePacked, GLint level, GLint zoffset); \ diff --git a/src/libANGLE/capture_gles_ext_autogen.cpp b/src/libANGLE/capture_gles_ext_autogen.cpp index 30476fc03..1e4c5ca3e 100644 --- a/src/libANGLE/capture_gles_ext_autogen.cpp +++ b/src/libANGLE/capture_gles_ext_autogen.cpp @@ -7960,6 +7960,15 @@ CallCapture CaptureQueryMatrixxOES(const State &glState, return CallCapture(gl::EntryPoint::QueryMatrixxOES, std::move(paramBuffer)); } +CallCapture CaptureMinSampleShadingOES(const State &glState, bool isCallValid, GLfloat value) +{ + ParamBuffer paramBuffer; + + paramBuffer.addValueParam("value", ParamType::TGLfloat, value); + + return CallCapture(gl::EntryPoint::MinSampleShadingOES, std::move(paramBuffer)); +} + CallCapture CaptureCompressedTexImage3DOES(const State &glState, bool isCallValid, TextureTarget targetPacked, diff --git a/src/libANGLE/capture_gles_ext_autogen.h b/src/libANGLE/capture_gles_ext_autogen.h index 3399c9820..e0e1567fb 100644 --- a/src/libANGLE/capture_gles_ext_autogen.h +++ b/src/libANGLE/capture_gles_ext_autogen.h @@ -1693,6 +1693,11 @@ angle::CallCapture CaptureQueryMatrixxOES(const State &glState, GLint *exponent, GLbitfield returnValue); +// GL_OES_sample_shading +angle::CallCapture CaptureMinSampleShadingOES(const State &glState, + bool isCallValid, + GLfloat value); + // GL_OES_texture_3D angle::CallCapture CaptureCompressedTexImage3DOES(const State &glState, bool isCallValid, diff --git a/src/libANGLE/entry_points_enum_autogen.cpp b/src/libANGLE/entry_points_enum_autogen.cpp index 2a7b7c639..ea4aedc07 100644 --- a/src/libANGLE/entry_points_enum_autogen.cpp +++ b/src/libANGLE/entry_points_enum_autogen.cpp @@ -1466,6 +1466,8 @@ const char *GetEntryPointName(EntryPoint ep) return "glMemoryObjectParameterivEXT"; case EntryPoint::MinSampleShading: return "glMinSampleShading"; + case EntryPoint::MinSampleShadingOES: + return "glMinSampleShadingOES"; case EntryPoint::MultMatrixd: return "glMultMatrixd"; case EntryPoint::MultMatrixf: diff --git a/src/libANGLE/entry_points_enum_autogen.h b/src/libANGLE/entry_points_enum_autogen.h index 32801ba2f..dc7f828c2 100644 --- a/src/libANGLE/entry_points_enum_autogen.h +++ b/src/libANGLE/entry_points_enum_autogen.h @@ -739,6 +739,7 @@ enum class EntryPoint MemoryBarrierByRegion, MemoryObjectParameterivEXT, MinSampleShading, + MinSampleShadingOES, MultMatrixd, MultMatrixf, MultMatrixx, diff --git a/src/libANGLE/validationES31.cpp b/src/libANGLE/validationES31.cpp index 0c7d01448..47c846e09 100644 --- a/src/libANGLE/validationES31.cpp +++ b/src/libANGLE/validationES31.cpp @@ -2006,6 +2006,12 @@ bool ValidateSampleMaski(const Context *context, GLuint maskNumber, GLbitfield m return ValidateSampleMaskiBase(context, maskNumber, mask); } +bool ValidateMinSampleShadingOES(const Context *context, GLfloat value) +{ + UNIMPLEMENTED(); + return false; +} + bool ValidateFramebufferTextureEXT(const Context *context, GLenum target, GLenum attachment, diff --git a/src/libANGLE/validationESEXT_autogen.h b/src/libANGLE/validationESEXT_autogen.h index bbb98949a..5f8e87c56 100644 --- a/src/libANGLE/validationESEXT_autogen.h +++ b/src/libANGLE/validationESEXT_autogen.h @@ -1355,6 +1355,9 @@ bool ValidateQueryMatrixxOES(const Context *context, const GLfixed *mantissa, const GLint *exponent); +// GL_OES_sample_shading +bool ValidateMinSampleShadingOES(const Context *context, GLfloat value); + // GL_OES_texture_3D bool ValidateCompressedTexImage3DOES(const Context *context, TextureTarget targetPacked, diff --git a/src/libGLESv2/entry_points_gles_ext_autogen.cpp b/src/libGLESv2/entry_points_gles_ext_autogen.cpp index 4c837421f..66a639cc4 100644 --- a/src/libGLESv2/entry_points_gles_ext_autogen.cpp +++ b/src/libGLESv2/entry_points_gles_ext_autogen.cpp @@ -6779,6 +6779,26 @@ GLbitfield GL_APIENTRY QueryMatrixxOES(GLfixed *mantissa, GLint *exponent) return returnValue; } +// GL_OES_sample_shading +void GL_APIENTRY MinSampleShadingOES(GLfloat value) +{ + Context *context = GetValidGlobalContext(); + EVENT(context, "glMinSampleShadingOES", "context = %d, GLfloat value = %f", CID(context), + value); + + if (context) + { + std::unique_lock shareContextLock = GetShareGroupLock(context); + bool isCallValid = + (context->skipValidation() || ValidateMinSampleShadingOES(context, value)); + if (isCallValid) + { + context->minSampleShading(value); + } + ANGLE_CAPTURE(MinSampleShadingOES, isCallValid, context, value); + } +} + // GL_OES_texture_3D void GL_APIENTRY CompressedTexImage3DOES(GLenum target, GLint level, @@ -17888,6 +17908,26 @@ void GL_APIENTRY MinSampleShadingContextANGLE(GLeglContext ctx, GLfloat value) } } +void GL_APIENTRY MinSampleShadingOESContextANGLE(GLeglContext ctx, GLfloat value) +{ + Context *context = static_cast(ctx); + EVENT(context, "glMinSampleShadingOES", "context = %d, GLfloat value = %f", CID(context), + value); + + if (context) + { + ASSERT(context == GetValidGlobalContext()); + std::unique_lock shareContextLock = GetShareGroupLock(context); + bool isCallValid = + (context->skipValidation() || ValidateMinSampleShadingOES(context, value)); + if (isCallValid) + { + context->minSampleShading(value); + } + ANGLE_CAPTURE(MinSampleShadingOES, isCallValid, context, value); + } +} + void GL_APIENTRY MultMatrixfContextANGLE(GLeglContext ctx, const GLfloat *m) { Context *context = static_cast(ctx); diff --git a/src/libGLESv2/entry_points_gles_ext_autogen.h b/src/libGLESv2/entry_points_gles_ext_autogen.h index 1c221503a..5986ff974 100644 --- a/src/libGLESv2/entry_points_gles_ext_autogen.h +++ b/src/libGLESv2/entry_points_gles_ext_autogen.h @@ -1101,6 +1101,9 @@ ANGLE_EXPORT void GL_APIENTRY PointSizePointerOES(GLenum type, GLsizei stride, c // GL_OES_query_matrix ANGLE_EXPORT GLbitfield GL_APIENTRY QueryMatrixxOES(GLfixed *mantissa, GLint *exponent); +// GL_OES_sample_shading +ANGLE_EXPORT void GL_APIENTRY MinSampleShadingOES(GLfloat value); + // GL_OES_texture_3D ANGLE_EXPORT void GL_APIENTRY CompressedTexImage3DOES(GLenum target, GLint level, @@ -2674,6 +2677,7 @@ ANGLE_EXPORT void GL_APIENTRY MemoryObjectParameterivEXTContextANGLE(GLeglContex GLenum pname, const GLint *params); ANGLE_EXPORT void GL_APIENTRY MinSampleShadingContextANGLE(GLeglContext ctx, GLfloat value); +ANGLE_EXPORT void GL_APIENTRY MinSampleShadingOESContextANGLE(GLeglContext ctx, GLfloat value); ANGLE_EXPORT void GL_APIENTRY MultMatrixfContextANGLE(GLeglContext ctx, const GLfloat *m); ANGLE_EXPORT void GL_APIENTRY MultMatrixxContextANGLE(GLeglContext ctx, const GLfixed *m); ANGLE_EXPORT void GL_APIENTRY MultiDrawElementsBaseVertexEXTContextANGLE(GLeglContext ctx, diff --git a/src/libGLESv2/libGLESv2_autogen.cpp b/src/libGLESv2/libGLESv2_autogen.cpp index 3238f7af0..278f56340 100644 --- a/src/libGLESv2/libGLESv2_autogen.cpp +++ b/src/libGLESv2/libGLESv2_autogen.cpp @@ -4721,6 +4721,12 @@ GLbitfield GL_APIENTRY glQueryMatrixxOES(GLfixed *mantissa, GLint *exponent) return gl::QueryMatrixxOES(mantissa, exponent); } +// GL_OES_sample_shading +void GL_APIENTRY glMinSampleShadingOES(GLfloat value) +{ + return gl::MinSampleShadingOES(value); +} + // GL_OES_texture_3D void GL_APIENTRY glCompressedTexImage3DOES(GLenum target, GLint level, @@ -7864,6 +7870,11 @@ void GL_APIENTRY glMinSampleShadingContextANGLE(GLeglContext ctx, GLfloat value) return gl::MinSampleShadingContextANGLE(ctx, value); } +void GL_APIENTRY glMinSampleShadingOESContextANGLE(GLeglContext ctx, GLfloat value) +{ + return gl::MinSampleShadingOESContextANGLE(ctx, value); +} + void GL_APIENTRY glMultMatrixfContextANGLE(GLeglContext ctx, const GLfloat *m) { return gl::MultMatrixfContextANGLE(ctx, m); diff --git a/src/libGLESv2/libGLESv2_autogen.def b/src/libGLESv2/libGLESv2_autogen.def index 6867db0ab..154e9d833 100644 --- a/src/libGLESv2/libGLESv2_autogen.def +++ b/src/libGLESv2/libGLESv2_autogen.def @@ -840,6 +840,9 @@ EXPORTS ; GL_OES_query_matrix glQueryMatrixxOES + ; GL_OES_sample_shading + glMinSampleShadingOES + ; GL_OES_texture_3D glCompressedTexImage3DOES glCompressedTexSubImage3DOES @@ -1352,6 +1355,7 @@ EXPORTS glMemoryBarrierByRegionContextANGLE glMemoryObjectParameterivEXTContextANGLE glMinSampleShadingContextANGLE + glMinSampleShadingOESContextANGLE glMultMatrixfContextANGLE glMultMatrixxContextANGLE glMultiDrawArraysANGLEContextANGLE diff --git a/src/libGLESv2/libGLESv2_no_capture_autogen.def b/src/libGLESv2/libGLESv2_no_capture_autogen.def index 03196832b..f9129d397 100644 --- a/src/libGLESv2/libGLESv2_no_capture_autogen.def +++ b/src/libGLESv2/libGLESv2_no_capture_autogen.def @@ -840,6 +840,9 @@ EXPORTS ; GL_OES_query_matrix glQueryMatrixxOES + ; GL_OES_sample_shading + glMinSampleShadingOES + ; GL_OES_texture_3D glCompressedTexImage3DOES glCompressedTexSubImage3DOES @@ -1352,6 +1355,7 @@ EXPORTS glMemoryBarrierByRegionContextANGLE glMemoryObjectParameterivEXTContextANGLE glMinSampleShadingContextANGLE + glMinSampleShadingOESContextANGLE glMultMatrixfContextANGLE glMultMatrixxContextANGLE glMultiDrawArraysANGLEContextANGLE diff --git a/src/libGLESv2/libGLESv2_with_capture_autogen.def b/src/libGLESv2/libGLESv2_with_capture_autogen.def index 257e91a2a..15724cc14 100644 --- a/src/libGLESv2/libGLESv2_with_capture_autogen.def +++ b/src/libGLESv2/libGLESv2_with_capture_autogen.def @@ -840,6 +840,9 @@ EXPORTS ; GL_OES_query_matrix glQueryMatrixxOES + ; GL_OES_sample_shading + glMinSampleShadingOES + ; GL_OES_texture_3D glCompressedTexImage3DOES glCompressedTexSubImage3DOES @@ -1352,6 +1355,7 @@ EXPORTS glMemoryBarrierByRegionContextANGLE glMemoryObjectParameterivEXTContextANGLE glMinSampleShadingContextANGLE + glMinSampleShadingOESContextANGLE glMultMatrixfContextANGLE glMultMatrixxContextANGLE glMultiDrawArraysANGLEContextANGLE diff --git a/src/libGLESv2/proc_table_egl_autogen.cpp b/src/libGLESv2/proc_table_egl_autogen.cpp index b70c40ae9..4ad1a7f20 100644 --- a/src/libGLESv2/proc_table_egl_autogen.cpp +++ b/src/libGLESv2/proc_table_egl_autogen.cpp @@ -1094,6 +1094,8 @@ const ProcEntry g_procTable[] = { {"glMemoryObjectParameterivEXTContextANGLE", P(gl::MemoryObjectParameterivEXTContextANGLE)}, {"glMinSampleShading", P(gl::MinSampleShading)}, {"glMinSampleShadingContextANGLE", P(gl::MinSampleShadingContextANGLE)}, + {"glMinSampleShadingOES", P(gl::MinSampleShadingOES)}, + {"glMinSampleShadingOESContextANGLE", P(gl::MinSampleShadingOESContextANGLE)}, {"glMultMatrixf", P(gl::MultMatrixf)}, {"glMultMatrixfContextANGLE", P(gl::MultMatrixfContextANGLE)}, {"glMultMatrixx", P(gl::MultMatrixx)}, @@ -1629,5 +1631,5 @@ const ProcEntry g_procTable[] = { {"glWeightPointerOES", P(gl::WeightPointerOES)}, {"glWeightPointerOESContextANGLE", P(gl::WeightPointerOESContextANGLE)}}; -const size_t g_numProcs = 1532; +const size_t g_numProcs = 1534; } // namespace egl diff --git a/src/tests/restricted_traces/trace_gles_loader_autogen.cpp b/src/tests/restricted_traces/trace_gles_loader_autogen.cpp index f0215311c..5ba0759f5 100644 --- a/src/tests/restricted_traces/trace_gles_loader_autogen.cpp +++ b/src/tests/restricted_traces/trace_gles_loader_autogen.cpp @@ -644,6 +644,7 @@ ANGLE_TRACE_EXPORT PFNGLPROGRAMBINARYOESPROC t_glProgramBinaryOES; ANGLE_TRACE_EXPORT PFNGLGETBUFFERPOINTERVOESPROC t_glGetBufferPointervOES; ANGLE_TRACE_EXPORT PFNGLMAPBUFFEROESPROC t_glMapBufferOES; ANGLE_TRACE_EXPORT PFNGLUNMAPBUFFEROESPROC t_glUnmapBufferOES; +ANGLE_TRACE_EXPORT PFNGLMINSAMPLESHADINGOESPROC t_glMinSampleShadingOES; ANGLE_TRACE_EXPORT PFNGLCOMPRESSEDTEXIMAGE3DOESPROC t_glCompressedTexImage3DOES; ANGLE_TRACE_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE3DOESPROC t_glCompressedTexSubImage3DOES; ANGLE_TRACE_EXPORT PFNGLCOPYTEXSUBIMAGE3DOESPROC t_glCopyTexSubImage3DOES; @@ -1481,6 +1482,7 @@ ANGLE_TRACE_EXPORT PFNGLPROGRAMBINARYOESCONTEXTANGLEPROC t_glProgramBinaryOESCon ANGLE_TRACE_EXPORT PFNGLGETBUFFERPOINTERVOESCONTEXTANGLEPROC t_glGetBufferPointervOESContextANGLE; ANGLE_TRACE_EXPORT PFNGLMAPBUFFEROESCONTEXTANGLEPROC t_glMapBufferOESContextANGLE; ANGLE_TRACE_EXPORT PFNGLUNMAPBUFFEROESCONTEXTANGLEPROC t_glUnmapBufferOESContextANGLE; +ANGLE_TRACE_EXPORT PFNGLMINSAMPLESHADINGOESCONTEXTANGLEPROC t_glMinSampleShadingOESContextANGLE; ANGLE_TRACE_EXPORT PFNGLCOMPRESSEDTEXIMAGE3DOESCONTEXTANGLEPROC t_glCompressedTexImage3DOESContextANGLE; ANGLE_TRACE_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE3DOESCONTEXTANGLEPROC @@ -2557,6 +2559,8 @@ void LoadGLES(LoadProc loadProc) reinterpret_cast(loadProc("glGetBufferPointervOES")); t_glMapBufferOES = reinterpret_cast(loadProc("glMapBufferOES")); t_glUnmapBufferOES = reinterpret_cast(loadProc("glUnmapBufferOES")); + t_glMinSampleShadingOES = + reinterpret_cast(loadProc("glMinSampleShadingOES")); t_glCompressedTexImage3DOES = reinterpret_cast(loadProc("glCompressedTexImage3DOES")); t_glCompressedTexSubImage3DOES = reinterpret_cast( @@ -4123,6 +4127,9 @@ void LoadGLES(LoadProc loadProc) reinterpret_cast(loadProc("glMapBufferOESContextANGLE")); t_glUnmapBufferOESContextANGLE = reinterpret_cast( loadProc("glUnmapBufferOESContextANGLE")); + t_glMinSampleShadingOESContextANGLE = + reinterpret_cast( + loadProc("glMinSampleShadingOESContextANGLE")); t_glCompressedTexImage3DOESContextANGLE = reinterpret_cast( loadProc("glCompressedTexImage3DOESContextANGLE")); diff --git a/src/tests/restricted_traces/trace_gles_loader_autogen.h b/src/tests/restricted_traces/trace_gles_loader_autogen.h index a15548310..7b87bf65e 100644 --- a/src/tests/restricted_traces/trace_gles_loader_autogen.h +++ b/src/tests/restricted_traces/trace_gles_loader_autogen.h @@ -634,6 +634,7 @@ #define glGetBufferPointervOES t_glGetBufferPointervOES #define glMapBufferOES t_glMapBufferOES #define glUnmapBufferOES t_glUnmapBufferOES +#define glMinSampleShadingOES t_glMinSampleShadingOES #define glCompressedTexImage3DOES t_glCompressedTexImage3DOES #define glCompressedTexSubImage3DOES t_glCompressedTexSubImage3DOES #define glCopyTexSubImage3DOES t_glCopyTexSubImage3DOES @@ -1343,6 +1344,7 @@ #define glGetBufferPointervOESContextANGLE t_glGetBufferPointervOESContextANGLE #define glMapBufferOESContextANGLE t_glMapBufferOESContextANGLE #define glUnmapBufferOESContextANGLE t_glUnmapBufferOESContextANGLE +#define glMinSampleShadingOESContextANGLE t_glMinSampleShadingOESContextANGLE #define glCompressedTexImage3DOESContextANGLE t_glCompressedTexImage3DOESContextANGLE #define glCompressedTexSubImage3DOESContextANGLE t_glCompressedTexSubImage3DOESContextANGLE #define glCopyTexSubImage3DOESContextANGLE t_glCopyTexSubImage3DOESContextANGLE @@ -2065,6 +2067,7 @@ ANGLE_TRACE_EXPORT extern PFNGLPROGRAMBINARYOESPROC t_glProgramBinaryOES; ANGLE_TRACE_EXPORT extern PFNGLGETBUFFERPOINTERVOESPROC t_glGetBufferPointervOES; ANGLE_TRACE_EXPORT extern PFNGLMAPBUFFEROESPROC t_glMapBufferOES; ANGLE_TRACE_EXPORT extern PFNGLUNMAPBUFFEROESPROC t_glUnmapBufferOES; +ANGLE_TRACE_EXPORT extern PFNGLMINSAMPLESHADINGOESPROC t_glMinSampleShadingOES; ANGLE_TRACE_EXPORT extern PFNGLCOMPRESSEDTEXIMAGE3DOESPROC t_glCompressedTexImage3DOES; ANGLE_TRACE_EXPORT extern PFNGLCOMPRESSEDTEXSUBIMAGE3DOESPROC t_glCompressedTexSubImage3DOES; ANGLE_TRACE_EXPORT extern PFNGLCOPYTEXSUBIMAGE3DOESPROC t_glCopyTexSubImage3DOES; @@ -3005,6 +3008,8 @@ ANGLE_TRACE_EXPORT extern PFNGLGETBUFFERPOINTERVOESCONTEXTANGLEPROC t_glGetBufferPointervOESContextANGLE; ANGLE_TRACE_EXPORT extern PFNGLMAPBUFFEROESCONTEXTANGLEPROC t_glMapBufferOESContextANGLE; ANGLE_TRACE_EXPORT extern PFNGLUNMAPBUFFEROESCONTEXTANGLEPROC t_glUnmapBufferOESContextANGLE; +ANGLE_TRACE_EXPORT extern PFNGLMINSAMPLESHADINGOESCONTEXTANGLEPROC + t_glMinSampleShadingOESContextANGLE; ANGLE_TRACE_EXPORT extern PFNGLCOMPRESSEDTEXIMAGE3DOESCONTEXTANGLEPROC t_glCompressedTexImage3DOESContextANGLE; ANGLE_TRACE_EXPORT extern PFNGLCOMPRESSEDTEXSUBIMAGE3DOESCONTEXTANGLEPROC diff --git a/util/gles_loader_autogen.cpp b/util/gles_loader_autogen.cpp index 511df4400..6979da7c6 100644 --- a/util/gles_loader_autogen.cpp +++ b/util/gles_loader_autogen.cpp @@ -644,6 +644,7 @@ ANGLE_UTIL_EXPORT PFNGLPROGRAMBINARYOESPROC l_glProgramBinaryOES; ANGLE_UTIL_EXPORT PFNGLGETBUFFERPOINTERVOESPROC l_glGetBufferPointervOES; ANGLE_UTIL_EXPORT PFNGLMAPBUFFEROESPROC l_glMapBufferOES; ANGLE_UTIL_EXPORT PFNGLUNMAPBUFFEROESPROC l_glUnmapBufferOES; +ANGLE_UTIL_EXPORT PFNGLMINSAMPLESHADINGOESPROC l_glMinSampleShadingOES; ANGLE_UTIL_EXPORT PFNGLCOMPRESSEDTEXIMAGE3DOESPROC l_glCompressedTexImage3DOES; ANGLE_UTIL_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE3DOESPROC l_glCompressedTexSubImage3DOES; ANGLE_UTIL_EXPORT PFNGLCOPYTEXSUBIMAGE3DOESPROC l_glCopyTexSubImage3DOES; @@ -1481,6 +1482,7 @@ ANGLE_UTIL_EXPORT PFNGLPROGRAMBINARYOESCONTEXTANGLEPROC l_glProgramBinaryOESCont ANGLE_UTIL_EXPORT PFNGLGETBUFFERPOINTERVOESCONTEXTANGLEPROC l_glGetBufferPointervOESContextANGLE; ANGLE_UTIL_EXPORT PFNGLMAPBUFFEROESCONTEXTANGLEPROC l_glMapBufferOESContextANGLE; ANGLE_UTIL_EXPORT PFNGLUNMAPBUFFEROESCONTEXTANGLEPROC l_glUnmapBufferOESContextANGLE; +ANGLE_UTIL_EXPORT PFNGLMINSAMPLESHADINGOESCONTEXTANGLEPROC l_glMinSampleShadingOESContextANGLE; ANGLE_UTIL_EXPORT PFNGLCOMPRESSEDTEXIMAGE3DOESCONTEXTANGLEPROC l_glCompressedTexImage3DOESContextANGLE; ANGLE_UTIL_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE3DOESCONTEXTANGLEPROC @@ -2557,6 +2559,8 @@ void LoadGLES(LoadProc loadProc) reinterpret_cast(loadProc("glGetBufferPointervOES")); l_glMapBufferOES = reinterpret_cast(loadProc("glMapBufferOES")); l_glUnmapBufferOES = reinterpret_cast(loadProc("glUnmapBufferOES")); + l_glMinSampleShadingOES = + reinterpret_cast(loadProc("glMinSampleShadingOES")); l_glCompressedTexImage3DOES = reinterpret_cast(loadProc("glCompressedTexImage3DOES")); l_glCompressedTexSubImage3DOES = reinterpret_cast( @@ -4123,6 +4127,9 @@ void LoadGLES(LoadProc loadProc) reinterpret_cast(loadProc("glMapBufferOESContextANGLE")); l_glUnmapBufferOESContextANGLE = reinterpret_cast( loadProc("glUnmapBufferOESContextANGLE")); + l_glMinSampleShadingOESContextANGLE = + reinterpret_cast( + loadProc("glMinSampleShadingOESContextANGLE")); l_glCompressedTexImage3DOESContextANGLE = reinterpret_cast( loadProc("glCompressedTexImage3DOESContextANGLE")); diff --git a/util/gles_loader_autogen.h b/util/gles_loader_autogen.h index e4b154194..a9c89b879 100644 --- a/util/gles_loader_autogen.h +++ b/util/gles_loader_autogen.h @@ -634,6 +634,7 @@ #define glGetBufferPointervOES l_glGetBufferPointervOES #define glMapBufferOES l_glMapBufferOES #define glUnmapBufferOES l_glUnmapBufferOES +#define glMinSampleShadingOES l_glMinSampleShadingOES #define glCompressedTexImage3DOES l_glCompressedTexImage3DOES #define glCompressedTexSubImage3DOES l_glCompressedTexSubImage3DOES #define glCopyTexSubImage3DOES l_glCopyTexSubImage3DOES @@ -1343,6 +1344,7 @@ #define glGetBufferPointervOESContextANGLE l_glGetBufferPointervOESContextANGLE #define glMapBufferOESContextANGLE l_glMapBufferOESContextANGLE #define glUnmapBufferOESContextANGLE l_glUnmapBufferOESContextANGLE +#define glMinSampleShadingOESContextANGLE l_glMinSampleShadingOESContextANGLE #define glCompressedTexImage3DOESContextANGLE l_glCompressedTexImage3DOESContextANGLE #define glCompressedTexSubImage3DOESContextANGLE l_glCompressedTexSubImage3DOESContextANGLE #define glCopyTexSubImage3DOESContextANGLE l_glCopyTexSubImage3DOESContextANGLE @@ -2054,6 +2056,7 @@ ANGLE_UTIL_EXPORT extern PFNGLPROGRAMBINARYOESPROC l_glProgramBinaryOES; ANGLE_UTIL_EXPORT extern PFNGLGETBUFFERPOINTERVOESPROC l_glGetBufferPointervOES; ANGLE_UTIL_EXPORT extern PFNGLMAPBUFFEROESPROC l_glMapBufferOES; ANGLE_UTIL_EXPORT extern PFNGLUNMAPBUFFEROESPROC l_glUnmapBufferOES; +ANGLE_UTIL_EXPORT extern PFNGLMINSAMPLESHADINGOESPROC l_glMinSampleShadingOES; ANGLE_UTIL_EXPORT extern PFNGLCOMPRESSEDTEXIMAGE3DOESPROC l_glCompressedTexImage3DOES; ANGLE_UTIL_EXPORT extern PFNGLCOMPRESSEDTEXSUBIMAGE3DOESPROC l_glCompressedTexSubImage3DOES; ANGLE_UTIL_EXPORT extern PFNGLCOPYTEXSUBIMAGE3DOESPROC l_glCopyTexSubImage3DOES; @@ -2967,6 +2970,8 @@ ANGLE_UTIL_EXPORT extern PFNGLGETBUFFERPOINTERVOESCONTEXTANGLEPROC l_glGetBufferPointervOESContextANGLE; ANGLE_UTIL_EXPORT extern PFNGLMAPBUFFEROESCONTEXTANGLEPROC l_glMapBufferOESContextANGLE; ANGLE_UTIL_EXPORT extern PFNGLUNMAPBUFFEROESCONTEXTANGLEPROC l_glUnmapBufferOESContextANGLE; +ANGLE_UTIL_EXPORT extern PFNGLMINSAMPLESHADINGOESCONTEXTANGLEPROC + l_glMinSampleShadingOESContextANGLE; ANGLE_UTIL_EXPORT extern PFNGLCOMPRESSEDTEXIMAGE3DOESCONTEXTANGLEPROC l_glCompressedTexImage3DOESContextANGLE; ANGLE_UTIL_EXPORT extern PFNGLCOMPRESSEDTEXSUBIMAGE3DOESCONTEXTANGLEPROC