From 84439c48b15a3027f9c5304c9717ce8f5d98b159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 6 Jul 2015 15:24:49 +0200 Subject: [PATCH] Removed redundant ifdefs. --- src/Magnum/Shader.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/Magnum/Shader.cpp b/src/Magnum/Shader.cpp index a406ff2a9..5cf5f4580 100644 --- a/src/Magnum/Shader.cpp +++ b/src/Magnum/Shader.cpp @@ -324,9 +324,7 @@ Int Shader::maxAtomicCounterBuffers(const Type type) { constexpr static GLenum what[] = { GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS, GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS, - #ifndef MAGNUM_TARGET_GLES2 GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS, - #endif #ifndef MAGNUM_TARGET_GLES GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS, GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS, @@ -377,9 +375,7 @@ Int Shader::maxAtomicCounters(const Type type) { constexpr static GLenum what[] = { GL_MAX_VERTEX_ATOMIC_COUNTERS, GL_MAX_FRAGMENT_ATOMIC_COUNTERS, - #ifndef MAGNUM_TARGET_GLES2 GL_MAX_COMPUTE_ATOMIC_COUNTERS, - #endif #ifndef MAGNUM_TARGET_GLES GL_MAX_GEOMETRY_ATOMIC_COUNTERS, GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS, @@ -430,9 +426,7 @@ Int Shader::maxImageUniforms(const Type type) { constexpr static GLenum what[] = { GL_MAX_VERTEX_IMAGE_UNIFORMS, GL_MAX_FRAGMENT_IMAGE_UNIFORMS, - #ifndef MAGNUM_TARGET_GLES2 GL_MAX_COMPUTE_IMAGE_UNIFORMS, - #endif #ifndef MAGNUM_TARGET_GLES GL_MAX_GEOMETRY_IMAGE_UNIFORMS, GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS, @@ -483,9 +477,7 @@ Int Shader::maxShaderStorageBlocks(const Type type) { constexpr static GLenum what[] = { GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS, GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS, - #ifndef MAGNUM_TARGET_GLES2 GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS, - #endif #ifndef MAGNUM_TARGET_GLES GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS, GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS,