diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-09-10 20:25:27 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-09-10 20:25:27 +0800 |
| commit | d86cfe53df0f408473234c6338c2e13b97bbb9b9 (patch) | |
| tree | a907a23c6c7a4c8744304ebbd47771f116b5bfa8 | |
| parent | 03dafac6321ea637a232f9501adaca53fd2e6522 (diff) | |
Fixes to get it build again on FreeBSD
and hopefully GNU/Linux too.
| -rw-r--r-- | indra/llcommon/llsys.h | 2 | ||||
| -rw-r--r-- | indra/llprimitive/llgltfmaterial.h | 1 | ||||
| -rw-r--r-- | indra/llrender/llglheaders.h | 2 | ||||
| -rw-r--r-- | indra/llrender/llglslshader.cpp | 2 | ||||
| -rw-r--r-- | indra/llrender/llrender.h | 1 |
5 files changed, 5 insertions, 3 deletions
diff --git a/indra/llcommon/llsys.h b/indra/llcommon/llsys.h index 08d4abffa2..d37e0d42df 100644 --- a/indra/llcommon/llsys.h +++ b/indra/llcommon/llsys.h @@ -130,7 +130,7 @@ public: void stream(std::ostream& s) const; ///< output text info to s U32Kilobytes getPhysicalMemoryKB() const; -#if LL_DARWIN +#if LL_DARWIN || LL_FREEBSD static U32Kilobytes getHardwareMemSize(); // Because some Mac linkers won't let us reference extern gSysMemory from a different lib. #endif diff --git a/indra/llprimitive/llgltfmaterial.h b/indra/llprimitive/llgltfmaterial.h index ad7784f6d1..943f29d616 100644 --- a/indra/llprimitive/llgltfmaterial.h +++ b/indra/llprimitive/llgltfmaterial.h @@ -35,6 +35,7 @@ #include "hbxxh.h" #include <string> +#include <array> namespace tinygltf { diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h index 915a7de50d..29dfb451c3 100644 --- a/indra/llrender/llglheaders.h +++ b/indra/llrender/llglheaders.h @@ -27,7 +27,7 @@ #ifndef LL_LLGLHEADERS_H #define LL_LLGLHEADERS_H -#if LL_MESA +#if LL_MESA || LL_LINUX || LL_FREEBSD //---------------------------------------------------------------------------- // MESA headers // quotes so we get libraries/.../GL/ version diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index 28f248367f..10dca0b932 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -279,7 +279,7 @@ bool LLGLSLShader::readProfileQuery(bool for_runtime, bool force_read) GLuint64 samples_passed = 0; glGetQueryObjectui64v(mSamplesQuery, GL_QUERY_RESULT, &samples_passed); - U64 primitives_generated = 0; + GLuint64 primitives_generated = 0; glGetQueryObjectui64v(mPrimitivesQuery, GL_QUERY_RESULT, &primitives_generated); sTotalTimeElapsed += time_elapsed; diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h index 98141d71f5..9660f7913a 100644 --- a/indra/llrender/llrender.h +++ b/indra/llrender/llrender.h @@ -34,6 +34,7 @@ //#include "linden_common.h" +#include <array> #include "v2math.h" #include "v3math.h" #include "v4coloru.h" |