commit 7331535c2ba7c2aa77cf5c7a25f8f7fdc3c01775
author Bill Hollings <bill.hollings@brenwill.com> Thu Jun 20 07:50:10 2019 -0400
committer GitHub <noreply@github.com> Thu Jun 20 07:50:10 2019 -0400
tree b37f8b95c2fc1c3ccf06a5e47437afde5a46fcbf
parent 541d223c3ac0627a2a73fac13c01b1b155f1c152
parent 11ca15edaac8d5a22321b43d6e0e4039e40eba65

Merge pull request #646 from billhollings/master

Quick fixes for pipeline cache lookups.

MoltenVKShaderConverter/MoltenVKSPIRVToMSLConverter/SPIRVToMSLConverter.cpp

diff --git a/MoltenVKShaderConverter/MoltenVKSPIRVToMSLConverter/SPIRVToMSLConverter.cpp b/MoltenVKShaderConverter/MoltenVKSPIRVToMSLConverter/SPIRVToMSLConverter.cpp
index 4cfc542..b8409c0 100644
--- a/MoltenVKShaderConverter/MoltenVKSPIRVToMSLConverter/SPIRVToMSLConverter.cpp
+++ b/MoltenVKShaderConverter/MoltenVKSPIRVToMSLConverter/SPIRVToMSLConverter.cpp
@@ -44,13 +44,13 @@
 	if (tessPatchKind != other.tessPatchKind) { return false; }
 	if (numTessControlPoints != other.numTessControlPoints) { return false; }
 	if (!!shouldFlipVertexY != !!other.shouldFlipVertexY) { return false; }
-	if (!!needsSwizzleBuffer != !!other.needsSwizzleBuffer) { return false; }
-	if (!!needsOutputBuffer != !!other.needsOutputBuffer) { return false; }
-	if (!!needsPatchOutputBuffer != !!other.needsPatchOutputBuffer) { return false; }
-	if (!!needsBufferSizeBuffer != !!other.needsBufferSizeBuffer) { return false; }
-	if (!!needsInputThreadgroupMem != !!other.needsInputThreadgroupMem) { return false; }
+//	if (!!needsSwizzleBuffer != !!other.needsSwizzleBuffer) { return false; }
+//	if (!!needsOutputBuffer != !!other.needsOutputBuffer) { return false; }
+//	if (!!needsPatchOutputBuffer != !!other.needsPatchOutputBuffer) { return false; }
+//	if (!!needsBufferSizeBuffer != !!other.needsBufferSizeBuffer) { return false; }
+//	if (!!needsInputThreadgroupMem != !!other.needsInputThreadgroupMem) { return false; }
 
-	if (mslOptions.platform != other.mslOptions.platform) { return false; }
+//	if (mslOptions.platform != other.mslOptions.platform) { return false; }
 	if (mslOptions.msl_version != other.mslOptions.msl_version) { return false; }
 	if (mslOptions.texel_buffer_texture_width != other.mslOptions.texel_buffer_texture_width) { return false; }
 	if (mslOptions.swizzle_buffer_index != other.mslOptions.swizzle_buffer_index) { return false; }
@@ -61,13 +61,13 @@
 	if (mslOptions.buffer_size_buffer_index != other.mslOptions.buffer_size_buffer_index) { return false; }
 	if (mslOptions.shader_input_wg_index != other.mslOptions.shader_input_wg_index) { return false; }
 	if (!!mslOptions.enable_point_size_builtin != !!other.mslOptions.enable_point_size_builtin) { return false; }
-	if (!!mslOptions.disable_rasterization != !!other.mslOptions.disable_rasterization) { return false; }
+//	if (!!mslOptions.disable_rasterization != !!other.mslOptions.disable_rasterization) { return false; }
 	if (!!mslOptions.capture_output_to_buffer != !!other.mslOptions.capture_output_to_buffer) { return false; }
 	if (!!mslOptions.swizzle_texture_samples != !!other.mslOptions.swizzle_texture_samples) { return false; }
 	if (!!mslOptions.tess_domain_origin_lower_left != !!other.mslOptions.tess_domain_origin_lower_left) { return false; }
-	if (mslOptions.argument_buffers != other.mslOptions.argument_buffers) { return false; }
-	if (mslOptions.pad_fragment_output_components != other.mslOptions.pad_fragment_output_components) { return false; }
-	if (mslOptions.texture_buffer_native != other.mslOptions.texture_buffer_native) { return false; }
+//	if (mslOptions.argument_buffers != other.mslOptions.argument_buffers) { return false; }
+//	if (mslOptions.pad_fragment_output_components != other.mslOptions.pad_fragment_output_components) { return false; }
+//	if (mslOptions.texture_buffer_native != other.mslOptions.texture_buffer_native) { return false; }
 
 	return true;
 }