From 6314c525f92fee6e635fdbf923d7d7f7838744d3 Mon Sep 17 00:00:00 2001 From: Jake Turner Date: Sun, 23 Jul 2023 08:31:52 +0100 Subject: [PATCH] Use GL_ANY_SAMPLES_PASSED instead of GL_SAMPLES_PASSED Closes #2972 GL_SAMPLES_PASSED is not supported by GLES. The pixel history test is already using a 1x1 scissor test, GL_ANY_SAMPLES_PASSED should be the same as GL_SAMPLES_PASSED. The pixel history logic is only testing for non-zero passing samples, the precise value is not used. --- renderdoc/driver/gl/gl_pixelhistory.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/renderdoc/driver/gl/gl_pixelhistory.cpp b/renderdoc/driver/gl/gl_pixelhistory.cpp index c6b18d272..b4deb13f8 100644 --- a/renderdoc/driver/gl/gl_pixelhistory.cpp +++ b/renderdoc/driver/gl/gl_pixelhistory.cpp @@ -1374,14 +1374,14 @@ bool QueryTest(WrappedOpenGL *driver, GLPixelHistoryResources &resources, const } driver->SetFetchCounters(true); - driver->glBeginQuery(eGL_SAMPLES_PASSED, samplesPassedQuery); + driver->glBeginQuery(eGL_ANY_SAMPLES_PASSED, samplesPassedQuery); driver->ReplayLog(event.eventId, event.eventId, eReplay_OnlyDraw); - driver->glEndQuery(eGL_SAMPLES_PASSED); + driver->glEndQuery(eGL_ANY_SAMPLES_PASSED); driver->SetFetchCounters(false); - int numSamplesPassed; - driver->glGetQueryObjectiv(samplesPassedQuery, eGL_QUERY_RESULT, &numSamplesPassed); + int anySamplesPassed = GL_FALSE; + driver->glGetQueryObjectiv(samplesPassedQuery, eGL_QUERY_RESULT, &anySamplesPassed); driver->glDeleteQueries(1, &samplesPassedQuery); - return numSamplesPassed == 0; + return anySamplesPassed == GL_FALSE; } void QueryFailedTests(WrappedOpenGL *driver, GLPixelHistoryResources &resources,