From d86cfe53df0f408473234c6338c2e13b97bbb9b9 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Sun, 10 Sep 2023 20:25:27 +0800 Subject: Fixes to get it build again on FreeBSD and hopefully GNU/Linux too. --- indra/llrender/llglheaders.h | 2 +- indra/llrender/llglslshader.cpp | 2 +- indra/llrender/llrender.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/llrender') 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 #include "v2math.h" #include "v3math.h" #include "v4coloru.h" -- cgit v1.3