diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-12-19 00:39:56 +0100 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-01-30 06:31:36 +0100 |
commit | bbc7844021dc34e26285a495ed86bad088b87279 (patch) | |
tree | b2ddd0e986bd6874673fb8cf99307c49e66c3252 /src/video_core/pica.h | |
parent | Merge pull request #2494 from Kloen/killing-warnings-2-final-mix (diff) | |
download | yuzu-bbc7844021dc34e26285a495ed86bad088b87279.tar yuzu-bbc7844021dc34e26285a495ed86bad088b87279.tar.gz yuzu-bbc7844021dc34e26285a495ed86bad088b87279.tar.bz2 yuzu-bbc7844021dc34e26285a495ed86bad088b87279.tar.lz yuzu-bbc7844021dc34e26285a495ed86bad088b87279.tar.xz yuzu-bbc7844021dc34e26285a495ed86bad088b87279.tar.zst yuzu-bbc7844021dc34e26285a495ed86bad088b87279.zip |
Diffstat (limited to 'src/video_core/pica.h')
-rw-r--r-- | src/video_core/pica.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/video_core/pica.h b/src/video_core/pica.h index b2db609ec..5afc9d5dd 100644 --- a/src/video_core/pica.h +++ b/src/video_core/pica.h @@ -868,7 +868,7 @@ struct Regs { LightSrc light[8]; LightColor global_ambient; // Emission + (material.ambient * lighting.ambient) INSERT_PADDING_WORDS(0x1); - BitField<0, 3, u32> num_lights; // Number of enabled lights - 1 + BitField<0, 3, u32> max_light_index; // Number of enabled lights - 1 union { BitField<2, 2, LightingFresnelSelector> fresnel_selector; @@ -1045,7 +1045,7 @@ struct Regs { BitField<48, 12, u64> attribute_mask; // number of total attributes minus 1 - BitField<60, 4, u64> num_extra_attributes; + BitField<60, 4, u64> max_attribute_index; }; inline VertexAttributeFormat GetFormat(int n) const { @@ -1076,7 +1076,7 @@ struct Regs { } inline int GetNumTotalAttributes() const { - return (int)num_extra_attributes + 1; + return (int)max_attribute_index + 1; } // Attribute loaders map the source vertex data to input attributes @@ -1214,7 +1214,7 @@ struct Regs { union { // Number of input attributes to shader unit - 1 - BitField<0, 4, u32> num_input_attributes; + BitField<0, 4, u32> max_input_attribute_index; }; // Offset to shader program entry point (in words) |