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

Merge pull request #1807 from billhollings/rmv-unused-debug-log-calls

Browse Source 
Remove some old unused commented-out debug log calls.
This commit is contained in:
Bill Hollings 2023-01-02 10:11:51 -05:00 committed by GitHub
commit 7a320974d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MoltenVK/MoltenVK/Commands/MVKCmdDispatch.mm
View File

@ -43,8 +43,6 @@ VkResult MVKCmdDispatch::setContent(MVKCommandBuffer* cmdBuff,
} }
void MVKCmdDispatch::encode(MVKCommandEncoder* cmdEncoder) { void MVKCmdDispatch::encode(MVKCommandEncoder* cmdEncoder) {
// MVKLogDebug("vkCmdDispatch() dispatching (%d, %d, %d) threadgroups.", _x, _y, _z);
MTLRegion mtlThreadgroupCount = MTLRegionMake3D(_baseGroupX, _baseGroupY, _baseGroupZ, _groupCountX, _groupCountY, _groupCountZ); MTLRegion mtlThreadgroupCount = MTLRegionMake3D(_baseGroupX, _baseGroupY, _baseGroupZ, _groupCountX, _groupCountY, _groupCountZ);
cmdEncoder->finalizeDispatchState(); // Ensure all updated state has been submitted to Metal cmdEncoder->finalizeDispatchState(); // Ensure all updated state has been submitted to Metal
id<MTLComputeCommandEncoder> mtlEncoder = cmdEncoder->getMTLComputeEncoder(kMVKCommandUseDispatch); id<MTLComputeCommandEncoder> mtlEncoder = cmdEncoder->getMTLComputeEncoder(kMVKCommandUseDispatch);
@ -77,8 +75,6 @@ VkResult MVKCmdDispatchIndirect::setContent(MVKCommandBuffer* cmdBuff, VkBuffer
} }
void MVKCmdDispatchIndirect::encode(MVKCommandEncoder* cmdEncoder) { void MVKCmdDispatchIndirect::encode(MVKCommandEncoder* cmdEncoder) {
// MVKLogDebug("vkCmdDispatchIndirect() dispatching indirectly.");
cmdEncoder->finalizeDispatchState(); // Ensure all updated state has been submitted to Metal cmdEncoder->finalizeDispatchState(); // Ensure all updated state has been submitted to Metal
[cmdEncoder->getMTLComputeEncoder(kMVKCommandUseDispatch) dispatchThreadgroupsWithIndirectBuffer: _mtlIndirectBuffer [cmdEncoder->getMTLComputeEncoder(kMVKCommandUseDispatch) dispatchThreadgroupsWithIndirectBuffer: _mtlIndirectBuffer
indirectBufferOffset: _mtlIndirectBufferOffset indirectBufferOffset: _mtlIndirectBufferOffset

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

@ -84,7 +84,6 @@ VkResult MVKCmdBeginRenderPass<N_CV, N_A>::setContent(MVKCommandBuffer* cmdBuff,
template <size_t N_CV, size_t N_A> template <size_t N_CV, size_t N_A>
void MVKCmdBeginRenderPass<N_CV, N_A>::encode(MVKCommandEncoder* cmdEncoder) { void MVKCmdBeginRenderPass<N_CV, N_A>::encode(MVKCommandEncoder* cmdEncoder) {
// MVKLogDebug("Encoding vkCmdBeginRenderPass(). Elapsed time: %.6f ms.", mvkGetElapsedMilliseconds());
// Convert the sample position array of arrays to an array of array-references, // Convert the sample position array of arrays to an array of array-references,
// so that it can be passed to the command encoder. // so that it can be passed to the command encoder.
@ -157,7 +156,6 @@ VkResult MVKCmdEndRenderPass::setContent(MVKCommandBuffer* cmdBuff,
} }
void MVKCmdEndRenderPass::encode(MVKCommandEncoder* cmdEncoder) { void MVKCmdEndRenderPass::encode(MVKCommandEncoder* cmdEncoder) {
// MVKLogDebug("Encoding vkCmdEndRenderPass(). Elapsed time: %.6f ms.", mvkGetElapsedMilliseconds());
if (cmdEncoder->getMultiviewPassIndex() + 1 < cmdEncoder->getSubpass()->getMultiviewMetalPassCount()) if (cmdEncoder->getMultiviewPassIndex() + 1 < cmdEncoder->getSubpass()->getMultiviewMetalPassCount())
cmdEncoder->beginNextMultiviewPass(); cmdEncoder->beginNextMultiviewPass();
else else

7
MoltenVK/MoltenVK/GPUObjects/MVKQueue.mm
View File

@ -304,8 +304,6 @@ MVKQueueSubmission::~MVKQueueSubmission() {
void MVKQueueCommandBufferSubmission::execute() { void MVKQueueCommandBufferSubmission::execute() {
// MVKLogDebug("Executing submission %p.", this);
_queue->_submissionCaptureScope->beginScope(); _queue->_submissionCaptureScope->beginScope();
// If using encoded semaphore waiting, do so now. // If using encoded semaphore waiting, do so now.
@ -448,8 +446,6 @@ void MVKQueueCommandBufferSubmission::commitActiveMTLCommandBuffer(bool signalCo
// and the app immediately destroys objects. Rare, but it has been encountered. // and the app immediately destroys objects. Rare, but it has been encountered.
void MVKQueueCommandBufferSubmission::finish() { void MVKQueueCommandBufferSubmission::finish() {
// MVKLogDebug("Finishing submission %p. Submission count %u.", this, _subCount--);
// Performed here instead of as part of execute() for rare case where app destroys queue // Performed here instead of as part of execute() for rare case where app destroys queue
// immediately after a waitIdle() is cleared by fence below, taking the capture scope with it. // immediately after a waitIdle() is cleared by fence below, taking the capture scope with it.
_queue->_submissionCaptureScope->endScope(); _queue->_submissionCaptureScope->endScope();
@ -509,9 +505,6 @@ MVKQueueCommandBufferSubmission::MVKQueueCommandBufferSubmission(MVKQueue* queue
if (_fence) { _fence->retain(); } if (_fence) { _fence->retain(); }
_activeMTLCommandBuffer = nil; _activeMTLCommandBuffer = nil;
// static std::atomic<uint32_t> _subCount;
// MVKLogDebug("Creating submission %p. Submission count %u.", this, ++_subCount);
} }
MVKQueueCommandBufferSubmission::~MVKQueueCommandBufferSubmission() { MVKQueueCommandBufferSubmission::~MVKQueueCommandBufferSubmission() {