attempt to fix nvidia compatibility

stohrendorf · Jan 30, 2021 · 22babb0 · 22babb0
1 parent c617950
commit 22babb0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/shaders/lighting.glsl b/shaders/lighting.glsl
@@ -5,10 +5,11 @@ layout(location=10) uniform float u_lightAmbient;
 
 #include "csm_interface.glsl"
 
-layout(std430) struct Light {
-    layout(offset=0) vec3 position;
-    layout(offset=12) float brightness;
-    layout(offset=16) float fadeDistance;
+struct Light {
+    vec3 position;
+    float brightness;
+    float fadeDistance;
+    float _pad[2];
 };
 
 readonly layout(std430, binding=3) buffer b_lights {

diff --git a/src/engine/lighting.h b/src/engine/lighting.h
@@ -12,10 +12,10 @@ struct Lighting
 {
   struct Light
   {
-    glm::vec3 position{std::numeric_limits<float>::quiet_NaN()};
+    glm::vec4 position{std::numeric_limits<float>::quiet_NaN()};
     float brightness = 0;
     float fadeDistance = 0;
-    float _pad[3];
+    float _pad[2];
 
     bool operator==(const Light& rhs) const
     {
@@ -80,7 +80,8 @@ struct Lighting
       // fade_distance / ( fade_distance + d )
       std::transform(
         room->lights.begin(), room->lights.end(), std::back_inserter(lights), [](const loader::file::Light& light) {
-          return Light{light.position.toRenderSystem(), light.getBrightness(), light.fadeDistance.get<float>()};
+          return Light{
+            glm::vec4{light.position.toRenderSystem(), 0.0f}, light.getBrightness(), light.fadeDistance.get<float>()};
         });
     }