AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

d3dcompiler_qt: Place compiler options in the shader file name

Browse Source 
The compiler service needs to know what options to pass to the compiler,
and these options can affect the outcome of the shader blob. Runtime
compiled shader output must match this file name in the binary directory.
Pre-compiled shader blobs (e.g. those placed in a resource file) are
permitted to drop options from the file name if the implementor can
ensure the blob is compatible with the target.

Defines are not written out as options, but written into the shader
source, and therefore affect the cache key.

Change-Id: I11e4a43fcf6818ddb29aca5eba3d8647ba4021a1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
This commit is contained in:
Andrew Knight 2014-01-06 23:07:36 +02:00 committed by The Qt Project
parent a69525243f
commit 603eac2dfb
2 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/angle/src/d3dcompiler/main.cpp
View File

@ -224,24 +224,45 @@ HRESULT WINAPI D3DCompile(
initialized = true;
}
const QByteArray sourceData = QByteArray::fromRawData(reinterpret_cast<const char *>(data), data_size);
const QString cacheKey = D3DCompiler::cacheKeyFor(sourceData);
QByteArray macros;
if (const D3D_SHADER_MACRO *macro = defines) {
while (macro) {
macros.append('#').append(macro->Name).append(' ').append(macro->Definition).append('\n');
++macro;
}
}
const QByteArray sourceData = macros + QByteArray::fromRawData(reinterpret_cast<const char *>(data), data_size);
const QString fileName = D3DCompiler::cacheKeyFor(sourceData)
+ QLatin1Char('!') + QString::fromUtf8(entrypoint)
+ QLatin1Char('!') + QString::fromUtf8(target)
+ QLatin1Char('!') + QString::number(sflags);
// Check if pre-compiled shader blob is available
if (!binaryPath.isEmpty()) {
QFile blob(binaryPath + cacheKey);
if (blob.open(QFile::ReadOnly)) {
qCDebug(QT_D3DCOMPILER) << "Opening precompiled shader blob at" << blob.fileName();
*shader = new D3DCompiler::Blob(blob.readAll());
return S_FALSE;
QString blobName = binaryPath + fileName;
QFile blob(blobName);
while (!blob.exists()) {
// Progressively drop optional parts
blobName.truncate(blobName.lastIndexOf(QLatin1Char('!')));
if (blobName.isEmpty())
break;
blob.setFileName(blobName);
}
if (blob.exists()) {
if (blob.open(QFile::ReadOnly)) {
qCDebug(QT_D3DCOMPILER) << "Opening precompiled shader blob at" << blob.fileName();
*shader = new D3DCompiler::Blob(blob.readAll());
return S_FALSE;
}
qCDebug(QT_D3DCOMPILER) << "Found, but unable to open, precompiled shader blob at" << blob.fileName();
}
qCDebug(QT_D3DCOMPILER) << "Found, but unable to open, precompiled shader blob at" << blob.fileName();
}
// Shader blob is not available, compile with compilation service if possible
if (!sourcePath.isEmpty() && serviceAvailable) {
// Dump source to source path; wait for blob to appear
QFile source(sourcePath + cacheKey);
QFile source(sourcePath + fileName);
if (!source.open(QFile::WriteOnly)) {
qCDebug(QT_D3DCOMPILER) << "Unable to write shader source to file:" << source.fileName() << source.errorString();
return E_ACCESSDENIED;
@ -257,7 +278,7 @@ HRESULT WINAPI D3DCompile(
QElapsedTimer timer;
timer.start();
QFile blob(binaryPath + cacheKey);
QFile blob(binaryPath + fileName);
while (!(blob.exists() && blob.open(QFile::ReadOnly)) && timer.elapsed() < timeout)
QThread::msleep(100);
@ -280,7 +301,7 @@ HRESULT WINAPI D3DCompile(
const QByteArray blobContents = QByteArray::fromRawData(
reinterpret_cast<const char *>((*shader)->GetBufferPointer()), (*shader)->GetBufferSize());
QFile blob(binaryPath + cacheKey);
QFile blob(binaryPath + fileName);
if (blob.open(QFile::WriteOnly) && blob.write(blobContents))
qCDebug(QT_D3DCOMPILER) << "Cached shader blob at" << blob.fileName();
else

7
tests/auto/other/d3dcompiler/tst_d3dcompiler.cpp
View File

@ -329,8 +329,9 @@ void tst_d3dcompiler::onlineCompile()
QVERIFY(path.exists(QStringLiteral("source")));
QVERIFY(path.exists(QStringLiteral("binary")));
const QByteArray hash = QCryptographicHash::hash(data, QCryptographicHash::Sha1).toHex();
QFile input(path.absoluteFilePath(QStringLiteral("source/") + hash));
const QString fileName = QCryptographicHash::hash(data, QCryptographicHash::Sha1).toHex()
+ QStringLiteral("!main!ps_4_0!0");
QFile input(path.absoluteFilePath(QStringLiteral("source/") + fileName));
QTRY_VERIFY_WITH_TIMEOUT(input.exists(), 3000);
QTRY_VERIFY_WITH_TIMEOUT(input.isOpen() || input.open(QFile::ReadOnly), 1000);
@ -351,7 +352,7 @@ void tst_d3dcompiler::onlineCompile()
reference->Release();
// Write to output directory
QFile output(path.absoluteFilePath(QStringLiteral("binary/") + hash));
QFile output(path.absoluteFilePath(QStringLiteral("binary/") + fileName));
QVERIFY(output.open(QFile::WriteOnly));
output.write(referenceData);
output.close();