Ryujinx/moltenvk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #50 from billhollings/master

Browse Source 
Fix push constant data copying and update to latest SPIRV-Cross.
This commit is contained in:
Bill Hollings 2018-02-14 14:31:23 -05:00 committed by GitHub
commit ddcb833da2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
External/SPIRV-Cross vendored

@ -1 +1 @@
Subproject commit 33c5cd9b19295f94702c8c3002283fb4b55f47ab Subproject commit 6a0f6980ef851c3973f8e723737aa764b04b18ca

2
MoltenVK/MoltenVK/Commands/MVKCmdPipeline.mm
View File

@ -159,7 +159,7 @@ void MVKCmdPushConstants::setContent(VkPipelineLayout layout,
_stageFlags = stageFlags; _stageFlags = stageFlags;
_offset = offset; _offset = offset;
mvkEnsureSize(_pushConstants, size); _pushConstants.resize(size);
copy_n((char*)pValues, size, _pushConstants.begin()); copy_n((char*)pValues, size, _pushConstants.begin());
} }

19
MoltenVK/MoltenVK/Commands/MVKCommandResourceFactory.mm
View File

@ -200,23 +200,12 @@ MVKImage* MVKCommandResourceFactory::newMVKImage(MVKImageDescriptorData& imgData
} }
string MVKCommandResourceFactory::getFragFunctionSuffix(MTLPixelFormat mtlPixFmt) { string MVKCommandResourceFactory::getFragFunctionSuffix(MTLPixelFormat mtlPixFmt) {
string suffix;
switch (mvkFormatTypeFromMTLPixelFormat(mtlPixFmt)) { switch (mvkFormatTypeFromMTLPixelFormat(mtlPixFmt)) {
case kMVKFormatDepthStencil: case kMVKFormatDepthStencil: return "DS";
suffix = "DS"; case kMVKFormatColorUInt: return "U";
break; case kMVKFormatColorInt: return "I";
case kMVKFormatColorUInt: default: return "F";
suffix = "U";
break;
case kMVKFormatColorInt:
suffix = "I";
break;
default:
suffix = "F";
break;
} }
return suffix;
} }
string MVKCommandResourceFactory::getFragFunctionSuffix(MVKRPSKeyClearAtt& attKey) { string MVKCommandResourceFactory::getFragFunctionSuffix(MVKRPSKeyClearAtt& attKey) {

12
MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/xcshareddata/xcschemes/MoltenVKShaderConverter.xcscheme
View File

@ -74,19 +74,19 @@
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "-gi" argument = "-gi"
isEnabled = "YES"> isEnabled = "NO">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "/Users/bill/Documents/Dev/iOSProjects/Molten/MoltenVK-bh/External/SPIRV-Cross/shaders-msl/comp/functions.comp" argument = "/Users/bill/Documents/Dev/iOSProjects/Molten/MoltenVK-bh/External/SPIRV-Cross/shaders-msl/vert/pointsize.vert"
isEnabled = "YES"> isEnabled = "NO">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "-si" argument = "-si"
isEnabled = "NO"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "/Users/bill/Documents/Dev/iOSProjects/Molten/Support/Valve/Dota2/shader-issues/spv_cross_bug/spv_cross_bug.spv" argument = "/Users/bill/Documents/Dev/iOSProjects/Molten/Support/Valve/Dota2/shader-issues/sample_mask/sample_mask.spv"
isEnabled = "NO"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "-mo" argument = "-mo"