79 Commits

Author SHA1 Message Date
Maximilian Maldacker
6eecd58ad2 added workgroupssize specialization constants 2018-02-15 19:00:24 +01:00
Bill Hollings
ddcb833da2
Merge pull request #50 from billhollings/master
Fix push constant data copying and update to latest SPIRV-Cross.
2018-02-14 14:31:23 -05:00
Bill Hollings
68b31e6361 Fix push constant data copying and update to latest SPIRV-Cross. 2018-02-14 13:52:53 -05:00
Bill Hollings
099b6de13e
Merge pull request #49 from mmaldacker/bugfix/push_constant_offset
push constant offset
2018-02-14 13:20:45 -05:00
Bill Hollings
17108ffcf4
Merge pull request #48 from mmaldacker/bugfix/frag_function_suffix
correct fragment function suffix
2018-02-14 13:20:32 -05:00
Maximilian Maldacker
529b3d1e8e added missing break statements 2018-02-13 22:54:03 +01:00
Maximilian Maldacker
c6723a187b don't align push constant buffer (otherwise it'll overwrite other push constants) 2018-02-13 22:53:17 +01:00
Maximilian Maldacker
21a74b6cda Merge branch 'master' of https://github.com/KhronosGroup/MoltenVK 2018-02-13 22:51:58 +01:00
Bill Hollings
8cc1ea6672
Merge pull request #47 from karl-lunarg/karl-def-passthrough
Karl def passthrough
2018-02-13 15:05:30 -05:00
Karl Schultz
563513be04 Add passthrough for build settings
Add $(GCC_PREPROCESSOR_DEFINITIONS) to Preprocessor Definitions
to allow specifying build settings while doing command line builds.

Fixes #45
2018-02-13 12:51:11 -07:00
Karl Schultz
c4ce08402d Disable watermark in debug builds 2018-02-13 12:47:18 -07:00
Maximilian Maldacker
ac8d079365 Merge branch 'bugfix/texture_synchronize' 2018-02-13 20:33:52 +01:00
Bill Hollings
433632abc1
Merge pull request #42 from mmaldacker/bugfix/texture_synchronize
don't check if texture is coherent since it never is on macOS
2018-02-13 11:14:38 -05:00
Maximilian Maldacker
93e20e28d3 check if storage mode is not shared when checking if synchronize is needed 2018-02-13 12:39:26 +01:00
Bill Hollings
94878f5c48
Merge pull request #43 from mmaldacker/bugfix/compute_pushconstants
setup push constants for compute shaders
2018-02-11 19:24:41 -05:00
Maximilian Maldacker
1122696814 Merge branch 'bugfix/texture_synchronize' 2018-02-08 21:58:33 +01:00
Maximilian Maldacker
dcb08d262c setup push constants for compute shaders 2018-02-08 21:36:42 +01:00
Maximilian Maldacker
c0355293c3 don't check if texture is coherent since it never is on macOS 2018-02-08 21:35:30 +01:00
Bill Hollings
9ed33e71bd
Merge pull request #40 from billhollings/master
Combine multiple VkCommandBuffers into a single MTLCommandBuffer.
2018-02-06 11:50:53 -05:00
Bill Hollings
5beaf7af01 Combine multiple VkCommandBuffers into a single MTLCommandBuffer. 2018-02-06 11:49:51 -05:00
Bill Hollings
f41ba8c627
Merge pull request #39 from billhollings/master
Update to latest SPIRV-Cross.
2018-02-02 09:34:59 -05:00
Bill Hollings
44d34f68a5 Update to latest SPIRV-Cross.
Includes fix for MSL resource ordering on NVIDIA.
2018-02-02 09:33:32 -05:00
Bill Hollings
6191d6731f
Merge pull request #38 from danginsburg/blit_image_fix
Fix vkCmdBlitImage between images of different sizes.
2018-02-01 16:59:53 -05:00
Dan Ginsburg
d834f4d4cd Fix vkCmdBlitImage between images of different sizes.
Fix typo that was setting the dstExtent from the source image.  This was
causing Desktop-Friendly fullscreen resolution not to render correctly
in Dota.
2018-02-01 14:55:56 -05:00
Bill Hollings
09ef57ca64
Merge pull request #37 from billhollings/master
Update copyright dates to 2018.
2018-01-31 16:58:44 -05:00
Bill Hollings
98b050e6e2 Update copyright dates to 2018. 2018-01-31 16:57:59 -05:00
Bill Hollings
a6eaf0a8b3
Merge pull request #36 from billhollings/master
Updates to Metal resource locking.
2018-01-31 13:44:04 -05:00
Bill Hollings
13687d1a57 Updates to Metal resource locking.
MVKBufferView add lock when creating MTLTexture.
MVKDeviceMemory add lock when creating MTLBuffer during memory mapping.
MVKMTLBufferAllocator does not need to be threadsafe.
Cleanup syntax on other lock handling to add consistency.
2018-01-31 13:43:19 -05:00
Bill Hollings
a1b5ea5494
Merge pull request #35 from danginsburg/issue_34
Closes issue #34 - fix Metal validation error with a renderpass with …
2018-01-31 11:51:56 -05:00
Dan Ginsburg
a46855ecfd Closes issue #34 - fix Metal validation error with a renderpass with no depth attachment
If there is no depth attachment, Metal Validation will give the
following error: "validateDepthStencilState:3657: failed assertion
`MTLDepthStencilDescriptor sets depth test but MTLRenderPassDescriptor
has a nil depthAttachment texture'".  Fix by checking the current
subpass to see if there is a depth/stencil attachment, and if not use a
depth/stencil state with depth test always, depth write disabled, and no
stencil state.
2018-01-31 11:03:24 -05:00
Bill Hollings
69e36e5656
Merge pull request #32 from danginsburg/dota_texture_corruption
Fix intermittent corruption uploading textures in Dota 2.
2018-01-31 10:18:00 -05:00
Dan Ginsburg
640c989a20 Address feedback from pull request review
* Move mutex lock in MVKBuffer::getMTLBuffer() to be after checking
MVKDeviceMemory::getMTLBuffer() so we don't always lock in that case
* Fix comment I put in the wrong place in previous commit
2018-01-31 09:07:45 -05:00
Dan Ginsburg
6d50a88178 Fix intermittent corruption uploading textures in Dota 2.
The problem was that MVKBuffer::getMTLBuffer() was not thread-safe.  If
multiple threads called it at the same time, more than one underlying
_mtlBuffer would be created.  This could make the vkCmdCopyBufferToImage
copy from an unfilled buffer leaving the texture corrupted.  I also
added similar thread safety to MVKImage::getMTLTexture() and
MVKImageView::getMTLTexture() since they both looked like they would
have the same potential problem.
2018-01-30 12:28:14 -05:00
Bill Hollings
d1cd122201
Merge pull request #31 from billhollings/master
Fixes for scissors and release builds.
2018-01-30 11:03:11 -05:00
Bill Hollings
e8e75f480e Enhance viewport and scissor handling.
In debug mode, ensure scissors fit inside renderpass area to avoid Metal validation assertions.
Consolidate setting of viewport and scissors by pipeline and command.
2018-01-30 11:00:50 -05:00
Bill Hollings
ee943818b0 Merge branch 'master' of https://github.com/KhronosGroup/MoltenVK 2018-01-30 10:43:34 -05:00
Bill Hollings
856f5ebc36 Allow color attachment when clearing depth only. 2018-01-29 15:46:49 -05:00
Bill Hollings
bee5cb019d Fix link failure on Release builds. 2018-01-29 13:34:05 -05:00
Bill Hollings
91f3c61046
Merge pull request #30 from billhollings/master
GPU management.
2018-01-29 12:01:22 -05:00
Bill Hollings
c3ac62ecd7 GPU management.
Log which GPU is attached to a VkDevice.
Sort multiple GPU's to put higher-power GPU's at front of list.
Use pipelineStatisticsQuery feature to determine whether pipeline stats are available.
Update to latest SPIRV-Cross.
2018-01-29 11:57:14 -05:00
Bill Hollings
aa1bd3d4f2
Merge pull request #29 from danginsburg/issue_7
Closes issue #7.  Support DXT1 RGB texture compression.
2018-01-24 16:07:20 -05:00
Dan Ginsburg
85f7a99523 Closes issue #7. Support DXT1 RGB texture compression. 2018-01-24 11:02:25 -05:00
Bill Hollings
84640bcebb
Merge pull request #28 from billhollings/master
Retrieve heap size from MTLDevice on macOS and from free shared system memory on iOS.
2018-01-23 22:23:19 -05:00
Bill Hollings
b2644ad909 Merge branch 'master' of https://github.com/KhronosGroup/MoltenVK 2018-01-23 22:21:28 -05:00
Bill Hollings
67abb772f5
Merge pull request #26 from danginsburg/bind_image_memory_crash
Fix vkBindImageMemory crash when multiple simultaneous threads are bi…
2018-01-23 22:19:26 -05:00
Bill Hollings
89e1c92845 Retrieve heap size from MTLDevice on macOS and from free shared system memory on iOS. 2018-01-23 22:06:43 -05:00
Bill Hollings
6753d90ac4
Merge pull request #27 from danginsburg/memory_heap_size
Use MTLDevice recommendedMaxWorkingSetSize to set the heap size rathe…
2018-01-23 18:51:25 -05:00
Dan Ginsburg
9105bf58cd Use MTLDevice recommendedMaxWorkingSetSize to set the heap size rather than leaving it at 0 (on macOS). recommenededMaxWorkingSetSize does not exist on iOS so for iOS continue to leave it at 0 for now. 2018-01-23 15:16:07 -05:00
Dan Ginsburg
47952be008 Fix vkBindImageMemory crash when multiple simultaneous threads are binding to different offsets in the of the same VkDeviceMemory. The _resources vector inside of MVKDeviceMemory was not mutex protected which could cause it to become corrupted on simulaneous access. Add mutex protection. 2018-01-23 13:47:02 -05:00
Bill Hollings
89bd4b7413
Merge pull request #23 from danginsburg/issue_22_fix
Closes #22. Fix "Game Rendering Quality" slider and Pause (F9) in dota2
2018-01-18 13:17:09 -05:00