From 841d5a1f023d890fc1110258738ff5d17e33df5d Mon Sep 17 00:00:00 2001
From: Steven Johnson <srj@google.com>
Date: Tue, 12 Jan 2021 13:50:57 -0800
Subject: [PATCH] Add TARGET_OPENGLCOMPUTE

Inadvertently removed code for properly enabling/disabling OGLC in #5626, this restores it properly
---
 Makefile           | 6 +++---
 src/CMakeLists.txt | 5 +++++
 src/Target.cpp     | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 921f8e388e3b..825a4a0fe9b7 100644
--- a/Makefile
+++ b/Makefile
@@ -120,7 +120,7 @@ WITH_WEBASSEMBLY ?= $(findstring webassembly, $(LLVM_COMPONENTS))
 WITH_AMDGPU ?= $(findstring amdgpu, $(LLVM_COMPONENTS))
 WITH_OPENCL ?= not-empty
 WITH_METAL ?= not-empty
-WITH_OPENGL ?= not-empty
+WITH_OPENGLCOMPUTE ?= not-empty
 WITH_D3D12 ?= not-empty
 WITH_INTROSPECTION ?= not-empty
 WITH_EXCEPTIONS ?=
@@ -157,7 +157,7 @@ OPENCL_LLVM_CONFIG_LIB=$(if $(WITH_OPENCL), , )
 METAL_CXX_FLAGS=$(if $(WITH_METAL), -DWITH_METAL, )
 METAL_LLVM_CONFIG_LIB=$(if $(WITH_METAL), , )
 
-OPENGL_CXX_FLAGS=$(if $(WITH_OPENGL), -DWITH_OPENGL, )
+OPENGLCOMPUTE_CXX_FLAGS=$(if $(WITH_OPENGLCOMPUTE), -DWITH_OPENGLCOMPUTE, )
 
 D3D12_CXX_FLAGS=$(if $(WITH_D3D12), -DWITH_D3D12, )
 D3D12_LLVM_CONFIG_LIB=$(if $(WITH_D3D12), , )
@@ -205,7 +205,7 @@ CXX_FLAGS += $(AARCH64_CXX_FLAGS)
 CXX_FLAGS += $(X86_CXX_FLAGS)
 CXX_FLAGS += $(OPENCL_CXX_FLAGS)
 CXX_FLAGS += $(METAL_CXX_FLAGS)
-CXX_FLAGS += $(OPENGL_CXX_FLAGS)
+CXX_FLAGS += $(OPENGLCOMPUTE_CXX_FLAGS)
 CXX_FLAGS += $(D3D12_CXX_FLAGS)
 CXX_FLAGS += $(MIPS_CXX_FLAGS)
 CXX_FLAGS += $(POWERPC_CXX_FLAGS)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0b45adf43715..2a167f34771d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -460,6 +460,11 @@ if (TARGET_D3D12COMPUTE)
     target_compile_definitions(Halide PRIVATE WITH_D3D12)
 endif ()
 
+option(TARGET_OPENGLCOMPUTE "Include OpenGLCompute target" ON)
+if (TARGET_OPENGLCOMPUTE)
+    target_compile_definitions(Halide PRIVATE WITH_OPENGLCOMPUTE)
+endif ()
+
 ##
 # Add autoschedulers to the build.
 ##
diff --git a/src/Target.cpp b/src/Target.cpp
index c9ea844729c2..8c83de1351bb 100644
--- a/src/Target.cpp
+++ b/src/Target.cpp
@@ -659,7 +659,7 @@ bool Target::supported() const {
 #if !defined(WITH_METAL)
     bad |= has_feature(Target::Metal);
 #endif
-#if !defined(WITH_OPENGL)
+#if !defined(WITH_OPENGLCOMPUTE)
     bad |= has_feature(Target::OpenGLCompute);
 #endif
 #if !defined(WITH_D3D12)