From 6e61354fde5e2bf5b048f7b9d80f074df8fd4a9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 17 Jan 2013 17:11:55 +0100 Subject: [PATCH] OpenGL ES compilation fixes. --- src/AbstractShaderProgram.cpp | 9 ++++++++- src/AbstractShaderProgram.h | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/AbstractShaderProgram.cpp b/src/AbstractShaderProgram.cpp index 854e86fea..2f390ade3 100644 --- a/src/AbstractShaderProgram.cpp +++ b/src/AbstractShaderProgram.cpp @@ -599,8 +599,10 @@ std::size_t Attribute::size(GLint components, DataType dataType) { case DataType::Int: case DataType::Float: return 4*components; + #ifndef MAGNUM_TARGET_GLES case DataType::Double: return 8*components; + #endif } CORRADE_INTERNAL_ASSERT(false); @@ -624,7 +626,7 @@ std::size_t Attribute::size(GLint components, DataType dataType) { return 0; } - +#ifndef MAGNUM_TARGET_GLES std::size_t Attribute::size(GLint components, DataType dataType) { switch(dataType) { case DataType::Double: @@ -634,6 +636,7 @@ std::size_t Attribute::size(GLint components, DataType dataType) { CORRADE_INTERNAL_ASSERT(false); return 0; } +#endif std::size_t Attribute>::size(GLint components, DataType dataType) { switch(dataType) { @@ -648,13 +651,17 @@ std::size_t Attribute>::size(GLint components, DataType case DataType::Int: case DataType::Float: return 4*components; + #ifndef MAGNUM_TARGET_GLES case DataType::Double: return 8*components; + #endif + #ifndef MAGNUM_TARGET_GLES2 case DataType::UnsignedInt2101010REV: case DataType::Int2101010REV: CORRADE_INTERNAL_ASSERT(components == 4); return 4; + #endif } CORRADE_INTERNAL_ASSERT(false); diff --git a/src/AbstractShaderProgram.h b/src/AbstractShaderProgram.h index cb16c0b2a..07fd6fa4f 100644 --- a/src/AbstractShaderProgram.h +++ b/src/AbstractShaderProgram.h @@ -1163,7 +1163,7 @@ template<> struct Attribute> { return options & DataOption::BGRA ? GL_BGRA : 4; } #else - inline constexpr static GLint components(DataOptions) { return 4; } + inline constexpr static GLint components(DataOptions = {}) { return 4; } #endif static std::size_t MAGNUM_EXPORT size(GLint components, DataType dataType);