From a92669523483eba151d07f7e9655fc5f25af7fcd Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Wed, 9 Jun 2021 01:55:36 -0400
Subject: [PATCH] glsl: Use existing tracking for enabling
 EXT_shader_image_load_formatted

---
 .../backend/glsl/emit_context.cpp                | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/shader_recompiler/backend/glsl/emit_context.cpp b/src/shader_recompiler/backend/glsl/emit_context.cpp
index a24fa46c5..e69a56d46 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.cpp
+++ b/src/shader_recompiler/backend/glsl/emit_context.cpp
@@ -220,20 +220,6 @@ void SetupOutPerVertex(EmitContext& ctx, std::string& header) {
         header += "out int gl_ViewportIndex;";
     }
 }
-
-bool UsesTyplessImage(const Info& info) {
-    for (const auto& desc : info.image_buffer_descriptors) {
-        if (desc.format == ImageFormat::Typeless) {
-            return true;
-        }
-    }
-    for (const auto& desc : info.image_descriptors) {
-        if (desc.format == ImageFormat::Typeless) {
-            return true;
-        }
-    }
-    return false;
-}
 } // Anonymous namespace
 
 EmitContext::EmitContext(IR::Program& program, Bindings& bindings, const Profile& profile_,
@@ -358,7 +344,7 @@ void EmitContext::SetupExtensions(std::string&) {
     if (info.stores_viewport_mask && profile.support_viewport_mask) {
         header += "#extension GL_NV_viewport_array2 : enable\n";
     }
-    if (UsesTyplessImage(info)) {
+    if (info.uses_typeless_image_reads || info.uses_typeless_image_writes) {
         header += "#extension GL_EXT_shader_image_load_formatted : enable\n";
     }
 }