From 806e20f463c9b98b945f0095e07642362720256a Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 26 Feb 2001 22:07:03 +0000
Subject: fixed extension checking in _mesa_BlendEquation()

---
 src/mesa/main/blend.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'src/mesa/main/blend.c')

diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c
index ef1ec85c91..7232ae4d18 100644
--- a/src/mesa/main/blend.c
+++ b/src/mesa/main/blend.c
@@ -1,10 +1,10 @@
-/* $Id: blend.c,v 1.27 2000/12/26 05:09:27 keithw Exp $ */
+/* $Id: blend.c,v 1.28 2001/02/26 22:07:03 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
  *
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,7 +25,6 @@
  */
 
 
-
 #ifdef PC_HEADER
 #include "all.h"
 #else
@@ -272,18 +271,26 @@ _mesa_BlendEquation( GLenum mode )
 	      gl_lookup_enum_by_nr(mode));
 
    switch (mode) {
+      case GL_FUNC_ADD_EXT:
+         break;
       case GL_MIN_EXT:
       case GL_MAX_EXT:
-      case GL_FUNC_ADD_EXT:
-         if (!ctx->Extensions.EXT_blend_minmax) {
+         if (!ctx->Extensions.EXT_blend_minmax &&
+             !ctx->Extensions.ARB_imaging) {
             gl_error(ctx, GL_INVALID_ENUM, "glBlendEquation");
             return;
          }
+         break;
       case GL_LOGIC_OP:
+         if (!ctx->Extensions.EXT_blend_logic_op) {
+            gl_error(ctx, GL_INVALID_ENUM, "glBlendEquation");
+            return;
+         }
          break;
       case GL_FUNC_SUBTRACT_EXT:
       case GL_FUNC_REVERSE_SUBTRACT_EXT:
-         if (!ctx->Extensions.EXT_blend_subtract) {
+         if (!ctx->Extensions.EXT_blend_subtract &&
+             !ctx->Extensions.ARB_imaging) {
             gl_error(ctx, GL_INVALID_ENUM, "glBlendEquation");
             return;
          }
-- 
cgit v1.2.3