Mesa (master): i965: Don't advertise OpenGL 3.3+ if driconf disables GL_ARB_blend_func_extended

[GitLab Mirror]

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

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Wed Jan 27 11:55:01 2021 -0800

i965: Don't advertise OpenGL 3.3+ if driconf disables GL_ARB_blend_func_extended

This prevents the assertion added in "i965: Use
allow_higher_compat_version option during screen initialization" from
failing when disable_blend_func_extended=true.

Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7387>

---

 src/mesa/drivers/dri/i965/intel_screen.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index 1e34cbbca1a..1c7f0ae3e75 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -2492,6 +2492,16 @@ set_max_gl_versions(struct intel_screen *screen)
    default:
       unreachable("unrecognized intel_screen::gen");
    }
+
+   /* OpenGL 3.3+ requires GL_ARB_blend_func_extended.  Don't advertise those
+    * versions if driconf disables the extension.
+    */
+   if (driQueryOptionb(&screen->optionCache, "disable_blend_func_extended")) {
+      dri_screen->max_gl_core_version =
+         MIN2(32, dri_screen->max_gl_core_version);
+      dri_screen->max_gl_compat_version =
+         MIN2(32, dri_screen->max_gl_compat_version);
+   }
 }
 
 static void