mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-05 18:16:23 +03:00
0025703: Visualization - Decrease number of samplers used in ray-tracing mode
This patch eliminates 3 samplers used in ray-tracing mode: //! Texture buffer of data records of bottom-level BVH nodes. Handle(OpenGl_TextureBufferArb) myObjectNodeInfoTexture; //! Texture buffer of minimum points of bottom-level BVH nodes. Handle(OpenGl_TextureBufferArb) myObjectMinPointTexture; //! Texture buffer of maximum points of bottom-level BVH nodes. Handle(OpenGl_TextureBufferArb) myObjectMaxPointTexture; Serialized data contained in corresponding texture buffers were added to global scene buffers: //! Texture buffer of data records of high-level BVH nodes. Handle(OpenGl_TextureBufferArb) mySceneNodeInfoTexture; //! Texture buffer of minimum points of high-level BVH nodes. Handle(OpenGl_TextureBufferArb) mySceneMinPointTexture; //! Texture buffer of maximum points of high-level BVH nodes. Handle(OpenGl_TextureBufferArb) mySceneMaxPointTexture; This modifications leads also to small performance improvement (~2%) due to higher texture cache efficiency. Some modifications in traversal function (GLSL code) also improve performance (~3%).
This commit is contained in:
dbp
bugmaster
parent
71595c2970
commit
e2da917a1c
@ -305,7 +305,7 @@ Standard_Boolean OpenGl_RaytraceGeometry::ProcessAcceleration()
|
||||
|
||||
Standard_Integer aVerticesOffset = 0;
|
||||
Standard_Integer aElementsOffset = 0;
|
||||
Standard_Integer aBVHNodesOffset = 0;
|
||||
Standard_Integer aBVHNodesOffset = BVH()->Length();
|
||||
|
||||
for (Standard_Integer aNodeIdx = 0; aNodeIdx < aBVH->Length(); ++aNodeIdx)
|
||||
{
|
||||
|
||||
@ -331,27 +331,22 @@ protected:
|
||||
OpenGl_RT_SceneNodeInfoTexture = 0,
|
||||
OpenGl_RT_SceneMinPointTexture = 1,
|
||||
OpenGl_RT_SceneMaxPointTexture = 2,
|
||||
OpenGl_RT_SceneTransformTexture = 3,
|
||||
|
||||
OpenGl_RT_ObjectNodeInfoTexture = 3,
|
||||
OpenGl_RT_ObjectMinPointTexture = 4,
|
||||
OpenGl_RT_ObjectMaxPointTexture = 5,
|
||||
OpenGl_RT_GeometryVertexTexture = 4,
|
||||
OpenGl_RT_GeometryNormalTexture = 5,
|
||||
OpenGl_RT_GeometryTexCrdTexture = 6,
|
||||
OpenGl_RT_GeometryTriangTexture = 7,
|
||||
|
||||
OpenGl_RT_GeometryVertexTexture = 6,
|
||||
OpenGl_RT_GeometryNormalTexture = 7,
|
||||
OpenGl_RT_GeometryTexCrdTexture = 8,
|
||||
OpenGl_RT_GeometryTriangTexture = 9,
|
||||
OpenGl_RT_EnvironmentMapTexture = 8,
|
||||
|
||||
OpenGl_RT_EnvironmentMapTexture = 10,
|
||||
OpenGl_RT_RaytraceMaterialTexture = 9,
|
||||
OpenGl_RT_RaytraceLightSrcTexture = 10,
|
||||
|
||||
OpenGl_RT_RaytraceMaterialTexture = 11,
|
||||
OpenGl_RT_RaytraceLightSrcTexture = 12,
|
||||
OpenGl_RT_FSAAInputTexture = 11,
|
||||
|
||||
OpenGl_RT_FSAAInputTexture = 13,
|
||||
|
||||
OpenGl_RT_SceneTransformTexture = 14,
|
||||
|
||||
OpenGl_RT_OpenGlColorTexture = 15,
|
||||
OpenGl_RT_OpenGlDepthTexture = 16
|
||||
OpenGl_RT_OpenGlColorTexture = 12,
|
||||
OpenGl_RT_OpenGlDepthTexture = 13
|
||||
};
|
||||
|
||||
//! Tool class for management of shader sources.
|
||||
@ -598,22 +593,15 @@ protected: //! @name fields related to ray-tracing
|
||||
//! OpenGL/GLSL adaptive-AA shader program.
|
||||
Handle(OpenGl_ShaderProgram) myPostFSAAProgram;
|
||||
|
||||
//! Texture buffer of data records of high-level BVH nodes.
|
||||
//! Texture buffer of data records of bottom-level BVH nodes.
|
||||
Handle(OpenGl_TextureBufferArb) mySceneNodeInfoTexture;
|
||||
//! Texture buffer of minimum points of high-level BVH nodes.
|
||||
//! Texture buffer of minimum points of bottom-level BVH nodes.
|
||||
Handle(OpenGl_TextureBufferArb) mySceneMinPointTexture;
|
||||
//! Texture buffer of maximum points of high-level BVH nodes.
|
||||
//! Texture buffer of maximum points of bottom-level BVH nodes.
|
||||
Handle(OpenGl_TextureBufferArb) mySceneMaxPointTexture;
|
||||
//! Texture buffer of transformations of high-level BVH nodes.
|
||||
Handle(OpenGl_TextureBufferArb) mySceneTransformTexture;
|
||||
|
||||
//! Texture buffer of data records of bottom-level BVH nodes.
|
||||
Handle(OpenGl_TextureBufferArb) myObjectNodeInfoTexture;
|
||||
//! Texture buffer of minimum points of bottom-level BVH nodes.
|
||||
Handle(OpenGl_TextureBufferArb) myObjectMinPointTexture;
|
||||
//! Texture buffer of maximum points of bottom-level BVH nodes.
|
||||
Handle(OpenGl_TextureBufferArb) myObjectMaxPointTexture;
|
||||
|
||||
//! Texture buffer of vertex coords.
|
||||
Handle(OpenGl_TextureBufferArb) myGeometryVertexTexture;
|
||||
//! Texture buffer of vertex normals.
|
||||
|
||||
@ -639,19 +639,19 @@ OpenGl_TriangleSet* OpenGl_Workspace::AddRaytracePrimitiveArray (const OpenGl_Pr
|
||||
|
||||
if (!aBounds.IsNull())
|
||||
{
|
||||
#ifdef RAY_TRACE_PRINT_INFO
|
||||
#ifdef RAY_TRACE_PRINT_INFO
|
||||
std::cout << "\tNumber of bounds = " << aBounds->NbBounds << std::endl;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
Standard_Integer aBoundStart = 0;
|
||||
for (Standard_Integer aBound = 0; aBound < aBounds->NbBounds; ++aBound)
|
||||
{
|
||||
const Standard_Integer aVertNum = aBounds->Bounds[aBound];
|
||||
|
||||
#ifdef RAY_TRACE_PRINT_INFO
|
||||
#ifdef RAY_TRACE_PRINT_INFO
|
||||
std::cout << "\tAdding indices from bound " << aBound << ": " <<
|
||||
aBoundStart << " .. " << aVertNum << std::endl;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
if (!AddRaytraceVertexIndices (*aSet, *theArray, aBoundStart, aVertNum, theMatID))
|
||||
{
|
||||
@ -1495,12 +1495,6 @@ Standard_Boolean OpenGl_Workspace::InitRaytraceResources (const Graphic3d_CView&
|
||||
"uSceneMaxPointTexture", OpenGl_RT_SceneMaxPointTexture);
|
||||
aShaderProgram->SetSampler (myGlContext,
|
||||
"uSceneNodeInfoTexture", OpenGl_RT_SceneNodeInfoTexture);
|
||||
aShaderProgram->SetSampler (myGlContext,
|
||||
"uObjectMinPointTexture", OpenGl_RT_ObjectMinPointTexture);
|
||||
aShaderProgram->SetSampler (myGlContext,
|
||||
"uObjectMaxPointTexture", OpenGl_RT_ObjectMaxPointTexture);
|
||||
aShaderProgram->SetSampler (myGlContext,
|
||||
"uObjectNodeInfoTexture", OpenGl_RT_ObjectNodeInfoTexture);
|
||||
aShaderProgram->SetSampler (myGlContext,
|
||||
"uGeometryVertexTexture", OpenGl_RT_GeometryVertexTexture);
|
||||
aShaderProgram->SetSampler (myGlContext,
|
||||
@ -1648,10 +1642,6 @@ void OpenGl_Workspace::ReleaseRaytraceResources()
|
||||
NullifyResource (myGlContext, mySceneMinPointTexture);
|
||||
NullifyResource (myGlContext, mySceneMaxPointTexture);
|
||||
|
||||
NullifyResource (myGlContext, myObjectNodeInfoTexture);
|
||||
NullifyResource (myGlContext, myObjectMinPointTexture);
|
||||
NullifyResource (myGlContext, myObjectMaxPointTexture);
|
||||
|
||||
NullifyResource (myGlContext, myGeometryVertexTexture);
|
||||
NullifyResource (myGlContext, myGeometryNormalTexture);
|
||||
NullifyResource (myGlContext, myGeometryTexCrdTexture);
|
||||
@ -1696,9 +1686,9 @@ Standard_Boolean OpenGl_Workspace::UploadRaytraceData()
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Create OpenGL texture buffers
|
||||
// Create OpenGL BVH buffers
|
||||
|
||||
if (mySceneNodeInfoTexture.IsNull()) // create hight-level BVH buffers
|
||||
if (mySceneNodeInfoTexture.IsNull()) // create scene BVH buffers
|
||||
{
|
||||
mySceneNodeInfoTexture = new OpenGl_TextureBufferArb;
|
||||
mySceneMinPointTexture = new OpenGl_TextureBufferArb;
|
||||
@ -1711,24 +1701,7 @@ Standard_Boolean OpenGl_Workspace::UploadRaytraceData()
|
||||
|| !mySceneTransformTexture->Create (myGlContext))
|
||||
{
|
||||
#ifdef RAY_TRACE_PRINT_INFO
|
||||
std::cout << "Error: Failed to create buffers for high-level scene BVH" << std::endl;
|
||||
#endif
|
||||
return Standard_False;
|
||||
}
|
||||
}
|
||||
|
||||
if (myObjectNodeInfoTexture.IsNull()) // create bottom-level BVH buffers
|
||||
{
|
||||
myObjectNodeInfoTexture = new OpenGl_TextureBufferArb;
|
||||
myObjectMinPointTexture = new OpenGl_TextureBufferArb;
|
||||
myObjectMaxPointTexture = new OpenGl_TextureBufferArb;
|
||||
|
||||
if (!myObjectNodeInfoTexture->Create (myGlContext)
|
||||
|| !myObjectMinPointTexture->Create (myGlContext)
|
||||
|| !myObjectMaxPointTexture->Create (myGlContext))
|
||||
{
|
||||
#ifdef RAY_TRACE_PRINT_INFO
|
||||
std::cout << "Error: Failed to create buffers for bottom-level scene BVH" << std::endl;
|
||||
std::cout << "Error: Failed to create scene BVH buffers" << std::endl;
|
||||
#endif
|
||||
return Standard_False;
|
||||
}
|
||||
@ -1766,34 +1739,13 @@ Standard_Boolean OpenGl_Workspace::UploadRaytraceData()
|
||||
}
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Write top-level BVH buffers
|
||||
|
||||
const NCollection_Handle<BVH_Tree<Standard_ShortReal, 3> >& aBVH = myRaytraceGeometry.BVH();
|
||||
|
||||
bool aResult = true;
|
||||
if (!aBVH->NodeInfoBuffer().empty())
|
||||
{
|
||||
aResult &= mySceneNodeInfoTexture->Init (myGlContext, 4, GLsizei (aBVH->NodeInfoBuffer().size()),
|
||||
reinterpret_cast<const GLuint*> (&aBVH->NodeInfoBuffer().front()));
|
||||
aResult &= mySceneMinPointTexture->Init (myGlContext, 3, GLsizei (aBVH->MinPointBuffer().size()),
|
||||
reinterpret_cast<const GLfloat*> (&aBVH->MinPointBuffer().front()));
|
||||
aResult &= mySceneMaxPointTexture->Init (myGlContext, 3, GLsizei (aBVH->MaxPointBuffer().size()),
|
||||
reinterpret_cast<const GLfloat*> (&aBVH->MaxPointBuffer().front()));
|
||||
}
|
||||
if (!aResult)
|
||||
{
|
||||
#ifdef RAY_TRACE_PRINT_INFO
|
||||
std::cout << "Error: Failed to upload buffers for high-level scene BVH" << std::endl;
|
||||
#endif
|
||||
return Standard_False;
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Write transform buffer
|
||||
|
||||
BVH_Mat4f* aNodeTransforms = new BVH_Mat4f[myRaytraceGeometry.Size()];
|
||||
|
||||
bool aResult = true;
|
||||
|
||||
for (Standard_Integer anElemIndex = 0; anElemIndex < myRaytraceGeometry.Size(); ++anElemIndex)
|
||||
{
|
||||
OpenGl_TriangleSet* aTriangleSet = dynamic_cast<OpenGl_TriangleSet*> (
|
||||
@ -1837,13 +1789,15 @@ Standard_Boolean OpenGl_Workspace::UploadRaytraceData()
|
||||
aTotalBVHNodesNb += aTriangleSet->BVH()->NodeInfoBuffer().size();
|
||||
}
|
||||
|
||||
aTotalBVHNodesNb += myRaytraceGeometry.BVH()->NodeInfoBuffer().size();
|
||||
|
||||
if (aTotalBVHNodesNb != 0)
|
||||
{
|
||||
aResult &= myObjectNodeInfoTexture->Init (
|
||||
aResult &= mySceneNodeInfoTexture->Init (
|
||||
myGlContext, 4, GLsizei (aTotalBVHNodesNb), static_cast<const GLuint*> (NULL));
|
||||
aResult &= myObjectMinPointTexture->Init (
|
||||
aResult &= mySceneMinPointTexture->Init (
|
||||
myGlContext, 3, GLsizei (aTotalBVHNodesNb), static_cast<const GLfloat*> (NULL));
|
||||
aResult &= myObjectMaxPointTexture->Init (
|
||||
aResult &= mySceneMaxPointTexture->Init (
|
||||
myGlContext, 3, GLsizei (aTotalBVHNodesNb), static_cast<const GLfloat*> (NULL));
|
||||
}
|
||||
|
||||
@ -1879,6 +1833,15 @@ Standard_Boolean OpenGl_Workspace::UploadRaytraceData()
|
||||
return Standard_False;
|
||||
}
|
||||
|
||||
const NCollection_Handle<BVH_Tree<Standard_ShortReal, 3> >& aBVH = myRaytraceGeometry.BVH();
|
||||
|
||||
aResult &= mySceneNodeInfoTexture->SubData (myGlContext, 0, aBVH->Length(),
|
||||
reinterpret_cast<const GLuint*> (&aBVH->NodeInfoBuffer().front()));
|
||||
aResult &= mySceneMinPointTexture->SubData (myGlContext, 0, aBVH->Length(),
|
||||
reinterpret_cast<const GLfloat*> (&aBVH->MinPointBuffer().front()));
|
||||
aResult &= mySceneMaxPointTexture->SubData (myGlContext, 0, aBVH->Length(),
|
||||
reinterpret_cast<const GLfloat*> (&aBVH->MaxPointBuffer().front()));
|
||||
|
||||
for (Standard_Integer aNodeIdx = 0; aNodeIdx < aBVH->Length(); ++aNodeIdx)
|
||||
{
|
||||
if (!aBVH->IsOuter (aNodeIdx))
|
||||
@ -1889,20 +1852,20 @@ Standard_Boolean OpenGl_Workspace::UploadRaytraceData()
|
||||
Standard_ASSERT_RETURN (aTriangleSet != NULL,
|
||||
"Error: Failed to get triangulation of OpenGL element", Standard_False);
|
||||
|
||||
const Standard_Integer aBVHOffset = myRaytraceGeometry.AccelerationOffset (aNodeIdx);
|
||||
Standard_Integer aBVHOffset = myRaytraceGeometry.AccelerationOffset (aNodeIdx);
|
||||
|
||||
Standard_ASSERT_RETURN (aBVHOffset != OpenGl_RaytraceGeometry::INVALID_OFFSET,
|
||||
"Error: Failed to get offset for bottom-level BVH", Standard_False);
|
||||
|
||||
const size_t aBVHBuffserSize = aTriangleSet->BVH()->NodeInfoBuffer().size();
|
||||
const Standard_Integer aBvhBuffersSize = aTriangleSet->BVH()->Length();
|
||||
|
||||
if (aBVHBuffserSize != 0)
|
||||
if (aBvhBuffersSize != 0)
|
||||
{
|
||||
aResult &= myObjectNodeInfoTexture->SubData (myGlContext, aBVHOffset, GLsizei (aBVHBuffserSize),
|
||||
aResult &= mySceneNodeInfoTexture->SubData (myGlContext, aBVHOffset, aBvhBuffersSize,
|
||||
reinterpret_cast<const GLuint*> (&aTriangleSet->BVH()->NodeInfoBuffer().front()));
|
||||
aResult &= myObjectMinPointTexture->SubData (myGlContext, aBVHOffset, GLsizei (aBVHBuffserSize),
|
||||
aResult &= mySceneMinPointTexture->SubData (myGlContext, aBVHOffset, aBvhBuffersSize,
|
||||
reinterpret_cast<const GLfloat*> (&aTriangleSet->BVH()->MinPointBuffer().front()));
|
||||
aResult &= myObjectMaxPointTexture->SubData (myGlContext, aBVHOffset, GLsizei (aBVHBuffserSize),
|
||||
aResult &= mySceneMaxPointTexture->SubData (myGlContext, aBVHOffset, aBvhBuffersSize,
|
||||
reinterpret_cast<const GLfloat*> (&aTriangleSet->BVH()->MaxPointBuffer().front()));
|
||||
if (!aResult)
|
||||
{
|
||||
@ -2180,9 +2143,6 @@ Standard_Boolean OpenGl_Workspace::RunRaytraceShaders (const Graphic3d_CView& th
|
||||
mySceneMinPointTexture->BindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_SceneMinPointTexture);
|
||||
mySceneMaxPointTexture->BindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_SceneMaxPointTexture);
|
||||
mySceneNodeInfoTexture->BindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_SceneNodeInfoTexture);
|
||||
myObjectMinPointTexture->BindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_ObjectMinPointTexture);
|
||||
myObjectMaxPointTexture->BindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_ObjectMaxPointTexture);
|
||||
myObjectNodeInfoTexture->BindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_ObjectNodeInfoTexture);
|
||||
myGeometryVertexTexture->BindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_GeometryVertexTexture);
|
||||
myGeometryNormalTexture->BindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_GeometryNormalTexture);
|
||||
myGeometryTexCrdTexture->BindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_GeometryTexCrdTexture);
|
||||
@ -2228,9 +2188,6 @@ Standard_Boolean OpenGl_Workspace::RunRaytraceShaders (const Graphic3d_CView& th
|
||||
mySceneMinPointTexture->UnbindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_SceneMinPointTexture);
|
||||
mySceneMaxPointTexture->UnbindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_SceneMaxPointTexture);
|
||||
mySceneNodeInfoTexture->UnbindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_SceneNodeInfoTexture);
|
||||
myObjectMinPointTexture->UnbindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_ObjectMinPointTexture);
|
||||
myObjectMaxPointTexture->UnbindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_ObjectMaxPointTexture);
|
||||
myObjectNodeInfoTexture->UnbindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_ObjectNodeInfoTexture);
|
||||
myGeometryVertexTexture->UnbindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_GeometryVertexTexture);
|
||||
myGeometryNormalTexture->UnbindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_GeometryNormalTexture);
|
||||
myGeometryTexCrdTexture->UnbindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_GeometryTexCrdTexture);
|
||||
@ -2324,9 +2281,6 @@ Standard_Boolean OpenGl_Workspace::RunRaytraceShaders (const Graphic3d_CView& th
|
||||
mySceneMinPointTexture->UnbindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_SceneMinPointTexture);
|
||||
mySceneMaxPointTexture->UnbindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_SceneMaxPointTexture);
|
||||
mySceneNodeInfoTexture->UnbindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_SceneNodeInfoTexture);
|
||||
myObjectMinPointTexture->UnbindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_ObjectMinPointTexture);
|
||||
myObjectMaxPointTexture->UnbindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_ObjectMaxPointTexture);
|
||||
myObjectNodeInfoTexture->UnbindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_ObjectNodeInfoTexture);
|
||||
myGeometryVertexTexture->UnbindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_GeometryVertexTexture);
|
||||
myGeometryNormalTexture->UnbindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_GeometryNormalTexture);
|
||||
myGeometryTexCrdTexture->UnbindTexture (myGlContext, GL_TEXTURE0 + OpenGl_RT_GeometryTexCrdTexture);
|
||||
|
||||
@ -36,22 +36,15 @@ uniform vec3 uDirectRB;
|
||||
//! Inverse model-view-projection matrix.
|
||||
uniform mat4 uUnviewMat;
|
||||
|
||||
//! Texture buffer of data records of high-level BVH nodes.
|
||||
//! Texture buffer of data records of bottom-level BVH nodes.
|
||||
uniform isamplerBuffer uSceneNodeInfoTexture;
|
||||
//! Texture buffer of minimum points of high-level BVH nodes.
|
||||
//! Texture buffer of minimum points of bottom-level BVH nodes.
|
||||
uniform samplerBuffer uSceneMinPointTexture;
|
||||
//! Texture buffer of maximum points of high-level BVH nodes.
|
||||
//! Texture buffer of maximum points of bottom-level BVH nodes.
|
||||
uniform samplerBuffer uSceneMaxPointTexture;
|
||||
//! Texture buffer of transformations of high-level BVH nodes.
|
||||
uniform samplerBuffer uSceneTransformTexture;
|
||||
|
||||
//! Texture buffer of data records of bottom-level BVH nodes.
|
||||
uniform isamplerBuffer uObjectNodeInfoTexture;
|
||||
//! Texture buffer of minimum points of bottom-level BVH nodes.
|
||||
uniform samplerBuffer uObjectMinPointTexture;
|
||||
//! Texture buffer of maximum points of bottom-level BVH nodes.
|
||||
uniform samplerBuffer uObjectMaxPointTexture;
|
||||
|
||||
//! Texture buffer of vertex coords.
|
||||
uniform samplerBuffer uGeometryVertexTexture;
|
||||
//! Texture buffer of vertex normals.
|
||||
@ -341,9 +334,11 @@ ivec4 ObjectNearestHit (in int theBVHOffset, in int theVrtOffset, in int theTrgO
|
||||
|
||||
ivec4 aTriIndex = INALID_HIT;
|
||||
|
||||
while (true)
|
||||
bool toContinue = true;
|
||||
|
||||
while (toContinue)
|
||||
{
|
||||
ivec3 aData = texelFetch (uObjectNodeInfoTexture, aNode).xyz;
|
||||
ivec3 aData = texelFetch (uSceneNodeInfoTexture, aNode).xyz;
|
||||
|
||||
if (aData.x == 0) // if inner node
|
||||
{
|
||||
@ -354,10 +349,10 @@ ivec4 ObjectNearestHit (in int theBVHOffset, in int theVrtOffset, in int theTrgO
|
||||
aData.y += theBVHOffset;
|
||||
aData.z += theBVHOffset;
|
||||
|
||||
vec3 aNodeMinLft = texelFetch (uObjectMinPointTexture, aData.y).xyz;
|
||||
vec3 aNodeMaxLft = texelFetch (uObjectMaxPointTexture, aData.y).xyz;
|
||||
vec3 aNodeMinRgh = texelFetch (uObjectMinPointTexture, aData.z).xyz;
|
||||
vec3 aNodeMaxRgh = texelFetch (uObjectMaxPointTexture, aData.z).xyz;
|
||||
vec3 aNodeMinLft = texelFetch (uSceneMinPointTexture, aData.y).xyz;
|
||||
vec3 aNodeMinRgh = texelFetch (uSceneMinPointTexture, aData.z).xyz;
|
||||
vec3 aNodeMaxLft = texelFetch (uSceneMaxPointTexture, aData.y).xyz;
|
||||
vec3 aNodeMaxRgh = texelFetch (uSceneMaxPointTexture, aData.z).xyz;
|
||||
|
||||
vec3 aTime0 = (aNodeMinLft - theRay.Origin) * theInverse;
|
||||
vec3 aTime1 = (aNodeMaxLft - theRay.Origin) * theInverse;
|
||||
@ -395,9 +390,9 @@ ivec4 ObjectNearestHit (in int theBVHOffset, in int theVrtOffset, in int theTrgO
|
||||
}
|
||||
else
|
||||
{
|
||||
if (aHead == theSentinel)
|
||||
return aTriIndex;
|
||||
toContinue = (aHead != theSentinel);
|
||||
|
||||
if (toContinue)
|
||||
aNode = Stack[aHead--];
|
||||
}
|
||||
}
|
||||
@ -430,9 +425,9 @@ ivec4 ObjectNearestHit (in int theBVHOffset, in int theVrtOffset, in int theTrgO
|
||||
}
|
||||
}
|
||||
|
||||
if (aHead == theSentinel)
|
||||
return aTriIndex;
|
||||
toContinue = (aHead != theSentinel);
|
||||
|
||||
if (toContinue)
|
||||
aNode = Stack[aHead--];
|
||||
}
|
||||
}
|
||||
@ -467,7 +462,7 @@ float ObjectAnyHit (in int theBVHOffset, in int theVrtOffset, in int theTrgOffse
|
||||
|
||||
while (true)
|
||||
{
|
||||
ivec4 aData = texelFetch (uObjectNodeInfoTexture, aNode);
|
||||
ivec4 aData = texelFetch (uSceneNodeInfoTexture, aNode);
|
||||
|
||||
if (aData.x == 0) // if inner node
|
||||
{
|
||||
@ -478,10 +473,10 @@ float ObjectAnyHit (in int theBVHOffset, in int theVrtOffset, in int theTrgOffse
|
||||
aData.y += theBVHOffset;
|
||||
aData.z += theBVHOffset;
|
||||
|
||||
vec3 aNodeMinLft = texelFetch (uObjectMinPointTexture, aData.y).xyz;
|
||||
vec3 aNodeMaxLft = texelFetch (uObjectMaxPointTexture, aData.y).xyz;
|
||||
vec3 aNodeMinRgh = texelFetch (uObjectMinPointTexture, aData.z).xyz;
|
||||
vec3 aNodeMaxRgh = texelFetch (uObjectMaxPointTexture, aData.z).xyz;
|
||||
vec3 aNodeMinLft = texelFetch (uSceneMinPointTexture, aData.y).xyz;
|
||||
vec3 aNodeMaxLft = texelFetch (uSceneMaxPointTexture, aData.y).xyz;
|
||||
vec3 aNodeMinRgh = texelFetch (uSceneMinPointTexture, aData.z).xyz;
|
||||
vec3 aNodeMaxRgh = texelFetch (uSceneMaxPointTexture, aData.z).xyz;
|
||||
|
||||
vec3 aTime0 = (aNodeMinLft - theRay.Origin) * theInverse;
|
||||
vec3 aTime1 = (aNodeMaxLft - theRay.Origin) * theInverse;
|
||||
@ -622,9 +617,7 @@ ivec4 SceneNearestHit (in SRay theRay, in vec3 theInverse, inout SIntersect theH
|
||||
|
||||
vec3 aTrsfInverse = 1.0f / max (abs (aTrsfRay.Direct), SMALL);
|
||||
|
||||
aTrsfInverse.x = aTrsfRay.Direct.x < 0.f ? -aTrsfInverse.x : aTrsfInverse.x;
|
||||
aTrsfInverse.y = aTrsfRay.Direct.y < 0.f ? -aTrsfInverse.y : aTrsfInverse.y;
|
||||
aTrsfInverse.z = aTrsfRay.Direct.z < 0.f ? -aTrsfInverse.z : aTrsfInverse.z;
|
||||
aTrsfInverse = mix (-aTrsfInverse, aTrsfInverse, step (ZERO, aTrsfRay.Direct));
|
||||
|
||||
ivec4 aTriIndex = ObjectNearestHit (
|
||||
aData.y, aData.z, aData.w, aTrsfRay, aTrsfInverse, theHit, aHead);
|
||||
@ -737,9 +730,7 @@ float SceneAnyHit (in SRay theRay, in vec3 theInverse, in float theDistance)
|
||||
|
||||
vec3 aTrsfInverse = 1.0f / max (abs (aTrsfRay.Direct), SMALL);
|
||||
|
||||
aTrsfInverse.x = aTrsfRay.Direct.x < 0.0f ? -aTrsfInverse.x : aTrsfInverse.x;
|
||||
aTrsfInverse.y = aTrsfRay.Direct.y < 0.0f ? -aTrsfInverse.y : aTrsfInverse.y;
|
||||
aTrsfInverse.z = aTrsfRay.Direct.z < 0.0f ? -aTrsfInverse.z : aTrsfInverse.z;
|
||||
aTrsfInverse = mix (-aTrsfInverse, aTrsfInverse, step (ZERO, aTrsfRay.Direct));
|
||||
|
||||
#ifdef TRANSPARENT_SHADOWS
|
||||
aFactor *= ObjectAnyHit (
|
||||
@ -1033,11 +1024,8 @@ vec4 Radiance (in SRay theRay, in vec3 theInverse)
|
||||
{
|
||||
vec3 aInverse = 1.0f / max (abs (aLight.xyz), SMALL);
|
||||
|
||||
aInverse.x = aLight.x < 0.0f ? -aInverse.x : aInverse.x;
|
||||
aInverse.y = aLight.y < 0.0f ? -aInverse.y : aInverse.y;
|
||||
aInverse.z = aLight.z < 0.0f ? -aInverse.z : aInverse.z;
|
||||
|
||||
aVisibility = SceneAnyHit (aShadow, aInverse, aDistance);
|
||||
aVisibility = SceneAnyHit (
|
||||
aShadow, mix (-aInverse, aInverse, step (ZERO, aLight.xyz)), aDistance);
|
||||
}
|
||||
|
||||
if (aVisibility > 0.0f)
|
||||
@ -1073,9 +1061,7 @@ vec4 Radiance (in SRay theRay, in vec3 theInverse)
|
||||
|
||||
theInverse = 1.0f / max (abs (theRay.Direct), SMALL);
|
||||
|
||||
theInverse.x = theRay.Direct.x < 0.0f ? -theInverse.x : theInverse.x;
|
||||
theInverse.y = theRay.Direct.y < 0.0f ? -theInverse.y : theInverse.y;
|
||||
theInverse.z = theRay.Direct.z < 0.0f ? -theInverse.z : theInverse.z;
|
||||
theInverse = mix (-theInverse, theInverse, step (ZERO, theRay.Direct));
|
||||
|
||||
aPoint += aHit.Normal * (dot (aHit.Normal, theRay.Direct) >= 0.0f ? uSceneEpsilon : -uSceneEpsilon);
|
||||
|
||||
@ -1101,9 +1087,7 @@ vec4 Radiance (in SRay theRay, in vec3 theInverse)
|
||||
|
||||
theInverse = 1.0f / max (abs (theRay.Direct), SMALL);
|
||||
|
||||
theInverse.x = theRay.Direct.x < 0.0f ? -theInverse.x : theInverse.x;
|
||||
theInverse.y = theRay.Direct.y < 0.0f ? -theInverse.y : theInverse.y;
|
||||
theInverse.z = theRay.Direct.z < 0.0f ? -theInverse.z : theInverse.z;
|
||||
theInverse = mix (-theInverse, theInverse, step (ZERO, theRay.Direct));
|
||||
|
||||
aPoint += aHit.Normal * (dot (aHit.Normal, theRay.Direct) >= 0.0f ? uSceneEpsilon : -uSceneEpsilon);
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user