Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 19:59:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #79 from daleglass-overte/fix-tests-build2

Browse source 
Make all tests compile
This commit is contained in:
Dale Glass 2022-06-09 17:44:45 +02:00 committed by GitHub
commit 4dfe7aab86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 91 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/animation/CMakeLists.txt
View file

@ -1,7 +1,7 @@
# Declare dependencies # Declare dependencies
macro (setup_testcase_dependencies) macro (setup_testcase_dependencies)
# link in the shared libraries # link in the shared libraries
link_hifi_libraries(shared animation gpu hfm graphics networking test-utils image) link_hifi_libraries(shared animation gpu hfm model-serializers graphics networking test-utils image)
package_libraries_for_deployment() package_libraries_for_deployment()
endmacro () endmacro ()

2
tests/animation/src/AnimInverseKinematicsTests.cpp
View file

@ -30,8 +30,6 @@ const glm::quat quaterTurnAroundZ = glm::angleAxis(0.5f * PI, zAxis);
void makeTestFBXJoints(HFMModel& hfmModel) { void makeTestFBXJoints(HFMModel& hfmModel) {
HFMJoint joint; HFMJoint joint;
joint.isFree = false;
joint.freeLineage.clear();
joint.parentIndex = -1; joint.parentIndex = -1;
joint.distanceToParent = 1.0f; joint.distanceToParent = 1.0f;

19
tests/animation/src/AnimTests.cpp
View file

@ -53,8 +53,11 @@ void AnimTests::testClipInternalState() {
float timeScale = 1.1f; float timeScale = 1.1f;
bool loopFlag = true; bool loopFlag = true;
bool mirrorFlag = false; bool mirrorFlag = false;
AnimBlendType blendType = AnimBlendType_Normal;
QString baseUrl = "";
float baseFrame = 0.0f;
AnimClip clip(id, url, startFrame, endFrame, timeScale, loopFlag, mirrorFlag); AnimClip clip(id, url, startFrame, endFrame, timeScale, loopFlag, mirrorFlag, blendType, baseUrl, baseFrame);
QVERIFY(clip.getID() == id); QVERIFY(clip.getID() == id);
QVERIFY(clip.getType() == AnimNode::Type::Clip); QVERIFY(clip.getType() == AnimNode::Type::Clip);
@ -81,11 +84,15 @@ void AnimTests::testClipEvaulate() {
float timeScale = 1.0f; float timeScale = 1.0f;
bool loopFlag = true; bool loopFlag = true;
bool mirrorFlag = false; bool mirrorFlag = false;
AnimBlendType blendType = AnimBlendType_Normal;
QString baseUrl = "";
float baseFrame = 0.0f;
auto vars = AnimVariantMap(); auto vars = AnimVariantMap();
vars.set("FalseVar", false); vars.set("FalseVar", false);
AnimClip clip(id, url, startFrame, endFrame, timeScale, loopFlag, mirrorFlag); AnimClip clip(id, url, startFrame, endFrame, timeScale, loopFlag, mirrorFlag, blendType, baseUrl, baseFrame);
AnimVariantMap triggers; AnimVariantMap triggers;
clip.evaluate(vars, context, framesToSec(10.0f), triggers); clip.evaluate(vars, context, framesToSec(10.0f), triggers);
@ -112,12 +119,16 @@ void AnimTests::testClipEvaulate() {
void AnimTests::testClipEvaulateWithVars() { void AnimTests::testClipEvaulateWithVars() {
AnimContext context(false, false, false, glm::mat4(), glm::mat4(), 0); AnimContext context(false, false, false, glm::mat4(), glm::mat4(), 0);
QString id = "myClipNode"; QString id = "myClipNode";
QString url = ExternalResource::getInstance()->getUrl(ExternalResource::Bucket::HF_Content, "/ozan/support/FightClubBotTest1/Animations/standard_idle.fbx"; QString url = ExternalResource::getInstance()->getUrl(ExternalResource::Bucket::HF_Content, "/ozan/support/FightClubBotTest1/Animations/standard_idle.fbx");
float startFrame = 2.0f; float startFrame = 2.0f;
float endFrame = 22.0f; float endFrame = 22.0f;
float timeScale = 1.0f; float timeScale = 1.0f;
bool loopFlag = true; bool loopFlag = true;
bool mirrorFlag = false; bool mirrorFlag = false;
AnimBlendType blendType = AnimBlendType_Normal;
QString baseUrl = "";
float baseFrame = 0.0f;
float startFrame2 = 22.0f; float startFrame2 = 22.0f;
float endFrame2 = 100.0f; float endFrame2 = 100.0f;
@ -130,7 +141,7 @@ void AnimTests::testClipEvaulateWithVars() {
vars.set("timeScale2", timeScale2); vars.set("timeScale2", timeScale2);
vars.set("loopFlag2", loopFlag2); vars.set("loopFlag2", loopFlag2);
AnimClip clip(id, url, startFrame, endFrame, timeScale, loopFlag, mirrorFlag); AnimClip clip(id, url, startFrame, endFrame, timeScale, loopFlag, mirrorFlag, blendType, baseUrl, baseFrame);
clip.setStartFrameVar("startFrame2"); clip.setStartFrameVar("startFrame2");
clip.setEndFrameVar("endFrame2"); clip.setEndFrameVar("endFrame2");
clip.setTimeScaleVar("timeScale2"); clip.setTimeScaleVar("timeScale2");

4
tests/gpu/CMakeLists.txt
View file

@ -1,7 +1,7 @@
# Declare dependencies # Declare dependencies
macro (setup_testcase_dependencies) macro (setup_testcase_dependencies)
# link in the shared libraries # link in the shared libraries
link_hifi_libraries(shared test-utils ktx gpu gl ${PLATFORM_GL_BACKEND}) link_hifi_libraries(shared test-utils ktx gpu gl shaders networking ${PLATFORM_GL_BACKEND})
package_libraries_for_deployment() package_libraries_for_deployment()
target_opengl() target_opengl()
target_zlib() target_zlib()
@ -10,5 +10,5 @@ macro (setup_testcase_dependencies)
add_dependency_external_projects(wasapi) add_dependency_external_projects(wasapi)
endif () endif ()
endmacro () endmacro ()
set(OpenGL_GL_PREFERENCE "GLVND")
setup_hifi_testcase() setup_hifi_testcase()

15
tests/gpu/src/ShaderLoadTest.cpp
View file

@ -169,19 +169,20 @@ void ShaderLoadTest::parseCacheFile() {
} }
_programs.insert(program); _programs.insert(program);
} }
} }
bool ShaderLoadTest::buildProgram(const Program& programFiles) { bool ShaderLoadTest::buildProgram(const Program& programFiles) {
const auto& vertexName = programFiles.first; const auto& vertexName = programFiles.first;
const auto& vertexSource = _shaderSources[vertexName]; const auto& vertexSource = _shaderSources[vertexName];
auto vertexShader = gpu::Shader::createVertex({ vertexSource }); auto vertexShader = gpu::Shader::createVertex({ shader::Source::generate(vertexSource) });
const auto& pixelName = programFiles.second; const auto& pixelName = programFiles.second;
const auto& pixelSource = _shaderSources[pixelName]; const auto& pixelSource = _shaderSources[pixelName];
auto pixelShader = gpu::Shader::createPixel({ pixelSource }); auto pixelShader = gpu::Shader::createPixel({ shader::Source::generate(pixelSource) });
auto program = gpu::Shader::createProgram(vertexShader, pixelShader); auto program = gpu::Shader::createProgram(vertexShader, pixelShader);
return gpu::gl::GLBackend::makeProgram(*program, {}, {}); //return gpu::gl::GLBackend::makeProgram(*program, {}, {}); // This no longer works, FIXME.
return false;
} }
void ShaderLoadTest::initTestCase() { void ShaderLoadTest::initTestCase() {
@ -260,7 +261,8 @@ void ShaderLoadTest::testShaderLoad() {
QVERIFY(buildProgram(program)); QVERIFY(buildProgram(program));
} }
qDebug() << "Cached shader load took" << timer.elapsed() << "ms"; qDebug() << "Cached shader load took" << timer.elapsed() << "ms";
QVERIFY(gpuBinaryShadersLoaded == _programs.size() * gpu::gl::GLShader::NumVersions); QSKIP("Test no longer compatible with current code, fix me!");
//QVERIFY(gpuBinaryShadersLoaded == _programs.size() * gpu::gl::GLShader::NumVersions);
} }
// Simulate reloading the shader cache from disk by destroying and recreating the gpu context // Simulate reloading the shader cache from disk by destroying and recreating the gpu context
@ -277,7 +279,8 @@ void ShaderLoadTest::testShaderLoad() {
QVERIFY(buildProgram(program)); QVERIFY(buildProgram(program));
} }
qDebug() << "Cached shader load took" << timer.elapsed() << "ms"; qDebug() << "Cached shader load took" << timer.elapsed() << "ms";
QVERIFY(gpuBinaryShadersLoaded == _programs.size() * gpu::gl::GLShader::NumVersions); QSKIP("Test no longer compatible with current code, fix me!");
//QVERIFY(gpuBinaryShadersLoaded == _programs.size() * gpu::gl::GLShader::NumVersions);
} }
} }

18
tests/gpu/src/TextureTest.cpp
View file

@ -38,11 +38,11 @@ std::string vertexShaderSource = R"SHADER(
layout(location = 0) out vec2 outTexCoord0; layout(location = 0) out vec2 outTexCoord0;
const vec4 VERTICES[] = vec4[]( const vec4 VERTICES[] = vec4[](
vec4(-1.0, -1.0, 0.0, 1.0), vec4(-1.0, -1.0, 0.0, 1.0),
vec4( 1.0, -1.0, 0.0, 1.0), vec4( 1.0, -1.0, 0.0, 1.0),
vec4(-1.0, 1.0, 0.0, 1.0), vec4(-1.0, 1.0, 0.0, 1.0),
vec4( 1.0, 1.0, 0.0, 1.0) vec4( 1.0, 1.0, 0.0, 1.0)
); );
void main() { void main() {
outTexCoord0 = VERTICES[gl_VertexID].xy; outTexCoord0 = VERTICES[gl_VertexID].xy;
@ -110,8 +110,8 @@ void TextureTest::initTestCase() {
_canvas.makeCurrent(); _canvas.makeCurrent();
{ {
auto VS = gpu::Shader::createVertex(vertexShaderSource); auto VS = gpu::Shader::createVertex(shader::Source::generate(vertexShaderSource));
auto PS = gpu::Shader::createPixel(fragmentShaderSource); auto PS = gpu::Shader::createPixel(shader::Source::generate(fragmentShaderSource));
auto program = gpu::Shader::createProgram(VS, PS); auto program = gpu::Shader::createProgram(VS, PS);
// If the pipeline did not exist, make it // If the pipeline did not exist, make it
auto state = std::make_shared<gpu::State>(); auto state = std::make_shared<gpu::State>();
@ -144,9 +144,9 @@ void TextureTest::cleanupTestCase() {
_gpuContext.reset(); _gpuContext.reset();
} }
std::vector<gpu::TexturePointer> TextureTest::loadTestTextures() const { std::vector<std::pair<gpu::TexturePointer, glm::ivec2>> TextureTest::loadTestTextures() const {
// Load the test textures // Load the test textures
std::vector<gpu::TexturePointer> result; std::vector<std::pair<gpu::TexturePointer, glm::ivec2>> result;
size_t newTextureCount = std::min<size_t>(_textureFiles.size(), LOAD_TEXTURE_COUNT); size_t newTextureCount = std::min<size_t>(_textureFiles.size(), LOAD_TEXTURE_COUNT);
for (size_t i = 0; i < newTextureCount; ++i) { for (size_t i = 0; i < newTextureCount; ++i) {
const auto& textureFile = _textureFiles[i]; const auto& textureFile = _textureFiles[i];
@ -193,14 +193,14 @@ void TextureTest::testTextureLoading() {
auto renderTexturesLamdba = [&](gpu::Batch& batch) { auto renderTexturesLamdba = [&](gpu::Batch& batch) {
batch.setPipeline(_pipeline); batch.setPipeline(_pipeline);
for (const auto& texture : textures) { for (const auto& texture : textures) {
batch.setResourceTexture(0, texture); batch.setResourceTexture(0, texture.first);
batch.draw(gpu::TRIANGLE_STRIP, 4, 0); batch.draw(gpu::TRIANGLE_STRIP, 4, 0);
} }
}; };
size_t expectedAllocation = 0; size_t expectedAllocation = 0;
for (const auto& texture : textures) { for (const auto& texture : textures) {
expectedAllocation += texture->evalTotalSize(); expectedAllocation += texture.first->evalTotalSize();
} }
QVERIFY(textures.size() > 0); QVERIFY(textures.size() > 0);

2
tests/gpu/src/TextureTest.h
View file

@ -21,7 +21,7 @@ private:
void beginFrame(); void beginFrame();
void endFrame(); void endFrame();
void renderFrame(const std::function<void(gpu::Batch&)>& = [](gpu::Batch&) {}); void renderFrame(const std::function<void(gpu::Batch&)>& = [](gpu::Batch&) {});
std::vector<gpu::TexturePointer> loadTestTextures() const; std::vector<std::pair<gpu::TexturePointer, glm::ivec2>> loadTestTextures() const;
private slots: private slots:

9
tests/ktx/src/KtxTests.cpp
View file

@ -15,6 +15,7 @@
#include <ktx/KTX.h> #include <ktx/KTX.h>
#include <gpu/Texture.h> #include <gpu/Texture.h>
#include <image/Image.h> #include <image/Image.h>
#include <image/TextureProcessing.h>
QTEST_GUILESS_MAIN(KtxTests) QTEST_GUILESS_MAIN(KtxTests)
@ -78,8 +79,12 @@ void KtxTests::testKtxSerialization() {
QImage image(TEST_IMAGE); QImage image(TEST_IMAGE);
std::atomic<bool> abortSignal; std::atomic<bool> abortSignal;
gpu::TexturePointer testTexture = gpu::TexturePointer testTexture =
image::TextureUsage::process2DTextureColorFromImage(std::move(image), TEST_IMAGE.toStdString(), true, abortSignal); image::TextureUsage::process2DTextureColorFromImage(std::move(image), TEST_IMAGE.toStdString(), true, gpu::BackendTarget::GL45, true, abortSignal);
auto ktxMemory = gpu::Texture::serialize(*testTexture); if (!testTexture) {
qWarning() << "Failed to process2DTextureColorFromImage:" << TEST_IMAGE;
QFAIL("Failed to process2DTextureColorFromImage");
}
auto ktxMemory = gpu::Texture::serialize(*testTexture, glm::ivec2(testTexture->getWidth(), testTexture->getHeight()));
QVERIFY(ktxMemory.get()); QVERIFY(ktxMemory.get());
// Serialize the image to a file // Serialize the image to a file

14
tests/octree/src/AABoxCubeTests.cpp
View file

@ -20,7 +20,7 @@ void AABoxCubeTests::raycastOutHitsXMinFace() {
// Raycast inside out // Raycast inside out
glm::vec3 corner(0.0f, 0.0f, 0.0f); glm::vec3 corner(0.0f, 0.0f, 0.0f);
float size = 1.0f; float size = 1.0f;
AABox box(corner, size); AABox box(corner, size);
glm::vec3 origin(0.5f, 0.5f, 0.5f); glm::vec3 origin(0.5f, 0.5f, 0.5f);
glm::vec3 direction(-1.0f, 0.0f, 0.0f); glm::vec3 direction(-1.0f, 0.0f, 0.0f);
@ -28,8 +28,8 @@ void AABoxCubeTests::raycastOutHitsXMinFace() {
BoxFace face; BoxFace face;
glm::vec3 surfaceNormal; glm::vec3 surfaceNormal;
bool intersects = box.findRayIntersection(origin, direction, distance, face, surfaceNormal); bool intersects = box.findRayIntersection(origin, direction, 1.0f / direction, distance, face, surfaceNormal);
QCOMPARE(intersects, true); QCOMPARE(intersects, true);
QCOMPARE(distance, 0.5f); QCOMPARE(distance, 0.5f);
QCOMPARE(face, MIN_X_FACE); QCOMPARE(face, MIN_X_FACE);
@ -39,7 +39,7 @@ void AABoxCubeTests::raycastOutHitsXMaxFace () {
// Raycast inside out // Raycast inside out
glm::vec3 corner(0.0f, 0.0f, 0.0f); glm::vec3 corner(0.0f, 0.0f, 0.0f);
float size = 1.0f; float size = 1.0f;
AABox box(corner, size); AABox box(corner, size);
glm::vec3 origin(0.5f, 0.5f, 0.5f); glm::vec3 origin(0.5f, 0.5f, 0.5f);
glm::vec3 direction(1.0f, 0.0f, 0.0f); glm::vec3 direction(1.0f, 0.0f, 0.0f);
@ -47,7 +47,7 @@ void AABoxCubeTests::raycastOutHitsXMaxFace () {
BoxFace face; BoxFace face;
glm::vec3 surfaceNormal; glm::vec3 surfaceNormal;
bool intersects = box.findRayIntersection(origin, direction, distance, face, surfaceNormal); bool intersects = box.findRayIntersection(origin, direction, 1.0f / direction, distance, face, surfaceNormal);
QCOMPARE(intersects, true); QCOMPARE(intersects, true);
QCOMPARE(distance, 0.5f); QCOMPARE(distance, 0.5f);
@ -57,7 +57,7 @@ void AABoxCubeTests::raycastInHitsXMinFace () {
// Raycast outside in // Raycast outside in
glm::vec3 corner(0.5f, 0.0f, 0.0f); glm::vec3 corner(0.5f, 0.0f, 0.0f);
float size = 0.5f; float size = 0.5f;
AABox box(corner, size); AABox box(corner, size);
glm::vec3 origin(0.25f, 0.25f, 0.25f); glm::vec3 origin(0.25f, 0.25f, 0.25f);
glm::vec3 direction(1.0f, 0.0f, 0.0f); glm::vec3 direction(1.0f, 0.0f, 0.0f);
@ -65,7 +65,7 @@ void AABoxCubeTests::raycastInHitsXMinFace () {
BoxFace face; BoxFace face;
glm::vec3 surfaceNormal; glm::vec3 surfaceNormal;
bool intersects = box.findRayIntersection(origin, direction, distance, face, surfaceNormal); bool intersects = box.findRayIntersection(origin, direction, 1.0f / direction, distance, face, surfaceNormal);
QCOMPARE(intersects, true); QCOMPARE(intersects, true);
QCOMPARE(distance, 0.25f); QCOMPARE(distance, 0.25f);

45
tests/shaders/CMakeLists.txt
View file

@ -1,19 +1,32 @@
# This doesn't link properly, and it seems it's built against some older library
# not being in use anymore. At least some of the stuff in the test doesn't seem
# to match anything in the build tree. If built, it fails with:
# [ 91%] Linking CXX executable shaders-ShaderTests
# /usr/bin/ld: CMakeFiles/shaders-ShaderTests.dir/src/ShaderTests.cpp.o: in function `rebuildSource(shader::Dialect, shader::Variant, shader::Source const&)':
# /home/dale/git/vircadia/overte/tests/shaders/src/ShaderTests.cpp:354: undefined reference to `glslang::TShader::TShader(EShLanguage)'
# /usr/bin/ld: /home/dale/git/vircadia/overte/tests/shaders/src/ShaderTests.cpp:358: undefined reference to `glslang::TShader::setStrings(char const* const*, int)'
# /usr/bin/ld: /home/dale/git/vircadia/overte/tests/shaders/src/ShaderTests.cpp:417: undefined reference to `glslang::TShader::~TShader()'
# /usr/bin/ld: /home/dale/git/vircadia/overte/tests/shaders/src/ShaderTests.cpp:417: undefined reference to `glslang::TShader::~TShader()'
# collect2: error: ld returned 1 exit status
#
# So I've disabled the entire thing, but left the code around as a reference in case it can be fixed.
# Declare dependencies # Declare dependencies
macro (setup_testcase_dependencies) #macro (setup_testcase_dependencies)
# link in the shared libraries # # link in the shared libraries
link_hifi_libraries(shared test-utils gpu shaders gl ${PLATFORM_GL_BACKEND}) # link_hifi_libraries(shared test-utils gpu shaders gl ${PLATFORM_GL_BACKEND})
#target_spirv() # #target_spirv()
#
find_package(spirv_cross_core REQUIRED) # find_package(spirv_cross_core REQUIRED)
find_package(spirv_cross_reflect REQUIRED) # find_package(spirv_cross_reflect REQUIRED)
find_package(spirv_cross_glsl REQUIRED) # find_package(spirv_cross_glsl REQUIRED)
target_include_directories(${TARGET_NAME} PRIVATE $<TARGET_PROPERTY:spirv-cross-core,INTERFACE_INCLUDE_DIRECTORIES>) # target_include_directories(${TARGET_NAME} PRIVATE $<TARGET_PROPERTY:spirv-cross-core,INTERFACE_INCLUDE_DIRECTORIES>)
target_include_directories(${TARGET_NAME} PRIVATE $ENV{VULKAN_SDK}/Include) # target_include_directories(${TARGET_NAME} PRIVATE $ENV{VULKAN_SDK}/Include)
#
#
package_libraries_for_deployment() # package_libraries_for_deployment()
endmacro () #endmacro ()
#
setup_hifi_testcase(Gui) #setup_hifi_testcase(Gui)

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

@ -360,7 +360,9 @@ void rebuildSource(shader::Dialect dialect, shader::Variant variant, const shade
shader.setEnvClient(EShClientVulkan, EShTargetVulkan_1_1); shader.setEnvClient(EShClientVulkan, EShTargetVulkan_1_1);
shader.setEnvTarget(EShTargetSpv, EShTargetSpv_1_3); shader.setEnvTarget(EShTargetSpv, EShTargetSpv_1_3);
bool success = shader.parse(&glslCompilerResources, 450, false, messages); //bool success = shader.parse(&glslCompilerResources, 450, false, messages);
QSKIP("Something wasn't fully implemented here, please fix me!");
bool success = false;
if (!success) { if (!success) {
qWarning() << "Failed to parse shader " << shaderName.c_str(); qWarning() << "Failed to parse shader " << shaderName.c_str();
qWarning() << shader.getInfoLog(); qWarning() << shader.getInfoLog();

2
tests/workload/CMakeLists.txt
View file

@ -1,7 +1,7 @@
# Declare dependencies # Declare dependencies
macro (setup_testcase_dependencies) macro (setup_testcase_dependencies)
link_hifi_libraries(shared workload) link_hifi_libraries(shared workload shaders)
package_libraries_for_deployment() package_libraries_for_deployment()
endmacro () endmacro ()

7
tests/workload/src/SpaceTests.cpp
View file

@ -23,6 +23,12 @@ const float INV_SQRT_3 = 1.0f / sqrtf(3.0f);
QTEST_MAIN(SpaceTests) QTEST_MAIN(SpaceTests)
void SpaceTests::testOverlaps() { void SpaceTests::testOverlaps() {
QSKIP("Test removed due to being completely broken, please fix me!");
#if 0
// This seems to be completely broken and doesn't work on the current code.
// Leaving it as a historical reference, in case it's useful later.
workload::Space space; workload::Space space;
using Changes = std::vector<workload::Space::Change>; using Changes = std::vector<workload::Space::Change>;
using Views = std::vector<workload::Space::View>; using Views = std::vector<workload::Space::View>;
@ -106,6 +112,7 @@ void SpaceTests::testOverlaps() {
QVERIFY(changes.size() == 0); QVERIFY(changes.size() == 0);
QVERIFY(space.getNumObjects() == 0); QVERIFY(space.getNumObjects() == 0);
} }
#endif
} }
#ifdef MANUAL_TEST #ifdef MANUAL_TEST