mirror of
				https://git.zaroz.cloud/nintendo-back-up/yuzu/yuzu-mainline.git
				synced 2025-03-21 01:53:15 +00:00 
			
		
		
		
	Pica: Name lighting.config0 and .config1 registers
This commit is contained in:
		
							parent
							
								
									068bd6f728
								
							
						
					
					
						commit
						8e905b3af6
					
				@ -824,7 +824,7 @@ struct Regs {
 | 
			
		||||
            BitField<27, 1, u32> clamp_highlights;
 | 
			
		||||
            BitField<28, 2, LightingBumpMode> bump_mode;
 | 
			
		||||
            BitField<30, 1, u32> disable_bump_renorm;
 | 
			
		||||
        };
 | 
			
		||||
        } config0;
 | 
			
		||||
 | 
			
		||||
        union {
 | 
			
		||||
            BitField<16, 1, u32> disable_lut_d0;
 | 
			
		||||
@ -845,13 +845,13 @@ struct Regs {
 | 
			
		||||
            BitField<29, 1, u32> disable_dist_atten_light_5;
 | 
			
		||||
            BitField<30, 1, u32> disable_dist_atten_light_6;
 | 
			
		||||
            BitField<31, 1, u32> disable_dist_atten_light_7;
 | 
			
		||||
        };
 | 
			
		||||
        } config1;
 | 
			
		||||
 | 
			
		||||
        bool IsDistAttenDisabled(unsigned index) const {
 | 
			
		||||
            const unsigned disable[] = { disable_dist_atten_light_0, disable_dist_atten_light_1,
 | 
			
		||||
                                         disable_dist_atten_light_2, disable_dist_atten_light_3,
 | 
			
		||||
                                         disable_dist_atten_light_4, disable_dist_atten_light_5,
 | 
			
		||||
                                         disable_dist_atten_light_6, disable_dist_atten_light_7 };
 | 
			
		||||
            const unsigned disable[] = { config1.disable_dist_atten_light_0, config1.disable_dist_atten_light_1,
 | 
			
		||||
                                         config1.disable_dist_atten_light_2, config1.disable_dist_atten_light_3,
 | 
			
		||||
                                         config1.disable_dist_atten_light_4, config1.disable_dist_atten_light_5,
 | 
			
		||||
                                         config1.disable_dist_atten_light_6, config1.disable_dist_atten_light_7 };
 | 
			
		||||
            return disable[index] != 0;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -94,42 +94,42 @@ union PicaShaderConfig {
 | 
			
		||||
            state.lighting.light[light_index].dist_atten_enable = !regs.lighting.IsDistAttenDisabled(num);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        state.lighting.lut_d0.enable = regs.lighting.disable_lut_d0 == 0;
 | 
			
		||||
        state.lighting.lut_d0.enable = regs.lighting.config1.disable_lut_d0 == 0;
 | 
			
		||||
        state.lighting.lut_d0.abs_input = regs.lighting.abs_lut_input.disable_d0 == 0;
 | 
			
		||||
        state.lighting.lut_d0.type = regs.lighting.lut_input.d0.Value();
 | 
			
		||||
        state.lighting.lut_d0.scale = regs.lighting.lut_scale.GetScale(regs.lighting.lut_scale.d0);
 | 
			
		||||
 | 
			
		||||
        state.lighting.lut_d1.enable = regs.lighting.disable_lut_d1 == 0;
 | 
			
		||||
        state.lighting.lut_d1.enable = regs.lighting.config1.disable_lut_d1 == 0;
 | 
			
		||||
        state.lighting.lut_d1.abs_input = regs.lighting.abs_lut_input.disable_d1 == 0;
 | 
			
		||||
        state.lighting.lut_d1.type = regs.lighting.lut_input.d1.Value();
 | 
			
		||||
        state.lighting.lut_d1.scale = regs.lighting.lut_scale.GetScale(regs.lighting.lut_scale.d1);
 | 
			
		||||
 | 
			
		||||
        state.lighting.lut_fr.enable = regs.lighting.disable_lut_fr == 0;
 | 
			
		||||
        state.lighting.lut_fr.enable = regs.lighting.config1.disable_lut_fr == 0;
 | 
			
		||||
        state.lighting.lut_fr.abs_input = regs.lighting.abs_lut_input.disable_fr == 0;
 | 
			
		||||
        state.lighting.lut_fr.type = regs.lighting.lut_input.fr.Value();
 | 
			
		||||
        state.lighting.lut_fr.scale = regs.lighting.lut_scale.GetScale(regs.lighting.lut_scale.fr);
 | 
			
		||||
 | 
			
		||||
        state.lighting.lut_rr.enable = regs.lighting.disable_lut_rr == 0;
 | 
			
		||||
        state.lighting.lut_rr.enable = regs.lighting.config1.disable_lut_rr == 0;
 | 
			
		||||
        state.lighting.lut_rr.abs_input = regs.lighting.abs_lut_input.disable_rr == 0;
 | 
			
		||||
        state.lighting.lut_rr.type = regs.lighting.lut_input.rr.Value();
 | 
			
		||||
        state.lighting.lut_rr.scale = regs.lighting.lut_scale.GetScale(regs.lighting.lut_scale.rr);
 | 
			
		||||
 | 
			
		||||
        state.lighting.lut_rg.enable = regs.lighting.disable_lut_rg == 0;
 | 
			
		||||
        state.lighting.lut_rg.enable = regs.lighting.config1.disable_lut_rg == 0;
 | 
			
		||||
        state.lighting.lut_rg.abs_input = regs.lighting.abs_lut_input.disable_rg == 0;
 | 
			
		||||
        state.lighting.lut_rg.type = regs.lighting.lut_input.rg.Value();
 | 
			
		||||
        state.lighting.lut_rg.scale = regs.lighting.lut_scale.GetScale(regs.lighting.lut_scale.rg);
 | 
			
		||||
 | 
			
		||||
        state.lighting.lut_rb.enable = regs.lighting.disable_lut_rb == 0;
 | 
			
		||||
        state.lighting.lut_rb.enable = regs.lighting.config1.disable_lut_rb == 0;
 | 
			
		||||
        state.lighting.lut_rb.abs_input = regs.lighting.abs_lut_input.disable_rb == 0;
 | 
			
		||||
        state.lighting.lut_rb.type = regs.lighting.lut_input.rb.Value();
 | 
			
		||||
        state.lighting.lut_rb.scale = regs.lighting.lut_scale.GetScale(regs.lighting.lut_scale.rb);
 | 
			
		||||
 | 
			
		||||
        state.lighting.config = regs.lighting.config;
 | 
			
		||||
        state.lighting.fresnel_selector = regs.lighting.fresnel_selector;
 | 
			
		||||
        state.lighting.bump_mode = regs.lighting.bump_mode;
 | 
			
		||||
        state.lighting.bump_selector = regs.lighting.bump_selector;
 | 
			
		||||
        state.lighting.bump_renorm = regs.lighting.disable_bump_renorm == 0;
 | 
			
		||||
        state.lighting.clamp_highlights = regs.lighting.clamp_highlights != 0;
 | 
			
		||||
        state.lighting.config = regs.lighting.config0.config;
 | 
			
		||||
        state.lighting.fresnel_selector = regs.lighting.config0.fresnel_selector;
 | 
			
		||||
        state.lighting.bump_mode = regs.lighting.config0.bump_mode;
 | 
			
		||||
        state.lighting.bump_selector = regs.lighting.config0.bump_selector;
 | 
			
		||||
        state.lighting.bump_renorm = regs.lighting.config0.disable_bump_renorm == 0;
 | 
			
		||||
        state.lighting.clamp_highlights = regs.lighting.config0.clamp_highlights != 0;
 | 
			
		||||
 | 
			
		||||
        return res;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user