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.

diff --git a/loader/loader.c b/loader/loader.c
index c6582796761952bbcb0f8471dfbb54f69e776ccc..c4e8a14886c16152e28d4938b4a436dfd3bf9480 100644 (file)
--- 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;
     }