From 423823dd2d87a0947834334922b2da3372f3691e Mon Sep 17 00:00:00 2001
From: Andrew Knight <andrew.knight@digia.com>
Date: Mon, 31 Mar 2014 11:14:36 +0300
Subject: d3dcompiler_qt: Improve shader source structure

The following adjustments are made:
 - A precompiled path, defaulting to a QRC path, is added for looking
   up precompiled shaders
 - The standard service source/binary paths are created if needed, in
   order to avoid fast-fails when the service cannot create the structure
   itself fast enough.

Change-Id: I966e54c0b35bafdaf0b3a32b76eb896308aca6db
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
---
 src/angle/src/d3dcompiler/main.cpp | 60 ++++++++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 22 deletions(-)

diff --git a/src/angle/src/d3dcompiler/main.cpp b/src/angle/src/d3dcompiler/main.cpp
index 47f80af7d3..63ee1cf976 100644
--- a/src/angle/src/d3dcompiler/main.cpp
+++ b/src/angle/src/d3dcompiler/main.cpp
@@ -199,9 +199,19 @@ HRESULT WINAPI D3DCompile(
     }
 
     static bool initialized = false;
-    static QString binaryPath;
+    static QStringList binaryPaths;
     static QString sourcePath;
     if (!initialized) {
+        // Precompiled directory
+        QString precompiledPath;
+        if (qEnvironmentVariableIsSet("QT_D3DCOMPILER_BINARY_DIR"))
+            precompiledPath = QString::fromLocal8Bit(qgetenv("QT_D3DCOMPILER_BINARY_DIR"));
+        else
+            precompiledPath = QStringLiteral(":/qt.d3dcompiler"); // Default QRC path
+        if (QDir(precompiledPath).exists())
+            binaryPaths.append(precompiledPath);
+
+        // Service directory
         QString base;
         if (qEnvironmentVariableIsSet("QT_D3DCOMPILER_DIR"))
             base = QString::fromLocal8Bit(qgetenv("QT_D3DCOMPILER_DIR"));
@@ -212,28 +222,33 @@ HRESULT WINAPI D3DCompile(
                 base = location + QStringLiteral("/d3dcompiler");
         }
 
-        // Unless the service has run, this directory won't exist.
+        // Create the directory structure
         QDir baseDir(base);
-        if (baseDir.exists()) {
-            // Check if we have can read/write blobs
-            if (baseDir.exists(QStringLiteral("binary"))) {
-                binaryPath = baseDir.absoluteFilePath(QStringLiteral("binary/"));
-            } else {
-                qCWarning(QT_D3DCOMPILER) << "D3D compiler base directory exists, but the binary directory does not.\n"
-                                             "Check the compiler service.";
+        if (!baseDir.exists()) {
+            baseDir.cdUp();
+            if (!baseDir.mkdir(QStringLiteral("d3dcompiler"))) {
+                qCWarning(QT_D3DCOMPILER) << "Unable to create shader base directory:"
+                                          << QDir::toNativeSeparators(baseDir.absolutePath());
+                if (binaryPaths.isEmpty()) // No possibility to get a shader, abort
+                    return E_FAIL;
             }
+            baseDir.cd(QStringLiteral("d3dcompiler"));
+        }
 
-            // Check if we can write shader source
-            if (baseDir.exists(QStringLiteral("source"))) {
-                sourcePath = baseDir.absoluteFilePath(QStringLiteral("source/"));
-            } else {
-                qCWarning(QT_D3DCOMPILER) << "D3D compiler base directory exists, but the source directory does not.\n"
-                                             "Check the compiler service.";
-            }
+        if (!baseDir.exists(QStringLiteral("binary")) && !baseDir.mkdir(QStringLiteral("binary"))) {
+            qCWarning(QT_D3DCOMPILER) << "Unable to create shader binary directory:"
+                                      << QDir::toNativeSeparators(baseDir.absoluteFilePath(QStringLiteral("binary")));
+            if (binaryPaths.isEmpty()) // No possibility to get a shader, abort
+                return E_FAIL;
+        } else {
+            binaryPaths.append(baseDir.absoluteFilePath(QStringLiteral("binary/")));
+        }
+
+        if (!baseDir.exists(QStringLiteral("source")) && !baseDir.mkdir(QStringLiteral("source"))) {
+            qCWarning(QT_D3DCOMPILER) << "Unable to create shader source directory:"
+                                      << QDir::toNativeSeparators(baseDir.absoluteFilePath(QStringLiteral("source")));
         } else {
-            qCWarning(QT_D3DCOMPILER) << "D3D compiler base directory does not exist:"
-                                      << QDir::toNativeSeparators(base)
-                                      << "\nCheck that the compiler service is running.";
+            sourcePath = baseDir.absoluteFilePath(QStringLiteral("source/"));
         }
 
         initialized = true;
@@ -254,8 +269,8 @@ HRESULT WINAPI D3DCompile(
             + QLatin1Char('!') + QString::number(sflags);
 
     // Check if pre-compiled shader blob is available
-    if (!binaryPath.isEmpty()) {
-        QString blobName = binaryPath + fileName;
+    foreach (const QString &path, binaryPaths) {
+        QString blobName = path + fileName;
         QFile blob(blobName);
         while (!blob.exists()) {
             // Progressively drop optional parts
@@ -271,6 +286,7 @@ HRESULT WINAPI D3DCompile(
                 return S_FALSE;
             }
             qCDebug(QT_D3DCOMPILER) << "Found, but unable to open, precompiled shader blob at" << blob.fileName();
+            break;
         }
     }
 
@@ -293,7 +309,7 @@ HRESULT WINAPI D3DCompile(
 
         QElapsedTimer timer;
         timer.start();
-        QFile blob(binaryPath + fileName);
+        QFile blob(binaryPaths.last() + fileName);
         while (!(blob.exists() && blob.open(QFile::ReadOnly)) && timer.elapsed() < timeout)
             QThread::msleep(100);
 
-- 
cgit v1.2.3