Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 16:23:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use GLES compatible context for shader tests

Browse source
This commit is contained in:
Brad Davis 2018-08-06 14:35:11 -07:00
parent a0ef0c0b13
commit 993e1e1c4d
2 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
tests/shaders/src/ShaderTests.cpp
View file

@ -32,10 +32,13 @@
QTEST_MAIN(ShaderTests) QTEST_MAIN(ShaderTests)
#pragma optimize("", off)
void ShaderTests::initTestCase() { void ShaderTests::initTestCase() {
_window = new QWindow();
_context = new ::gl::Context(_window);
getDefaultOpenGLSurfaceFormat(); getDefaultOpenGLSurfaceFormat();
_canvas.create(); _context->create();
if (!_canvas.makeCurrent()) { if (!_context->makeCurrent()) {
qFatal("Unable to make test GL context current"); qFatal("Unable to make test GL context current");
} }
gl::initModuleGl(); gl::initModuleGl();
@ -181,9 +184,19 @@ void ShaderTests::testShaderLoad() {
std::set<uint32_t> usedShaders; std::set<uint32_t> usedShaders;
uint32_t maxShader = 0; uint32_t maxShader = 0;
try { try {
#if 1
uint32_t testPrograms[] = {
shader::render_utils::program::parabola,
shader::INVALID_PROGRAM,
};
#else
const auto& testPrograms = shader::all_programs;
#endif
size_t index = 0; size_t index = 0;
while (shader::INVALID_PROGRAM != shader::all_programs[index]) { while (shader::INVALID_PROGRAM != testPrograms[index]) {
auto programId = shader::all_programs[index]; auto programId = testPrograms[index];
++index; ++index;
uint32_t vertexId = shader::getVertexId(programId); uint32_t vertexId = shader::getVertexId(programId);
@ -216,6 +229,12 @@ void ShaderTests::testShaderLoad() {
// Uniforms // Uniforms
{ {
auto uniforms = gl::Uniform::load(program); auto uniforms = gl::Uniform::load(program);
for (const auto& uniform : uniforms) {
GLint offset, size;
glGetActiveUniformsiv(program, 1, (GLuint*)&uniform.index, GL_UNIFORM_OFFSET, &offset);
glGetActiveUniformsiv(program, 1, (GLuint*)&uniform.index, GL_UNIFORM_SIZE, &size);
qDebug() << uniform.name.c_str() << " size " << size << "offset" << offset;
}
const auto& uniformRemap = shaderObject.uniformRemap; const auto& uniformRemap = shaderObject.uniformRemap;
auto expectedUniforms = expectedBindings[gpu::Shader::BindingType::UNIFORM]; auto expectedUniforms = expectedBindings[gpu::Shader::BindingType::UNIFORM];
if (!compareBindings(uniforms, expectedUniforms)) { if (!compareBindings(uniforms, expectedUniforms)) {
@ -224,11 +243,9 @@ void ShaderTests::testShaderLoad() {
for (const auto& uniform : uniforms) { for (const auto& uniform : uniforms) {
if (0 != expectedUniforms.count(uniform.name)) { if (0 != expectedUniforms.count(uniform.name)) {
auto expectedLocation = expectedUniforms[uniform.name]; auto expectedLocation = expectedUniforms[uniform.name];
#ifdef Q_OS_MAC
if (0 != uniformRemap.count(expectedLocation)) { if (0 != uniformRemap.count(expectedLocation)) {
expectedLocation = uniformRemap.at(expectedLocation); expectedLocation = uniformRemap.at(expectedLocation);
} }
#endif
QVERIFY(expectedLocation == uniform.binding); QVERIFY(expectedLocation == uniform.binding);
} }
} }
@ -236,7 +253,12 @@ void ShaderTests::testShaderLoad() {
// Textures // Textures
{ {
const auto textures = gl::Uniform::loadTextures(program); auto textures = gl::Uniform::loadTextures(program);
auto expiredBegin = std::remove_if(textures.begin(), textures.end(), [&](const gl::Uniform& uniform) -> bool {
return uniform.name == "transformObjectBuffer";
});
textures.erase(expiredBegin, textures.end());
const auto expectedTextures = expectedBindings[gpu::Shader::BindingType::TEXTURE]; const auto expectedTextures = expectedBindings[gpu::Shader::BindingType::TEXTURE];
if (!compareBindings(textures, expectedTextures)) { if (!compareBindings(textures, expectedTextures)) {
qDebug() << "Textures mismatch"; qDebug() << "Textures mismatch";

4
tests/shaders/src/ShaderTests.h
View file

@ -12,6 +12,7 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <gpu/Forward.h> #include <gpu/Forward.h>
#include <gl/OffscreenGLCanvas.h> #include <gl/OffscreenGLCanvas.h>
#include <gl/Context.h>
class ShaderTests : public QObject { class ShaderTests : public QObject {
Q_OBJECT Q_OBJECT
@ -22,7 +23,8 @@ private slots:
void testShaderLoad(); void testShaderLoad();
private: private:
OffscreenGLCanvas _canvas; QWindow* _window{ nullptr };
gl::Context* _context{ nullptr };
gpu::ContextPointer _gpuContext; gpu::ContextPointer _gpuContext;
}; };