Move D3DCompliationRequest struct to d3d folder
So it can be shared between D3D11 and D3D12 backends.
Bug: dawn:1705
Change-Id: Iafd2a1d66a9989229892f86a61a0d4df26f3d672
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/124881
Reviewed-by: Austin Eng <enga@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Peng Huang <penghuang@chromium.org>
diff --git a/src/dawn/native/BUILD.gn b/src/dawn/native/BUILD.gn
index 866a3ac..1ca341d 100644
--- a/src/dawn/native/BUILD.gn
+++ b/src/dawn/native/BUILD.gn
@@ -401,6 +401,7 @@
"d3d/BackendD3D.h",
"d3d/BlobD3D.cpp",
"d3d/BlobD3D.h",
+ "d3d/D3DCompilationRequest.h",
"d3d/D3DError.cpp",
"d3d/D3DError.h",
"d3d/DeviceD3D.cpp",
diff --git a/src/dawn/native/CMakeLists.txt b/src/dawn/native/CMakeLists.txt
index 34b6f66..d1625a1 100644
--- a/src/dawn/native/CMakeLists.txt
+++ b/src/dawn/native/CMakeLists.txt
@@ -259,6 +259,7 @@
"d3d/BackendD3D.h"
"d3d/BlobD3D.cpp"
"d3d/BlobD3D.h"
+ "d3d/D3DCompilationRequest.h"
"d3d/D3DError.cpp"
"d3d/D3DError.h"
"d3d/DeviceD3D.cpp"
diff --git a/src/dawn/native/d3d/D3DCompilationRequest.h b/src/dawn/native/d3d/D3DCompilationRequest.h
new file mode 100644
index 0000000..4a604de
--- /dev/null
+++ b/src/dawn/native/d3d/D3DCompilationRequest.h
@@ -0,0 +1,104 @@
+// Copyright 2023 The Dawn Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef SRC_DAWN_NATIVE_D3D_D3DCOMPILATIONREQUEST_H_
+#define SRC_DAWN_NATIVE_D3D_D3DCOMPILATIONREQUEST_H_
+
+#include <d3dcompiler.h>
+
+#include <string>
+
+#include "dawn/native/CacheRequest.h"
+#include "dawn/native/Serializable.h"
+#include "dawn/native/d3d/d3d_platform.h"
+
+#include "tint/tint.h"
+
+namespace dawn::native::stream {
+
+// Define no-op serializations for pD3DCompile, IDxcLibrary, and IDxcCompiler.
+// These are output-only interfaces used to generate bytecode.
+template <>
+inline void Stream<IDxcLibrary*>::Write(Sink*, IDxcLibrary* const&) {}
+template <>
+inline void Stream<IDxcCompiler*>::Write(Sink*, IDxcCompiler* const&) {}
+template <>
+inline void Stream<pD3DCompile>::Write(Sink*, pD3DCompile const&) {}
+
+} // namespace dawn::native::stream
+
+namespace dawn::native::d3d {
+
+enum class Compiler { FXC, DXC };
+
+#define HLSL_COMPILATION_REQUEST_MEMBERS(X) \
+ X(const tint::Program*, inputProgram) \
+ X(std::string_view, entryPointName) \
+ X(SingleShaderStage, stage) \
+ X(uint32_t, shaderModel) \
+ X(uint32_t, compileFlags) \
+ X(Compiler, compiler) \
+ X(uint64_t, compilerVersion) \
+ X(std::wstring_view, dxcShaderProfile) \
+ X(std::string_view, fxcShaderProfile) \
+ X(pD3DCompile, d3dCompile) \
+ X(IDxcLibrary*, dxcLibrary) \
+ X(IDxcCompiler*, dxcCompiler) \
+ X(uint32_t, firstIndexOffsetShaderRegister) \
+ X(uint32_t, firstIndexOffsetRegisterSpace) \
+ X(bool, usesNumWorkgroups) \
+ X(uint32_t, numWorkgroupsShaderRegister) \
+ X(uint32_t, numWorkgroupsRegisterSpace) \
+ X(tint::writer::ExternalTextureOptions, externalTextureOptions) \
+ X(tint::writer::ArrayLengthFromUniformOptions, arrayLengthFromUniform) \
+ X(tint::writer::BindingRemapperOptions, bindingRemapper) \
+ X(std::optional<tint::transform::SubstituteOverride::Config>, substituteOverrideConfig) \
+ X(std::bitset<kMaxInterStageShaderVariables>, interstageLocations) \
+ X(LimitsForCompilationRequest, limits) \
+ X(bool, disableSymbolRenaming) \
+ X(bool, isRobustnessEnabled) \
+ X(bool, disableWorkgroupInit) \
+ X(bool, polyfillReflectVec2F32) \
+ X(bool, dumpShaders)
+
+#define D3D_BYTECODE_COMPILATION_REQUEST_MEMBERS(X) \
+ X(bool, hasShaderF16Feature) \
+ X(uint32_t, compileFlags) \
+ X(Compiler, compiler) \
+ X(uint64_t, compilerVersion) \
+ X(std::wstring_view, dxcShaderProfile) \
+ X(std::string_view, fxcShaderProfile) \
+ X(pD3DCompile, d3dCompile) \
+ X(IDxcLibrary*, dxcLibrary) \
+ X(IDxcCompiler*, dxcCompiler)
+
+DAWN_SERIALIZABLE(struct, HlslCompilationRequest, HLSL_COMPILATION_REQUEST_MEMBERS){};
+#undef HLSL_COMPILATION_REQUEST_MEMBERS
+
+DAWN_SERIALIZABLE(struct,
+ D3DBytecodeCompilationRequest,
+ D3D_BYTECODE_COMPILATION_REQUEST_MEMBERS){};
+#undef D3D_BYTECODE_COMPILATION_REQUEST_MEMBERS
+
+#define D3D_COMPILATION_REQUEST_MEMBERS(X) \
+ X(HlslCompilationRequest, hlsl) \
+ X(D3DBytecodeCompilationRequest, bytecode) \
+ X(CacheKey::UnsafeUnkeyedValue<dawn::platform::Platform*>, tracePlatform)
+
+DAWN_MAKE_CACHE_REQUEST(D3DCompilationRequest, D3D_COMPILATION_REQUEST_MEMBERS);
+#undef D3D_COMPILATION_REQUEST_MEMBERS
+
+} // namespace dawn::native::d3d
+
+#endif // SRC_DAWN_NATIVE_D3D_D3DCOMPILATIONREQUEST_H_
diff --git a/src/dawn/native/d3d12/ShaderModuleD3D12.cpp b/src/dawn/native/d3d12/ShaderModuleD3D12.cpp
index 6e5fd02..745b27a 100644
--- a/src/dawn/native/d3d12/ShaderModuleD3D12.cpp
+++ b/src/dawn/native/d3d12/ShaderModuleD3D12.cpp
@@ -14,8 +14,6 @@
#include "dawn/native/d3d12/ShaderModuleD3D12.h"
-#include <d3dcompiler.h>
-
#include <map>
#include <sstream>
#include <string>
@@ -29,10 +27,10 @@
#include "dawn/common/Log.h"
#include "dawn/common/WindowsUtils.h"
#include "dawn/native/CacheKey.h"
-#include "dawn/native/CacheRequest.h"
#include "dawn/native/Pipeline.h"
#include "dawn/native/TintUtils.h"
#include "dawn/native/d3d/BlobD3D.h"
+#include "dawn/native/d3d/D3DCompilationRequest.h"
#include "dawn/native/d3d/D3DError.h"
#include "dawn/native/d3d12/AdapterD3D12.h"
#include "dawn/native/d3d12/BackendD3D12.h"
@@ -48,82 +46,10 @@
#include "tint/tint.h"
-namespace dawn::native::stream {
-
-// Define no-op serializations for pD3DCompile, IDxcLibrary, and IDxcCompiler.
-// These are output-only interfaces used to generate bytecode.
-template <>
-void Stream<IDxcLibrary*>::Write(Sink*, IDxcLibrary* const&) {}
-template <>
-void Stream<IDxcCompiler*>::Write(Sink*, IDxcCompiler* const&) {}
-template <>
-void Stream<pD3DCompile>::Write(Sink*, pD3DCompile const&) {}
-
-} // namespace dawn::native::stream
-
namespace dawn::native::d3d12 {
namespace {
-enum class Compiler { FXC, DXC };
-
-#define HLSL_COMPILATION_REQUEST_MEMBERS(X) \
- X(const tint::Program*, inputProgram) \
- X(std::string_view, entryPointName) \
- X(SingleShaderStage, stage) \
- X(uint32_t, shaderModel) \
- X(uint32_t, compileFlags) \
- X(Compiler, compiler) \
- X(uint64_t, compilerVersion) \
- X(std::wstring_view, dxcShaderProfile) \
- X(std::string_view, fxcShaderProfile) \
- X(pD3DCompile, d3dCompile) \
- X(IDxcLibrary*, dxcLibrary) \
- X(IDxcCompiler*, dxcCompiler) \
- X(uint32_t, firstIndexOffsetShaderRegister) \
- X(uint32_t, firstIndexOffsetRegisterSpace) \
- X(bool, usesNumWorkgroups) \
- X(uint32_t, numWorkgroupsShaderRegister) \
- X(uint32_t, numWorkgroupsRegisterSpace) \
- X(tint::writer::ExternalTextureOptions, externalTextureOptions) \
- X(tint::writer::ArrayLengthFromUniformOptions, arrayLengthFromUniform) \
- X(tint::writer::BindingRemapperOptions, bindingRemapper) \
- X(std::optional<tint::transform::SubstituteOverride::Config>, substituteOverrideConfig) \
- X(std::bitset<kMaxInterStageShaderVariables>, interstageLocations) \
- X(LimitsForCompilationRequest, limits) \
- X(bool, disableSymbolRenaming) \
- X(bool, isRobustnessEnabled) \
- X(bool, disableWorkgroupInit) \
- X(bool, polyfillReflectVec2F32) \
- X(bool, dumpShaders)
-
-#define D3D_BYTECODE_COMPILATION_REQUEST_MEMBERS(X) \
- X(bool, hasShaderF16Feature) \
- X(uint32_t, compileFlags) \
- X(Compiler, compiler) \
- X(uint64_t, compilerVersion) \
- X(std::wstring_view, dxcShaderProfile) \
- X(std::string_view, fxcShaderProfile) \
- X(pD3DCompile, d3dCompile) \
- X(IDxcLibrary*, dxcLibrary) \
- X(IDxcCompiler*, dxcCompiler)
-
-DAWN_SERIALIZABLE(struct, HlslCompilationRequest, HLSL_COMPILATION_REQUEST_MEMBERS){};
-#undef HLSL_COMPILATION_REQUEST_MEMBERS
-
-DAWN_SERIALIZABLE(struct,
- D3DBytecodeCompilationRequest,
- D3D_BYTECODE_COMPILATION_REQUEST_MEMBERS){};
-#undef D3D_BYTECODE_COMPILATION_REQUEST_MEMBERS
-
-#define D3D_COMPILATION_REQUEST_MEMBERS(X) \
- X(HlslCompilationRequest, hlsl) \
- X(D3DBytecodeCompilationRequest, bytecode) \
- X(CacheKey::UnsafeUnkeyedValue<dawn::platform::Platform*>, tracePlatform)
-
-DAWN_MAKE_CACHE_REQUEST(D3DCompilationRequest, D3D_COMPILATION_REQUEST_MEMBERS);
-#undef D3D_COMPILATION_REQUEST_MEMBERS
-
std::vector<const wchar_t*> GetDXCArguments(uint32_t compileFlags, bool enable16BitTypes) {
std::vector<const wchar_t*> arguments;
if (compileFlags & D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY) {
@@ -176,7 +102,7 @@
return arguments;
}
-ResultOrError<ComPtr<IDxcBlob>> CompileShaderDXC(const D3DBytecodeCompilationRequest& r,
+ResultOrError<ComPtr<IDxcBlob>> CompileShaderDXC(const d3d::D3DBytecodeCompilationRequest& r,
const std::string& entryPointName,
const std::string& hlslSource) {
ComPtr<IDxcBlobEncoding> sourceBlob;
@@ -273,7 +199,7 @@
return result;
}
-ResultOrError<ComPtr<ID3DBlob>> CompileShaderFXC(const D3DBytecodeCompilationRequest& r,
+ResultOrError<ComPtr<ID3DBlob>> CompileShaderFXC(const d3d::D3DBytecodeCompilationRequest& r,
const std::string& entryPointName,
const std::string& hlslSource) {
ComPtr<ID3DBlob> compiledShader;
@@ -288,7 +214,7 @@
}
ResultOrError<std::string> TranslateToHLSL(
- HlslCompilationRequest r,
+ d3d::HlslCompilationRequest r,
CacheKey::UnsafeUnkeyedValue<dawn::platform::Platform*> tracePlatform,
std::string* remappedEntryPointName,
bool* usesVertexOrInstanceIndex) {
@@ -395,7 +321,7 @@
return std::move(result.hlsl);
}
-ResultOrError<CompiledShader> CompileShader(D3DCompilationRequest r) {
+ResultOrError<CompiledShader> CompileShader(d3d::D3DCompilationRequest r) {
CompiledShader compiledShader;
// Compile the source shader to HLSL.
std::string remappedEntryPoint;
@@ -404,7 +330,7 @@
&compiledShader.usesVertexOrInstanceIndex));
switch (r.bytecode.compiler) {
- case Compiler::DXC: {
+ case d3d::Compiler::DXC: {
TRACE_EVENT0(r.tracePlatform.UnsafeGetValue(), General, "CompileShaderDXC");
ComPtr<IDxcBlob> compiledDXCShader;
DAWN_TRY_ASSIGN(compiledDXCShader, CompileShaderDXC(r.bytecode, remappedEntryPoint,
@@ -412,7 +338,7 @@
compiledShader.shaderBlob = CreateBlob(std::move(compiledDXCShader));
break;
}
- case Compiler::FXC: {
+ case d3d::Compiler::FXC: {
TRACE_EVENT0(r.tracePlatform.UnsafeGetValue(), General, "CompileShaderFXC");
ComPtr<ID3DBlob> compiledFXCShader;
DAWN_TRY_ASSIGN(compiledFXCShader, CompileShaderFXC(r.bytecode, remappedEntryPoint,
@@ -465,7 +391,7 @@
ScopedTintICEHandler scopedICEHandler(device);
const EntryPointMetadata& entryPoint = GetEntryPoint(programmableStage.entryPoint);
- D3DCompilationRequest req = {};
+ d3d::D3DCompilationRequest req = {};
req.tracePlatform = UnsafeUnkeyedValue(device->GetPlatform());
req.hlsl.shaderModel = device->GetDeviceInfo().shaderModel;
req.hlsl.disableSymbolRenaming = device->IsToggleEnabled(Toggle::DisableSymbolRenaming);
@@ -488,13 +414,13 @@
d3d::DxcVersionInfo dxcVersionInfo =
ToBackend(device->GetAdapter())->GetBackend()->GetDxcVersion();
- req.bytecode.compiler = Compiler::DXC;
+ req.bytecode.compiler = d3d::Compiler::DXC;
req.bytecode.dxcLibrary = device->GetDxcLibrary().Get();
req.bytecode.dxcCompiler = device->GetDxcCompiler().Get();
req.bytecode.compilerVersion = dxcVersionInfo.DxcCompilerVersion;
req.bytecode.dxcShaderProfile = device->GetDeviceInfo().shaderProfiles[stage];
} else {
- req.bytecode.compiler = Compiler::FXC;
+ req.bytecode.compiler = d3d::Compiler::FXC;
req.bytecode.d3dCompile = device->GetFunctions()->d3dCompile;
req.bytecode.compilerVersion = D3D_COMPILER_VERSION;
switch (stage) {