Currently job artifacts in CI/CD pipelines on LRZ GitLab never expire. Starting from Wed 26.1.2022 the default expiration time will be 30 days (GitLab default). Currently existing artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

Commit e92090bd authored by schultezub's avatar schultezub
Browse files

adapting ray casting processors/shaders to GLSL 3.30

git-svn-id: https://camplinux.in.tum.de/svn/campvis/trunk@275 bb408c1c-ae56-11e1-83d9-df6b3e0c105e
parent b45b9c19
......@@ -72,7 +72,7 @@ namespace TUMVis {
void RaycastingProcessor::init() {
VisualizationProcessor::init();
_shader = ShdrMgr.loadSeparate("core/glsl/passthrough_deprecated.vert", _fragmentShaderFilename, "", false);
_shader = ShdrMgr.loadSeparate("core/glsl/passthrough.vert", _fragmentShaderFilename, "", false);
_shader->setHeaders(generateHeader());
_shader->rebuild();
}
......
......@@ -26,6 +26,10 @@
//
// ================================================================================================
#version 330
out vec4 out_Color; ///< outgoing fragment color
#include "tools/raycasting.frag"
#include "tools/texture2d.frag"
#include "tools/texture3d.frag"
......@@ -129,6 +133,6 @@ void main() {
discard;
} else {
//fragCoords are lying inside the boundingbox
gl_FragData[0] = raycastDRR(frontPos, backPos);
out_Color = raycastDRR(frontPos, backPos);
}
}
......@@ -26,6 +26,10 @@
//
// ================================================================================================
#version 330
out vec4 out_Color; ///< outgoing fragment color
#include "tools/raycasting.frag"
#include "tools/texture2d.frag"
#include "tools/texture3d.frag"
......@@ -116,6 +120,6 @@ void main() {
discard;
} else {
//fragCoords are lying inside the boundingbox
gl_FragData[0] = performRaycasting(frontPos, backPos, p);
out_Color = performRaycasting(frontPos, backPos, p);
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment