From 5663e39eba8979228e252d76fba676586c4f862f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 26 May 2016 19:04:51 +0300 Subject: Move shader program load function from resourcemanager into separate file. --- src/resources/loaders/shaderprogramloader.cpp | 73 +++++++++++++++++++++++++++ src/resources/loaders/shaderprogramloader.h | 42 +++++++++++++++ 2 files changed, 115 insertions(+) create mode 100644 src/resources/loaders/shaderprogramloader.cpp create mode 100644 src/resources/loaders/shaderprogramloader.h (limited to 'src/resources/loaders') diff --git a/src/resources/loaders/shaderprogramloader.cpp b/src/resources/loaders/shaderprogramloader.cpp new file mode 100644 index 000000000..eeeedc868 --- /dev/null +++ b/src/resources/loaders/shaderprogramloader.cpp @@ -0,0 +1,73 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2016 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifdef USE_OPENGL + +#include "logger.h" + +#include "utils/checkutils.h" + +#include "render/shaders/shaderprogram.h" +#include "render/shaders/shadersmanager.h" + +#include "resources/loaders/shaderprogramloader.h" + +#include "resources/resourcemanager/resourcemanager.h" + +#include "debug.h" + +namespace +{ + struct ShaderProgramLoader final + { + const std::string vertex; + const std::string fragment; + const bool isNewShader; + + static Resource *load(const void *const v) + { + if (!v) + return nullptr; + + const ShaderProgramLoader *const rl + = static_cast(v); + ShaderProgram *const resource = shaders.createProgram( + rl->vertex, + rl->fragment, + rl->isNewShader); + if (!resource) + reportAlways("Shader program creation error"); + return resource; + } + }; +} // namespace + +Resource *Loader::getShaderProgram(const std::string &vertex, + const std::string &fragment, + const bool isNewShader) +{ + ShaderProgramLoader rl = { vertex, fragment, isNewShader }; + return resourceManager->get("program_" + vertex + " + " + fragment, + ShaderProgramLoader::load, &rl); +} + +#endif // USE_OPENGL diff --git a/src/resources/loaders/shaderprogramloader.h b/src/resources/loaders/shaderprogramloader.h new file mode 100644 index 000000000..ca5c2b086 --- /dev/null +++ b/src/resources/loaders/shaderprogramloader.h @@ -0,0 +1,42 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2016 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef RESOURCES_LOADERS_SHADERPROGRAMLOADER_H +#define RESOURCES_LOADERS_SHADERPROGRAMLOADER_H + +#ifdef USE_OPENGL + +#include + +#include "localconsts.h" + +class Resource; + +namespace Loader +{ + Resource *getShaderProgram(const std::string &vertex, + const std::string &fragment, + const bool isNewShader) A_WARN_UNUSED; +} // namespace Loader + +#endif // USE_OPENGL +#endif // RESOURCES_LOADERS_SHADERPROGRAMLOADER_H -- cgit v1.2.3-70-g09d2