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

gl_rasterizer: Fix PicaShaderConfig on GCC.

Browse Source
This commit is contained in:
bunnei
2015-12-14 21:14:54 -05:00
parent 9dfb223d26
commit c229503f4a
1 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/video_core/renderer_opengl/gl_rasterizer.h
View File

@@ -139,39 +139,37 @@ struct PicaShaderConfig {
return std::memcmp(this, &o, sizeof(PicaShaderConfig)) == 0; return std::memcmp(this, &o, sizeof(PicaShaderConfig)) == 0;
}; };
Pica::Regs::CompareFunc alpha_test_func = Pica::Regs::CompareFunc::Never;
std::array<Pica::Regs::TevStageConfig, 6> tev_stages = {};
u8 combiner_buffer_input = 0;
struct { struct {
Pica::Regs::CompareFunc alpha_test_func = Pica::Regs::CompareFunc::Never; struct {
std::array<Pica::Regs::TevStageConfig, 6> tev_stages = {}; unsigned num = 0;
u8 combiner_buffer_input = 0; bool directional = false;
bool two_sided_diffuse = false;
bool dist_atten_enable = false;
GLfloat dist_atten_scale = 0.0f;
GLfloat dist_atten_bias = 0.0f;
} light[8];
bool enable = false;
unsigned src_num = 0;
Pica::Regs::LightingBumpMode bump_mode = Pica::Regs::LightingBumpMode::None;
unsigned bump_selector = 0;
bool bump_renorm = false;
bool clamp_highlights = false;
Pica::Regs::LightingConfig config = Pica::Regs::LightingConfig::Config0;
Pica::Regs::LightingFresnelSelector fresnel_selector = Pica::Regs::LightingFresnelSelector::None;
struct { struct {
struct {
unsigned num = 0;
bool directional = false;
bool two_sided_diffuse = false;
bool dist_atten_enable = false;
GLfloat dist_atten_scale = 0.0f;
GLfloat dist_atten_bias = 0.0f;
} light[8];
bool enable = false; bool enable = false;
unsigned src_num = 0; bool abs_input = false;
Pica::Regs::LightingBumpMode bump_mode = Pica::Regs::LightingBumpMode::None; Pica::Regs::LightingLutInput type = Pica::Regs::LightingLutInput::NH;
unsigned bump_selector = 0; float scale = 1.0f;
bool bump_renorm = false; } lut_d0, lut_d1, lut_fr, lut_rr, lut_rg, lut_rb;
bool clamp_highlights = false; } lighting;
Pica::Regs::LightingConfig config = Pica::Regs::LightingConfig::Config0;
Pica::Regs::LightingFresnelSelector fresnel_selector = Pica::Regs::LightingFresnelSelector::None;
struct {
bool enable = false;
bool abs_input = false;
Pica::Regs::LightingLutInput type = Pica::Regs::LightingLutInput::NH;
float scale = 1.0f;
} lut_d0, lut_d1, lut_fr, lut_rr, lut_rg, lut_rb;
} lighting;
};
}; };
namespace std { namespace std {