Browse Source

Use Containers::Array instead of std::vector for non-resizable storage.

pull/132/head
Vladimír Vondruš 10 years ago
parent
commit
a1cae889df
  1. 4
      src/Magnum/Implementation/TextureState.cpp
  2. 2
      src/Magnum/Implementation/TextureState.h

4
src/Magnum/Implementation/TextureState.cpp

@ -383,10 +383,10 @@ TextureState::TextureState(Context& context, std::vector<std::string>& extension
compressedBlockDataSizeImplementation = &AbstractTexture::compressedBlockDataSizeImplementationDefault; compressedBlockDataSizeImplementation = &AbstractTexture::compressedBlockDataSizeImplementationDefault;
#endif #endif
/* Resize bindings array to hold all possible texture units */ /* Allocate texture bindings array to hold all possible texture units */
glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &maxTextureUnits); glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &maxTextureUnits);
CORRADE_INTERNAL_ASSERT(maxTextureUnits > 0); CORRADE_INTERNAL_ASSERT(maxTextureUnits > 0);
bindings.resize(maxTextureUnits); bindings = Containers::Array<std::pair<GLenum, GLuint>>{Containers::ValueInit, std::size_t(maxTextureUnits)};
} }
TextureState::~TextureState() = default; TextureState::~TextureState() = default;

2
src/Magnum/Implementation/TextureState.h

@ -139,7 +139,7 @@ struct TextureState {
GLint bufferOffsetAlignment; GLint bufferOffsetAlignment;
#endif #endif
std::vector<std::pair<GLenum, GLuint>> bindings; Containers::Array<std::pair<GLenum, GLuint>> bindings;
}; };
}} }}

Loading…
Cancel
Save