Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions lib/compilers/nsc-spirv.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,14 @@
import path from 'path';
import fs from 'fs/promises';

import type {ExecutionOptions} from '../../types/compilation/compilation.interfaces.js';
import type {CompilationResult, ExecutionOptions} from '../../types/compilation/compilation.interfaces.js';
import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js';
import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js';
import {BaseCompiler} from '../base-compiler.js';
import {logger} from '../logger.js';
import {SPIRVAsmParser} from '../parsers/asm-parser-spirv.js';
import type {OptRemark} from '../../static/panes/opt-view.interfaces.js';
import type {StackUsageInfo} from '../stack-usage-transformer.js';
import * as utils from '../utils.js';
import {splitArguments} from '../../shared/common-utils.js';
import {unwrap} from '../assert.js';
Expand Down Expand Up @@ -153,9 +155,13 @@ export class NSCSPIRVCompiler extends BaseCompiler {
const ppFilename = path.join(sourceDir, this.outputFilebase + '.i');
if (await utils.fileExists(ppFilename)) {
const ppText = await fs.readFile(ppFilename, 'utf8');
result.stdout = result.stdout.concat(utils.parseOutput(ppText));
result.asm = ppText;
} else {
result.asm = '<No preprocessed output file>';
}
result.languageId = 'hlsl';
result.okToCache = false;
(result as any).preprocessOnly = true;
return result;
}

Expand Down Expand Up @@ -244,4 +250,16 @@ export class NSCSPIRVCompiler extends BaseCompiler {
asm: ir.asm,
};
}

override async postProcess(
result: CompilationResult,
outputFilename: string,
filters: ParseFiltersAndOutputOptions,
produceOptRemarks = false,
): Promise<[CompilationResult, OptRemark[], StackUsageInfo[]]> {
if ((result as any).preprocessOnly) {
return [result, [] as OptRemark[], [] as StackUsageInfo[]];
}
return super.postProcess(result, outputFilename, filters, produceOptRemarks);
}
}
Loading