Skip to content

Commit

Permalink
[format] Applying clang-format
Browse files Browse the repository at this point in the history
  • Loading branch information
@sherholz-intel
sherholz-intel committed Aug 15, 2024
1 parent 170ceb9 commit 7475295
Show file tree
Hide file tree
Showing 81 changed files with 9,206 additions and 8,631 deletions.
2 changes: 1 addition & 1 deletion cmake/check_arm_neon.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@

int main()
{
return vaddvq_s32(vdupq_n_s32(1));
return vaddvq_s32(vdupq_n_s32(1));
}
377 changes: 186 additions & 191 deletions openpgl/api/api.cpp
View file

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions openpgl/api/deviceCPU16.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#include "device/Device.h"

namespace openpgl {
namespace openpgl
{

IDevice* newDeviceCPU16(size_t numThreads) {
return (IDevice*) new Device<16>(numThreads);
IDevice *newDeviceCPU16(size_t numThreads)
{
return (IDevice *)new Device<16>(numThreads);
}

}
} // namespace openpgl
10 changes: 6 additions & 4 deletions openpgl/api/deviceCPU4.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#include "device/Device.h"

namespace openpgl {
namespace openpgl
{

IDevice* newDeviceCPU4(size_t numThreads) {
return (IDevice*) new Device<4>(numThreads);
IDevice *newDeviceCPU4(size_t numThreads)
{
return (IDevice *)new Device<4>(numThreads);
}

}
} // namespace openpgl
10 changes: 6 additions & 4 deletions openpgl/api/deviceCPU8.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#include "device/Device.h"

namespace openpgl {
namespace openpgl
{

IDevice* newDeviceCPU8(size_t numThreads) {
return (IDevice*) new Device<8>(numThreads);
IDevice *newDeviceCPU8(size_t numThreads)
{
return (IDevice *)new Device<8>(numThreads);
}

}
} // namespace openpgl
230 changes: 115 additions & 115 deletions openpgl/data/PathSegmentData.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,130 +3,130 @@

#pragma once

#include "../openpgl_common.h"
#include "../include/openpgl/data.h"

#include <sstream>

#include "../include/openpgl/data.h"
#include "../openpgl_common.h"

namespace openpgl
{

inline float OPENPGL_SPECTRUM_TO_FLOAT(Vector3 spectrum)
{
//return (spectrum[0] + spectrum[1] + spectrum[2] ) / 3.0f;
// return (spectrum[0] + spectrum[1] + spectrum[2] ) / 3.0f;
return std::max(spectrum[0], std::max(spectrum[1], spectrum[2]));
}

using PathSegmentData = PGLPathSegmentData;

inline bool isValid(const PathSegmentData& psd)
{
bool valid = true;
valid = valid && embree::isvalid(psd.position.x);
valid = valid && embree::isvalid(psd.position.y);
valid = valid && embree::isvalid(psd.position.z);
OPENPGL_ASSERT(valid);

valid = valid && embree::isvalid(psd.directionIn.x);
valid = valid && psd.directionIn.x <= 1.0f && psd.directionIn.x >= -1.0f;
valid = valid && embree::isvalid(psd.directionIn.y);
valid = valid && psd.directionIn.y <= 1.0f && psd.directionIn.y >= -1.0f;
valid = valid && embree::isvalid(psd.directionIn.z);
valid = valid && psd.directionIn.z <= 1.0f && psd.directionIn.z >= -1.0f;
OPENPGL_ASSERT(valid);

valid = valid && embree::isvalid(psd.directionOut.x);
valid = valid && psd.directionOut.x <= 1.0f && psd.directionOut.x >= -1.0f;
valid = valid && embree::isvalid(psd.directionOut.y);
valid = valid && psd.directionOut.y <= 1.0f && psd.directionOut.y >= -1.0f;
valid = valid && embree::isvalid(psd.directionOut.z);
valid = valid && psd.directionOut.z <= 1.0f && psd.directionOut.z >= -1.0f;
OPENPGL_ASSERT(valid);

valid = valid && embree::isvalid(psd.normal.x);
valid = valid && psd.normal.x <= 1.0f && psd.normal.x >= -1.0f;
valid = valid && embree::isvalid(psd.normal.y);
valid = valid && psd.normal.y <= 1.0f && psd.normal.y >= -1.0f;
valid = valid && embree::isvalid(psd.normal.z);
valid = valid && psd.normal.z <= 1.0f && psd.normal.z >= -1.0f;
OPENPGL_ASSERT(valid);

valid = valid && embree::isvalid(psd.pdfDirectionIn);
valid = valid && psd.pdfDirectionIn >=0.f;
OPENPGL_ASSERT(valid);

valid = valid && embree::isvalid(psd.scatteringWeight.x);
valid = valid && psd.scatteringWeight.x >= 0.0f;
valid = valid && embree::isvalid(psd.scatteringWeight.y);
valid = valid && psd.scatteringWeight.y >= 0.0f;
valid = valid && embree::isvalid(psd.scatteringWeight.z);
valid = valid && psd.scatteringWeight.z >= 0.0f;
OPENPGL_ASSERT(valid);

valid = valid && embree::isvalid(psd.transmittanceWeight.x);
valid = valid && psd.transmittanceWeight.x >= 0.0f;
valid = valid && embree::isvalid(psd.transmittanceWeight.y);
valid = valid && psd.transmittanceWeight.y >= 0.0f;
valid = valid && embree::isvalid(psd.transmittanceWeight.z);
valid = valid && psd.transmittanceWeight.z >= 0.0f;
OPENPGL_ASSERT(valid);

valid = valid && embree::isvalid(psd.directContribution.x);
valid = valid && psd.directContribution.x >= 0.0f;
valid = valid && embree::isvalid(psd.directContribution.y);
valid = valid && psd.directContribution.y >= 0.0f;
valid = valid && embree::isvalid(psd.directContribution.z);
valid = valid && psd.directContribution.z >= 0.0f;
OPENPGL_ASSERT(valid);

valid = valid && embree::isvalid(psd.scatteredContribution.x);
valid = valid && psd.scatteredContribution.x >= 0.0f;
valid = valid && embree::isvalid(psd.scatteredContribution.y);
valid = valid && psd.scatteredContribution.y >= 0.0f;
valid = valid && embree::isvalid(psd.scatteredContribution.z);
valid = valid && psd.scatteredContribution.z >= 0.0f;
OPENPGL_ASSERT(valid);

valid = valid && embree::isvalid(psd.miWeight);
valid = valid && psd.miWeight >=0.f && psd.miWeight <=1.0f;
OPENPGL_ASSERT(valid);

valid = valid && embree::isvalid(psd.russianRouletteSurvivalProbability);
valid = valid && psd.miWeight >=0.f && psd.russianRouletteSurvivalProbability <=1.0f;
OPENPGL_ASSERT(valid);

valid = valid && embree::isvalid(psd.eta);
valid = valid && psd.eta >=0.f;
OPENPGL_ASSERT(valid);

valid = valid && embree::isvalid(psd.roughness);
valid = valid && psd.roughness >=0.f && psd.roughness <=1.f;
OPENPGL_ASSERT(valid);
return valid;
}

std::string toString(const PGLPathSegmentData& psd)
{
std::stringstream ss;
ss << "PathSegmentData: ";
ss << "pos = " << psd.position.x << "\t " << psd.position.y << "\t " << psd.position.z << "\t ";
ss << "\t dirIn = " << psd.directionIn.x << "\t " << psd.directionIn.y << "\t " << psd.directionIn.z << "\t ";
ss << "\t dirOut = " << psd.directionOut.x << "\t " << psd.directionOut.y << "\t " << psd.directionOut.z << "\t ";
ss << "\t normal = " << psd.normal.x << "\t " << psd.normal.y << "\t " << psd.normal.z << "\t ";
ss << "\t volume = " << psd.volumeScatter;
ss << "\t pdf = " << psd.pdfDirectionIn;
ss << "\t delta = " << psd.isDelta;
ss << "\t scatteringWeight = " << psd.scatteringWeight.x << "\t " << psd.scatteringWeight.y << "\t " << psd.scatteringWeight.z << "\t ";
ss << "\t transmittanceWeight = " << psd.transmittanceWeight.x << "\t " << psd.transmittanceWeight.y << "\t " << psd.transmittanceWeight.z << "\t ";
ss << "\t directContribution = " << psd.directContribution.x << "\t " << psd.directContribution.y << "\t " << psd.directContribution.z << "\t ";
ss << "\t miWeight = " << psd.miWeight;
ss << "\t scatteredContribution = " << psd.scatteredContribution.x << "\t " << psd.scatteredContribution.y << "\t " << psd.scatteredContribution.z << "\t ";
ss << "\t russianRouletteSurvivalProbability = " << psd.russianRouletteSurvivalProbability;
ss << "\t eta = " << psd.eta;
ss << "\t rough = " << psd.roughness;
ss << std::endl;
return ss.str();
}
}
inline bool isValid(const PathSegmentData &psd)
{
bool valid = true;
valid = valid && embree::isvalid(psd.position.x);
valid = valid && embree::isvalid(psd.position.y);
valid = valid && embree::isvalid(psd.position.z);
OPENPGL_ASSERT(valid);

valid = valid && embree::isvalid(psd.directionIn.x);
valid = valid && psd.directionIn.x <= 1.0f && psd.directionIn.x >= -1.0f;
valid = valid && embree::isvalid(psd.directionIn.y);
valid = valid && psd.directionIn.y <= 1.0f && psd.directionIn.y >= -1.0f;
valid = valid && embree::isvalid(psd.directionIn.z);
valid = valid && psd.directionIn.z <= 1.0f && psd.directionIn.z >= -1.0f;
OPENPGL_ASSERT(valid);

valid = valid && embree::isvalid(psd.directionOut.x);
valid = valid && psd.directionOut.x <= 1.0f && psd.directionOut.x >= -1.0f;
valid = valid && embree::isvalid(psd.directionOut.y);
valid = valid && psd.directionOut.y <= 1.0f && psd.directionOut.y >= -1.0f;
valid = valid && embree::isvalid(psd.directionOut.z);
valid = valid && psd.directionOut.z <= 1.0f && psd.directionOut.z >= -1.0f;
OPENPGL_ASSERT(valid);

valid = valid && embree::isvalid(psd.normal.x);
valid = valid && psd.normal.x <= 1.0f && psd.normal.x >= -1.0f;
valid = valid && embree::isvalid(psd.normal.y);
valid = valid && psd.normal.y <= 1.0f && psd.normal.y >= -1.0f;
valid = valid && embree::isvalid(psd.normal.z);
valid = valid && psd.normal.z <= 1.0f && psd.normal.z >= -1.0f;
OPENPGL_ASSERT(valid);

valid = valid && embree::isvalid(psd.pdfDirectionIn);
valid = valid && psd.pdfDirectionIn >= 0.f;
OPENPGL_ASSERT(valid);

valid = valid && embree::isvalid(psd.scatteringWeight.x);
valid = valid && psd.scatteringWeight.x >= 0.0f;
valid = valid && embree::isvalid(psd.scatteringWeight.y);
valid = valid && psd.scatteringWeight.y >= 0.0f;
valid = valid && embree::isvalid(psd.scatteringWeight.z);
valid = valid && psd.scatteringWeight.z >= 0.0f;
OPENPGL_ASSERT(valid);

valid = valid && embree::isvalid(psd.transmittanceWeight.x);
valid = valid && psd.transmittanceWeight.x >= 0.0f;
valid = valid && embree::isvalid(psd.transmittanceWeight.y);
valid = valid && psd.transmittanceWeight.y >= 0.0f;
valid = valid && embree::isvalid(psd.transmittanceWeight.z);
valid = valid && psd.transmittanceWeight.z >= 0.0f;
OPENPGL_ASSERT(valid);

valid = valid && embree::isvalid(psd.directContribution.x);
valid = valid && psd.directContribution.x >= 0.0f;
valid = valid && embree::isvalid(psd.directContribution.y);
valid = valid && psd.directContribution.y >= 0.0f;
valid = valid && embree::isvalid(psd.directContribution.z);
valid = valid && psd.directContribution.z >= 0.0f;
OPENPGL_ASSERT(valid);

valid = valid && embree::isvalid(psd.scatteredContribution.x);
valid = valid && psd.scatteredContribution.x >= 0.0f;
valid = valid && embree::isvalid(psd.scatteredContribution.y);
valid = valid && psd.scatteredContribution.y >= 0.0f;
valid = valid && embree::isvalid(psd.scatteredContribution.z);
valid = valid && psd.scatteredContribution.z >= 0.0f;
OPENPGL_ASSERT(valid);

valid = valid && embree::isvalid(psd.miWeight);
valid = valid && psd.miWeight >= 0.f && psd.miWeight <= 1.0f;
OPENPGL_ASSERT(valid);

valid = valid && embree::isvalid(psd.russianRouletteSurvivalProbability);
valid = valid && psd.miWeight >= 0.f && psd.russianRouletteSurvivalProbability <= 1.0f;
OPENPGL_ASSERT(valid);

valid = valid && embree::isvalid(psd.eta);
valid = valid && psd.eta >= 0.f;
OPENPGL_ASSERT(valid);

valid = valid && embree::isvalid(psd.roughness);
valid = valid && psd.roughness >= 0.f && psd.roughness <= 1.f;
OPENPGL_ASSERT(valid);

return valid;
}

std::string toString(const PGLPathSegmentData &psd)
{
std::stringstream ss;
ss << "PathSegmentData: ";
ss << "pos = " << psd.position.x << "\t " << psd.position.y << "\t " << psd.position.z << "\t ";
ss << "\t dirIn = " << psd.directionIn.x << "\t " << psd.directionIn.y << "\t " << psd.directionIn.z << "\t ";
ss << "\t dirOut = " << psd.directionOut.x << "\t " << psd.directionOut.y << "\t " << psd.directionOut.z << "\t ";
ss << "\t normal = " << psd.normal.x << "\t " << psd.normal.y << "\t " << psd.normal.z << "\t ";
ss << "\t volume = " << psd.volumeScatter;
ss << "\t pdf = " << psd.pdfDirectionIn;
ss << "\t delta = " << psd.isDelta;
ss << "\t scatteringWeight = " << psd.scatteringWeight.x << "\t " << psd.scatteringWeight.y << "\t " << psd.scatteringWeight.z << "\t ";
ss << "\t transmittanceWeight = " << psd.transmittanceWeight.x << "\t " << psd.transmittanceWeight.y << "\t " << psd.transmittanceWeight.z << "\t ";
ss << "\t directContribution = " << psd.directContribution.x << "\t " << psd.directContribution.y << "\t " << psd.directContribution.z << "\t ";
ss << "\t miWeight = " << psd.miWeight;
ss << "\t scatteredContribution = " << psd.scatteredContribution.x << "\t " << psd.scatteredContribution.y << "\t " << psd.scatteredContribution.z << "\t ";
ss << "\t russianRouletteSurvivalProbability = " << psd.russianRouletteSurvivalProbability;
ss << "\t eta = " << psd.eta;
ss << "\t rough = " << psd.roughness;
ss << std::endl;

return ss.str();
}
} // namespace openpgl
Loading

0 comments on commit 7475295

Please sign in to comment.