OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-22 17:00:05 +00:00
Code Issues Projects Releases Wiki Activity

video_core:fix warnings

Browse Source
This commit is contained in:
SachinVin 2023-06-09 22:48:16 +05:30
parent c66594caf8
commit 796e8a9f24
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/video_core/geometry_pipeline.cpp
View File

@ -150,7 +150,7 @@ public:
setup.uniforms.f[0] = Common::MakeVec(vertex_num, vertex_num, vertex_num, vertex_num); setup.uniforms.f[0] = Common::MakeVec(vertex_num, vertex_num, vertex_num, vertex_num);
// The second uniform register and so on are used for receiving input vertices // The second uniform register and so on are used for receiving input vertices
buffer_cur = setup.uniforms.f + 1; buffer_cur = setup.uniforms.f.data() + 1;
main_vertex_num = regs.pipeline.variable_vertex_main_num_minus_1 + 1; main_vertex_num = regs.pipeline.variable_vertex_main_num_minus_1 + 1;
total_vertex_num = val; total_vertex_num = val;
@ -200,7 +200,7 @@ private:
template <class Archive> template <class Archive>
void save(Archive& ar, const unsigned int version) const { void save(Archive& ar, const unsigned int version) const {
serialize_common(this, ar, version); serialize_common(this, ar, version);
auto buffer_idx = static_cast<u32>(buffer_cur - setup.uniforms.f); auto buffer_idx = static_cast<u32>(buffer_cur - setup.uniforms.f.data());
ar << buffer_idx; ar << buffer_idx;
} }
@ -209,7 +209,7 @@ private:
serialize_common(this, ar, version); serialize_common(this, ar, version);
u32 buffer_idx; u32 buffer_idx;
ar >> buffer_idx; ar >> buffer_idx;
buffer_cur = setup.uniforms.f + buffer_idx; buffer_cur = setup.uniforms.f.data() + buffer_idx;
} }
BOOST_SERIALIZATION_SPLIT_MEMBER() BOOST_SERIALIZATION_SPLIT_MEMBER()
@ -229,7 +229,7 @@ public:
vs_output_num = regs.pipeline.vs_outmap_total_minus_1_a + 1; vs_output_num = regs.pipeline.vs_outmap_total_minus_1_a + 1;
ASSERT(vs_output_num == regs.pipeline.gs_config.stride_minus_1 + 1); ASSERT(vs_output_num == regs.pipeline.gs_config.stride_minus_1 + 1);
std::size_t vertex_num = regs.pipeline.gs_config.fixed_vertex_num_minus_1 + 1; std::size_t vertex_num = regs.pipeline.gs_config.fixed_vertex_num_minus_1 + 1;
buffer_cur = buffer_begin = setup.uniforms.f + regs.pipeline.gs_config.start_index; buffer_cur = buffer_begin = setup.uniforms.f.data() + regs.pipeline.gs_config.start_index;
buffer_end = buffer_begin + vs_output_num * vertex_num; buffer_end = buffer_begin + vs_output_num * vertex_num;
} }
@ -273,9 +273,9 @@ private:
template <class Archive> template <class Archive>
void save(Archive& ar, const unsigned int version) const { void save(Archive& ar, const unsigned int version) const {
serialize_common(this, ar, version); serialize_common(this, ar, version);
auto buffer_offset = static_cast<u32>(buffer_begin - setup.uniforms.f); auto buffer_offset = static_cast<u32>(buffer_begin - setup.uniforms.f.data());
auto buffer_idx = static_cast<u32>(buffer_cur - setup.uniforms.f); auto buffer_idx = static_cast<u32>(buffer_cur - setup.uniforms.f.data());
auto buffer_size = static_cast<u32>(buffer_end - setup.uniforms.f); auto buffer_size = static_cast<u32>(buffer_end - setup.uniforms.f.data());
ar << buffer_offset; ar << buffer_offset;
ar << buffer_idx; ar << buffer_idx;
ar << buffer_size; ar << buffer_size;
@ -288,9 +288,9 @@ private:
ar >> buffer_offset; ar >> buffer_offset;
ar >> buffer_idx; ar >> buffer_idx;
ar >> buffer_size; ar >> buffer_size;
buffer_begin = setup.uniforms.f + buffer_offset; buffer_begin = setup.uniforms.f.data() + buffer_offset;
buffer_cur = setup.uniforms.f + buffer_idx; buffer_cur = setup.uniforms.f.data() + buffer_idx;
buffer_end = setup.uniforms.f + buffer_size; buffer_end = setup.uniforms.f.data() + buffer_size;
} }
BOOST_SERIALIZATION_SPLIT_MEMBER() BOOST_SERIALIZATION_SPLIT_MEMBER()

9
src/video_core/pica.cpp
View File

@ -32,8 +32,7 @@ void Shutdown() {
template <typename T> template <typename T>
void Zero(T& o) { void Zero(T& o) {
static_assert(std::is_trivially_copyable_v<T>, static_assert(std::is_trivial_v<T>, "It's undefined behavior to memset a non-trivial type");
"It's undefined behavior to memset a non-trivially copyable type");
memset(&o, 0, sizeof(o)); memset(&o, 0, sizeof(o));
} }
@ -56,10 +55,10 @@ State::State() : geometry_pipeline(*this) {
void State::Reset() { void State::Reset() {
Zero(regs); Zero(regs);
Zero(vs); vs = {};
Zero(gs); gs = {};
Zero(cmd_list); Zero(cmd_list);
Zero(immediate); immediate = {};
primitive_assembler.Reconfigure(PipelineRegs::TriangleTopology::List); primitive_assembler.Reconfigure(PipelineRegs::TriangleTopology::List);
vs_float_regs_counter = 0; vs_float_regs_counter = 0;
vs_uniform_write_buffer.fill(0); vs_uniform_write_buffer.fill(0);

2
src/video_core/shader/shader.h
View File

@ -241,7 +241,7 @@ private:
struct Uniforms { struct Uniforms {
// The float uniforms are accessed by the shader JIT using SSE instructions, and are // The float uniforms are accessed by the shader JIT using SSE instructions, and are
// therefore required to be 16-byte aligned. // therefore required to be 16-byte aligned.
alignas(16) Common::Vec4<float24> f[96]; alignas(16) std::array<Common::Vec4<float24>, 96> f;
std::array<bool, 16> b; std::array<bool, 16> b;
std::array<Common::Vec4<u8>, 4> i; std::array<Common::Vec4<u8>, 4> i;