diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-07-26 12:27:36 +0200 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-07-26 13:49:35 +0200 |
commit | 877d2a0e48a4944951a0d2129ec2f8a7856a1412 (patch) | |
tree | 5244200e0d46c7d2b84fc2dfc078d87e9178fb4c | |
parent | Merge pull request #990 from lioncash/arm (diff) | |
download | yuzu-877d2a0e48a4944951a0d2129ec2f8a7856a1412.tar yuzu-877d2a0e48a4944951a0d2129ec2f8a7856a1412.tar.gz yuzu-877d2a0e48a4944951a0d2129ec2f8a7856a1412.tar.bz2 yuzu-877d2a0e48a4944951a0d2129ec2f8a7856a1412.tar.lz yuzu-877d2a0e48a4944951a0d2129ec2f8a7856a1412.tar.xz yuzu-877d2a0e48a4944951a0d2129ec2f8a7856a1412.tar.zst yuzu-877d2a0e48a4944951a0d2129ec2f8a7856a1412.zip |
-rw-r--r-- | src/video_core/vertex_shader.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/vertex_shader.cpp b/src/video_core/vertex_shader.cpp index b77503806..ad0fc797d 100644 --- a/src/video_core/vertex_shader.cpp +++ b/src/video_core/vertex_shader.cpp @@ -2,8 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include <stack> - +#include <boost/container/static_vector.hpp> #include <boost/range/algorithm.hpp> #include <common/file_util.h> @@ -53,7 +52,7 @@ struct VertexShaderState { }; // TODO: Is there a maximal size for this? - std::stack<CallStackElement> call_stack; + boost::container::static_vector<CallStackElement, 16> call_stack; struct { u32 max_offset; // maximum program counter ever reached @@ -71,13 +70,13 @@ static void ProcessShaderCode(VertexShaderState& state) { while (true) { if (!state.call_stack.empty()) { - auto& top = state.call_stack.top(); + auto& top = state.call_stack.back(); if (state.program_counter - program_code.data() == top.final_address) { state.address_registers[2] += top.loop_increment; if (top.repeat_counter-- == 0) { state.program_counter = &program_code[top.return_address]; - state.call_stack.pop(); + state.call_stack.pop_back(); } else { state.program_counter = &program_code[top.loop_address]; } @@ -94,7 +93,8 @@ static void ProcessShaderCode(VertexShaderState& state) { static auto call = [&program_code](VertexShaderState& state, u32 offset, u32 num_instructions, u32 return_offset, u8 repeat_count, u8 loop_increment) { state.program_counter = &program_code[offset] - 1; // -1 to make sure when incrementing the PC we end up at the correct offset - state.call_stack.push({ offset + num_instructions, return_offset, repeat_count, loop_increment, offset }); + ASSERT(state.call_stack.size() < state.call_stack.capacity()); + state.call_stack.push_back({ offset + num_instructions, return_offset, repeat_count, loop_increment, offset }); }; u32 binary_offset = state.program_counter - program_code.data(); |