Module: Mesa Branch: master Commit: a8ae1bc7672ea7c40d4116959388e212a2702be6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a8ae1bc7672ea7c40d4116959388e212a2702be6
Author: Ilia Mirkin <imir...@alum.mit.edu> Date: Fri Apr 1 22:08:13 2016 -0400 glapi: add KHR_blend_equation_advanced dispatch v2 (Ken): Fix enum values, drop _mesa_BlendBarrierKHR stub as Curro has already implemented it. v3 (Ken): Rework for _mesa_BlendBarrierKHR -> _mesa_BlendBarrier rename. Signed-off-by: Ilia Mirkin <imir...@alum.mit.edu> Signed-off-by: Kenneth Graunke <kenn...@whitecape.org> Reviewed-by: Francisco Jerez <curroje...@riseup.net> --- src/mapi/glapi/gen/gl_API.xml | 24 ++++++++++++++++++++++++ src/mesa/main/tests/dispatch_sanity.cpp | 6 ++++++ 2 files changed, 30 insertions(+) diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index 79e1ba1..b5d010b 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -8294,6 +8294,30 @@ <!-- ARB extension 171 --> <xi:include href="ARB_pipeline_statistics_query.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> +<category name="KHR_blend_equation_advanced" number="174"> + <enum name="BLEND_ADVANCED_COHERENT_KHR" value="0x9285"/> + + <enum name="MULTIPLY_KHR" value="0x9294"/> + <enum name="SCREEN_KHR" value="0x9295"/> + <enum name="OVERLAY_KHR" value="0x9296"/> + <enum name="DARKEN_KHR" value="0x9297"/> + <enum name="LIGHTEN_KHR" value="0x9298"/> + <enum name="COLORDODGE_KHR" value="0x9299"/> + <enum name="COLORBURN_KHR" value="0x929A"/> + <enum name="HARDLIGHT_KHR" value="0x929B"/> + <enum name="SOFTLIGHT_KHR" value="0x929C"/> + <enum name="DIFFERENCE_KHR" value="0x929E"/> + <enum name="EXCLUSION_KHR" value="0x92A0"/> + + <enum name="HSL_HUE_KHR" value="0x92AD"/> + <enum name="HSL_SATURATION_KHR" value="0x92AE"/> + <enum name="HSL_COLOR_KHR" value="0x92AF"/> + <enum name="HSL_LUMINOSITY_KHR" value="0x92B0"/> + + <function name="BlendBarrier" es2="3.2"/> + <function name="BlendBarrierKHR" alias="BlendBarrier" es2="2.0"/> +</category> + <!-- Non-ARB extensions sorted by extension number. --> <category name="GL_EXT_blend_color" number="2"> diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp index cfbf70d..a0bdd17 100644 --- a/src/mesa/main/tests/dispatch_sanity.cpp +++ b/src/mesa/main/tests/dispatch_sanity.cpp @@ -955,6 +955,9 @@ const struct function common_desktop_functions_possible[] = { /* GL_EXT_window_rectangles */ { "glWindowRectanglesEXT", 30, -1 }, + /* GL_KHR_blend_equation_advanced */ + { "glBlendBarrierKHR", 20, -1 }, + { NULL, 0, -1 } }; @@ -2322,6 +2325,9 @@ const struct function gles2_functions_possible[] = { { "glGetnUniformivKHR", 20, -1 }, { "glGetnUniformuivKHR", 20, -1 }, + /* GL_KHR_blend_equation_advanced */ + { "glBlendBarrierKHR", 20, -1 }, + { NULL, 0, -1 } }; _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit