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

TextureTools: don't query distance field input size if it was passed. 

Avoids needless GL calls on each invoication.
pull/674/head
Vladimír Vondruš 1 year ago
parent
23eca4d8d0
commit
665f226025
3 changed files with 51 additions and 45 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. 30
      src/Magnum/TextureTools/DistanceFieldGL.cpp
  2. 12
      src/Magnum/TextureTools/DistanceFieldGL.h
  3. 54
      src/Magnum/TextureTools/Test/DistanceFieldGLTest.cpp

30
src/Magnum/TextureTools/DistanceFieldGL.cpp
Unescape View File

@ -183,15 +183,13 @@ DistanceFieldGL& DistanceFieldGL::operator=(DistanceFieldGL&&) noexcept = defaul
UnsignedInt DistanceFieldGL::radius() const { return _state->radius; } UnsignedInt DistanceFieldGL::radius() const { return _state->radius; }
void DistanceFieldGL::operator()(GL::Texture2D& input, GL::Framebuffer& output, const Range2Di& rectangle, const Vector2i& void DistanceFieldGL::operator()(GL::Texture2D& input, GL::Framebuffer& output, const Range2Di& rectangle, const Vector2i& imageSize) {
#ifdef MAGNUM_TARGET_GLES
imageSize
#endif
) {
/** @todo Disable depth test, blending and then enable it back (if was previously) */ /** @todo Disable depth test, blending and then enable it back (if was previously) */
Vector2i imageSizeToUse = imageSize;
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
Vector2i imageSize = input.imageSize(0); if(imageSizeToUse.isZero())
imageSizeToUse = input.imageSize(0);
#endif #endif
CORRADE_ASSERT(output.checkStatus(GL::FramebufferTarget::Draw) == GL::Framebuffer::Status::Complete, CORRADE_ASSERT(output.checkStatus(GL::FramebufferTarget::Draw) == GL::Framebuffer::Status::Complete,
@ -200,9 +198,9 @@ void DistanceFieldGL::operator()(GL::Texture2D& input, GL::Framebuffer& output,
/* The shader assumes that the ratio between the output and input is a /* The shader assumes that the ratio between the output and input is a
multiple of 2, causing output pixel *centers* to be aligned with input multiple of 2, causing output pixel *centers* to be aligned with input
pixel *edges* */ pixel *edges* */
CORRADE_ASSERT(imageSize % rectangle.size() == Vector2i{0} && CORRADE_ASSERT(imageSizeToUse % rectangle.size() == Vector2i{0} &&
(imageSize/rectangle.size()) % 2 == Vector2i{0}, (imageSizeToUse/rectangle.size()) % 2 == Vector2i{0},
"TextureTools::DistanceFieldGL: expected input and output size ratio to be a multiple of 2, got" << Debug::packed << imageSize << "and" << Debug::packed << rectangle.size(), ); "TextureTools::DistanceFieldGL: expected input and output size ratio to be a multiple of 2, got" << Debug::packed << imageSizeToUse << "and" << Debug::packed << rectangle.size(), );
/* Save existing viewport to restore it back after */ /* Save existing viewport to restore it back after */
const Range2Di previousViewport = output.viewport(); const Range2Di previousViewport = output.viewport();
@ -213,7 +211,7 @@ void DistanceFieldGL::operator()(GL::Texture2D& input, GL::Framebuffer& output,
_state->shader _state->shader
.bindTexture(input) .bindTexture(input)
.setImageSizeInverted(1.0f/Vector2(imageSize)) .setImageSizeInverted(1.0f/Vector2{imageSizeToUse})
.draw(_state->mesh); .draw(_state->mesh);
/* Restore the previous viewport */ /* Restore the previous viewport */
@ -226,19 +224,11 @@ void DistanceFieldGL::operator()(GL::Texture2D& input, GL::Framebuffer& output,
} }
#endif #endif
void DistanceFieldGL::operator()(GL::Texture2D& input, GL::Texture2D& output, const Range2Di& rectangle, const Vector2i& void DistanceFieldGL::operator()(GL::Texture2D& input, GL::Texture2D& output, const Range2Di& rectangle, const Vector2i& imageSize) {
#ifdef MAGNUM_TARGET_GLES
imageSize
#endif
) {
GL::Framebuffer framebuffer{rectangle}; GL::Framebuffer framebuffer{rectangle};
framebuffer.attachTexture(GL::Framebuffer::ColorAttachment(0), output, 0); framebuffer.attachTexture(GL::Framebuffer::ColorAttachment(0), output, 0);
operator()(input, framebuffer, rectangle operator()(input, framebuffer, rectangle, imageSize);
#ifdef MAGNUM_TARGET_GLES
, imageSize
#endif
);
} }
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES

12
src/Magnum/TextureTools/DistanceFieldGL.h
Unescape View File

@ -231,9 +231,9 @@ class MAGNUM_TEXTURETOOLS_EXPORT DistanceFieldGL {
* @param input Input texture * @param input Input texture
* @param output Output framebuffer * @param output Output framebuffer
* @param rectangle Rectangle in the output where to render * @param rectangle Rectangle in the output where to render
* @param imageSize Input texture size. Needed only for OpenGL ES, * @param imageSize Input texture size. Mandatory on OpenGL ES and
* on desktop GL the size is queried automatically using * WebGL, on desktop GL if left at default the size is internally
* @ref GL::Texture2D::imageSize() and this parameter is ignored. * queried using @ref GL::Texture2D::imageSize() instead.
* @m_since_latest * @m_since_latest
* *
* The @p output texture is expected to have a framebuffer-drawable * The @p output texture is expected to have a framebuffer-drawable
@ -274,9 +274,9 @@ class MAGNUM_TEXTURETOOLS_EXPORT DistanceFieldGL {
* @param input Input texture * @param input Input texture
* @param output Output texture * @param output Output texture
* @param rectangle Rectangle in the output where to render * @param rectangle Rectangle in the output where to render
* @param imageSize Input texture size. Needed only for OpenGL ES, * @param imageSize Input texture size. Mandatory on OpenGL ES and
* on desktop GL the information is gathered automatically using * WebGL, on desktop GL if left at default the size is internally
* @ref GL::Texture2D::imageSize(). * queried using @ref GL::Texture2D::imageSize() instead.
* *
* Convenience variant of @ref operator()(GL::Texture2D&, GL::Framebuffer&, const Range2Di&, const Vector2i&) * Convenience variant of @ref operator()(GL::Texture2D&, GL::Framebuffer&, const Range2Di&, const Vector2i&)
* that creates a temporary framebuffer with @p output attached and * that creates a temporary framebuffer with @p output attached and

54
src/Magnum/TextureTools/Test/DistanceFieldGLTest.cpp
Unescape View File

@ -81,27 +81,35 @@ using namespace Math::Literals;
const struct { const struct {
const char* name; const char* name;
bool framebuffer; bool framebuffer, implicitOutputSize;
Vector2i size; Vector2i size;
Vector2i offset; Vector2i offset;
bool flipX, flipY; bool flipX, flipY;
} RunData[]{ } RunData[]{
{"texture output", {"texture output",
false, {64, 64}, {}, false, false}, false, false, {64, 64}, {}, false, false},
{"texture output, flipped on X", {"texture output, flipped on X",
false, {64, 64}, {}, true, false}, false, false, {64, 64}, {}, true, false},
{"texture output, flipped on Y", {"texture output, flipped on Y",
false, {64, 64}, {}, false, true}, false, false, {64, 64}, {}, false, true},
{"texture output, with offset", {"texture output, with offset",
false, {128, 96}, {64, 32}, false, false}, false, false, {128, 96}, {64, 32}, false, false},
#ifndef MAGNUM_TARGET_GLES
{"texture output with implicit size",
false, true, {64, 64}, {}, false, false},
#endif
{"framebuffer output", {"framebuffer output",
true, {64, 64}, {}, false, false}, true, false, {64, 64}, {}, false, false},
{"framebuffer output, flipped on X", {"framebuffer output, flipped on X",
true, {64, 64}, {}, true, false}, true, false, {64, 64}, {}, true, false},
{"framebuffer output, flipped on Y", {"framebuffer output, flipped on Y",
true, {64, 64}, {}, false, true}, true, false, {64, 64}, {}, false, true},
{"framebuffer output, with offset", {"framebuffer output, with offset",
true, {128, 96}, {64, 32}, false, false}, true, false, {128, 96}, {64, 32}, false, false},
#ifndef MAGNUM_TARGET_GLES
{"framebuffer output with implicit size",
true, true, {64, 64}, {}, false, false},
#endif
}; };
#ifndef MAGNUM_TARGET_WEBGL #ifndef MAGNUM_TARGET_WEBGL
@ -279,17 +287,25 @@ void DistanceFieldGLTest::run() {
MAGNUM_VERIFY_NO_GL_ERROR(); MAGNUM_VERIFY_NO_GL_ERROR();
if(data.framebuffer) { if(data.framebuffer) {
distanceField(input, outputFramebuffer, Range2Di::fromSize(data.offset, Vector2i{64}) #ifndef MAGNUM_TARGET_GLES
#ifdef MAGNUM_TARGET_GLES if(data.implicitOutputSize)
, inputImage->size() distanceField(input, outputFramebuffer,
#endif Range2Di::fromSize(data.offset, Vector2i{64}));
); else
#endif
distanceField(input, outputFramebuffer,
Range2Di::fromSize(data.offset, Vector2i{64}),
inputImage->size());
} else { } else {
distanceField(input, outputTexture, Range2Di::fromSize(data.offset, Vector2i{64}) #ifndef MAGNUM_TARGET_GLES
#ifdef MAGNUM_TARGET_GLES if(data.implicitOutputSize)
, inputImage->size() distanceField(input, outputTexture,
#endif Range2Di::fromSize(data.offset, Vector2i{64}));
); else
#endif
distanceField(input, outputTexture,
Range2Di::fromSize(data.offset, Vector2i{64}),
inputImage->size());
} }
/* The viewport should stay as it was before */ /* The viewport should stay as it was before */

Write Preview
Loading…
Cancel
Save