mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-12 04:14:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unecessary vulkan loader check var, per kd

Browse Source
This commit is contained in:
JohnHolmesII 2019-06-06 20:42:18 -07:00 committed by Nekotekina
parent a124ec4a26
commit 948c1df969
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rpcs3/Emu/RSX/VK/VKHelpers.h
View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "stdafx.h" #include "stdafx.h"
#include <exception> #include <exception>
@ -170,7 +170,7 @@ namespace vk
void insert_buffer_memory_barrier(VkCommandBuffer cmd, VkBuffer buffer, VkDeviceSize offset, VkDeviceSize length, void insert_buffer_memory_barrier(VkCommandBuffer cmd, VkBuffer buffer, VkDeviceSize offset, VkDeviceSize length,
VkPipelineStageFlags src_stage, VkPipelineStageFlags dst_stage, VkAccessFlags src_mask, VkAccessFlags dst_mask); VkPipelineStageFlags src_stage, VkPipelineStageFlags dst_stage, VkAccessFlags src_mask, VkAccessFlags dst_mask);
void insert_image_memory_barrier(VkCommandBuffer cmd, VkImage image, VkImageLayout current_layout, VkImageLayout new_layout, void insert_image_memory_barrier(VkCommandBuffer cmd, VkImage image, VkImageLayout current_layout, VkImageLayout new_layout,
VkPipelineStageFlags src_stage, VkPipelineStageFlags dst_stage, VkAccessFlags src_mask, VkAccessFlags dst_mask, VkPipelineStageFlags src_stage, VkPipelineStageFlags dst_stage, VkAccessFlags src_mask, VkAccessFlags dst_mask,
const VkImageSubresourceRange& range); const VkImageSubresourceRange& range);
@ -2313,7 +2313,6 @@ public:
PFN_vkCreateDebugReportCallbackEXT createDebugReportCallback = nullptr; PFN_vkCreateDebugReportCallbackEXT createDebugReportCallback = nullptr;
VkDebugReportCallbackEXT m_debugger = nullptr; VkDebugReportCallbackEXT m_debugger = nullptr;
bool loader_exists = false;
bool extensions_loaded = false; bool extensions_loaded = false;
public: public:
@ -2321,9 +2320,6 @@ public:
context() context()
{ {
m_instance = nullptr; m_instance = nullptr;
//Check that some critical entry-points have been loaded into memory indicating presence of a loader
loader_exists = (vkCreateInstance != nullptr);
} }
~context() ~context()
@ -2370,8 +2366,6 @@ public:
uint32_t createInstance(const char *app_name, bool fast = false) uint32_t createInstance(const char *app_name, bool fast = false)
{ {
if (!loader_exists) return 0;
//Initialize a vulkan instance //Initialize a vulkan instance
VkApplicationInfo app = {}; VkApplicationInfo app = {};
@ -2477,9 +2471,6 @@ public:
std::vector<physical_device>& enumerateDevices() std::vector<physical_device>& enumerateDevices()
{ {
if (!loader_exists)
return gpus;
uint32_t num_gpus; uint32_t num_gpus;
// This may fail on unsupported drivers, so just assume no devices // This may fail on unsupported drivers, so just assume no devices
if (vkEnumeratePhysicalDevices(m_instance, &num_gpus, nullptr) != VK_SUCCESS) if (vkEnumeratePhysicalDevices(m_instance, &num_gpus, nullptr) != VK_SUCCESS)