Forks/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2025-10-30 21:30:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added shader state; WIP kernel objects

Browse source
This commit is contained in:
Hamish Milne 2019-08-11 00:20:09 +01:00 • committed by zhupengfei
parent 45788b9c82
commit f79c9668a3
33 changed files with 576 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/video_core/pica_state.h
View file

@ -161,8 +161,6 @@ struct State {
UnionArray<LutEntry, 128> lut;
} fog;
#undef SERIALIZE_RAW
/// Current Pica command list
struct {
PAddr addr; // This exists only for serialization
@ -185,7 +183,7 @@ struct State {
template<class Archive>
void serialize(Archive & ar, const unsigned int file_version)
{
// ar & input_vertex;
ar & input_vertex;
ar & current_attribute;
ar & reset_geometry_pipeline;
}
@ -220,7 +218,7 @@ private:
ar & regs.reg_array;
ar & vs;
ar & gs;
// ar & input_default_attributes;
ar & input_default_attributes;
ar & proctex;
ar & lighting.luts;
ar & fog.lut;

52
src/video_core/shader/shader.h
View file

@ -10,6 +10,7 @@
#include <type_traits>
#include <nihstro/shader_bytecode.h>
#include <boost/serialization/array.hpp>
#include <boost/serialization/base_object.hpp>
#include "common/assert.h"
#include "common/common_funcs.h"
#include "common/common_types.h"
@ -32,6 +33,14 @@ using SwizzleData = std::array<u32, MAX_SWIZZLE_DATA_LENGTH>;
struct AttributeBuffer {
alignas(16) Common::Vec4<float24> attr[16];
private:
friend class boost::serialization::access;
template <class Archive>
void serialize(Archive& ar, const unsigned int file_version)
{
ar & attr;
}
};
/// Handler type for receiving vertex outputs from vertex shader or geometry shader
@ -91,6 +100,19 @@ struct GSEmitter {
GSEmitter();
~GSEmitter();
void Emit(Common::Vec4<float24> (&output_regs)[16]);
private:
friend class boost::serialization::access;
template <class Archive>
void serialize(Archive& ar, const unsigned int file_version)
{
ar & buffer;
ar & vertex_id;
ar & prim_emit;
ar & winding;
ar & output_mask;
// Handlers are ignored because they're constant
}
};
static_assert(std::is_standard_layout<GSEmitter>::value, "GSEmitter is not standard layout type");
@ -108,6 +130,16 @@ struct UnitState {
alignas(16) Common::Vec4<float24> input[16];
alignas(16) Common::Vec4<float24> temporary[16];
alignas(16) Common::Vec4<float24> output[16];
private:
friend class boost::serialization::access;
template <class Archive>
void serialize(Archive& ar, const unsigned int file_version)
{
ar & input;
ar & temporary;
ar & output;
}
} registers;
static_assert(std::is_pod<Registers>::value, "Structure is not POD");
@ -160,6 +192,17 @@ struct UnitState {
void LoadInput(const ShaderRegs& config, const AttributeBuffer& input);
void WriteOutput(const ShaderRegs& config, AttributeBuffer& output);
private:
friend class boost::serialization::access;
template <class Archive>
void serialize(Archive& ar, const unsigned int file_version)
{
ar & registers;
ar & conditional_code;
ar & address_registers;
// TODO: emitter_ptr
}
};
/**
@ -173,6 +216,15 @@ struct GSUnitState : public UnitState {
void ConfigOutput(const ShaderRegs& config);
GSEmitter emitter;
private:
friend class boost::serialization::access;
template <class Archive>
void serialize(Archive& ar, const unsigned int file_version)
{
ar & boost::serialization::base_object<UnitState>(*this);
ar & emitter;
}
};
struct Uniforms {