VERY experimental Nintendo Switch 2 emulator
C++
gl_rasterizer: Implement DrawTransformFeedback macro
Ameer J2fc6f3fcfd94
diff --git a/src/video_core/macro/macro_hle.cpp b/src/video_core/macro/macro_hle.cppindex 046c8085e5..46e853e040 100644--- a/src/video_core/macro/macro_hle.cpp+++ b/src/video_core/macro/macro_hle.cpp@@ -327,12 +327,13 @@ public:explicit HLE_DrawIndirectByteCount(Maxwell3D& maxwell3d_) : HLEMacroImpl(maxwell3d_) {}void Execute(const std::vector<u32>& parameters, [[maybe_unused]] u32 method) override {+ const bool force = maxwell3d.Rasterizer().HasDrawTransformFeedback();+auto topology = static_cast<Maxwell3D::Regs::PrimitiveTopology>(parameters[0] & 0xFFFFU);- if (!maxwell3d.AnyParametersDirty() || !IsTopologySafe(topology)) {+ if (!force && (!maxwell3d.AnyParametersDirty() || !IsTopologySafe(topology))) {Fallback(parameters);return;}-auto& params = maxwell3d.draw_manager->GetIndirectParams();params.is_byte_count = true;params.is_indexed = false;@@ -503,6 +504,8 @@ public:maxwell3d.CallMethod(static_cast<size_t>(MAXWELL3D_REG_INDEX(launch_dma)), 0x1011, true);maxwell3d.CallMethod(static_cast<size_t>(MAXWELL3D_REG_INDEX(inline_data)),regs.transform_feedback.controls[0].stride, true);++ maxwell3d.Rasterizer().RegisterTransformFeedback(regs.upload.dest.Address());}};diff --git a/src/video_core/rasterizer_interface.h b/src/video_core/rasterizer_interface.hindex af1469147b..49224ca85c 100644--- a/src/video_core/rasterizer_interface.h+++ b/src/video_core/rasterizer_interface.h@@ -173,5 +173,13 @@ public:virtual void BindChannel(Tegra::Control::ChannelState& channel) {}virtual void ReleaseChannel(s32 channel_id) {}++ /// Register the address as a Transform Feedback Object+ virtual void RegisterTransformFeedback(GPUVAddr tfb_object_addr) {}++ /// Returns true when the rasterizer has Draw Transform Feedback capabilities+ virtual bool HasDrawTransformFeedback() {+ return false;+ }};} // namespace VideoCorediff --git a/src/video_core/renderer_opengl/gl_buffer_cache.cpp b/src/video_core/renderer_opengl/gl_buffer_cache.cppindex b787b69948..517ac14dd5 100644--- a/src/video_core/renderer_opengl/gl_buffer_cache.cpp+++ b/src/video_core/renderer_opengl/gl_buffer_cache.cpp@@ -376,4 +376,15 @@ void BufferCacheRuntime::BindImageBuffer(Buffer& buffer, u32 offset, u32 size, P*image_handles++ = buffer.View(offset, size, format);}+void BufferCacheRuntime::BindTransformFeedbackObject(GPUVAddr tfb_object_addr) {+ OGLTransformFeedback& tfb_object = tfb_objects[tfb_object_addr];+ tfb_object.Create();+ glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, tfb_object.handle);+}++GLuint BufferCacheRuntime::GetTransformFeedbackObject(GPUVAddr tfb_object_addr) {+ ASSERT(tfb_objects.contains(tfb_object_addr));+ return tfb_objects[tfb_object_addr].handle;+}+} // namespace OpenGLdiff --git a/src/video_core/renderer_opengl/gl_buffer_cache.h b/src/video_core/renderer_opengl/gl_buffer_cache.hindex 1e8708f59e..2c18de1669 100644--- a/src/video_core/renderer_opengl/gl_buffer_cache.h+++ b/src/video_core/renderer_opengl/gl_buffer_cache.h@@ -5,6 +5,7 @@#include <array>#include <span>+#include <unordered_map>#include "common/common_types.h"#include "video_core/buffer_cache/buffer_cache_base.h"@@ -121,6 +122,9 @@ public:void BindImageBuffer(Buffer& buffer, u32 offset, u32 size,VideoCore::Surface::PixelFormat format);+ void BindTransformFeedbackObject(GPUVAddr tfb_object_addr);+ GLuint GetTransformFeedbackObject(GPUVAddr tfb_object_addr);+u64 GetDeviceMemoryUsage() const;void BindFastUniformBuffer(size_t stage, u32 binding_index, u32 size) {@@ -233,6 +237,7 @@ private:u32 index_buffer_offset = 0;u64 device_access_memory;+ std::unordered_map<GPUVAddr, OGLTransformFeedback> tfb_objects;};struct BufferCacheParams {diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cppindex 4832c03c57..291515e735 100644--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp@@ -294,6 +294,13 @@ void RasterizerOpenGL::DrawIndirect() {const auto& params = maxwell3d->draw_manager->GetIndirectParams();buffer_cache.SetDrawIndirect(¶ms);PrepareDraw(params.is_indexed, [this, ¶ms](GLenum primitive_mode) {+ if (params.is_byte_count) {+ const GPUVAddr tfb_object_base_addr = params.indirect_start_address - 4U;+ const GLuint tfb_object =+ buffer_cache_runtime.GetTransformFeedbackObject(tfb_object_base_addr);+ glDrawTransformFeedback(primitive_mode, tfb_object);+ return;+ }const auto [buffer, offset] = buffer_cache.GetDrawIndirectBuffer();const GLvoid* const gl_offset =reinterpret_cast<const GLvoid*>(static_cast<uintptr_t>(offset));@@ -1350,6 +1357,10 @@ void RasterizerOpenGL::ReleaseChannel(s32 channel_id) {query_cache.EraseChannel(channel_id);}+void RasterizerOpenGL::RegisterTransformFeedback(GPUVAddr tfb_object_addr) {+ buffer_cache_runtime.BindTransformFeedbackObject(tfb_object_addr);+}+AccelerateDMA::AccelerateDMA(BufferCache& buffer_cache_, TextureCache& texture_cache_): buffer_cache{buffer_cache_}, texture_cache{texture_cache_} {}diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.hindex ceffe1f1ea..d28388a9d0 100644--- a/src/video_core/renderer_opengl/gl_rasterizer.h+++ b/src/video_core/renderer_opengl/gl_rasterizer.h@@ -139,6 +139,12 @@ public:void ReleaseChannel(s32 channel_id) override;+ void RegisterTransformFeedback(GPUVAddr tfb_object_addr) override;++ bool HasDrawTransformFeedback() override {+ return true;+ }+private:static constexpr size_t MAX_TEXTURES = 192;static constexpr size_t MAX_IMAGES = 48;diff --git a/src/video_core/renderer_opengl/gl_resource_manager.cpp b/src/video_core/renderer_opengl/gl_resource_manager.cppindex eae8fd1108..1d2c9b70a6 100644--- a/src/video_core/renderer_opengl/gl_resource_manager.cpp+++ b/src/video_core/renderer_opengl/gl_resource_manager.cpp@@ -207,4 +207,21 @@ void OGLQuery::Release() {handle = 0;}+void OGLTransformFeedback::Create() {+ if (handle != 0)+ return;++ MICROPROFILE_SCOPE(OpenGL_ResourceCreation);+ glCreateTransformFeedbacks(1, &handle);+}++void OGLTransformFeedback::Release() {+ if (handle == 0)+ return;++ MICROPROFILE_SCOPE(OpenGL_ResourceDeletion);+ glDeleteTransformFeedbacks(1, &handle);+ handle = 0;+}+} // namespace OpenGLdiff --git a/src/video_core/renderer_opengl/gl_resource_manager.h b/src/video_core/renderer_opengl/gl_resource_manager.hindex 77362acd26..6ca8227bdb 100644--- a/src/video_core/renderer_opengl/gl_resource_manager.h+++ b/src/video_core/renderer_opengl/gl_resource_manager.h@@ -323,4 +323,31 @@ public:GLuint handle = 0;};+class OGLTransformFeedback final {+public:+ YUZU_NON_COPYABLE(OGLTransformFeedback);++ OGLTransformFeedback() = default;++ OGLTransformFeedback(OGLTransformFeedback&& o) noexcept : handle(std::exchange(o.handle, 0)) {}++ ~OGLTransformFeedback() {+ Release();+ }++ OGLTransformFeedback& operator=(OGLTransformFeedback&& o) noexcept {+ Release();+ handle = std::exchange(o.handle, 0);+ return *this;+ }++ /// Creates a new internal OpenGL resource and stores the handle+ void Create();++ /// Deletes the internal OpenGL resource+ void Release();++ GLuint handle = 0;+};+} // namespace OpenGL