summaryrefslogtreecommitdiff
path: root/src/video_core/buffer_cache
diff options
context:
space:
mode:
authorGravatar ReinUsesLisp2019-11-02 04:08:31 -0300
committerGravatar ReinUsesLisp2019-11-02 05:05:34 -0300
commit76ca2a5f82f4df64cb839af42c93acb6705411ae (patch)
tree22ef46bef8f32d8b2aa2f3928a96b30b3f69e213 /src/video_core/buffer_cache
parentMerge pull request #3054 from FernandoS27/fix-tld4-2 (diff)
downloadyuzu-76ca2a5f82f4df64cb839af42c93acb6705411ae.tar.gz
yuzu-76ca2a5f82f4df64cb839af42c93acb6705411ae.tar.xz
yuzu-76ca2a5f82f4df64cb839af42c93acb6705411ae.zip
gl_rasterizer: Upload constant buffers with glNamedBufferSubData
Nvidia's OpenGL driver maps gl(Named)BufferSubData with some requirements to a fast. This path has an extra memcpy but updates the buffer without orphaning or waiting for previous calls. It can be seen as a better model for "push constants" that can upload a whole UBO instead of 256 bytes. This path has some requirements established here: http://on-demand.gputechconf.com/gtc/2014/presentations/S4379-opengl-44-scene-rendering-techniques.pdf#page=24 Instead of using the stream buffer, this commits moves constant buffers uploads to calls of glNamedBufferSubData and from my testing it brings a performance improvement. This is disabled when the vendor is not Nvidia since it brings performance regressions.
Diffstat (limited to 'src/video_core/buffer_cache')
-rw-r--r--src/video_core/buffer_cache/buffer_cache.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h
index 2442ddfd6..63b3a8205 100644
--- a/src/video_core/buffer_cache/buffer_cache.h
+++ b/src/video_core/buffer_cache/buffer_cache.h
@@ -30,7 +30,7 @@ public:
30 using BufferInfo = std::pair<const TBufferType*, u64>; 30 using BufferInfo = std::pair<const TBufferType*, u64>;
31 31
32 BufferInfo UploadMemory(GPUVAddr gpu_addr, std::size_t size, std::size_t alignment = 4, 32 BufferInfo UploadMemory(GPUVAddr gpu_addr, std::size_t size, std::size_t alignment = 4,
33 bool is_written = false) { 33 bool is_written = false, bool use_fast_cbuf = false) {
34 std::lock_guard lock{mutex}; 34 std::lock_guard lock{mutex};
35 35
36 auto& memory_manager = system.GPU().MemoryManager(); 36 auto& memory_manager = system.GPU().MemoryManager();
@@ -43,9 +43,13 @@ public:
43 // Cache management is a big overhead, so only cache entries with a given size. 43 // Cache management is a big overhead, so only cache entries with a given size.
44 // TODO: Figure out which size is the best for given games. 44 // TODO: Figure out which size is the best for given games.
45 constexpr std::size_t max_stream_size = 0x800; 45 constexpr std::size_t max_stream_size = 0x800;
46 if (size < max_stream_size) { 46 if (use_fast_cbuf || size < max_stream_size) {
47 if (!is_written && !IsRegionWritten(cache_addr, cache_addr + size - 1)) { 47 if (!is_written && !IsRegionWritten(cache_addr, cache_addr + size - 1)) {
48 return StreamBufferUpload(host_ptr, size, alignment); 48 if (use_fast_cbuf) {
49 return ConstBufferUpload(host_ptr, size);
50 } else {
51 return StreamBufferUpload(host_ptr, size, alignment);
52 }
49 } 53 }
50 } 54 }
51 55
@@ -152,6 +156,10 @@ protected:
152 virtual void CopyBlock(const TBuffer& src, const TBuffer& dst, std::size_t src_offset, 156 virtual void CopyBlock(const TBuffer& src, const TBuffer& dst, std::size_t src_offset,
153 std::size_t dst_offset, std::size_t size) = 0; 157 std::size_t dst_offset, std::size_t size) = 0;
154 158
159 virtual BufferInfo ConstBufferUpload(const void* raw_pointer, std::size_t size) {
160 return {};
161 }
162
155 /// Register an object into the cache 163 /// Register an object into the cache
156 void Register(const MapInterval& new_map, bool inherit_written = false) { 164 void Register(const MapInterval& new_map, bool inherit_written = false) {
157 const CacheAddr cache_ptr = new_map->GetStart(); 165 const CacheAddr cache_ptr = new_map->GetStart();