summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-10-12 16:54:25 +0800
committerErik Kundiman <erik@megapahit.org>2024-10-12 16:54:25 +0800
commitca452502e73389d376c81c7d0ca8aabc294387c7 (patch)
tree62979471a9a4b875b5140dea01d0d22fbe657482 /indra
parent4f26fe6430cd12914b0d6edf33baabe19829d014 (diff)
No samples_passed when there's no GL_SAMPLES_PASSED
cause it relies on querying mSamplesQuery, which would only have a value if it could run glBeginQuery(GL_SAMPLES_PASSED, mSamplesQuery).
Diffstat (limited to 'indra')
-rw-r--r--indra/llrender/llglslshader.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index 439cf46684..f21f0327fe 100644
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -307,16 +307,15 @@ bool LLGLSLShader::readProfileQuery(bool for_runtime, bool force_read)
GLuint64 primitives_generated = 0;
glGetQueryObjectui64v(mPrimitivesQuery, GL_QUERY_RESULT, &primitives_generated);
#else
- GLuint samples_passed = 0;
- glGetQueryObjectuiv(mSamplesQuery, GL_QUERY_RESULT, &samples_passed);
-
GLuint primitives_generated = 0;
glGetQueryObjectuiv(mPrimitivesQuery, GL_QUERY_RESULT, &primitives_generated);
#endif
sTotalTimeElapsed += time_elapsed;
+#if GL_VERSION_1_5
sTotalSamplesDrawn += samples_passed;
mSamplesDrawn += samples_passed;
+#endif
U32 tri_count = (U32)primitives_generated / 3;