Browse Source

Documentation fixes and updates.

pull/7/head
Vladimír Vondruš 14 years ago
parent
commit
b2f42f234e
  1. 2
      src/Query.h
  2. 10
      src/ResourceManager.h

2
src/Query.h

@ -87,6 +87,7 @@ template<> GLint MAGNUM_EXPORT AbstractQuery::result<GLint>();
template<> GLuint64 MAGNUM_EXPORT AbstractQuery::result<GLuint64>();
template<> GLint64 MAGNUM_EXPORT AbstractQuery::result<GLint64>();
#endif
#endif
#ifndef MAGNUM_TARGET_GLES2
/**
@ -348,7 +349,6 @@ class TimeQuery: public AbstractQuery {
}
};
#endif
#endif
}

10
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

Loading…
Cancel
Save