Mesa (master): i965: Enable GL_KHR_blend_equation_advanced on G45 and later.

Kenneth Graunke kwg at kemper.freedesktop.org
Fri Aug 26 03:05:54 UTC 2016


Module: Mesa
Branch: master
Commit: c2b10cabed6468b998a9c4d0ada7953d93311029
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c2b10cabed6468b998a9c4d0ada7953d93311029

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Jun 27 23:02:24 2016 -0700

i965: Enable GL_KHR_blend_equation_advanced on G45 and later.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Francisco Jerez <currojerez at riseup.net>

---

 src/mesa/drivers/dri/i965/brw_link.cpp       | 2 ++
 src/mesa/drivers/dri/i965/intel_extensions.c | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp
index 1ad2369..4800be0 100644
--- a/src/mesa/drivers/dri/i965/brw_link.cpp
+++ b/src/mesa/drivers/dri/i965/brw_link.cpp
@@ -101,6 +101,8 @@ process_glsl_ir(gl_shader_stage stage,
 
    ralloc_adopt(mem_ctx, shader->ir);
 
+   lower_blend_equation_advanced(shader);
+
    /* lower_packing_builtins() inserts arithmetic instructions, so it
     * must precede lower_instructions().
     */
diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c
index 5092da5..48e8299 100644
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -281,8 +281,10 @@ intelInitExtensions(struct gl_context *ctx)
    ctx->Extensions.EXT_shader_integer_mix = ctx->Const.GLSLVersion >= 130;
    ctx->Extensions.MESA_shader_integer_functions = ctx->Const.GLSLVersion >= 130;
 
-   if (brw->is_g4x || brw->gen >= 5)
+   if (brw->is_g4x || brw->gen >= 5) {
       ctx->Extensions.MESA_shader_framebuffer_fetch_non_coherent = true;
+      ctx->Extensions.KHR_blend_equation_advanced = true;
+   }
 
    if (brw->gen >= 5) {
       ctx->Extensions.ARB_texture_query_levels = ctx->Const.GLSLVersion >= 130;




More information about the mesa-commit mailing list