Kaydet (Commit) cf728ae8 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

the msaa checks are only needed on windows

Change-Id: Ib5a4012b7365259e08e8d2fd0c1f3b239b46517c
üst 27c1d4f2
......@@ -761,16 +761,17 @@ OpenGLRender::OpenGLRender(uno::Reference< drawing::XShape > xTarget):
m_iHeight(0),
mxRenderTarget(xTarget),
mbArbMultisampleSupported(false),
#if defined( _WIN32 )
m_iArbMultisampleFormat(0),
#endif
m_2DColor(glm::vec4(1.0, 0.0, 0.0, 1.0)),
m_frameBufferMS(0),
m_TextVertexID(0),
m_TextTexCoordID(1),
m_TextTexCoordID(1)
{
//TODO: moggi: use STL
memset(&m_Bubble2DCircle, 0, sizeof(m_Bubble2DCircle));
m_iArbMultisampleFormat = 0;
//TODO: moggi: use STL
for (size_t i = 0; i < sizeof(m_BackgroundColor) / sizeof(float); i++)
{
......@@ -950,7 +951,6 @@ bool OpenGLRender::InitMultisample(PIXELFORMATDESCRIPTOR pfd)
DestroyWindow(hWnd);
return mbArbMultisampleSupported;
}
#endif
bool OpenGLRender::GetMSAASupport()
{
......@@ -962,7 +962,6 @@ int OpenGLRender::GetMSAAFormat()
return m_iArbMultisampleFormat;
}
#if defined( _WIN32 )
//TODO: moggi: why the hell do we need another implementation here?
int OpenGLRender::InitTempWindow(HWND *hwnd, int width, int height, PIXELFORMATDESCRIPTOR inPfd)
{
......
......@@ -151,9 +151,9 @@ public:
BitmapEx GetAsBitmap();
#if defined( _WIN32 )
bool InitMultisample(PIXELFORMATDESCRIPTOR pfd);
#endif
bool GetMSAASupport();
int GetMSAAFormat();
#endif
void SetColor(sal_uInt32 color);
int Bubble2DShapePoint(float x, float y, float directionX, float directionY);
int RenderBubble2FBO(int wholeFlag);
......@@ -204,7 +204,7 @@ private:
glm::mat4 m_Projection;
// Camera matrix
glm::mat4 m_View;
// Model matrix : an identity matrix (model will be at the origin#elif defined( UNX )
// Model matrix : an identity matrix (model will be at the origin
glm::mat4 m_Model;
// Our ModelViewProjection : multiplication of our 3 matrices
glm::mat4 m_MVP;
......@@ -247,8 +247,11 @@ private:
std::list <Line2DPointList> m_Line2DShapePointList;
com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxRenderTarget;
bool mbArbMultisampleSupported;
#if defined( _WIN32 )
int m_iArbMultisampleFormat;
#endif
glm::vec4 m_2DColor;
GLuint m_frameBufferMS;
......
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