diff options
| -rw-r--r-- | etc/config/hlsl.defaults.properties | 1 | ||||
| -rw-r--r-- | lib/compilers/hlsl.ts | 9 |
2 files changed, 5 insertions, 5 deletions
diff --git a/etc/config/hlsl.defaults.properties b/etc/config/hlsl.defaults.properties index 68bc14e46..2d3f53899 100644 --- a/etc/config/hlsl.defaults.properties +++ b/etc/config/hlsl.defaults.properties @@ -3,6 +3,7 @@ compilers=&dxc:&rga:&clang defaultCompiler=dxc_default supportsBinary=false compilerType=hlsl +instructionSet=llvm group.dxc.compilers=dxc_default compiler.dxc_default.exe=/usr/dxc-artifacts/bin/dxc diff --git a/lib/compilers/hlsl.ts b/lib/compilers/hlsl.ts index 26d5423b1..f103869b7 100644 --- a/lib/compilers/hlsl.ts +++ b/lib/compilers/hlsl.ts @@ -22,7 +22,6 @@ // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. -import path from 'path'; import _ from 'underscore'; import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; @@ -40,6 +39,10 @@ export class HLSLCompiler extends BaseCompiler { this.compiler.supportsIntel = false; this.spirvAsm = new SPIRVAsmParser(this.compilerProps); + + this.compiler.supportsLLVMOptPipelineView = true; + this.compiler.llvmOptArg = ['-print-before-all', '-print-after-all']; + this.compiler.llvmOptNoDiscardValueNamesArg = []; } override async generateAST(inputFilename, options) { @@ -91,10 +94,6 @@ export class HLSLCompiler extends BaseCompiler { return options; } - override getIrOutputFilename(inputFilename: string) { - return this.getOutputFilename(path.dirname(inputFilename), this.outputFilebase).replace('.s', '.dxil'); - } - override async processAsm(result, filters, options) { if (this.isSpirv(result.asm)) { return this.spirvAsm.processAsm(result.asm, filters); |