ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Use Range2Di in *Framebuffer::read(). 

Not sure why I chose to have offset and size in these two function, but
that's probably because I never used them in real code. The original
overloads taking pair of Vector2i are now marked as deprecated and will
be removed in future release.
pull/87/head
Vladimír Vondruš 11 years ago
parent
f277f9bd31
commit
60d1259483
5 changed files with 50 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      src/Magnum/AbstractFramebuffer.cpp
  2. 35
      src/Magnum/AbstractFramebuffer.h
  3. 2
      src/Magnum/Implementation/FramebufferState.h
  4. 14
      src/Magnum/Test/FramebufferGLTest.cpp
  5. 4
      src/Magnum/Test/MeshGLTest.cpp

28
src/Magnum/AbstractFramebuffer.cpp
Unescape View File

@ -230,30 +230,28 @@ void AbstractFramebuffer::clear(FramebufferClearMask mask) {
glClear(GLbitfield(mask)); glClear(GLbitfield(mask));
} }
void AbstractFramebuffer::read(const Vector2i& offset, const Vector2i& size, Image2D& image) { void AbstractFramebuffer::read(const Range2Di& rectangle, Image2D& image) {
const Implementation::FramebufferState& state = *Context::current()->state().framebuffer;
#ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES2
bindInternal(FramebufferTarget::Read); bindInternal(FramebufferTarget::Read);
#else #else
bindInternal(state.readTarget); bindInternal(state.readTarget);
#endif #endif
const std::size_t dataSize = image.dataSize(size); const std::size_t dataSize = image.dataSize(rectangle.size());
char* const data = new char[dataSize]; char* const data = new char[dataSize];
(state.readImplementation)(offset, size, image.format(), image.type(), dataSize, data); (Context::current()->state().framebuffer->readImplementation)(rectangle, image.format(), image.type(), dataSize, data);
image.setData(image.format(), image.type(), size, data); image.setData(image.format(), image.type(), rectangle.size(), data);
} }
#ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES2
void AbstractFramebuffer::read(const Vector2i& offset, const Vector2i& size, BufferImage2D& image, BufferUsage usage) { void AbstractFramebuffer::read(const Range2Di& rectangle, BufferImage2D& image, BufferUsage usage) {
bindInternal(FramebufferTarget::Read); bindInternal(FramebufferTarget::Read);
/* If the buffer doesn't have sufficient size, resize it */ /* If the buffer doesn't have sufficient size, resize it */
/** @todo Explicitly reset also when buffer usage changes */ /** @todo Explicitly reset also when buffer usage changes */
if(image.size() != size) if(image.size() != rectangle.size())
image.setData(image.format(), image.type(), size, nullptr, usage); image.setData(image.format(), image.type(), rectangle.size(), nullptr, usage);
image.buffer().bindInternal(Buffer::TargetHint::PixelPack); image.buffer().bindInternal(Buffer::TargetHint::PixelPack);
(Context::current()->state().framebuffer->readImplementation)(offset, size, image.format(), image.type(), image.dataSize(size), nullptr); (Context::current()->state().framebuffer->readImplementation)(rectangle, image.format(), image.type(), image.dataSize(rectangle.size()), nullptr);
} }
#endif #endif
@ -394,15 +392,15 @@ void AbstractFramebuffer::readBufferImplementationDSAEXT(GLenum buffer) {
} }
#endif #endif
void AbstractFramebuffer::readImplementationDefault(const Vector2i& offset, const Vector2i& size, const ColorFormat format, const ColorType type, const std::size_t, GLvoid* const data) { void AbstractFramebuffer::readImplementationDefault(const Range2Di& rectangle, const ColorFormat format, const ColorType type, const std::size_t, GLvoid* const data) {
glReadPixels(offset.x(), offset.y(), size.x(), size.y(), GLenum(format), GLenum(type), data); glReadPixels(rectangle.min().x(), rectangle.min().y(), rectangle.sizeX(), rectangle.sizeY(), GLenum(format), GLenum(type), data);
} }
void AbstractFramebuffer::readImplementationRobustness(const Vector2i& offset, const Vector2i& size, const ColorFormat format, const ColorType type, const std::size_t dataSize, GLvoid* const data) { void AbstractFramebuffer::readImplementationRobustness(const Range2Di& rectangle, const ColorFormat format, const ColorType type, const std::size_t dataSize, GLvoid* const data) {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
glReadnPixelsARB(offset.x(), offset.y(), size.x(), size.y(), GLenum(format), GLenum(type), dataSize, data); glReadnPixelsARB(rectangle.min().x(), rectangle.min().y(), rectangle.sizeX(), rectangle.sizeY(), GLenum(format), GLenum(type), dataSize, data);
#elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL) #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
glReadnPixelsEXT(offset.x(), offset.y(), size.x(), size.y(), GLenum(format), GLenum(type), dataSize, data); glReadnPixelsEXT(rectangle.min().x(), rectangle.min().y(), rectangle.sizeX(), rectangle.sizeY(), GLenum(format), GLenum(type), dataSize, data);
#else #else
static_cast<void>(offset); static_cast<void>(offset);
static_cast<void>(size); static_cast<void>(size);

35
src/Magnum/AbstractFramebuffer.h
Unescape View File

@ -297,8 +297,7 @@ class MAGNUM_EXPORT AbstractFramebuffer {
/** /**
* @brief Read block of pixels from framebuffer to image * @brief Read block of pixels from framebuffer to image
* @param offset Offset in the framebuffer * @param rectangle Framebuffer rectangle to read
* @param size Image size
* @param image Image where to put the data * @param image Image where to put the data
* *
* Image parameters like format and type of pixel data are taken from * Image parameters like format and type of pixel data are taken from
@ -309,13 +308,22 @@ class MAGNUM_EXPORT AbstractFramebuffer {
* @see @fn_gl{BindFramebuffer}, @fn_gl{ReadPixels} or * @see @fn_gl{BindFramebuffer}, @fn_gl{ReadPixels} or
* @fn_gl_extension{ReadnPixels,ARB,robustness} * @fn_gl_extension{ReadnPixels,ARB,robustness}
*/ */
void read(const Vector2i& offset, const Vector2i& size, Image2D& image); void read(const Range2Di& rectangle, Image2D& image);
#ifdef MAGNUM_BUILD_DEPRECATED
/**
* @copybrief read(const Range2Di&, Image2D&)
* @deprecated Use @ref read(const Range2Di&, Image2D&) instead.
*/
CORRADE_DEPRECATED("use read(const Range2Di&, Image2D& instead) instead") void read(const Vector2i& offset, const Vector2i& size, Image2D& image) {
read({offset, size}, image);
}
#endif
#ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES2
/** /**
* @brief Read block of pixels from framebuffer to buffer image * @brief Read block of pixels from framebuffer to buffer image
* @param offset Offset in the framebuffer * @param rectangle Framebuffer rectangle to read
* @param size Image size
* @param image Buffer image where to put the data * @param image Buffer image where to put the data
* @param usage Buffer usage * @param usage Buffer usage
* *
@ -325,7 +333,18 @@ class MAGNUM_EXPORT AbstractFramebuffer {
* @todo Make it more flexible (usable with * @todo Make it more flexible (usable with
* @extension{ARB,buffer_storage}, avoiding relocations...) * @extension{ARB,buffer_storage}, avoiding relocations...)
*/ */
void read(const Vector2i& offset, const Vector2i& size, BufferImage2D& image, BufferUsage usage); void read(const Range2Di& rectangle, BufferImage2D& image, BufferUsage usage);
#ifdef MAGNUM_BUILD_DEPRECATED
/**
* @copybrief read(const Range2Di&, BufferImage2D&, BufferUsage)
* @deprecated Use @ref read(const Range2Di&, BufferImage2D&, BufferUsage)
* instead.
*/
CORRADE_DEPRECATED("use read(const Range2Di&, BufferImage2D&, BufferUsage) instead") void read(const Vector2i& offset, const Vector2i& size, BufferImage2D& image, BufferUsage usage) {
read({offset, size}, image, usage);
}
#endif
#endif #endif
#ifdef DOXYGEN_GENERATING_OUTPUT #ifdef DOXYGEN_GENERATING_OUTPUT
@ -381,8 +400,8 @@ class MAGNUM_EXPORT AbstractFramebuffer {
void MAGNUM_LOCAL readBufferImplementationDSAEXT(GLenum buffer); void MAGNUM_LOCAL readBufferImplementationDSAEXT(GLenum buffer);
#endif #endif
static void MAGNUM_LOCAL readImplementationDefault(const Vector2i& offset, const Vector2i& size, ColorFormat format, ColorType type, std::size_t dataSize, GLvoid* data); static void MAGNUM_LOCAL readImplementationDefault(const Range2Di& rectangle, ColorFormat format, ColorType type, std::size_t dataSize, GLvoid* data);
static void MAGNUM_LOCAL readImplementationRobustness(const Vector2i& offset, const Vector2i& size, ColorFormat format, ColorType type, std::size_t dataSize, GLvoid* data); static void MAGNUM_LOCAL readImplementationRobustness(const Range2Di& rectangle, ColorFormat format, ColorType type, std::size_t dataSize, GLvoid* data);
void MAGNUM_LOCAL invalidateImplementationNoOp(GLsizei, const GLenum*); void MAGNUM_LOCAL invalidateImplementationNoOp(GLsizei, const GLenum*);
void MAGNUM_LOCAL invalidateImplementationDefault(GLsizei count, const GLenum* attachments); void MAGNUM_LOCAL invalidateImplementationDefault(GLsizei count, const GLenum* attachments);

2
src/Magnum/Implementation/FramebufferState.h
Unescape View File

@ -59,7 +59,7 @@ struct FramebufferState {
void(Renderbuffer::*renderbufferStorageImplementation)(RenderbufferFormat, const Vector2i&); void(Renderbuffer::*renderbufferStorageImplementation)(RenderbufferFormat, const Vector2i&);
void(Renderbuffer::*renderbufferStorageMultisampleImplementation)(GLsizei, RenderbufferFormat, const Vector2i&); void(Renderbuffer::*renderbufferStorageMultisampleImplementation)(GLsizei, RenderbufferFormat, const Vector2i&);
void(*readImplementation)(const Vector2i&, const Vector2i&, ColorFormat, ColorType, std::size_t, GLvoid*); void(*readImplementation)(const Range2Di&, ColorFormat, ColorType, std::size_t, GLvoid*);
FramebufferTarget readTarget, drawTarget; FramebufferTarget readTarget, drawTarget;

14
src/Magnum/Test/FramebufferGLTest.cpp
Unescape View File

@ -790,7 +790,7 @@ void FramebufferGLTest::read() {
framebuffer.clear(FramebufferClear::Color|FramebufferClear::Depth|FramebufferClear::Stencil); framebuffer.clear(FramebufferClear::Color|FramebufferClear::Depth|FramebufferClear::Stencil);
Image2D colorImage(ColorFormat::RGBA, ColorType::UnsignedByte); Image2D colorImage(ColorFormat::RGBA, ColorType::UnsignedByte);
framebuffer.read({16, 8}, {8, 16}, colorImage); framebuffer.read({{16, 8}, {8, 16}}, colorImage);
CORRADE_COMPARE(colorImage.size(), Vector2i(8, 16)); CORRADE_COMPARE(colorImage.size(), Vector2i(8, 16));
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
@ -805,7 +805,7 @@ void FramebufferGLTest::read() {
#endif #endif
Image2D depthImage(ColorFormat::DepthComponent, ColorType::UnsignedShort); Image2D depthImage(ColorFormat::DepthComponent, ColorType::UnsignedShort);
framebuffer.read({}, Vector2i(1), depthImage); framebuffer.read({{}, Vector2i{1}}, depthImage);
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(depthImage.data<UnsignedShort>()[0], 48352); CORRADE_COMPARE(depthImage.data<UnsignedShort>()[0], 48352);
@ -820,7 +820,7 @@ void FramebufferGLTest::read() {
#endif #endif
Image2D stencilImage(ColorFormat::StencilIndex, ColorType::UnsignedByte); Image2D stencilImage(ColorFormat::StencilIndex, ColorType::UnsignedByte);
framebuffer.read({}, Vector2i(1), stencilImage); framebuffer.read({{}, Vector2i{1}}, stencilImage);
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(stencilImage.data<UnsignedByte>()[0], 67); CORRADE_COMPARE(stencilImage.data<UnsignedByte>()[0], 67);
@ -835,7 +835,7 @@ void FramebufferGLTest::read() {
#endif #endif
Image2D depthStencilImage(ColorFormat::DepthStencil, ColorType::UnsignedInt248); Image2D depthStencilImage(ColorFormat::DepthStencil, ColorType::UnsignedInt248);
framebuffer.read({}, Vector2i(1), depthStencilImage); framebuffer.read({{}, Vector2i{1}}, depthStencilImage);
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
/** @todo This will probably fail on different systems */ /** @todo This will probably fail on different systems */
@ -870,7 +870,7 @@ void FramebufferGLTest::readBuffer() {
framebuffer.clear(FramebufferClear::Color|FramebufferClear::Depth|FramebufferClear::Stencil); framebuffer.clear(FramebufferClear::Color|FramebufferClear::Depth|FramebufferClear::Stencil);
BufferImage2D colorImage(ColorFormat::RGBA, ColorType::UnsignedByte); BufferImage2D colorImage(ColorFormat::RGBA, ColorType::UnsignedByte);
framebuffer.read({16, 8}, {8, 16}, colorImage, BufferUsage::StaticRead); framebuffer.read({{16, 8}, {8, 16}}, colorImage, BufferUsage::StaticRead);
CORRADE_COMPARE(colorImage.size(), Vector2i(8, 16)); CORRADE_COMPARE(colorImage.size(), Vector2i(8, 16));
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
@ -918,14 +918,14 @@ void FramebufferGLTest::blit() {
/* The framebuffer should be black before */ /* The framebuffer should be black before */
Image2D image(ColorFormat::RGBA, ColorType::UnsignedByte); Image2D image(ColorFormat::RGBA, ColorType::UnsignedByte);
b.read({}, Vector2i(1), image); b.read({{}, Vector2i{1}}, image);
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.data<Color4ub>()[0], Color4ub()); CORRADE_COMPARE(image.data<Color4ub>()[0], Color4ub());
/* And have given color after */ /* And have given color after */
Framebuffer::blit(a, b, a.viewport(), FramebufferBlit::Color); Framebuffer::blit(a, b, a.viewport(), FramebufferBlit::Color);
b.read({}, Vector2i(1), image); b.read({{}, Vector2i{1}}, image);
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.data<Color4ub>()[0], Color4ub(128, 64, 32, 17)); CORRADE_COMPARE(image.data<Color4ub>()[0], Color4ub(128, 64, 32, 17));

4
src/Magnum/Test/MeshGLTest.cpp
Unescape View File

@ -457,7 +457,7 @@ Checker::Checker(AbstractShaderProgram&& shader, RenderbufferFormat format, Mesh
template<class T> T Checker::get(ColorFormat format, ColorType type) { template<class T> T Checker::get(ColorFormat format, ColorType type) {
Image2D image(format, type); Image2D image(format, type);
framebuffer.read({}, Vector2i(1), image); framebuffer.read({{}, Vector2i{1}}, image);
return image.data<T>()[0]; return image.data<T>()[0];
} }
#endif #endif
@ -1750,7 +1750,7 @@ MultiChecker::MultiChecker(AbstractShaderProgram&& shader, Mesh& mesh): framebuf
template<class T> T MultiChecker::get(ColorFormat format, ColorType type) { template<class T> T MultiChecker::get(ColorFormat format, ColorType type) {
Image2D image(format, type); Image2D image(format, type);
framebuffer.read({}, Vector2i(1), image); framebuffer.read({{}, Vector2i{1}}, image);
return image.data<T>()[0]; return image.data<T>()[0];
} }
#endif #endif

Write Preview
Loading…
Cancel
Save