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

Backed out changeset a23a23055e13 (bug 863498) for compilation failures on a CLOSED TREE

Browse Source
This commit is contained in:
Ed Morley 2013-05-09 17:31:59 +01:00
parent 85b6ea48c3
commit d1df1cdf56
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gfx/layers/opengl/TextureHostOGL.cpp
View File

@ -263,6 +263,7 @@ SharedTextureHostOGL::SwapTexturesImpl(const SurfaceDescriptor& aImage,
mTextureTarget = handleDetails.mTarget;
mShaderProgram = handleDetails.mProgramType;
mFormat = FormatFromShaderType(mShaderProgram);
mTextureTransform = handleDetails.mTextureTransform;
}
}
@ -288,20 +289,6 @@ SharedTextureHostOGL::Unlock()
mGL->fBindTexture(LOCAL_GL_TEXTURE_2D, 0);
}
gfx3DMatrix
SharedTextureHostOGL::GetTextureTransform() MOZ_OVERRIDE
{
GLContext::SharedHandleDetails handleDetails;
// GetSharedHandleDetails can call into Java which we'd
// rather not do from the compositor
if (mSharedHandle) {
mGL->GetSharedHandleDetails(mShareType, mSharedHandle, handleDetails);
}
return handleDetails.mTextureTransform;
}
void
SurfaceStreamHostOGL::SetCompositor(Compositor* aCompositor)
{

8
gfx/layers/opengl/TextureHostOGL.h
View File

@ -51,7 +51,7 @@ public:
// TODO: Noone's implementing this anymore, should see if we need this.
virtual GLenum GetTextureTarget() const { return LOCAL_GL_TEXTURE_2D; }
virtual GLenum GetWrapMode() const = 0;// { return LOCAL_GL_CLAMP_TO_EDGE; } // default
virtual gfx3DMatrix GetTextureTransform() { return gfx3DMatrix(); }
virtual gfx3DMatrix GetTextureTransform() const { return gfx3DMatrix(); }
};
inline gl::ShaderProgramType
@ -360,7 +360,10 @@ public:
gfxASurface::CONTENT_COLOR;
}
virtual gfx3DMatrix GetTextureTransform() MOZ_OVERRIDE;
virtual gfx3DMatrix GetTextureTransform() const MOZ_OVERRIDE
{
return mTextureTransform;
}
#ifdef MOZ_LAYERS_HAVE_LOG
virtual const char* Name() { return "SharedTextureHostOGL"; }
@ -377,6 +380,7 @@ protected:
gl::SharedTextureHandle mSharedHandle;
gl::ShaderProgramType mShaderProgram;
gl::GLContext::SharedTextureShareType mShareType;
gfx3DMatrix mTextureTransform;
};
class SurfaceStreamHostOGL : public TextureHost