wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 589978 - [D3D9] 2D canvas layers always have premultiplied alpha. r=bas, a=beta5+

Browse Source
This commit is contained in:
Matt Woodrow 2010-08-23 20:58:27 -07:00
parent 2bfe332d33
commit 5407e8a286
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gfx/layers/d3d9/CanvasLayerD3D9.cpp
View File

@ -58,11 +58,12 @@ CanvasLayerD3D9::Initialize(const Data& aData)
NS_ASSERTION(aData.mGLContext == nsnull,
"CanvasLayer can't have both surface and GLContext");
mNeedsYFlip = PR_FALSE;
mDataIsPremultiplied = PR_TRUE;
} else if (aData.mGLContext) {
NS_ASSERTION(aData.mGLContext->IsOffscreen(), "canvas gl context isn't offscreen");
mGLContext = aData.mGLContext;
mCanvasFramebuffer = mGLContext->GetOffscreenFBO();
mGLBufferIsPremultiplied = aData.mGLBufferIsPremultiplied;
mDataIsPremultiplied = aData.mGLBufferIsPremultiplied;
mNeedsYFlip = PR_TRUE;
} else {
NS_ERROR("CanvasLayer created without mSurface or mGLContext?");
@ -240,13 +241,13 @@ CanvasLayerD3D9::RenderLayer()
mD3DManager->SetShaderMode(DeviceManagerD3D9::RGBLAYER);
if (!mGLBufferIsPremultiplied) {
if (!mDataIsPremultiplied) {
device()->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
device()->SetRenderState(D3DRS_SEPARATEALPHABLENDENABLE, TRUE);
}
device()->SetTexture(0, mTexture);
device()->DrawPrimitive(D3DPT_TRIANGLESTRIP, 0, 2);
if (!mGLBufferIsPremultiplied) {
if (!mDataIsPremultiplied) {
device()->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_ONE);
device()->SetRenderState(D3DRS_SEPARATEALPHABLENDENABLE, FALSE);
}

4
gfx/layers/d3d9/CanvasLayerD3D9.h
View File

@ -55,7 +55,7 @@ public:
: CanvasLayer(aManager, NULL),
LayerD3D9(aManager),
mTexture(0),
mGLBufferIsPremultiplied(PR_FALSE),
mDataIsPremultiplied(PR_FALSE),
mNeedsYFlip(PR_FALSE)
{
mImplData = static_cast<LayerD3D9*>(this);
@ -83,7 +83,7 @@ protected:
nsIntRect mBounds;
PRPackedBool mGLBufferIsPremultiplied;
PRPackedBool mDataIsPremultiplied;
PRPackedBool mNeedsYFlip;
};