From cdde9d36e0507d88eac4d418efd0e1557a61f161 Mon Sep 17 00:00:00 2001 From: Mark Callow Date: Mon, 5 Aug 2024 17:32:38 +0900 Subject: [PATCH] Fix Emscripten build in absence of assimp headers. --- .../glloadtests/shader-based/EncodeTexture.h | 2 ++ .../glloadtests/shader-based/GL3LoadTestSample.cpp | 13 +++++++++++++ tests/loadtests/glloadtests/utils/GLMeshLoader.hpp | 7 +++++++ 3 files changed, 22 insertions(+) diff --git a/tests/loadtests/glloadtests/shader-based/EncodeTexture.h b/tests/loadtests/glloadtests/shader-based/EncodeTexture.h index 545f55b360..55acd0092a 100644 --- a/tests/loadtests/glloadtests/shader-based/EncodeTexture.h +++ b/tests/loadtests/glloadtests/shader-based/EncodeTexture.h @@ -18,6 +18,8 @@ #include "GL3LoadTestSample.h" +#include + class EncodeTexture : public GL3LoadTestSample { public: EncodeTexture(uint32_t width, uint32_t height, diff --git a/tests/loadtests/glloadtests/shader-based/GL3LoadTestSample.cpp b/tests/loadtests/glloadtests/shader-based/GL3LoadTestSample.cpp index ac86ee3aa9..a96ae4e55a 100644 --- a/tests/loadtests/glloadtests/shader-based/GL3LoadTestSample.cpp +++ b/tests/loadtests/glloadtests/shader-based/GL3LoadTestSample.cpp @@ -241,12 +241,14 @@ GL3LoadTestSample::framebufferColorEncoding() return encoding; } +#if !defined(__EMSCRIPTEN__) void GL3LoadTestSample::loadMesh(std::string filename, glMeshLoader::MeshBuffer& meshBuffer, std::vector vertexLayout, float scale) { +// Emscripten assimp port not yet available. GLMeshLoader *mesh = new GLMeshLoader(); mesh->LoadMesh(filename); @@ -262,4 +264,15 @@ GL3LoadTestSample::loadMesh(std::string filename, delete(mesh); } +#else +void +GL3LoadTestSample::loadMesh(std::string, + glMeshLoader::MeshBuffer&, + std::vector, + float) +{ +} +#endif + + diff --git a/tests/loadtests/glloadtests/utils/GLMeshLoader.hpp b/tests/loadtests/glloadtests/utils/GLMeshLoader.hpp index 07ad30ac7f..1b6c4ee942 100644 --- a/tests/loadtests/glloadtests/utils/GLMeshLoader.hpp +++ b/tests/loadtests/glloadtests/utils/GLMeshLoader.hpp @@ -21,9 +21,12 @@ #else #endif +// Emscripten assimp port not yet available. +#if !defined(__EMSCRIPTEN__) #include #include #include +#endif #include "disable_glm_warnings.h" #include @@ -88,6 +91,7 @@ namespace glMeshLoader } }; +#if !defined(__EMSCRIPTEN__) // Get vertex size from vertex layout static uint32_t vertexSize(std::vector layout) { @@ -106,8 +110,10 @@ namespace glMeshLoader } return vSize; } +#endif } +#if !defined(__EMSCRIPTEN__) // Simple mesh class for getting all the necessary stuff from models // loaded via ASSIMP. class GLMeshLoader { @@ -506,4 +512,5 @@ class GLMeshLoader { glBindVertexArray(0); } }; +#endif // !defined(__EMSCRIPTEN__)