OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0026363: Visualization, TKOpenGl - missing RayTracing shader files should be properly reported in Release mode

Browse Source 
OpenGl_View::ShaderSource::Load() - print error about missing files.
This commit is contained in:
kgv 2015-06-23 10:12:03 +03:00 committed by bugmaster
parent b77233473a
commit 73722cc947
2 changed files with 70 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/OpenGl/OpenGl_View.hxx
View File

@ -398,16 +398,14 @@ protected: //! @name data types related to ray-tracing
// //
} }
//! Creates new shader source from specified file.
ShaderSource (const TCollection_AsciiString& theFileName, const TCollection_AsciiString& thePrefix = EMPTY_PREFIX)
{
TCollection_AsciiString aFileNames[] = { theFileName, "" };
Load (aFileNames, thePrefix);
}
public: public:
//! Returns error description in case of load fail.
const TCollection_AsciiString& ErrorDescription() const
{
return myError;
}
//! Returns prefix to insert before the source. //! Returns prefix to insert before the source.
const TCollection_AsciiString& Prefix() const const TCollection_AsciiString& Prefix() const
{ {
@ -424,12 +422,13 @@ protected: //! @name data types related to ray-tracing
TCollection_AsciiString Source() const; TCollection_AsciiString Source() const;
//! Loads shader source from specified files. //! Loads shader source from specified files.
void Load (const TCollection_AsciiString* theFileNames, const TCollection_AsciiString& thePrefix = EMPTY_PREFIX); Standard_Boolean Load (const TCollection_AsciiString* theFileNames, const TCollection_AsciiString& thePrefix = EMPTY_PREFIX);
private: private:
TCollection_AsciiString mySource; //!< Source string of the shader object TCollection_AsciiString mySource; //!< Source string of the shader object
TCollection_AsciiString myPrefix; //!< Prefix to insert before the source TCollection_AsciiString myPrefix; //!< Prefix to insert before the source
TCollection_AsciiString myError; //!< error state
}; };

106
src/OpenGl/OpenGl_View_Raytrace.cxx
View File

@ -1013,36 +1013,50 @@ TCollection_AsciiString OpenGl_View::ShaderSource::Source() const
// function : Load // function : Load
// purpose : Loads shader source from specified files // purpose : Loads shader source from specified files
// ======================================================================= // =======================================================================
void OpenGl_View::ShaderSource::Load (const TCollection_AsciiString* theFileNames, Standard_Boolean OpenGl_View::ShaderSource::Load (const TCollection_AsciiString* theFileNames,
const TCollection_AsciiString& thePrefix) const TCollection_AsciiString& thePrefix)
{ {
myError.Clear();
mySource.Clear(); mySource.Clear();
TCollection_AsciiString aMissingFiles;
for (Standard_Integer anIndex = 0; !theFileNames[anIndex].IsEmpty(); ++anIndex) for (Standard_Integer anIndex = 0; !theFileNames[anIndex].IsEmpty(); ++anIndex)
{ {
OSD_File aFile (theFileNames[anIndex]); OSD_File aFile (theFileNames[anIndex]);
if (aFile.Exists())
Standard_ASSERT_RETURN (aFile.Exists(), {
"Error: Failed to find shader source file", /* none */); aFile.Open (OSD_ReadOnly, OSD_Protection());
}
aFile.Open (OSD_ReadOnly, OSD_Protection()); if (!aFile.IsOpen())
{
if (!aMissingFiles.IsEmpty())
{
aMissingFiles += ", ";
}
aMissingFiles += TCollection_AsciiString("'") + theFileNames[anIndex] + "'";
continue;
}
else if (!aMissingFiles.IsEmpty())
{
aFile.Close();
continue;
}
TCollection_AsciiString aSource; TCollection_AsciiString aSource;
Standard_ASSERT_RETURN (aFile.IsOpen(),
"Error: Failed to open shader source file", /* none */);
aFile.Read (aSource, (Standard_Integer) aFile.Size()); aFile.Read (aSource, (Standard_Integer) aFile.Size());
if (!aSource.IsEmpty()) if (!aSource.IsEmpty())
{ {
mySource += TCollection_AsciiString ("\n") + aSource; mySource += TCollection_AsciiString ("\n") + aSource;
} }
aFile.Close(); aFile.Close();
} }
myPrefix = thePrefix; myPrefix = thePrefix;
if (!aMissingFiles.IsEmpty())
{
myError = TCollection_AsciiString("Shader files ") + aMissingFiles + " are missing or inaccessible";
return Standard_False;
}
return Standard_True;
} }
// ======================================================================= // =======================================================================
@ -1364,33 +1378,39 @@ Standard_Boolean OpenGl_View::initRaytraceResources (const Graphic3d_CView& theC
std::cout << "GLSL prefix string:" << std::endl << aPrefixString << std::endl; std::cout << "GLSL prefix string:" << std::endl << aPrefixString << std::endl;
#endif #endif
ShaderSource aBasicVertShaderSrc;
{ {
Handle(OpenGl_ShaderObject) aBasicVertShader = initShader ( TCollection_AsciiString aFiles[] = { aFolder + "/RaytraceBase.vs", "" };
GL_VERTEX_SHADER, ShaderSource (aFolder + "/RaytraceBase.vs"), theGlContext); if (!aBasicVertShaderSrc.Load (aFiles))
{
return safeFailBack (aBasicVertShaderSrc.ErrorDescription(), theGlContext);
}
}
{
TCollection_AsciiString aFiles[] = { aFolder + "/RaytraceBase.fs",
aFolder + "/PathtraceBase.fs",
aFolder + "/RaytraceRender.fs",
"" };
if (!myRaytraceShaderSource.Load (aFiles, aPrefixString))
{
return safeFailBack (myRaytraceShaderSource.ErrorDescription(), theGlContext);
}
Handle(OpenGl_ShaderObject) aBasicVertShader = initShader (GL_VERTEX_SHADER, aBasicVertShaderSrc, theGlContext);
if (aBasicVertShader.IsNull()) if (aBasicVertShader.IsNull())
{ {
return safeFailBack ("Failed to initialize ray-trace vertex shader", theGlContext); return safeFailBack ("Failed to initialize ray-trace vertex shader", theGlContext);
} }
TCollection_AsciiString aFiles[] = { aFolder + "/RaytraceBase.fs",
aFolder + "/PathtraceBase.fs",
aFolder + "/RaytraceRender.fs",
"" };
myRaytraceShaderSource.Load (aFiles, aPrefixString);
myRaytraceShader = initShader (GL_FRAGMENT_SHADER, myRaytraceShaderSource, theGlContext); myRaytraceShader = initShader (GL_FRAGMENT_SHADER, myRaytraceShaderSource, theGlContext);
if (myRaytraceShader.IsNull()) if (myRaytraceShader.IsNull())
{ {
aBasicVertShader->Release (theGlContext.operator->()); aBasicVertShader->Release (theGlContext.operator->());
return safeFailBack ("Failed to initialize ray-trace fragment shader", theGlContext); return safeFailBack ("Failed to initialize ray-trace fragment shader", theGlContext);
} }
myRaytraceProgram = initProgram (theGlContext, aBasicVertShader, myRaytraceShader); myRaytraceProgram = initProgram (theGlContext, aBasicVertShader, myRaytraceShader);
if (myRaytraceProgram.IsNull()) if (myRaytraceProgram.IsNull())
{ {
return safeFailBack ("Failed to initialize ray-trace shader program", theGlContext); return safeFailBack ("Failed to initialize ray-trace shader program", theGlContext);
@ -1398,31 +1418,28 @@ Standard_Boolean OpenGl_View::initRaytraceResources (const Graphic3d_CView& theC
} }
{ {
Handle(OpenGl_ShaderObject) aBasicVertShader = initShader ( TCollection_AsciiString aFiles[] = { aFolder + "/RaytraceBase.fs",
GL_VERTEX_SHADER, ShaderSource (aFolder + "/RaytraceBase.vs"), theGlContext); aFolder + "/RaytraceSmooth.fs",
"" };
if (!myPostFSAAShaderSource.Load (aFiles, aPrefixString))
{
return safeFailBack (myPostFSAAShaderSource.ErrorDescription(), theGlContext);
}
Handle(OpenGl_ShaderObject) aBasicVertShader = initShader (GL_VERTEX_SHADER, aBasicVertShaderSrc, theGlContext);
if (aBasicVertShader.IsNull()) if (aBasicVertShader.IsNull())
{ {
return safeFailBack ("Failed to initialize FSAA vertex shader", theGlContext); return safeFailBack ("Failed to initialize FSAA vertex shader", theGlContext);
} }
TCollection_AsciiString aFiles[] = { aFolder + "/RaytraceBase.fs",
aFolder + "/RaytraceSmooth.fs",
"" };
myPostFSAAShaderSource.Load (aFiles, aPrefixString);
myPostFSAAShader = initShader (GL_FRAGMENT_SHADER, myPostFSAAShaderSource, theGlContext); myPostFSAAShader = initShader (GL_FRAGMENT_SHADER, myPostFSAAShaderSource, theGlContext);
if (myPostFSAAShader.IsNull()) if (myPostFSAAShader.IsNull())
{ {
aBasicVertShader->Release (theGlContext.operator->()); aBasicVertShader->Release (theGlContext.operator->());
return safeFailBack ("Failed to initialize FSAA fragment shader", theGlContext); return safeFailBack ("Failed to initialize FSAA fragment shader", theGlContext);
} }
myPostFSAAProgram = initProgram (theGlContext, aBasicVertShader, myPostFSAAShader); myPostFSAAProgram = initProgram (theGlContext, aBasicVertShader, myPostFSAAShader);
if (myPostFSAAProgram.IsNull()) if (myPostFSAAProgram.IsNull())
{ {
return safeFailBack ("Failed to initialize FSAA shader program", theGlContext); return safeFailBack ("Failed to initialize FSAA shader program", theGlContext);
@ -1430,26 +1447,27 @@ Standard_Boolean OpenGl_View::initRaytraceResources (const Graphic3d_CView& theC
} }
{ {
Handle(OpenGl_ShaderObject) aBasicVertShader = initShader ( ShaderSource aDispShaderSrc;
GL_VERTEX_SHADER, ShaderSource (aFolder + "/RaytraceBase.vs"), theGlContext); TCollection_AsciiString aFiles[] = { aFolder + "/Display.fs", "" };
if (!aDispShaderSrc.Load (aFiles, aPrefixString))
{
return safeFailBack (aDispShaderSrc.ErrorDescription(), theGlContext);
}
Handle(OpenGl_ShaderObject) aBasicVertShader = initShader (GL_VERTEX_SHADER, aBasicVertShaderSrc, theGlContext);
if (aBasicVertShader.IsNull()) if (aBasicVertShader.IsNull())
{ {
return safeFailBack ("Failed to set vertex shader source", theGlContext); return safeFailBack ("Failed to set vertex shader source", theGlContext);
} }
Handle(OpenGl_ShaderObject) aDisplayShader = initShader ( Handle(OpenGl_ShaderObject) aDisplayShader = initShader (GL_FRAGMENT_SHADER, aDispShaderSrc, theGlContext);
GL_FRAGMENT_SHADER, ShaderSource (aFolder + "/Display.fs", aPrefixString), theGlContext);
if (aDisplayShader.IsNull()) if (aDisplayShader.IsNull())
{ {
aBasicVertShader->Release (theGlContext.operator->()); aBasicVertShader->Release (theGlContext.operator->());
return safeFailBack ("Failed to set display fragment shader source", theGlContext); return safeFailBack ("Failed to set display fragment shader source", theGlContext);
} }
myOutImageProgram = initProgram (theGlContext, aBasicVertShader, aDisplayShader); myOutImageProgram = initProgram (theGlContext, aBasicVertShader, aDisplayShader);
if (myOutImageProgram.IsNull()) if (myOutImageProgram.IsNull())
{ {
return safeFailBack ("Failed to initialize output shader program", theGlContext); return safeFailBack ("Failed to initialize output shader program", theGlContext);