diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llrender/llglslshader.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llvieweroctree.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index 58f2a4d91d..c0485d3b97 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -239,7 +239,7 @@ void LLGLSLShader::placeProfileQuery(bool for_runtime) if (!for_runtime) { - glBeginQuery(GL_SAMPLES_PASSED, mSamplesQuery); + glBeginQuery(GL_ANY_SAMPLES_PASSED, mSamplesQuery); #if GL_VERSION_3_0 glBeginQuery(GL_PRIMITIVES_GENERATED, mPrimitivesQuery); #endif @@ -258,7 +258,7 @@ bool LLGLSLShader::readProfileQuery(bool for_runtime, bool force_read) #endif if (!for_runtime) { - glEndQuery(GL_SAMPLES_PASSED); + glEndQuery(GL_ANY_SAMPLES_PASSED); #if GL_VERSION_3_0 glEndQuery(GL_PRIMITIVES_GENERATED); #endif diff --git a/indra/newview/llvieweroctree.cpp b/indra/newview/llvieweroctree.cpp index 9d63241300..671098328b 100644 --- a/indra/newview/llvieweroctree.cpp +++ b/indra/newview/llvieweroctree.cpp @@ -1217,7 +1217,7 @@ void LLOcclusionCullingGroup::doOcclusion(LLCamera* camera, const LLVector4a* sh LLGLEnable clamp(use_depth_clamp ? GL_DEPTH_CLAMP : 0); - U32 mode = gGLManager.mGLVersion >= 3.3f ? GL_ANY_SAMPLES_PASSED : GL_SAMPLES_PASSED; + U32 mode = GL_ANY_SAMPLES_PASSED; #if LL_TRACK_PENDING_OCCLUSION_QUERIES sPendingQueries.insert(mOcclusionQuery[LLViewerCamera::sCurCameraID]); |