Changes to support native execution

Author: dave-juicelabs

libs/vkd3d/command.c

@@ -10158,7 +10158,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(d3d12_comman
                 bufferViewCreateInfo.offset = offset;
                 bufferViewCreateInfo.size = size;
 
-                VK_CALL(vkCreateBufferViewJUICE(resource->allocation->device_allocation.vk_memory, &bufferViewCreateInfo));
+                // UNDO: VK_CALL(vkCreateBufferViewJUICE(resource->allocation->device_allocation.vk_memory, &bufferViewCreateInfo));
             }
             else
             {

libs/vkd3d/resource.c

@@ -5243,7 +5243,7 @@ static void vkd3d_create_buffer_srv(vkd3d_cpu_descriptor_va_t desc_va,
         	bufferViewCreateInfo.offset = descriptor_info[vk_write_count].buffer.offset;
         	bufferViewCreateInfo.size = descriptor_info[vk_write_count].buffer.range;
 
-        	VK_CALL(vkCreateBufferViewJUICE(resource->mem.device_allocation.vk_memory, &bufferViewCreateInfo));
+        	// UNDO: VK_CALL(vkCreateBufferViewJUICE(resource->mem.device_allocation.vk_memory, &bufferViewCreateInfo));
 
         	vk_write_count++;
         }
@@ -5305,7 +5305,7 @@ static void vkd3d_create_buffer_srv(vkd3d_cpu_descriptor_va_t desc_va,
             	bindViewInfo.d3d12Type = VK_D3D12_DESC_VIEW_TYPE_SHADER_RESOURCE_JUICE;
             	bindViewInfo.bufferView = descriptor_info[vk_write_count].buffer_view;
 
-            	VK_CALL(vkBindBufferViewJUICE(resource->mem.device_allocation.vk_memory, &bindViewInfo));
+            	// UNDO: VK_CALL(vkBindBufferViewJUICE(resource->mem.device_allocation.vk_memory, &bindViewInfo));
         	}
 
         	vk_write_count++;
@@ -5982,7 +5982,7 @@ static void vkd3d_create_buffer_uav(vkd3d_cpu_descriptor_va_t desc_va, struct d3
         	bufferViewCreateInfo.offset = descriptor_info[vk_write_count].buffer.offset;
         	bufferViewCreateInfo.size = descriptor_info[vk_write_count].buffer.range;
 
-        	VK_CALL(vkCreateBufferViewJUICE(resource->mem.device_allocation.vk_memory, &bufferViewCreateInfo));
+        	// UNDO: VK_CALL(vkCreateBufferViewJUICE(resource->mem.device_allocation.vk_memory, &bufferViewCreateInfo));
 
             vk_write_count++;
         }
@@ -6046,7 +6046,7 @@ static void vkd3d_create_buffer_uav(vkd3d_cpu_descriptor_va_t desc_va, struct d3
             	bindViewInfo.d3d12Type = VK_D3D12_DESC_VIEW_TYPE_UNORDERED_ACCESS_JUICE;
             	bindViewInfo.bufferView = descriptor_info[vk_write_count].buffer_view;
 
-            	VK_CALL(vkBindBufferViewJUICE(resource->mem.device_allocation.vk_memory, &bindViewInfo));
+            	// UNDO: VK_CALL(vkBindBufferViewJUICE(resource->mem.device_allocation.vk_memory, &bindViewInfo));
         	}
 
             vk_write_count++;

libs/vkd3d/swapchain.c

@@ -1807,7 +1807,32 @@ static void dxgi_vk_swap_chain_present_iteration(struct dxgi_vk_swap_chain *chai
 
     vk_queue = vkd3d_queue_acquire(chain->queue->vkd3d_queue);
     VKD3D_REGION_BEGIN(queue_present);
-    vr = VK_CALL(vkQueuePresentKHR(vk_queue, &present_info));
+    {
+        static HMODULE JuiceHandle = NULL;
+
+        typedef void (*PFN_VOID)();
+        static PFN_VOID disableHooks = NULL;
+        static PFN_VOID enableHooks = NULL;
+
+        static bool juiceChecked = false;
+        if (!juiceChecked)
+        {
+            juiceChecked = true;
+
+            JuiceHandle = GetModuleHandleW(L"JuiceShim64.dll");
+            if (JuiceHandle != NULL)
+            {
+                disableHooks = (PFN_VOID)GetProcAddress(JuiceHandle, "DisableHooks");
+                enableHooks = (PFN_VOID)GetProcAddress(JuiceHandle, "EnableHooks");
+            }
+        }
+
+        if (disableHooks != NULL)
+            disableHooks();
+        vr = VK_CALL(vkQueuePresentKHR(vk_queue, &present_info));
+        if (enableHooks != NULL)
+            enableHooks();
+    }
     VKD3D_REGION_END(queue_present);
     vkd3d_queue_release(chain->queue->vkd3d_queue);
     VKD3D_DEVICE_REPORT_BREADCRUMB_IF(chain->queue->device, vr == VK_ERROR_DEVICE_LOST);

libs/vkd3d/vulkan_procs.h

@@ -195,9 +195,9 @@ VK_DEVICE_PFN(vkWaitForFences)
 VK_DEVICE_PFN(vkWaitSemaphores)
 VK_DEVICE_PFN(vkCmdSetDepthWriteEnable)
 
-VK_DEVICE_PFN(vkCreateBufferViewJUICE)
-VK_DEVICE_PFN(vkBindBufferViewJUICE)
-VK_DEVICE_PFN(vkBindImageViewJUICE)
+// UNDO: VK_DEVICE_PFN(vkCreateBufferViewJUICE)
+// UNDO: VK_DEVICE_PFN(vkBindBufferViewJUICE)
+// UNDO: VK_DEVICE_PFN(vkBindImageViewJUICE)
 
 ///* VK_KHR_buffer_device_address */
 //VK_DEVICE_EXT_PFN(vkGetBufferDeviceAddressKHR)