Browse Source

Shaders: make the helper function inline.

Will be used outside of the library and I don't want to create
another inter-library dependency.
pull/68/head
Vladimír Vondruš 12 years ago
parent
commit
5303979315
  1. 2
      src/Magnum/Shaders/CMakeLists.txt
  2. 58
      src/Magnum/Shaders/Implementation/CreateCompatibilityShader.cpp
  3. 27
      src/Magnum/Shaders/Implementation/CreateCompatibilityShader.h

2
src/Magnum/Shaders/CMakeLists.txt

@ -34,8 +34,6 @@ set(MagnumShaders_SRCS
Vector.cpp
VertexColor.cpp
Implementation/CreateCompatibilityShader.cpp
${MagnumShaders_RCS})
set(MagnumShaders_HEADERS

58
src/Magnum/Shaders/Implementation/CreateCompatibilityShader.cpp

@ -1,58 +0,0 @@
/*
This file is part of Magnum.
Copyright © 2010, 2011, 2012, 2013, 2014
Vladimír Vondruš <mosra@centrum.cz>
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
#include "CreateCompatibilityShader.h"
#include <Corrade/Utility/Resource.h>
#include "Magnum/Context.h"
#include "Magnum/Extensions.h"
namespace Magnum { namespace Shaders { namespace Implementation {
Shader createCompatibilityShader(const Version version, const Shader::Type type) {
Shader shader(version, type);
#ifndef MAGNUM_TARGET_GLES
if(Context::current()->isExtensionDisabled<Extensions::GL::ARB::explicit_attrib_location>(version))
shader.addSource("#define DISABLE_GL_ARB_explicit_attrib_location\n");
if(Context::current()->isExtensionDisabled<Extensions::GL::ARB::shading_language_420pack>(version))
shader.addSource("#define DISABLE_GL_ARB_shading_language_420pack\n");
if(Context::current()->isExtensionDisabled<Extensions::GL::ARB::explicit_uniform_location>(version))
shader.addSource("#define DISABLE_GL_ARB_explicit_uniform_location\n");
#endif
/* My Android emulator (running on NVidia) doesn't define GL_ES
preprocessor macro, thus *all* the stock shaders fail to compile */
/** @todo remove this when Android emulator is sane */
#ifdef CORRADE_TARGET_ANDROID
shader.addSource("#ifndef GL_ES\n#define GL_ES 1\n#endif\n");
#endif
shader.addSource(Utility::Resource("MagnumShaders").get("compatibility.glsl"));
return shader;
}
}}}

27
src/Magnum/Shaders/Implementation/CreateCompatibilityShader.h

@ -25,11 +25,36 @@
DEALINGS IN THE SOFTWARE.
*/
#include <Corrade/Utility/Resource.h>
#include "Magnum/Context.h"
#include "Magnum/Extensions.h"
#include "Magnum/Shader.h"
namespace Magnum { namespace Shaders { namespace Implementation {
Shader createCompatibilityShader(Version version, Shader::Type type);
inline Shader createCompatibilityShader(Version version, Shader::Type type) {
Shader shader(version, type);
#ifndef MAGNUM_TARGET_GLES
if(Context::current()->isExtensionDisabled<Extensions::GL::ARB::explicit_attrib_location>(version))
shader.addSource("#define DISABLE_GL_ARB_explicit_attrib_location\n");
if(Context::current()->isExtensionDisabled<Extensions::GL::ARB::shading_language_420pack>(version))
shader.addSource("#define DISABLE_GL_ARB_shading_language_420pack\n");
if(Context::current()->isExtensionDisabled<Extensions::GL::ARB::explicit_uniform_location>(version))
shader.addSource("#define DISABLE_GL_ARB_explicit_uniform_location\n");
#endif
/* My Android emulator (running on NVidia) doesn't define GL_ES
preprocessor macro, thus *all* the stock shaders fail to compile */
/** @todo remove this when Android emulator is sane */
#ifdef CORRADE_TARGET_ANDROID
shader.addSource("#ifndef GL_ES\n#define GL_ES 1\n#endif\n");
#endif
shader.addSource(Utility::Resource("MagnumShaders").get("compatibility.glsl"));
return shader;
}
}}}

Loading…
Cancel
Save