Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CAMP
campvis-public
Commits
d9e7da62
Commit
d9e7da62
authored
Feb 06, 2014
by
Christian Schulte zu Berge
Browse files
Improved OpenGL support logging in CampVisApplication::init()
parent
96165933
Changes
1
Hide whitespace changes
Inline
Side-by-side
application/campvisapplication.cpp
View file @
d9e7da62
...
...
@@ -109,17 +109,6 @@ namespace campvis {
ShdrMgr
.
setDefaultGlslVersion
(
"330"
);
LGL_ERROR
;
// ensure matching OpenGL specs
if
(
GpuCaps
.
getGlVersion
()
<
tgt
::
GpuCapabilities
::
GlVersion
::
TGT_GL_VERSION_3_3
)
{
LERROR
(
"Your system does not support OpenGL 3.3, which is mandatory. CAMPVis will probably not work as intended."
);
}
if
(
GpuCaps
.
getShaderVersion
()
<
tgt
::
GpuCapabilities
::
GlVersion
::
SHADER_VERSION_330
)
{
LERROR
(
"Your system does not support GLSL Shader Version 3.30, which is mandatory. CAMPVis will probably not work as intended."
);
}
if
(
!
GpuCaps
.
isNpotSupported
()
&&
!
GpuCaps
.
areTextureRectanglesSupported
())
{
LERROR
(
"Neither non-power-of-two textures nor texture rectangles seem to be supported. CAMPVis will probably not work as intended."
);
}
QuadRenderer
::
init
();
if
(
_argc
>
0
)
{
...
...
@@ -144,6 +133,16 @@ namespace campvis {
_mainWindow
->
init
();
// ensure matching OpenGL specs
LINFO
(
"Using Graphics Hardware "
<<
GpuCaps
.
getVendorAsString
()
<<
" "
<<
GpuCaps
.
getGlRendererString
()
<<
" on "
<<
GpuCaps
.
getOSVersionString
());
LINFO
(
"Supported OpenGL "
<<
GpuCaps
.
getGlVersion
()
<<
", GLSL "
<<
GpuCaps
.
getShaderVersion
());
if
(
GpuCaps
.
getGlVersion
()
<
tgt
::
GpuCapabilities
::
GlVersion
::
TGT_GL_VERSION_3_3
)
{
LERROR
(
"Your system does not support OpenGL 3.3, which is mandatory. CAMPVis will probably not work as intended."
);
}
if
(
GpuCaps
.
getShaderVersion
()
<
tgt
::
GpuCapabilities
::
GlVersion
::
SHADER_VERSION_330
)
{
LERROR
(
"Your system does not support GLSL Shader Version 3.30, which is mandatory. CAMPVis will probably not work as intended."
);
}
// init pipeline first
for
(
std
::
vector
<
AbstractPipeline
*>::
iterator
it
=
_pipelines
.
begin
();
it
!=
_pipelines
.
end
();
++
it
)
{
(
*
it
)
->
init
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment