mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-10-17 17:59:19 +02:00
ce5ee288ff
Every module unit now includes the standard headers it uses. Declarations reaching a unit only through an imported module's global module fragment are reachable but not visible, so ADL misses the free operators older libstdc++ declares beside a type - reproduced on ubuntu 24.04 (libstdc++ 13), where gl/vao.cpp could not compare vector iterators. Also drops a stale editor/editorSettings.hpp from the MSVC source list, which broke the Windows configure step, silences the deliberate include-in-purview warning in the glm wrapper, and removes GCC support: clang or MSVC only.
71 lines
1.4 KiB
C++
71 lines
1.4 KiB
C++
module;
|
|
#include <cstdint>
|
|
#include "glad/glad.h"
|
|
#include <optional>
|
|
#include "utilities/Globals_macros.h"
|
|
|
|
module eu07.gl.query;
|
|
import eu07.utilities.globals;
|
|
gl::query::query(targets target)
|
|
: target(target)
|
|
{
|
|
glGenQueries(1, *this);
|
|
}
|
|
|
|
gl::query::~query()
|
|
{
|
|
end();
|
|
glDeleteQueries(1, *this);
|
|
}
|
|
|
|
void gl::query::begin()
|
|
{
|
|
if (active_queries[target])
|
|
active_queries[target]->end();
|
|
|
|
glBeginQuery(glenum_target(target), *this);
|
|
active_queries[target] = this;
|
|
}
|
|
|
|
void gl::query::end()
|
|
{
|
|
if (active_queries[target] != this)
|
|
return;
|
|
|
|
glEndQuery(glenum_target(target));
|
|
active_queries[target] = nullptr;
|
|
}
|
|
|
|
std::optional<int64_t> gl::query::result()
|
|
{
|
|
end(); // intercept potential error if the result check is called for still active object
|
|
GLuint ready;
|
|
glGetQueryObjectuiv(*this, GL_QUERY_RESULT_AVAILABLE, &ready);
|
|
int64_t value = 0;
|
|
if (ready) {
|
|
if (!Global.gfx_usegles)
|
|
glGetQueryObjecti64v(*this, GL_QUERY_RESULT, &value);
|
|
else
|
|
glGetQueryObjectuiv(*this, GL_QUERY_RESULT, reinterpret_cast<GLuint*>(&value));
|
|
|
|
return std::optional<int64_t>(value);
|
|
}
|
|
return std::nullopt;
|
|
}
|
|
|
|
GLenum gl::query::glenum_target(targets target)
|
|
{
|
|
static GLenum mapping[6] =
|
|
{
|
|
GL_SAMPLES_PASSED,
|
|
GL_ANY_SAMPLES_PASSED,
|
|
GL_ANY_SAMPLES_PASSED_CONSERVATIVE,
|
|
GL_PRIMITIVES_GENERATED,
|
|
GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN,
|
|
GL_TIME_ELAPSED
|
|
};
|
|
return mapping[target];
|
|
}
|
|
|
|
thread_local gl::query* gl::query::active_queries[6];
|