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 37610ec6 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Merge branch 'fix-const' of...

Merge branch 'fix-const' of /mnt/bigone/git/repositories/sebastian.poelsterl/campvis into development
parents bf0851b2 fec543d6
...@@ -51,7 +51,7 @@ namespace campvis { ...@@ -51,7 +51,7 @@ namespace campvis {
: AbstractData() : AbstractData()
, _depthTexture(0) , _depthTexture(0)
{ {
tgt::Texture *const *const attachments = fbo->getAttachments(); tgt::Texture* const * attachments = fbo->getAttachments();
for (size_t i = 0; i < TGT_FRAMEBUFFEROBJECT_MAX_SUPPORTED_COLOR_ATTACHMENTS; ++i) { for (size_t i = 0; i < TGT_FRAMEBUFFEROBJECT_MAX_SUPPORTED_COLOR_ATTACHMENTS; ++i) {
if (attachments[i] != 0) { if (attachments[i] != 0) {
ImageData* img = new ImageData(2, attachments[i]->getDimensions(), attachments[i]->getNumChannels()); ImageData* img = new ImageData(2, attachments[i]->getDimensions(), attachments[i]->getNumChannels());
......
...@@ -160,7 +160,7 @@ GLuint FramebufferObject::generateId() { ...@@ -160,7 +160,7 @@ GLuint FramebufferObject::generateId() {
return id_; return id_;
} }
Texture*const *const FramebufferObject::getAttachments() const { Texture* const * FramebufferObject::getAttachments() const {
return attachments_; return attachments_;
} }
......
...@@ -64,7 +64,7 @@ public: ...@@ -64,7 +64,7 @@ public:
GLuint getId() const { return id_; }; GLuint getId() const { return id_; };
Texture *const *const getAttachments() const; Texture* const * getAttachments() const;
size_t getNumColorAttachments() const; size_t getNumColorAttachments() const;
......
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