From 13689628bdc61bb5b72f58fefa6f41b14ecf9dd3 Mon Sep 17 00:00:00 2001
From: Courtney Goeltzenleuchter <courtney@LunarG.com>
Date: Wed, 7 Jan 2015 10:17:44 -0700
Subject: loader: Include layers specified in environment

If application specified layer_info in the CreateDevice call
the code would only look for layers the app specified. However,
we want to include layers specified in the environment in addition
to any specified by the application.
---
 loader/loader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/loader/loader.c b/loader/loader.c
index c6582796..c4e8a148 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -642,7 +642,7 @@ static XGL_UINT loader_get_layer_libs(struct loader_icd *icd, XGL_UINT gpu_index
                 layerNames[i].layer_name[len] = '\0';
                 layerNames[i].lib_name = lib_name;
             }
-            return pCi->layerCount;
+            return pCi->layerCount + loader_get_layer_env(icd, gpu_index, layerNames);
         }
         pCi = pCi->pNext;
     }
-- 
cgit v1.2.3