mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 895116: Use RGBARectProgram in nsChildView r=mattwoodrow
This commit is contained in:
parent
04e2cb2e9e
commit
ff2b9a1250
@ -327,8 +327,8 @@ public:
|
|||||||
virtual GLContext* gl() const MOZ_OVERRIDE { return mGLContext; }
|
virtual GLContext* gl() const MOZ_OVERRIDE { return mGLContext; }
|
||||||
virtual ShaderProgramOGL* GetProgram(ShaderProgramType aType) MOZ_OVERRIDE
|
virtual ShaderProgramOGL* GetProgram(ShaderProgramType aType) MOZ_OVERRIDE
|
||||||
{
|
{
|
||||||
MOZ_ASSERT(aType == BGRARectLayerProgramType, "unexpected program type");
|
MOZ_ASSERT(aType == RGBARectLayerProgramType, "unexpected program type");
|
||||||
return mBGRARectProgram;
|
return mRGBARectProgram;
|
||||||
}
|
}
|
||||||
virtual void BindAndDrawQuad(ShaderProgramOGL *aProg) MOZ_OVERRIDE;
|
virtual void BindAndDrawQuad(ShaderProgramOGL *aProg) MOZ_OVERRIDE;
|
||||||
|
|
||||||
@ -343,7 +343,7 @@ public:
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
nsRefPtr<mozilla::gl::GLContext> mGLContext;
|
nsRefPtr<mozilla::gl::GLContext> mGLContext;
|
||||||
nsAutoPtr<mozilla::layers::ShaderProgramOGL> mBGRARectProgram;
|
nsAutoPtr<mozilla::layers::ShaderProgramOGL> mRGBARectProgram;
|
||||||
GLuint mQuadVBO;
|
GLuint mQuadVBO;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -2603,8 +2603,8 @@ GLPresenter::GLPresenter(GLContext* aContext)
|
|||||||
{
|
{
|
||||||
mGLContext->SetFlipped(true);
|
mGLContext->SetFlipped(true);
|
||||||
mGLContext->MakeCurrent();
|
mGLContext->MakeCurrent();
|
||||||
mBGRARectProgram = new ShaderProgramOGL(mGLContext,
|
mRGBARectProgram = new ShaderProgramOGL(mGLContext,
|
||||||
ProgramProfileOGL::GetProfileFor(BGRARectLayerProgramType, MaskNone));
|
ProgramProfileOGL::GetProfileFor(RGBARectLayerProgramType, MaskNone));
|
||||||
|
|
||||||
// Create mQuadVBO.
|
// Create mQuadVBO.
|
||||||
mGLContext->fGenBuffers(1, &mQuadVBO);
|
mGLContext->fGenBuffers(1, &mQuadVBO);
|
||||||
@ -2668,7 +2668,7 @@ GLPresenter::BeginFrame(nsIntSize aRenderSize)
|
|||||||
gfx3DMatrix matrix3d = gfx3DMatrix::From2D(viewMatrix);
|
gfx3DMatrix matrix3d = gfx3DMatrix::From2D(viewMatrix);
|
||||||
matrix3d._33 = 0.0f;
|
matrix3d._33 = 0.0f;
|
||||||
|
|
||||||
mBGRARectProgram->CheckAndSetProjectionMatrix(matrix3d);
|
mRGBARectProgram->CheckAndSetProjectionMatrix(matrix3d);
|
||||||
|
|
||||||
// Default blend function implements "OVER"
|
// Default blend function implements "OVER"
|
||||||
mGLContext->fBlendFuncSeparate(LOCAL_GL_ONE, LOCAL_GL_ONE_MINUS_SRC_ALPHA,
|
mGLContext->fBlendFuncSeparate(LOCAL_GL_ONE, LOCAL_GL_ONE_MINUS_SRC_ALPHA,
|
||||||
|
Loading…
Reference in New Issue
Block a user