From b2f42f234eecab34edf5b56fe9ba0b7db5efaa99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 6 Nov 2012 11:44:41 +0100 Subject: [PATCH] Documentation fixes and updates. --- src/Query.h | 2 +- src/ResourceManager.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Query.h b/src/Query.h index 35aae172f..4657775c4 100644 --- a/src/Query.h +++ b/src/Query.h @@ -87,6 +87,7 @@ template<> GLint MAGNUM_EXPORT AbstractQuery::result(); template<> GLuint64 MAGNUM_EXPORT AbstractQuery::result(); template<> GLint64 MAGNUM_EXPORT AbstractQuery::result(); #endif +#endif #ifndef MAGNUM_TARGET_GLES2 /** @@ -348,7 +349,6 @@ class TimeQuery: public AbstractQuery { } }; #endif -#endif } diff --git a/src/ResourceManager.h b/src/ResourceManager.h index 62a717913..d5f9b4e34 100644 --- a/src/ResourceManager.h +++ b/src/ResourceManager.h @@ -24,7 +24,7 @@ namespace Magnum { -/** +/** @relates ResourceManager * @brief %Resource state * * @see Resource::state(), ResourceManager::state() @@ -43,7 +43,7 @@ enum class ResourceState { Final }; -/** +/** @relates ResourceManager * @brief %Resource data state * * @see ResourceManager::set() @@ -65,7 +65,7 @@ enum class ResourceDataState { Final = int(ResourceState::Final) }; -/** +/** @relates ResourceManager @brief %Resource policy @see ResourceManager::set(), ResourceManager::free() @@ -88,7 +88,7 @@ enum class ResourcePolicy { @brief Key for accessing resource @see ResourceManager::referenceCount(), ResourceManager::state(), - ResourceManager::get(), ResourceManager::set() + ResourceManager::get(), ResourceManager::set(), Resource::key() */ class ResourceKey: public Corrade::Utility::MurmurHash2::Digest { public: @@ -438,7 +438,7 @@ if(!cube) { - Using the resource data. @code shader->use(); -texture->bind(); +texture->bind(layer); cube->draw(); @endcode - Destroying resource references and deleting manager instance when nothing