diff options
author | Morph <39850852+Morph1984@users.noreply.github.com> | 2023-06-15 00:03:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-15 00:03:11 +0200 |
commit | 702a2ac63164b5af2305113205c3deba327fb4e9 (patch) | |
tree | 386fb267fe068ffa5a6d29e25a630a9fa49dabdb /src/video_core/buffer_cache/buffer_cache.h | |
parent | Merge pull request #10726 from t895/emulation-nav-component (diff) | |
parent | buffer_cache_base: Specify buffer type in HostBindings (diff) | |
download | yuzu-702a2ac63164b5af2305113205c3deba327fb4e9.tar yuzu-702a2ac63164b5af2305113205c3deba327fb4e9.tar.gz yuzu-702a2ac63164b5af2305113205c3deba327fb4e9.tar.bz2 yuzu-702a2ac63164b5af2305113205c3deba327fb4e9.tar.lz yuzu-702a2ac63164b5af2305113205c3deba327fb4e9.tar.xz yuzu-702a2ac63164b5af2305113205c3deba327fb4e9.tar.zst yuzu-702a2ac63164b5af2305113205c3deba327fb4e9.zip |
Diffstat (limited to 'src/video_core/buffer_cache/buffer_cache.h')
-rw-r--r-- | src/video_core/buffer_cache/buffer_cache.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index 251a4a880..9bafd8cc0 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -715,7 +715,7 @@ void BufferCache<P>::BindHostIndexBuffer() { template <class P> void BufferCache<P>::BindHostVertexBuffers() { - HostBindings host_bindings; + HostBindings<typename P::Buffer> host_bindings; bool any_valid{false}; auto& flags = maxwell3d->dirty.flags; for (u32 index = 0; index < NUM_VERTEX_BUFFERS; ++index) { @@ -741,7 +741,7 @@ void BufferCache<P>::BindHostVertexBuffers() { const u32 stride = maxwell3d->regs.vertex_streams[index].stride; const u32 offset = buffer.Offset(binding.cpu_addr); - host_bindings.buffers.push_back(reinterpret_cast<void*>(&buffer)); + host_bindings.buffers.push_back(&buffer); host_bindings.offsets.push_back(offset); host_bindings.sizes.push_back(binding.size); host_bindings.strides.push_back(stride); @@ -900,7 +900,7 @@ void BufferCache<P>::BindHostTransformFeedbackBuffers() { if (maxwell3d->regs.transform_feedback_enabled == 0) { return; } - HostBindings host_bindings; + HostBindings<typename P::Buffer> host_bindings; for (u32 index = 0; index < NUM_TRANSFORM_FEEDBACK_BUFFERS; ++index) { const Binding& binding = channel_state->transform_feedback_buffers[index]; if (maxwell3d->regs.transform_feedback.controls[index].varying_count == 0 && @@ -913,7 +913,7 @@ void BufferCache<P>::BindHostTransformFeedbackBuffers() { SynchronizeBuffer(buffer, binding.cpu_addr, size); const u32 offset = buffer.Offset(binding.cpu_addr); - host_bindings.buffers.push_back(reinterpret_cast<void*>(&buffer)); + host_bindings.buffers.push_back(&buffer); host_bindings.offsets.push_back(offset); host_bindings.sizes.push_back(binding.size); } |