tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drawable Renderer (#1570), PremultipliedImage is RGBA only

Browse Source
This commit is contained in:
mwilsnd
2023-05-31 10:05:12 -05:00
committed by Bart Louwers
parent 8f3b5ec093
commit f45437b9ab
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mbgl/gl/texture2d.cpp
View File

@@ -134,15 +134,8 @@ void Texture2D::upload(const PremultipliedImage& image, gfx::UploadPass& uploadP
}
assert(PremultipliedImage::channels == numChannels());
if (PremultipliedImage::channels != numChannels()) {
return;
}
// note: images are always unsigned bytes
assert(PremultipliedImage::channels == getPixelStride());
if (PremultipliedImage::channels != getPixelStride()) {
return;
}
uploadPass.updateTextureResource(*textureResource, size, &image.data[0], pixelFormat, channelType);
}

2
src/mbgl/gl/upload_pass.cpp
View File

@@ -213,7 +213,7 @@ gfx::AttributeBindingArray UploadPass::buildAttributeBindings(
std::shared_ptr<gfx::Texture2D> UploadPass::createTexture2D(const PremultipliedImage& image) {
auto tex = std::make_shared<gl::Texture2D>(commandEncoder.context);
tex->setSize(image.size)
.setFormat(image.channels == 4 ? gfx::TexturePixelType::RGBA : gfx::TexturePixelType::Alpha,
.setFormat(gfx::TexturePixelType::RGBA,
gfx::TextureChannelDataType::UnsignedByte)
.create();
tex->upload(image, *this);