renderer_opengl: Remove interop
Remove unused interop code from the OpenGL backend.
This commit is contained in:
parent
3da87d3f12
commit
0b631f22fc
|
@ -7,10 +7,6 @@
|
||||||
#include "video_core/buffer_cache/buffer_cache.h"
|
#include "video_core/buffer_cache/buffer_cache.h"
|
||||||
#include "video_core/renderer_opengl/gl_buffer_cache.h"
|
#include "video_core/renderer_opengl/gl_buffer_cache.h"
|
||||||
#include "video_core/renderer_opengl/gl_device.h"
|
#include "video_core/renderer_opengl/gl_device.h"
|
||||||
#include "video_core/vulkan_common/vulkan_device.h"
|
|
||||||
#include "video_core/vulkan_common/vulkan_instance.h"
|
|
||||||
#include "video_core/vulkan_common/vulkan_library.h"
|
|
||||||
#include "video_core/vulkan_common/vulkan_memory_allocator.h"
|
|
||||||
|
|
||||||
namespace OpenGL {
|
namespace OpenGL {
|
||||||
namespace {
|
namespace {
|
||||||
|
@ -66,11 +62,8 @@ void Buffer::MakeResident(GLenum access) noexcept {
|
||||||
glMakeNamedBufferResidentNV(buffer.handle, access);
|
glMakeNamedBufferResidentNV(buffer.handle, access);
|
||||||
}
|
}
|
||||||
|
|
||||||
BufferCacheRuntime::BufferCacheRuntime(const Device& device_, const Vulkan::Device* vulkan_device_,
|
BufferCacheRuntime::BufferCacheRuntime(const Device& device_)
|
||||||
Vulkan::MemoryAllocator* vulkan_memory_allocator_)
|
: device{device_}, has_fast_buffer_sub_data{device.HasFastBufferSubData()},
|
||||||
: device{device_}, vulkan_device{vulkan_device_},
|
|
||||||
vulkan_memory_allocator{vulkan_memory_allocator_},
|
|
||||||
has_fast_buffer_sub_data{device.HasFastBufferSubData()},
|
|
||||||
use_assembly_shaders{device.UseAssemblyShaders()},
|
use_assembly_shaders{device.UseAssemblyShaders()},
|
||||||
has_unified_vertex_buffers{device.HasVertexBufferUnifiedMemory()},
|
has_unified_vertex_buffers{device.HasVertexBufferUnifiedMemory()},
|
||||||
stream_buffer{has_fast_buffer_sub_data ? std::nullopt : std::make_optional<StreamBuffer>()} {
|
stream_buffer{has_fast_buffer_sub_data ? std::nullopt : std::make_optional<StreamBuffer>()} {
|
||||||
|
|
|
@ -15,13 +15,6 @@
|
||||||
#include "video_core/renderer_opengl/gl_device.h"
|
#include "video_core/renderer_opengl/gl_device.h"
|
||||||
#include "video_core/renderer_opengl/gl_resource_manager.h"
|
#include "video_core/renderer_opengl/gl_resource_manager.h"
|
||||||
#include "video_core/renderer_opengl/gl_stream_buffer.h"
|
#include "video_core/renderer_opengl/gl_stream_buffer.h"
|
||||||
#include "video_core/vulkan_common/vulkan_device.h"
|
|
||||||
#include "video_core/vulkan_common/vulkan_memory_allocator.h"
|
|
||||||
|
|
||||||
namespace Vulkan {
|
|
||||||
class Device;
|
|
||||||
class MemoryAllocator;
|
|
||||||
} // namespace Vulkan
|
|
||||||
|
|
||||||
namespace OpenGL {
|
namespace OpenGL {
|
||||||
|
|
||||||
|
@ -59,8 +52,7 @@ class BufferCacheRuntime {
|
||||||
public:
|
public:
|
||||||
static constexpr u8 INVALID_BINDING = std::numeric_limits<u8>::max();
|
static constexpr u8 INVALID_BINDING = std::numeric_limits<u8>::max();
|
||||||
|
|
||||||
explicit BufferCacheRuntime(const Device& device_, const Vulkan::Device* vulkan_device_,
|
explicit BufferCacheRuntime(const Device& device_);
|
||||||
Vulkan::MemoryAllocator* vulkan_memory_allocator_);
|
|
||||||
|
|
||||||
void CopyBuffer(Buffer& dst_buffer, Buffer& src_buffer,
|
void CopyBuffer(Buffer& dst_buffer, Buffer& src_buffer,
|
||||||
std::span<const VideoCommon::BufferCopy> copies);
|
std::span<const VideoCommon::BufferCopy> copies);
|
||||||
|
@ -132,8 +124,6 @@ private:
|
||||||
};
|
};
|
||||||
|
|
||||||
const Device& device;
|
const Device& device;
|
||||||
const Vulkan::Device* vulkan_device;
|
|
||||||
Vulkan::MemoryAllocator* vulkan_memory_allocator;
|
|
||||||
|
|
||||||
bool has_fast_buffer_sub_data = false;
|
bool has_fast_buffer_sub_data = false;
|
||||||
bool use_assembly_shaders = false;
|
bool use_assembly_shaders = false;
|
||||||
|
|
|
@ -197,7 +197,7 @@ bool IsASTCSupported() {
|
||||||
}
|
}
|
||||||
} // Anonymous namespace
|
} // Anonymous namespace
|
||||||
|
|
||||||
Device::Device(bool has_vulkan_instance) {
|
Device::Device() {
|
||||||
if (!GLAD_GL_VERSION_4_6) {
|
if (!GLAD_GL_VERSION_4_6) {
|
||||||
LOG_ERROR(Render_OpenGL, "OpenGL 4.6 is not available");
|
LOG_ERROR(Render_OpenGL, "OpenGL 4.6 is not available");
|
||||||
throw std::runtime_error{"Insufficient version"};
|
throw std::runtime_error{"Insufficient version"};
|
||||||
|
@ -246,8 +246,7 @@ Device::Device(bool has_vulkan_instance) {
|
||||||
|
|
||||||
use_assembly_shaders = Settings::values.use_assembly_shaders.GetValue() &&
|
use_assembly_shaders = Settings::values.use_assembly_shaders.GetValue() &&
|
||||||
GLAD_GL_NV_gpu_program5 && GLAD_GL_NV_compute_program5 &&
|
GLAD_GL_NV_gpu_program5 && GLAD_GL_NV_compute_program5 &&
|
||||||
GLAD_GL_NV_transform_feedback && GLAD_GL_NV_transform_feedback2 &&
|
GLAD_GL_NV_transform_feedback && GLAD_GL_NV_transform_feedback2;
|
||||||
has_vulkan_instance;
|
|
||||||
|
|
||||||
use_asynchronous_shaders = Settings::values.use_asynchronous_shaders.GetValue();
|
use_asynchronous_shaders = Settings::values.use_asynchronous_shaders.GetValue();
|
||||||
use_driver_cache = is_nvidia;
|
use_driver_cache = is_nvidia;
|
||||||
|
|
|
@ -19,7 +19,7 @@ public:
|
||||||
u32 image{};
|
u32 image{};
|
||||||
};
|
};
|
||||||
|
|
||||||
explicit Device(bool has_vulkan_instance);
|
explicit Device();
|
||||||
explicit Device(std::nullptr_t);
|
explicit Device(std::nullptr_t);
|
||||||
|
|
||||||
u32 GetMaxUniformBuffers(Tegra::Engines::ShaderType shader_type) const noexcept {
|
u32 GetMaxUniformBuffers(Tegra::Engines::ShaderType shader_type) const noexcept {
|
||||||
|
|
|
@ -167,8 +167,6 @@ ImageViewType ImageViewTypeFromEntry(const ImageEntry& entry) {
|
||||||
|
|
||||||
RasterizerOpenGL::RasterizerOpenGL(Core::Frontend::EmuWindow& emu_window_, Tegra::GPU& gpu_,
|
RasterizerOpenGL::RasterizerOpenGL(Core::Frontend::EmuWindow& emu_window_, Tegra::GPU& gpu_,
|
||||||
Core::Memory::Memory& cpu_memory_, const Device& device_,
|
Core::Memory::Memory& cpu_memory_, const Device& device_,
|
||||||
const Vulkan::Device* vulkan_device,
|
|
||||||
Vulkan::MemoryAllocator* vulkan_memory_allocator,
|
|
||||||
ScreenInfo& screen_info_, ProgramManager& program_manager_,
|
ScreenInfo& screen_info_, ProgramManager& program_manager_,
|
||||||
StateTracker& state_tracker_)
|
StateTracker& state_tracker_)
|
||||||
: RasterizerAccelerated(cpu_memory_), gpu(gpu_), maxwell3d(gpu.Maxwell3D()),
|
: RasterizerAccelerated(cpu_memory_), gpu(gpu_), maxwell3d(gpu.Maxwell3D()),
|
||||||
|
@ -176,7 +174,7 @@ RasterizerOpenGL::RasterizerOpenGL(Core::Frontend::EmuWindow& emu_window_, Tegra
|
||||||
screen_info(screen_info_), program_manager(program_manager_), state_tracker(state_tracker_),
|
screen_info(screen_info_), program_manager(program_manager_), state_tracker(state_tracker_),
|
||||||
texture_cache_runtime(device, program_manager, state_tracker),
|
texture_cache_runtime(device, program_manager, state_tracker),
|
||||||
texture_cache(texture_cache_runtime, *this, maxwell3d, kepler_compute, gpu_memory),
|
texture_cache(texture_cache_runtime, *this, maxwell3d, kepler_compute, gpu_memory),
|
||||||
buffer_cache_runtime(device, vulkan_device, vulkan_memory_allocator),
|
buffer_cache_runtime(device),
|
||||||
buffer_cache(*this, maxwell3d, kepler_compute, gpu_memory, cpu_memory_, buffer_cache_runtime),
|
buffer_cache(*this, maxwell3d, kepler_compute, gpu_memory, cpu_memory_, buffer_cache_runtime),
|
||||||
shader_cache(*this, emu_window_, gpu, maxwell3d, kepler_compute, gpu_memory, device),
|
shader_cache(*this, emu_window_, gpu, maxwell3d, kepler_compute, gpu_memory, device),
|
||||||
query_cache(*this, maxwell3d, gpu_memory),
|
query_cache(*this, maxwell3d, gpu_memory),
|
||||||
|
|
|
@ -46,11 +46,6 @@ namespace Tegra {
|
||||||
class MemoryManager;
|
class MemoryManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace Vulkan {
|
|
||||||
class Device;
|
|
||||||
class MemoryAllocator;
|
|
||||||
} // namespace Vulkan
|
|
||||||
|
|
||||||
namespace OpenGL {
|
namespace OpenGL {
|
||||||
|
|
||||||
struct ScreenInfo;
|
struct ScreenInfo;
|
||||||
|
@ -67,8 +62,6 @@ class RasterizerOpenGL : public VideoCore::RasterizerAccelerated {
|
||||||
public:
|
public:
|
||||||
explicit RasterizerOpenGL(Core::Frontend::EmuWindow& emu_window_, Tegra::GPU& gpu_,
|
explicit RasterizerOpenGL(Core::Frontend::EmuWindow& emu_window_, Tegra::GPU& gpu_,
|
||||||
Core::Memory::Memory& cpu_memory_, const Device& device_,
|
Core::Memory::Memory& cpu_memory_, const Device& device_,
|
||||||
const Vulkan::Device* vulkan_device,
|
|
||||||
Vulkan::MemoryAllocator* vulkan_memory_allocator,
|
|
||||||
ScreenInfo& screen_info_, ProgramManager& program_manager_,
|
ScreenInfo& screen_info_, ProgramManager& program_manager_,
|
||||||
StateTracker& state_tracker_);
|
StateTracker& state_tracker_);
|
||||||
~RasterizerOpenGL() override;
|
~RasterizerOpenGL() override;
|
||||||
|
|
|
@ -27,11 +27,6 @@
|
||||||
#include "video_core/renderer_opengl/gl_shader_manager.h"
|
#include "video_core/renderer_opengl/gl_shader_manager.h"
|
||||||
#include "video_core/renderer_opengl/renderer_opengl.h"
|
#include "video_core/renderer_opengl/renderer_opengl.h"
|
||||||
#include "video_core/textures/decoders.h"
|
#include "video_core/textures/decoders.h"
|
||||||
#include "video_core/vulkan_common/vulkan_debug_callback.h"
|
|
||||||
#include "video_core/vulkan_common/vulkan_device.h"
|
|
||||||
#include "video_core/vulkan_common/vulkan_instance.h"
|
|
||||||
#include "video_core/vulkan_common/vulkan_library.h"
|
|
||||||
#include "video_core/vulkan_common/vulkan_memory_allocator.h"
|
|
||||||
|
|
||||||
namespace OpenGL {
|
namespace OpenGL {
|
||||||
namespace {
|
namespace {
|
||||||
|
@ -127,93 +122,16 @@ void APIENTRY DebugHandler(GLenum source, GLenum type, GLuint id, GLenum severit
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Vulkan::vk::PhysicalDevice FindPhysicalDevice(Vulkan::vk::Instance& instance) {
|
|
||||||
using namespace Vulkan;
|
|
||||||
using UUID = std::array<GLubyte, GL_UUID_SIZE_EXT>;
|
|
||||||
|
|
||||||
GLint num_device_uuids;
|
|
||||||
glGetIntegerv(GL_NUM_DEVICE_UUIDS_EXT, &num_device_uuids);
|
|
||||||
std::vector<UUID> device_uuids(num_device_uuids);
|
|
||||||
for (GLint index = 0; index < num_device_uuids; ++index) {
|
|
||||||
glGetUnsignedBytei_vEXT(GL_DEVICE_UUID_EXT, 0, device_uuids[index].data());
|
|
||||||
}
|
|
||||||
UUID driver_uuid;
|
|
||||||
glGetUnsignedBytevEXT(GL_DRIVER_UUID_EXT, driver_uuid.data());
|
|
||||||
|
|
||||||
for (const VkPhysicalDevice raw_physical_device : instance.EnumeratePhysicalDevices()) {
|
|
||||||
VkPhysicalDeviceIDProperties device_id_properties{};
|
|
||||||
device_id_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES;
|
|
||||||
|
|
||||||
VkPhysicalDeviceProperties2KHR properties{
|
|
||||||
.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR,
|
|
||||||
.pNext = &device_id_properties,
|
|
||||||
.properties{},
|
|
||||||
};
|
|
||||||
vk::PhysicalDevice physical_device(raw_physical_device, instance.Dispatch());
|
|
||||||
physical_device.GetProperties2KHR(properties);
|
|
||||||
if (!std::ranges::equal(device_id_properties.driverUUID, driver_uuid)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
const auto it =
|
|
||||||
std::ranges::find_if(device_uuids, [&device_id_properties, driver_uuid](UUID uuid) {
|
|
||||||
return std::ranges::equal(device_id_properties.deviceUUID, uuid);
|
|
||||||
});
|
|
||||||
if (it != device_uuids.end()) {
|
|
||||||
return physical_device;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
throw vk::Exception(VK_ERROR_INCOMPATIBLE_DRIVER);
|
|
||||||
}
|
|
||||||
} // Anonymous namespace
|
} // Anonymous namespace
|
||||||
|
|
||||||
struct VulkanObjects {
|
|
||||||
static std::unique_ptr<VulkanObjects> TryCreate() {
|
|
||||||
if (!GLAD_GL_EXT_memory_object) {
|
|
||||||
// Interop is not present
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
const std::string_view vendor{reinterpret_cast<const char*>(glGetString(GL_VENDOR))};
|
|
||||||
if (vendor == "ATI Technologies Inc.") {
|
|
||||||
// Avoid using GL_EXT_memory_object on AMD, as it makes the GL driver crash
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
if (!Settings::values.use_assembly_shaders.GetValue()) {
|
|
||||||
// We only need interop when assembly shaders are enabled
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
#ifdef __linux__
|
|
||||||
LOG_WARNING(Render_OpenGL, "Interop doesn't work on Linux at the moment");
|
|
||||||
return nullptr;
|
|
||||||
#endif
|
|
||||||
try {
|
|
||||||
return std::make_unique<VulkanObjects>();
|
|
||||||
} catch (const Vulkan::vk::Exception& exception) {
|
|
||||||
LOG_ERROR(Render_OpenGL, "Failed to initialize Vulkan objects with error: {}",
|
|
||||||
exception.what());
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Common::DynamicLibrary library{Vulkan::OpenLibrary()};
|
|
||||||
Vulkan::vk::InstanceDispatch dld;
|
|
||||||
Vulkan::vk::Instance instance{Vulkan::CreateInstance(library, dld, VK_API_VERSION_1_1)};
|
|
||||||
Vulkan::Device device{*instance, FindPhysicalDevice(instance), nullptr, dld};
|
|
||||||
Vulkan::MemoryAllocator memory_allocator{device, true};
|
|
||||||
};
|
|
||||||
|
|
||||||
RendererOpenGL::RendererOpenGL(Core::TelemetrySession& telemetry_session_,
|
RendererOpenGL::RendererOpenGL(Core::TelemetrySession& telemetry_session_,
|
||||||
Core::Frontend::EmuWindow& emu_window_,
|
Core::Frontend::EmuWindow& emu_window_,
|
||||||
Core::Memory::Memory& cpu_memory_, Tegra::GPU& gpu_,
|
Core::Memory::Memory& cpu_memory_, Tegra::GPU& gpu_,
|
||||||
std::unique_ptr<Core::Frontend::GraphicsContext> context_)
|
std::unique_ptr<Core::Frontend::GraphicsContext> context_)
|
||||||
: RendererBase{emu_window_, std::move(context_)}, telemetry_session{telemetry_session_},
|
: RendererBase{emu_window_, std::move(context_)}, telemetry_session{telemetry_session_},
|
||||||
emu_window{emu_window_}, cpu_memory{cpu_memory_}, gpu{gpu_},
|
emu_window{emu_window_}, cpu_memory{cpu_memory_}, gpu{gpu_}, state_tracker{gpu},
|
||||||
vulkan_objects{VulkanObjects::TryCreate()}, device{vulkan_objects != nullptr},
|
program_manager{device},
|
||||||
state_tracker{gpu}, program_manager{device},
|
rasterizer(emu_window, gpu, cpu_memory, device, screen_info, program_manager, state_tracker) {
|
||||||
rasterizer(emu_window, gpu, cpu_memory, device,
|
|
||||||
vulkan_objects ? &vulkan_objects->device : nullptr,
|
|
||||||
vulkan_objects ? &vulkan_objects->memory_allocator : nullptr, screen_info,
|
|
||||||
program_manager, state_tracker) {
|
|
||||||
if (Settings::values.renderer_debug && GLAD_GL_KHR_debug) {
|
if (Settings::values.renderer_debug && GLAD_GL_KHR_debug) {
|
||||||
glEnable(GL_DEBUG_OUTPUT);
|
glEnable(GL_DEBUG_OUTPUT);
|
||||||
glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
|
glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
|
||||||
|
|
|
@ -38,8 +38,6 @@ class GPU;
|
||||||
|
|
||||||
namespace OpenGL {
|
namespace OpenGL {
|
||||||
|
|
||||||
struct VulkanObjects;
|
|
||||||
|
|
||||||
/// Structure used for storing information about the textures for the Switch screen
|
/// Structure used for storing information about the textures for the Switch screen
|
||||||
struct TextureInfo {
|
struct TextureInfo {
|
||||||
OGLTexture resource;
|
OGLTexture resource;
|
||||||
|
@ -101,7 +99,6 @@ private:
|
||||||
Core::Memory::Memory& cpu_memory;
|
Core::Memory::Memory& cpu_memory;
|
||||||
Tegra::GPU& gpu;
|
Tegra::GPU& gpu;
|
||||||
|
|
||||||
std::unique_ptr<VulkanObjects> vulkan_objects;
|
|
||||||
Device device;
|
Device device;
|
||||||
StateTracker state_tracker;
|
StateTracker state_tracker;
|
||||||
ProgramManager program_manager;
|
ProgramManager program_manager;
|
||||||
|
|
Loading…
Reference in New Issue