mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1241665 - Correctly convert IOSurfaces to SourceSurfaces in MacIOSurfaceTextureSourceBasic and MacIOSurfaceTextureData. r=mattwoodrow
This commit is contained in:
parent
7d15f65edb
commit
926f5cd049
@ -5,6 +5,7 @@
|
||||
|
||||
#include "MacIOSurfaceTextureHostBasic.h"
|
||||
#include "mozilla/gfx/MacIOSurface.h"
|
||||
#include "MacIOSurfaceHelpers.h"
|
||||
|
||||
namespace mozilla {
|
||||
namespace layers {
|
||||
@ -33,7 +34,9 @@ MacIOSurfaceTextureSourceBasic::GetSize() const
|
||||
gfx::SurfaceFormat
|
||||
MacIOSurfaceTextureSourceBasic::GetFormat() const
|
||||
{
|
||||
return mSurface->HasAlpha() ? gfx::SurfaceFormat::R8G8B8A8 : gfx::SurfaceFormat::B8G8R8X8;
|
||||
// Set the format the same way as CreateSourceSurfaceFromMacIOSurface.
|
||||
return mSurface->GetFormat() == gfx::SurfaceFormat::NV12
|
||||
? gfx::SurfaceFormat::B8G8R8X8 : gfx::SurfaceFormat::B8G8R8A8;
|
||||
}
|
||||
|
||||
MacIOSurfaceTextureHostBasic::MacIOSurfaceTextureHostBasic(
|
||||
@ -51,7 +54,7 @@ gfx::SourceSurface*
|
||||
MacIOSurfaceTextureSourceBasic::GetSurface(gfx::DrawTarget* aTarget)
|
||||
{
|
||||
if (!mSourceSurface) {
|
||||
mSourceSurface = mSurface->GetAsSurface();
|
||||
mSourceSurface = CreateSourceSurfaceFromMacIOSurface(mSurface);
|
||||
}
|
||||
return mSourceSurface;
|
||||
}
|
||||
|
@ -5,6 +5,7 @@
|
||||
|
||||
#include "MacIOSurfaceTextureClientOGL.h"
|
||||
#include "mozilla/gfx/MacIOSurface.h"
|
||||
#include "MacIOSurfaceHelpers.h"
|
||||
|
||||
namespace mozilla {
|
||||
namespace layers {
|
||||
@ -53,7 +54,7 @@ MacIOSurfaceTextureData::GetFormat() const
|
||||
already_AddRefed<gfx::DataSourceSurface>
|
||||
MacIOSurfaceTextureData::GetAsSurface()
|
||||
{
|
||||
RefPtr<gfx::SourceSurface> surf = mSurface->GetAsSurface();
|
||||
RefPtr<gfx::SourceSurface> surf = CreateSourceSurfaceFromMacIOSurface(mSurface);
|
||||
return surf->GetDataSurface();
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user