From 74b9670650a5e0bddd0ed17fb0a9a95d7df3644e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 1 Mar 2015 11:29:01 +0100 Subject: [PATCH] Shaders: don't exceed limits for no reason. Shader::maxTextureImageUnits(Shader::Type::Fragment) is 16 on Ivy Bridge and Mesa. --- src/Magnum/Shaders/AbstractVector.h | 4 ++-- src/Magnum/Shaders/DistanceFieldVector.frag | 2 +- src/Magnum/Shaders/Vector.frag | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Magnum/Shaders/AbstractVector.h b/src/Magnum/Shaders/AbstractVector.h index a37ee26b6..a575f6ca1 100644 --- a/src/Magnum/Shaders/AbstractVector.h +++ b/src/Magnum/Shaders/AbstractVector.h @@ -62,7 +62,7 @@ template class AbstractVector: public AbstractShaderProg * Vector texture binding unit * @deprecated Use @ref Magnum::Shaders::AbstractVector::setVectorTexture() "setVectorTexture()" instead. */ - VectorTextureLayer = 16 + VectorTextureLayer = 15 }; #endif @@ -77,7 +77,7 @@ template class AbstractVector: public AbstractShaderProg ~AbstractVector() = default; #ifndef MAGNUM_BUILD_DEPRECATED - enum: Int { VectorTextureLayer = 16 }; + enum: Int { VectorTextureLayer = 15 }; #endif }; diff --git a/src/Magnum/Shaders/DistanceFieldVector.frag b/src/Magnum/Shaders/DistanceFieldVector.frag index 97aa284e5..23a67a6fb 100644 --- a/src/Magnum/Shaders/DistanceFieldVector.frag +++ b/src/Magnum/Shaders/DistanceFieldVector.frag @@ -49,7 +49,7 @@ uniform lowp float smoothness; #endif #ifdef EXPLICIT_TEXTURE_LAYER -layout(binding = 16) uniform sampler2D vectorTexture; +layout(binding = 15) uniform sampler2D vectorTexture; #else uniform lowp sampler2D vectorTexture; #endif diff --git a/src/Magnum/Shaders/Vector.frag b/src/Magnum/Shaders/Vector.frag index a53fe65c7..40c46af82 100644 --- a/src/Magnum/Shaders/Vector.frag +++ b/src/Magnum/Shaders/Vector.frag @@ -38,7 +38,7 @@ uniform lowp vec4 color; #endif #ifdef EXPLICIT_TEXTURE_LAYER -layout(binding = 16) uniform sampler2D vectorTexture; +layout(binding = 15) uniform sampler2D vectorTexture; #else uniform lowp sampler2D vectorTexture; #endif