Shadergen: More lighting work

This commit is contained in:
wheremyfoodat 2024-07-18 02:57:41 +03:00
parent ed00ddc805
commit ccf9693877
4 changed files with 57 additions and 5 deletions

View file

@ -1,12 +1,27 @@
#pragma once
#include <array>
#include <cstddef>
#include <type_traits>
#include "helpers.hpp"
namespace PICA {
struct FragmentUniforms {
struct LightUniform {
using vec3 = std::array<float, 3>;
// std140 requires vec3s be aligned to 16 bytes
alignas(16) vec3 specular0;
alignas(16) vec3 specular1;
alignas(16) vec3 diffuse;
alignas(16) vec3 ambient;
alignas(16) vec3 position;
alignas(16) vec3 spotlightDirection;
float distAttenuationBias;
float distanceAttenuationScale;
};
struct FragmentUniforms {
using vec4 = std::array<float, 4>;
static constexpr usize tevStageCount = 6;
@ -17,5 +32,11 @@ namespace PICA {
alignas(16) vec4 constantColors[tevStageCount];
alignas(16) vec4 tevBufferColor;
alignas(16) vec4 clipCoords;
// NOTE: THIS MUST BE LAST so that if lighting is disabled we can potentially omit uploading it
LightUniform lightUniforms[8];
};
// Assert that lightUniforms is the last member of the structure
static_assert(offsetof(FragmentUniforms, lightUniforms) + 8 * sizeof(LightUniform) == sizeof(FragmentUniforms));
} // namespace PICA

View file

@ -26,6 +26,7 @@ namespace PICA::ShaderGen {
void getAlphaOperation(std::string& shader, PICA::TexEnvConfig::Operation op);
void applyAlphaTest(std::string& shader, const PICARegs& regs);
void compileLights(std::string& shader, const PICA::FragmentConfig& config);
u32 textureConfig = 0;