Hash :
de09f8db
Author :
Date :
2021-09-02T18:21:37
Revert "GL: Update StateManagerGL binding funcs to use ANGLE_GL_TRY" This reverts commit 4b5a774e855af2493d64b0635f56053bd795c5c5. Reason for revert: broken on iOS and Skia Original change's description: > GL: Update StateManagerGL binding funcs to use ANGLE_GL_TRY > > Bug: angleproject:3020 > Change-Id: Iff460a1012d06e1c5feff84d91117de87e7c870a > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3123167 > Reviewed-by: Jamie Madill <jmadill@chromium.org> > Commit-Queue: Geoff Lang <geofflang@chromium.org> Bug: angleproject:3020 Change-Id: I54d81a7b734d007f65ff97990008f5e6eb8536f6 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3140453 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426
//
// Copyright 2015 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// QueryGL.cpp: Implements the class methods for QueryGL.
#include "libANGLE/renderer/gl/QueryGL.h"
#include "common/debug.h"
#include "libANGLE/Context.h"
#include "libANGLE/renderer/gl/ContextGL.h"
#include "libANGLE/renderer/gl/FunctionsGL.h"
#include "libANGLE/renderer/gl/StateManagerGL.h"
#include "libANGLE/renderer/gl/renderergl_utils.h"
namespace
{
GLuint64 MergeQueryResults(gl::QueryType type, GLuint64 currentResult, GLuint64 newResult)
{
switch (type)
{
case gl::QueryType::AnySamples:
case gl::QueryType::AnySamplesConservative:
return (currentResult == GL_TRUE || newResult == GL_TRUE) ? GL_TRUE : GL_FALSE;
case gl::QueryType::TransformFeedbackPrimitivesWritten:
return currentResult + newResult;
case gl::QueryType::TimeElapsed:
return currentResult + newResult;
case gl::QueryType::Timestamp:
return newResult;
case gl::QueryType::PrimitivesGenerated:
return currentResult + newResult;
default:
UNREACHABLE();
return 0;
}
}
// Some drivers tend to hang when flushing pending queries. Wait until this number of queries have
// added up before checking if results are ready.
constexpr uint32_t kPauseResumeFlushThreshold = 5;
} // anonymous namespace
namespace rx
{
QueryGL::QueryGL(gl::QueryType type) : QueryImpl(type) {}
QueryGL::~QueryGL() {}
StandardQueryGL::StandardQueryGL(gl::QueryType type,
const FunctionsGL *functions,
StateManagerGL *stateManager)
: QueryGL(type),
mFunctions(functions),
mStateManager(stateManager),
mActiveQuery(0),
mPendingQueries(),
mResultSum(0)
{}
StandardQueryGL::~StandardQueryGL()
{
if (mActiveQuery != 0)
{
mStateManager->endQuery(mType, this, mActiveQuery);
mFunctions->deleteQueries(1, &mActiveQuery);
mActiveQuery = 0;
}
while (!mPendingQueries.empty())
{
GLuint id = mPendingQueries.front();
mFunctions->deleteQueries(1, &id);
mPendingQueries.pop_front();
}
}
angle::Result StandardQueryGL::begin(const gl::Context *context)
{
mResultSum = 0;
return resume(context);
}
angle::Result StandardQueryGL::end(const gl::Context *context)
{
return pause(context);
}
angle::Result StandardQueryGL::queryCounter(const gl::Context *context)
{
ASSERT(mType == gl::QueryType::Timestamp);
// Directly create a query for the timestamp and add it to the pending query queue, as timestamp
// queries do not have the traditional begin/end block and never need to be paused/resumed
GLuint query;
mFunctions->genQueries(1, &query);
mFunctions->queryCounter(query, GL_TIMESTAMP);
mPendingQueries.push_back(query);
return angle::Result::Continue;
}
template <typename T>
angle::Result StandardQueryGL::getResultBase(const gl::Context *context, T *params)
{
ASSERT(mActiveQuery == 0);
ANGLE_TRY(flush(context, true));
ASSERT(mPendingQueries.empty());
*params = static_cast<T>(mResultSum);
return angle::Result::Continue;
}
angle::Result StandardQueryGL::getResult(const gl::Context *context, GLint *params)
{
return getResultBase(context, params);
}
angle::Result StandardQueryGL::getResult(const gl::Context *context, GLuint *params)
{
return getResultBase(context, params);
}
angle::Result StandardQueryGL::getResult(const gl::Context *context, GLint64 *params)
{
return getResultBase(context, params);
}
angle::Result StandardQueryGL::getResult(const gl::Context *context, GLuint64 *params)
{
return getResultBase(context, params);
}
angle::Result StandardQueryGL::isResultAvailable(const gl::Context *context, bool *available)
{
ASSERT(mActiveQuery == 0);
ANGLE_TRY(flush(context, false));
*available = mPendingQueries.empty();
return angle::Result::Continue;
}
angle::Result StandardQueryGL::pause(const gl::Context *context)
{
if (mActiveQuery != 0)
{
mStateManager->endQuery(mType, this, mActiveQuery);
mPendingQueries.push_back(mActiveQuery);
mActiveQuery = 0;
}
// Flush to make sure the pending queries don't add up too much.
if (mPendingQueries.size() >= kPauseResumeFlushThreshold)
{
ANGLE_TRY(flush(context, false));
}
return angle::Result::Continue;
}
angle::Result StandardQueryGL::resume(const gl::Context *context)
{
if (mActiveQuery == 0)
{
// Flush to make sure the pending queries don't add up too much.
if (mPendingQueries.size() >= kPauseResumeFlushThreshold)
{
ANGLE_TRY(flush(context, false));
}
mFunctions->genQueries(1, &mActiveQuery);
mStateManager->beginQuery(mType, this, mActiveQuery);
ContextGL *contextGL = GetImplAs<ContextGL>(context);
contextGL->markWorkSubmitted();
}
return angle::Result::Continue;
}
angle::Result StandardQueryGL::flush(const gl::Context *context, bool force)
{
while (!mPendingQueries.empty())
{
GLuint id = mPendingQueries.front();
if (!force)
{
GLuint resultAvailable = 0;
mFunctions->getQueryObjectuiv(id, GL_QUERY_RESULT_AVAILABLE, &resultAvailable);
if (resultAvailable == GL_FALSE)
{
return angle::Result::Continue;
}
}
// Even though getQueryObjectui64v was introduced for timer queries, there is nothing in the
// standard that says that it doesn't work for any other queries. It also passes on all the
// trybots, so we use it if it is available
if (mFunctions->getQueryObjectui64v != nullptr)
{
GLuint64 result = 0;
mFunctions->getQueryObjectui64v(id, GL_QUERY_RESULT, &result);
mResultSum = MergeQueryResults(mType, mResultSum, result);
}
else
{
GLuint result = 0;
mFunctions->getQueryObjectuiv(id, GL_QUERY_RESULT, &result);
mResultSum = MergeQueryResults(mType, mResultSum, static_cast<GLuint64>(result));
}
mFunctions->deleteQueries(1, &id);
mPendingQueries.pop_front();
}
return angle::Result::Continue;
}
class SyncProviderGL
{
public:
virtual ~SyncProviderGL() {}
virtual angle::Result init(const gl::Context *context, gl::QueryType queryType)
{
return angle::Result::Continue;
}
virtual angle::Result flush(const gl::Context *context, bool force, bool *finished) = 0;
};
class SyncProviderGLSync : public SyncProviderGL
{
public:
SyncProviderGLSync(const FunctionsGL *functions) : mFunctions(functions), mSync(nullptr) {}
~SyncProviderGLSync() override { mFunctions->deleteSync(mSync); }
angle::Result init(const gl::Context *context, gl::QueryType type) override
{
ContextGL *contextGL = GetImplAs<ContextGL>(context);
mSync = mFunctions->fenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
ANGLE_CHECK(contextGL, mSync != 0, "glFenceSync failed to create a GLsync object.",
GL_OUT_OF_MEMORY);
contextGL->markWorkSubmitted();
return angle::Result::Continue;
}
angle::Result flush(const gl::Context *context, bool force, bool *finished) override
{
if (force)
{
mFunctions->clientWaitSync(mSync, 0, 0);
*finished = true;
}
else
{
GLint value = 0;
mFunctions->getSynciv(mSync, GL_SYNC_STATUS, 1, nullptr, &value);
*finished = (value == GL_SIGNALED);
}
return angle::Result::Continue;
}
private:
const FunctionsGL *mFunctions;
GLsync mSync;
};
class SyncProviderGLQuery : public SyncProviderGL
{
public:
SyncProviderGLQuery(const FunctionsGL *functions) : mFunctions(functions), mQuery(0) {}
angle::Result init(const gl::Context *context, gl::QueryType type) override
{
StateManagerGL *stateManager = GetStateManagerGL(context);
mFunctions->genQueries(1, &mQuery);
ANGLE_TRY(stateManager->pauseQuery(context, type));
mFunctions->beginQuery(ToGLenum(type), mQuery);
mFunctions->endQuery(ToGLenum(type));
return stateManager->resumeQuery(context, type);
}
~SyncProviderGLQuery() override { mFunctions->deleteQueries(1, &mQuery); }
angle::Result flush(const gl::Context *context, bool force, bool *finished) override
{
if (force)
{
GLint result = 0;
mFunctions->getQueryObjectiv(mQuery, GL_QUERY_RESULT, &result);
*finished = true;
}
else
{
GLint available = 0;
mFunctions->getQueryObjectiv(mQuery, GL_QUERY_RESULT_AVAILABLE, &available);
*finished = (available == GL_TRUE);
}
return angle::Result::Continue;
}
private:
const FunctionsGL *mFunctions;
GLuint mQuery;
};
SyncQueryGL::SyncQueryGL(gl::QueryType type, const FunctionsGL *functions)
: QueryGL(type), mFunctions(functions), mSyncProvider(nullptr), mFinished(false)
{
ASSERT(IsSupported(mFunctions));
ASSERT(type == gl::QueryType::CommandsCompleted);
}
SyncQueryGL::~SyncQueryGL() {}
bool SyncQueryGL::IsSupported(const FunctionsGL *functions)
{
return nativegl::SupportsFenceSync(functions) || nativegl::SupportsOcclusionQueries(functions);
}
angle::Result SyncQueryGL::begin(const gl::Context *context)
{
return angle::Result::Continue;
}
angle::Result SyncQueryGL::end(const gl::Context *context)
{
if (nativegl::SupportsFenceSync(mFunctions))
{
mSyncProvider.reset(new SyncProviderGLSync(mFunctions));
}
else if (nativegl::SupportsOcclusionQueries(mFunctions))
{
mSyncProvider.reset(new SyncProviderGLQuery(mFunctions));
}
else
{
ANGLE_GL_UNREACHABLE(GetImplAs<ContextGL>(context));
}
ANGLE_TRY(mSyncProvider->init(context, gl::QueryType::AnySamples));
return angle::Result::Continue;
}
angle::Result SyncQueryGL::queryCounter(const gl::Context *context)
{
UNREACHABLE();
return angle::Result::Continue;
}
angle::Result SyncQueryGL::getResult(const gl::Context *context, GLint *params)
{
return getResultBase(context, params);
}
angle::Result SyncQueryGL::getResult(const gl::Context *context, GLuint *params)
{
return getResultBase(context, params);
}
angle::Result SyncQueryGL::getResult(const gl::Context *context, GLint64 *params)
{
return getResultBase(context, params);
}
angle::Result SyncQueryGL::getResult(const gl::Context *context, GLuint64 *params)
{
return getResultBase(context, params);
}
angle::Result SyncQueryGL::isResultAvailable(const gl::Context *context, bool *available)
{
ANGLE_TRY(flush(context, false));
*available = mFinished;
return angle::Result::Continue;
}
angle::Result SyncQueryGL::pause(const gl::Context *context)
{
return angle::Result::Continue;
}
angle::Result SyncQueryGL::resume(const gl::Context *context)
{
return angle::Result::Continue;
}
angle::Result SyncQueryGL::flush(const gl::Context *context, bool force)
{
if (mSyncProvider == nullptr)
{
ASSERT(mFinished);
return angle::Result::Continue;
}
ANGLE_TRY(mSyncProvider->flush(context, force, &mFinished));
if (mFinished)
{
mSyncProvider.reset();
}
return angle::Result::Continue;
}
template <typename T>
angle::Result SyncQueryGL::getResultBase(const gl::Context *context, T *params)
{
ANGLE_TRY(flush(context, true));
*params = static_cast<T>(mFinished ? GL_TRUE : GL_FALSE);
return angle::Result::Continue;
}
} // namespace rx