octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrate Boost into build system and perform a trivial cleanup in vertex_shader.cpp.

Browse Source
This commit is contained in:
Tony Wasserka
2014-12-07 22:22:04 +01:00
parent 2db294306f
commit 4d4572c697
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@@ -19,6 +19,14 @@ if (PNG_FOUND)
add_definitions(-DHAVE_PNG) add_definitions(-DHAVE_PNG)
endif () endif ()
find_package(Boost)
if (Boost_FOUND)
include_directories(${Boost_INCLUDE_DIRS})
else()
message(STATUS "Boost not found, falling back to externals")
include_directories(externals/boost)
endif()
# Include bundled CMake modules # Include bundled CMake modules
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/externals/cmake-modules") list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/externals/cmake-modules")

16
src/video_core/vertex_shader.cpp
View File

@@ -2,11 +2,16 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <boost/range/algorithm.hpp>
#include <common/file_util.h>
#include <core/mem_map.h>
#include "debug_utils/debug_utils.h"
#include "pica.h" #include "pica.h"
#include "vertex_shader.h" #include "vertex_shader.h"
#include "debug_utils/debug_utils.h"
#include <core/mem_map.h>
#include <common/file_util.h>
namespace Pica { namespace Pica {
@@ -238,7 +243,7 @@ OutputVertex RunShader(const InputVertex& input, int num_attributes)
// Setup input register table // Setup input register table
const auto& attribute_register_map = registers.vs_input_register_map; const auto& attribute_register_map = registers.vs_input_register_map;
float24 dummy_register; float24 dummy_register;
std::fill(&state.input_register_table[0], &state.input_register_table[16], &dummy_register); boost::fill(state.input_register_table, &dummy_register);
if(num_attributes > 0) state.input_register_table[attribute_register_map.attribute0_register] = &input.attr[0].x; if(num_attributes > 0) state.input_register_table[attribute_register_map.attribute0_register] = &input.attr[0].x;
if(num_attributes > 1) state.input_register_table[attribute_register_map.attribute1_register] = &input.attr[1].x; if(num_attributes > 1) state.input_register_table[attribute_register_map.attribute1_register] = &input.attr[1].x;
if(num_attributes > 2) state.input_register_table[attribute_register_map.attribute2_register] = &input.attr[2].x; if(num_attributes > 2) state.input_register_table[attribute_register_map.attribute2_register] = &input.attr[2].x;
@@ -272,8 +277,7 @@ OutputVertex RunShader(const InputVertex& input, int num_attributes)
state.status_registers[0] = false; state.status_registers[0] = false;
state.status_registers[1] = false; state.status_registers[1] = false;
std::fill(state.call_stack, state.call_stack + sizeof(state.call_stack) / sizeof(state.call_stack[0]), boost::fill(state.call_stack, VertexShaderState::INVALID_ADDRESS);
VertexShaderState::INVALID_ADDRESS);
state.call_stack_pointer = &state.call_stack[0]; state.call_stack_pointer = &state.call_stack[0];
ProcessShaderCode(state); ProcessShaderCode(state);