Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 12:08:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #9716 from zzmp/fix/ubuntu

Browse source 
Compile interface in Ubuntu
This commit is contained in:
Brad Davis 2017-02-21 11:54:37 -08:00 committed by GitHub
commit 3a0e13387d
4 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/gpu-gl/src/gpu/gl45/GL45BackendVariableTexture.cpp
View file

@ -112,7 +112,8 @@ TransferJob::TransferJob(const GL45VariableAllocationTexture& parent, uint16_t s
_transferLambda = [=] { _transferLambda = [=] {
_parent.copyMipFaceLinesFromTexture(targetMip, face, transferDimensions, lineOffset, format, type, _buffer.data()); _parent.copyMipFaceLinesFromTexture(targetMip, face, transferDimensions, lineOffset, format, type, _buffer.data());
_buffer.swap(std::vector<uint8_t>()); std::vector<uint8_t> emptyVector;
_buffer.swap(emptyVector);
}; };
} }

1
libraries/ktx/src/ktx/KTX.h
View file

@ -16,6 +16,7 @@
#include <list> #include <list>
#include <vector> #include <vector>
#include <cstdint> #include <cstdint>
#include <cstring>
#include <memory> #include <memory>
/* KTX Spec: /* KTX Spec:

6
libraries/ktx/src/ktx/Reader.cpp
View file

@ -17,9 +17,7 @@ namespace ktx {
class ReaderException: public std::exception { class ReaderException: public std::exception {
public: public:
ReaderException(const std::string& explanation) : _explanation("KTX deserialization error: " + explanation) {} ReaderException(const std::string& explanation) : _explanation("KTX deserialization error: " + explanation) {}
const char* what() const override { const char* what() const noexcept override { return _explanation.c_str(); }
return _explanation.c_str();
}
private: private:
const std::string _explanation; const std::string _explanation;
}; };
@ -179,4 +177,4 @@ namespace ktx {
return result; return result;
} }
} }

4
libraries/ktx/src/ktx/Writer.cpp
View file

@ -16,9 +16,7 @@ namespace ktx {
class WriterException : public std::exception { class WriterException : public std::exception {
public: public:
WriterException(const std::string& explanation) : _explanation("KTX serialization error: " + explanation) {} WriterException(const std::string& explanation) : _explanation("KTX serialization error: " + explanation) {}
const char* what() const override { const char* what() const noexcept override { return _explanation.c_str(); }
return _explanation.c_str();
}
private: private:
const std::string _explanation; const std::string _explanation;
}; };