Kaydet (Commit) 9ec88587 authored tarafından Jan Holesovsky's avatar Jan Holesovsky Kaydeden (comit) Markus Mohrhard

windows opengl: We should actually use Init() from OpenGLSalGraphicsImpl.

Change-Id: I524883b0f0bbce9a8b6f893771f144feeee49934
üst 1386c348
...@@ -26,8 +26,6 @@ private: ...@@ -26,8 +26,6 @@ private:
public: public:
WinOpenGLSalGraphicsImpl(WinSalGraphics& rGraphics); WinOpenGLSalGraphicsImpl(WinSalGraphics& rGraphics);
virtual void Init() SAL_OVERRIDE;
protected: protected:
virtual GLfloat GetWidth() const SAL_OVERRIDE; virtual GLfloat GetWidth() const SAL_OVERRIDE;
virtual GLfloat GetHeight() const SAL_OVERRIDE; virtual GLfloat GetHeight() const SAL_OVERRIDE;
......
...@@ -18,15 +18,6 @@ WinOpenGLSalGraphicsImpl::WinOpenGLSalGraphicsImpl(WinSalGraphics& rGraphics): ...@@ -18,15 +18,6 @@ WinOpenGLSalGraphicsImpl::WinOpenGLSalGraphicsImpl(WinSalGraphics& rGraphics):
{ {
} }
void WinOpenGLSalGraphicsImpl::Init()
{
// FIXME - is this still needed after the recent changes?
//if (mbVirDev)
// GetOpenGLContext().requestVirtualDevice();
//GetOpenGLContext().requestSingleBufferedRendering();
//GetOpenGLContext().init(mhLocalDC, mhWnd);
}
void WinOpenGLSalGraphicsImpl::copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) void WinOpenGLSalGraphicsImpl::copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics )
{ {
OpenGLSalGraphicsImpl *pImpl = pSrcGraphics ? static_cast< OpenGLSalGraphicsImpl* >(pSrcGraphics->GetImpl()) : static_cast< OpenGLSalGraphicsImpl *>(mrParent.GetImpl()); OpenGLSalGraphicsImpl *pImpl = pSrcGraphics ? static_cast< OpenGLSalGraphicsImpl* >(pSrcGraphics->GetImpl()) : static_cast< OpenGLSalGraphicsImpl *>(mrParent.GetImpl());
......
...@@ -482,6 +482,7 @@ void WinSalGraphics::InitGraphics() ...@@ -482,6 +482,7 @@ void WinSalGraphics::InitGraphics()
::SetTextAlign( getHDC(), TA_BASELINE | TA_LEFT | TA_NOUPDATECP ); ::SetTextAlign( getHDC(), TA_BASELINE | TA_LEFT | TA_NOUPDATECP );
::SetBkMode( getHDC(), WIN32_TRANSPARENT ); ::SetBkMode( getHDC(), WIN32_TRANSPARENT );
::SetROP2( getHDC(), R2_COPYPEN ); ::SetROP2( getHDC(), R2_COPYPEN );
mpImpl->Init(); mpImpl->Init();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment