Fix Linux build

Author: yozhijk

.gitignore

@@ -18,4 +18,23 @@ Bin/Release/x64/App64.exe
 *.exe
 *.opendb
 *.db
-*.sln
+*.sln
+*.d
+
+*.o
+
+*.a
+
+*.so
+
+App/Makefile
+
+Bin/Release/x64/
+
+CLW/Makefile
+
+Calc/Makefile
+
+Gtest/Makefile
+
+Makefile

App/CL/payload.cl

@@ -31,10 +31,10 @@ typedef struct _Camera
         float3 right;
         float3 up;
         float3 p;
-        
+
         // Image plane width & height in current units
         float2 dim;
-        
+
         // Near and far Z
         float2 zcap;
         // Focal lenght
@@ -127,7 +127,7 @@ typedef struct _Material
         int type;
         int num_materials;
     };
-    
+
     int twosided;
 } Material;
 
@@ -162,8 +162,8 @@ typedef struct _Light
             int texdiffuse;
             float multiplier;
         };
-        
-        
+
+
         // Spot
         struct
         {
@@ -198,11 +198,11 @@ typedef struct _Volume
     {
         VolumeType type;
         PhaseFunction phase_func;
-        
+
         // Id of volume data if present
         int data;
         int extra;
-        
+
         // Absorbtion
         float3 sigma_a;
         // Scattering
@@ -245,7 +245,7 @@ typedef struct __matrix
             float4 m1;
             float4 m2;
             float4 m3;
-        };
+        } rows;
 
         float m[16];
     };

App/CL/scene.cl

@@ -63,35 +63,35 @@ void DifferentialGeometry_Fill(// Scene
     // Determine shape and polygon
     int shapeid = isect->shapeid - 1;
     int primid = isect->primid;
-    
+
     // Get barycentrics
     float2 uv = isect->uvwt.xy;
-    
+
     // Extract shape data
     Shape shape = scene->shapes[shapeid];
     //float3 linearvelocity = shape.linearvelocity;
     //float4 angularvelocity = shape.angularvelocity;
-    
+
     // Fetch indices starting from startidx and offset by primid
     int i0 = scene->indices[shape.startidx + 3 * primid];
     int i1 = scene->indices[shape.startidx + 3 * primid + 1];
     int i2 = scene->indices[shape.startidx + 3 * primid + 2];
-    
+
     // Fetch normals
     float3 n0 = scene->normals[shape.startvtx + i0];
     float3 n1 = scene->normals[shape.startvtx + i1];
     float3 n2 = scene->normals[shape.startvtx + i2];
-    
+
     // Fetch positions
     float3 v0 = scene->vertices[shape.startvtx + i0];
     float3 v1 = scene->vertices[shape.startvtx + i1];
     float3 v2 = scene->vertices[shape.startvtx + i2];
-    
+
     // Fetch UVs
     float2 uv0 = scene->uvs[shape.startvtx + i0];
     float2 uv1 = scene->uvs[shape.startvtx + i1];
     float2 uv2 = scene->uvs[shape.startvtx + i2];
-    
+
     // Calculate barycentric position and normal
     diffgeo->n = normalize(transform_vector((1.f - uv.x - uv.y) * n0 + uv.x * n1 + uv.y * n2, shape.m0, shape.m1, shape.m2, shape.m3));
     diffgeo->p = transform_point((1.f - uv.x - uv.y) * v0 + uv.x * v1 + uv.y * v2, shape.m0, shape.m1, shape.m2, shape.m3);
@@ -101,7 +101,7 @@ void DifferentialGeometry_Fill(// Scene
 
     if (dot(diffgeo->ng, diffgeo->n) < 0.f)
         diffgeo->ng = -diffgeo->ng;
-    
+
     // Get material at shading point
     int matidx = scene->materialids[shape.startidx / 3 + primid];
     diffgeo->mat = scene->materials[matidx];
@@ -111,12 +111,12 @@ void DifferentialGeometry_Fill(// Scene
     float du2 = uv1.x - uv2.x;
     float dv1 = uv0.y - uv2.y;
     float dv2 = uv1.y - uv2.y;
-    
+
     float3 dp1 = v0 - v2;
     float3 dp2 = v1 - v2;
-    
+
     float det = du1 * dv2 - dv1 * du2;
-    
+
     if (0 && det != 0.f)
     {
         float invdet = 1.f / det;
@@ -128,7 +128,7 @@ void DifferentialGeometry_Fill(// Scene
         diffgeo->dpdu = normalize(GetOrthoVector(diffgeo->n));
         diffgeo->dpdv = normalize(cross(diffgeo->n, diffgeo->dpdu));
     }
-    
+
 
 
     // Fix all to be orthogonal
@@ -149,18 +149,18 @@ void DifferentialGeometry_CalculateTangentTransforms(DifferentialGeometry* diffg
         diffgeo->n,
         diffgeo->dpdv);
 
-    diffgeo->world_to_tangent.m0.w = -dot(diffgeo->dpdu, diffgeo->p);
-    diffgeo->world_to_tangent.m1.w = -dot(diffgeo->n, diffgeo->p);
-    diffgeo->world_to_tangent.m2.w = -dot(diffgeo->dpdv, diffgeo->p);
+    diffgeo->world_to_tangent.rows.m0.w = -dot(diffgeo->dpdu, diffgeo->p);
+    diffgeo->world_to_tangent.rows.m1.w = -dot(diffgeo->n, diffgeo->p);
+    diffgeo->world_to_tangent.rows.m2.w = -dot(diffgeo->dpdv, diffgeo->p);
 
     diffgeo->tangent_to_world = matrix_from_cols3(
-        diffgeo->world_to_tangent.m0.xyz,
-        diffgeo->world_to_tangent.m1.xyz,
-        diffgeo->world_to_tangent.m2.xyz);
+        diffgeo->world_to_tangent.rows.m0.xyz,
+        diffgeo->world_to_tangent.rows.m1.xyz,
+        diffgeo->world_to_tangent.rows.m2.xyz);
 
-    diffgeo->tangent_to_world.m0.w = diffgeo->p.x;
-    diffgeo->tangent_to_world.m1.w = diffgeo->p.y;
-    diffgeo->tangent_to_world.m2.w = diffgeo->p.z;
+    diffgeo->tangent_to_world.rows.m0.w = diffgeo->p.x;
+    diffgeo->tangent_to_world.rows.m1.w = diffgeo->p.y;
+    diffgeo->tangent_to_world.rows.m2.w = diffgeo->p.z;
 }
 
 int Scene_SampleLight(Scene const* scene, float sample, float* pdf)

App/CL/utils.cl

@@ -72,73 +72,73 @@ float matrix_get(matrix m, int i, int j)
 matrix matrix_from_cols(float4 c0, float4 c1, float4 c2, float4 c3)
 {
     matrix m;
-    m.m0 = make_float4(c0.x, c1.x, c2.x, c3.x);
-    m.m1 = make_float4(c0.y, c1.y, c2.y, c3.y);
-    m.m2 = make_float4(c0.z, c1.z, c2.z, c3.z);
-    m.m3 = make_float4(c0.w, c1.w, c2.w, c3.w);
+    m.rows.m0 = make_float4(c0.x, c1.x, c2.x, c3.x);
+    m.rows.m1 = make_float4(c0.y, c1.y, c2.y, c3.y);
+    m.rows.m2 = make_float4(c0.z, c1.z, c2.z, c3.z);
+    m.rows.m3 = make_float4(c0.w, c1.w, c2.w, c3.w);
     return m;
 }
 
 matrix matrix_from_rows(float4 c0, float4 c1, float4 c2, float4 c3)
 {
     matrix m;
-    m.m0 = c0;
-    m.m1 = c1;
-    m.m2 = c2;
-    m.m3 = c3;
+    m.rows.m0 = c0;
+    m.rows.m1 = c1;
+    m.rows.m2 = c2;
+    m.rows.m3 = c3;
     return m;
 }
 
 matrix matrix_from_rows3(float3 c0, float3 c1, float3 c2)
 {
     matrix m;
-    m.m0.xyz = c0; m.m0.w = 0;
-    m.m1.xyz = c1; m.m1.w = 0;
-    m.m2.xyz = c2; m.m2.w = 0;
-    m.m3 = make_float4(0.f, 0.f, 0.f, 1.f);
+    m.rows.m0.xyz = c0; m.rows.m0.w = 0;
+    m.rows.m1.xyz = c1; m.rows.m1.w = 0;
+    m.rows.m2.xyz = c2; m.rows.m2.w = 0;
+    m.rows.m3 = make_float4(0.f, 0.f, 0.f, 1.f);
     return m;
 }
 
 matrix matrix_from_cols3(float3 c0, float3 c1, float3 c2)
 {
     matrix m;
-    m.m0 = make_float4(c0.x, c1.x, c2.x, 0.f);
-    m.m1 = make_float4(c0.y, c1.y, c2.y, 0.f);
-    m.m2 = make_float4(c0.z, c1.z, c2.z, 0.f);
-    m.m3 = make_float4(0.f, 0.f, 0.f, 1.f);
+    m.rows.m0 = make_float4(c0.x, c1.x, c2.x, 0.f);
+    m.rows.m1 = make_float4(c0.y, c1.y, c2.y, 0.f);
+    m.rows.m2 = make_float4(c0.z, c1.z, c2.z, 0.f);
+    m.rows.m3 = make_float4(0.f, 0.f, 0.f, 1.f);
     return m;
 }
 
 matrix matrix_transpose(matrix m)
 {
-    return matrix_from_cols(m.m0, m.m1, m.m2, m.m3);
+    return matrix_from_cols(m.rows.m0, m.rows.m1, m.rows.m2, m.rows.m3);
 }
 
 float4 matrix_mul_vector4(matrix m, float4 v)
 {
     float4 res;
-    res.x = dot(m.m0, v);
-    res.y = dot(m.m1, v);
-    res.z = dot(m.m2, v);
-    res.w = dot(m.m3, v);
+    res.x = dot(m.rows.m0, v);
+    res.y = dot(m.rows.m1, v);
+    res.z = dot(m.rows.m2, v);
+    res.w = dot(m.rows.m3, v);
     return res;
 }
 
 float3 matrix_mul_vector3(matrix m, float3 v)
 {
     float3 res;
-    res.x = dot(m.m0.xyz, v);
-    res.y = dot(m.m1.xyz, v);
-    res.z = dot(m.m2.xyz, v);
+    res.x = dot(m.rows.m0.xyz, v);
+    res.y = dot(m.rows.m1.xyz, v);
+    res.z = dot(m.rows.m2.xyz, v);
     return res;
 }
 
 float3 matrix_mul_point3(matrix m, float3 v)
 {
     float3 res;
-    res.x = dot(m.m0.xyz, v) + m.m0.w;
-    res.y = dot(m.m1.xyz, v) + m.m1.w;
-    res.z = dot(m.m2.xyz, v) + m.m2.w;
+    res.x = dot(m.rows.m0.xyz, v) + m.rows.m0.w;
+    res.y = dot(m.rows.m1.xyz, v) + m.rows.m1.w;
+    res.z = dot(m.rows.m2.xyz, v) + m.rows.m2.w;
     return res;
 }
 

App/Scene/IO/material_io.cpp

@@ -6,7 +6,7 @@
 #include "Scene/material.h"
 
 #include "Scene/IO/image_io.h"
-#include "Scene/Collector/Collector.h"
+#include "Scene/Collector/collector.h"
 
 
 #include "XML/tinyxml2.h"
@@ -18,7 +18,7 @@
 namespace Baikal
 {
     using namespace tinyxml2;
-    
+
     // XML based material IO implememtation
     class MaterialIoXML : public MaterialIo
     {
@@ -60,7 +60,7 @@ namespace Baikal
         std::set<ResolveRequest> m_resolve_requests;
         std::string m_base_path;
     };
-    
+
     MaterialIo* MaterialIo::CreateMaterialIoXML()
     {
         return new MaterialIoXML();
@@ -106,7 +106,7 @@ namespace Baikal
 
     static SingleBxdf::BxdfType StringToBxdf(std::string const& bxdf)
     {
-        static std::map<std::string, SingleBxdf::BxdfType> bxdf_map = 
+        static std::map<std::string, SingleBxdf::BxdfType> bxdf_map =
         {
             { "zero" , Baikal::SingleBxdf::BxdfType::kZero },
             { "lambert" , Baikal::SingleBxdf::BxdfType::kLambert },
@@ -167,7 +167,7 @@ namespace Baikal
         else
         {
             printer.PushAttribute("type", "material");
-            
+
             printer.PushAttribute("value", (int)(reinterpret_cast<std::uint64_t>(value.mat_value)));
         }
 
@@ -243,13 +243,13 @@ namespace Baikal
             if (type == MultiBxdf::Type::kFresnelBlend)
             {
                 Material::InputValue ior = material->GetInputValue("ior");
-                
+
                 WriteInput(io, printer, "ior", ior);
             }
             else
             {
                 Material::InputValue weight = material->GetInputValue("weight");
-                
+
                 WriteInput(io, printer, "weight", weight);
             }
         }