diff options
| author |  Jan Beich | 2020-05-01 23:08:41 +0000 |
|---|---|---|
| committer | Jan Beich | 2020-05-01 23:38:23 +0000 |
| commit | b4d0724a63e0edb09c8bf057bbbf247fdf2d8427 (patch) | |
| tree | f1e45f78f22702a3692e0f4a0134409d4ed89415 /src | |
| parent | Merge pull request #3857 from ogniK5377/GetGpuTime-StackCorruption (diff) | |
| download | yuzu-b4d0724a63e0edb09c8bf057bbbf247fdf2d8427.tar.gz yuzu-b4d0724a63e0edb09c8bf057bbbf247fdf2d8427.tar.xz yuzu-b4d0724a63e0edb09c8bf057bbbf247fdf2d8427.zip | |
fixed_pipeline_state: explicitly use template keyword after 1f345ebe3a55
In file included from src/video_core/renderer_opengl/renderer_opengl.cpp:25:
In file included from src/./video_core/renderer_opengl/gl_rasterizer.h:26:
In file included from src/./video_core/renderer_opengl/gl_fence_manager.h:11:
src/./video_core/fence_manager.h:91:32: error: use 'template' keyword
to treat 'Write' as a dependent template name
memory_manager.Write<u32>(current_fence->GetAddress(), current_fence->GetPayload());
^
template
src/./video_core/fence_manager.h:137:32: error: use 'template'
keyword to treat 'Write' as a dependent template name
memory_manager.Write<u32>(current_fence->GetAddress(), current_fence->GetPayload());
^
template
Diffstat (limited to '')
| -rw-r--r-- | src/video_core/fence_manager.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/video_core/fence_manager.h b/src/video_core/fence_manager.h index dabd1588c..8b2a6a42c 100644 --- a/src/video_core/fence_manager.h +++ b/src/video_core/fence_manager.h | |||
| @@ -88,7 +88,8 @@ public: | |||
| 88 | } | 88 | } |
| 89 | PopAsyncFlushes(); | 89 | PopAsyncFlushes(); |
| 90 | if (current_fence->IsSemaphore()) { | 90 | if (current_fence->IsSemaphore()) { |
| 91 | memory_manager.Write<u32>(current_fence->GetAddress(), current_fence->GetPayload()); | 91 | memory_manager.template Write<u32>(current_fence->GetAddress(), |
| 92 | current_fence->GetPayload()); | ||
| 92 | } else { | 93 | } else { |
| 93 | gpu.IncrementSyncPoint(current_fence->GetPayload()); | 94 | gpu.IncrementSyncPoint(current_fence->GetPayload()); |
| 94 | } | 95 | } |
| @@ -134,7 +135,8 @@ private: | |||
| 134 | } | 135 | } |
| 135 | PopAsyncFlushes(); | 136 | PopAsyncFlushes(); |
| 136 | if (current_fence->IsSemaphore()) { | 137 | if (current_fence->IsSemaphore()) { |
| 137 | memory_manager.Write<u32>(current_fence->GetAddress(), current_fence->GetPayload()); | 138 | memory_manager.template Write<u32>(current_fence->GetAddress(), |
| 139 | current_fence->GetPayload()); | ||
| 138 | } else { | 140 | } else { |
| 139 | gpu.IncrementSyncPoint(current_fence->GetPayload()); | 141 | gpu.IncrementSyncPoint(current_fence->GetPayload()); |
| 140 | } | 142 | } |