Kaydet (Commit) b91d4776 authored tarafından Jan Holesovsky's avatar Jan Holesovsky

windows opengl: We need a constructor for OpenGLSalGraphicsImpl.

Otherwise we a get random value in mnSolidProgram, and we never initialize
that.

Change-Id: Ic648a1f6755021da25f5b9da306cf600a3f0c739
üst 0a0bb284
...@@ -88,6 +88,7 @@ protected: ...@@ -88,6 +88,7 @@ protected:
public: public:
OpenGLSalGraphicsImpl();
virtual ~OpenGLSalGraphicsImpl (); virtual ~OpenGLSalGraphicsImpl ();
OpenGLContext& GetOpenGLContext() { return maContext; } OpenGLContext& GetOpenGLContext() { return maContext; }
......
...@@ -51,6 +51,26 @@ ...@@ -51,6 +51,26 @@
((float) SALCOLOR_BLUE( nColor )) / 255, \ ((float) SALCOLOR_BLUE( nColor )) / 255, \
(1.0f - fTransparency) ) (1.0f - fTransparency) )
OpenGLSalGraphicsImpl::OpenGLSalGraphicsImpl()
: mpFrame(NULL)
, mbOffscreen(false)
, mnFramebufferId(0)
, mpOffscreenTex(NULL)
, mnLineColor(SALCOLOR_NONE)
, mnFillColor(SALCOLOR_NONE)
, mnSolidProgram(0)
, mnColorUniform(0)
, mnTextureProgram(0)
, mnSamplerUniform(0)
, mnMaskedTextureProgram(0)
, mnMaskedSamplerUniform(0)
, mnMaskSamplerUniform(0)
, mnMaskProgram(0)
, mnMaskUniform(0)
, mnMaskColorUniform(0)
{
}
OpenGLSalGraphicsImpl::~OpenGLSalGraphicsImpl() OpenGLSalGraphicsImpl::~OpenGLSalGraphicsImpl()
{ {
} }
...@@ -162,6 +182,7 @@ void OpenGLSalGraphicsImpl::SetROPFillColor( SalROPColor /*nROPColor*/ ) ...@@ -162,6 +182,7 @@ void OpenGLSalGraphicsImpl::SetROPFillColor( SalROPColor /*nROPColor*/ )
bool OpenGLSalGraphicsImpl::CreateSolidProgram( void ) bool OpenGLSalGraphicsImpl::CreateSolidProgram( void )
{ {
SAL_INFO( "vcl.opengl", "::CreateSolidProgram" );
mnSolidProgram = OpenGLHelper::LoadShaders( "solidVertexShader", "solidFragmentShader" ); mnSolidProgram = OpenGLHelper::LoadShaders( "solidVertexShader", "solidFragmentShader" );
if( mnSolidProgram == 0 ) if( mnSolidProgram == 0 )
return false; return false;
......
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