diff options
Diffstat (limited to 'source/slang/emit.cpp')
| -rw-r--r-- | source/slang/emit.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source/slang/emit.cpp b/source/slang/emit.cpp index 5b7a42ad7..614e8f474 100644 --- a/source/slang/emit.cpp +++ b/source/slang/emit.cpp @@ -3481,9 +3481,9 @@ struct EmitVisitor break; case LayoutResourceKind::RegisterSpace: + case LayoutResourceKind::GenericResource: // ignore break; - default: { Emit(": register("); @@ -6771,7 +6771,7 @@ EntryPointLayout* findEntryPointLayout( StructTypeLayout* getGlobalStructLayout( ProgramLayout* programLayout) { - auto globalScopeLayout = programLayout->globalScopeLayout; + auto globalScopeLayout = programLayout->globalScopeLayout->typeLayout; if( auto gs = globalScopeLayout.As<StructTypeLayout>() ) { return gs.Ptr(); @@ -6816,13 +6816,13 @@ String emitEntryPoint( EntryPointRequest* entryPoint, ProgramLayout* programLayout, CodeGenTarget target, - CodeGenTarget finalTarget) + TargetRequest* targetRequest) { auto translationUnit = entryPoint->getTranslationUnit(); SharedEmitContext sharedContext; sharedContext.target = target; - sharedContext.finalTarget = finalTarget; + sharedContext.finalTarget = targetRequest->target; sharedContext.entryPoint = entryPoint; if (entryPoint) @@ -6890,7 +6890,8 @@ String emitEntryPoint( auto lowered = specializeIRForEntryPoint( entryPoint, programLayout, - target); + target, + targetRequest); // If the user specified the flag that they want us to dump // IR, then do it here, for the target-specific, but |