Commit: ff179051dbda0d6efc11eed3c10b074d338391ef
Author: Campbell Barton
Date: Fri Jul 25 02:42:34 2014 +1000
Branches: soc-2014-viewport_context
https://developer.blender.org/rBff179051dbda0d6efc11eed3c10b074d338391ef
Cleanup: whitespace, also only keep file descriptions in cpp files
===================================================================
M intern/ghost/intern/GHOST_Context.cpp
M intern/ghost/intern/GHOST_Context.h
M intern/ghost/intern/GHOST_ContextCGL.h
M intern/ghost/intern/GHOST_ContextCGL.mm
M intern/ghost/intern/GHOST_ContextEGL.cpp
M intern/ghost/intern/GHOST_ContextEGL.h
M intern/ghost/intern/GHOST_ContextGLX.cpp
M intern/ghost/intern/GHOST_ContextGLX.h
M intern/ghost/intern/GHOST_ContextNone.cpp
M intern/ghost/intern/GHOST_ContextNone.h
M intern/ghost/intern/GHOST_ContextWGL.cpp
M intern/ghost/intern/GHOST_ContextWGL.h
===================================================================
diff --git a/intern/ghost/intern/GHOST_Context.cpp
b/intern/ghost/intern/GHOST_Context.cpp
index 38f26c3..8866198 100644
--- a/intern/ghost/intern/GHOST_Context.cpp
+++ b/intern/ghost/intern/GHOST_Context.cpp
@@ -27,6 +27,7 @@
/** \file ghost/intern/GHOST_Context.cpp
* \ingroup GHOST
+ *
* Definition of GHOST_Context class.
*/
@@ -190,7 +191,7 @@ bool win32_chk(bool result, const char *file, int line,
const char *text)
_ftprintf(
stderr,
"%s(%d):[%s] -> Win32 Error# (%d): %s",
- file,
+ file,
line,
text,
error,
diff --git a/intern/ghost/intern/GHOST_Context.h
b/intern/ghost/intern/GHOST_Context.h
index 8dabad9..4d7c947 100644
--- a/intern/ghost/intern/GHOST_Context.h
+++ b/intern/ghost/intern/GHOST_Context.h
@@ -134,7 +134,7 @@ protected:
}
bool m_stereoVisual;
-
+
GHOST_TUns16 m_numOfAASamples;
static void initClearGL();
diff --git a/intern/ghost/intern/GHOST_ContextCGL.h
b/intern/ghost/intern/GHOST_ContextCGL.h
index f08b4cd..99d995b 100644
--- a/intern/ghost/intern/GHOST_ContextCGL.h
+++ b/intern/ghost/intern/GHOST_ContextCGL.h
@@ -27,7 +27,6 @@
/** \file ghost/intern/GHOST_ContextCGL.h
* \ingroup GHOST
- * Declaration of GHOST_ContextCGL class.
*/
#ifndef __GHOST_CONTEXTCGL_H__
@@ -39,8 +38,6 @@
//#include <GL/cglew.h>
//extern "C" CGLEWContext *cglewContext;
-
-
#ifndef GHOST_OPENGL_CGL_CONTEXT_FLAGS
#define GHOST_OPENGL_CGL_CONTEXT_FLAGS 0
#endif
@@ -50,13 +47,11 @@
#endif
-
@class NSWindow;
@class NSOpenGLView;
@class NSOpenGLContext;
-
class GHOST_ContextCGL : public GHOST_Context
{
public:
@@ -74,7 +69,6 @@ public:
int contextFlags,
int contextResetNotificationStrategy);
-
/**
* Destructor.
*/
@@ -136,9 +130,9 @@ private:
/** The window containing the OpenGL view */
NSWindow *m_window;
-
+
/** The openGL view */
- NSOpenGLView *m_openGLView;
+ NSOpenGLView *m_openGLView;
const int m_contextProfileMask;
const int m_contextMajorVersion;
@@ -148,11 +142,11 @@ private:
/** The opgnGL drawing context */
NSOpenGLContext *m_openGLContext;
-
+
//static CGLEWContext *s_cglewContext;
/** The first created OpenGL context (for sharing display lists) */
- static NSOpenGLContext *s_sharedOpenGLContext;
+ static NSOpenGLContext *s_sharedOpenGLContext;
static int s_sharedCount;
};
diff --git a/intern/ghost/intern/GHOST_ContextCGL.mm
b/intern/ghost/intern/GHOST_ContextCGL.mm
index 711258a..a7dfcae 100644
--- a/intern/ghost/intern/GHOST_ContextCGL.mm
+++ b/intern/ghost/intern/GHOST_ContextCGL.mm
@@ -27,6 +27,7 @@
/** \file ghost/intern/GHOST_ContextCGL.mm
* \ingroup GHOST
+ *
* Definition of GHOST_ContextCGL class.
*/
@@ -181,11 +182,11 @@ static void makeAttribList(
{
// Pixel Format Attributes for the windowed NSOpenGLContext
attribs.push_back(NSOpenGLPFADoubleBuffer);
-
+
// Guarantees the back buffer contents to be valid after a call to
NSOpenGLContext object's flushBuffer
// needed for 'Draw Overlap' drawing method
attribs.push_back(NSOpenGLPFABackingStore);
-
+
// Force software OpenGL, for debugging
/* XXX jwilkins: fixed this to work on Intel macs? useful feature for
Windows and Linux too?
* Maybe a command line flag is better... */
@@ -223,13 +224,13 @@ static void makeAttribList(
if (numOfAASamples > 0) {
// Multisample anti-aliasing
attribs.push_back(NSOpenGLPFAMultisample);
-
+
attribs.push_back(NSOpenGLPFASampleBuffers);
attribs.push_back((NSOpenGLPixelFormatAttribute) 1);
-
+
attribs.push_back(NSOpenGLPFASamples);
attribs.push_back((NSOpenGLPixelFormatAttribute)
numOfAASamples);
-
+
attribs.push_back(NSOpenGLPFANoRecovery);
}
diff --git a/intern/ghost/intern/GHOST_ContextEGL.cpp
b/intern/ghost/intern/GHOST_ContextEGL.cpp
index d24ca1a..242d87c 100644
--- a/intern/ghost/intern/GHOST_ContextEGL.cpp
+++ b/intern/ghost/intern/GHOST_ContextEGL.cpp
@@ -27,6 +27,7 @@
/** \file ghost/intern/GHOST_ContextEGL.cpp
* \ingroup GHOST
+ *
* Definition of GHOST_ContextEGL class.
*/
diff --git a/intern/ghost/intern/GHOST_ContextEGL.h
b/intern/ghost/intern/GHOST_ContextEGL.h
index 968af15..3b29105 100644
--- a/intern/ghost/intern/GHOST_ContextEGL.h
+++ b/intern/ghost/intern/GHOST_ContextEGL.h
@@ -27,7 +27,6 @@
/** \file ghost/intern/GHOST_ContextEGL.h
* \ingroup GHOST
- * Declaration of GHOST_ContextEGL class.
*/
#ifndef __GHOST_CONTEXTEGL_H__
@@ -40,7 +39,6 @@
extern "C" EGLEWContext *eglewContext;
-
#ifndef GHOST_OPENGL_EGL_CONTEXT_FLAGS
#define GHOST_OPENGL_EGL_CONTEXT_FLAGS 0
#endif
@@ -50,7 +48,6 @@ extern "C" EGLEWContext *eglewContext;
#endif
-
class GHOST_ContextEGL : public GHOST_Context
{
public:
@@ -157,6 +154,4 @@ private:
#endif
};
-
-
#endif // __GHOST_CONTEXTEGL_H__
diff --git a/intern/ghost/intern/GHOST_ContextGLX.cpp
b/intern/ghost/intern/GHOST_ContextGLX.cpp
index 38d6e61..71a70b9 100644
--- a/intern/ghost/intern/GHOST_ContextGLX.cpp
+++ b/intern/ghost/intern/GHOST_ContextGLX.cpp
@@ -27,6 +27,7 @@
/** \file ghost/intern/GHOST_ContextGLX.cpp
* \ingroup GHOST
+ *
* Definition of GHOST_ContextGLX class.
*/
diff --git a/intern/ghost/intern/GHOST_ContextGLX.h
b/intern/ghost/intern/GHOST_ContextGLX.h
index c1d4a50..b9b311f 100644
--- a/intern/ghost/intern/GHOST_ContextGLX.h
+++ b/intern/ghost/intern/GHOST_ContextGLX.h
@@ -27,7 +27,6 @@
/** \file ghost/intern/GHOST_ContextGLX.h
* \ingroup GHOST
- * Declaration of GHOST_ContextGLX class.
*/
#ifndef __GHOST_CONTEXTGLX_H__
@@ -40,7 +39,6 @@
extern "C" GLXEWContext *glxewContext;
-
#ifndef GHOST_OPENGL_GLX_CONTEXT_FLAGS
#define GHOST_OPENGL_GLX_CONTEXT_FLAGS 0
#endif
@@ -50,7 +48,6 @@ extern "C" GLXEWContext *glxewContext;
#endif
-
class GHOST_ContextGLX : public GHOST_Context
{
public:
diff --git a/intern/ghost/intern/GHOST_ContextNone.cpp
b/intern/ghost/intern/GHOST_ContextNone.cpp
index 8685cda..380ab53 100644
--- a/intern/ghost/intern/GHOST_ContextNone.cpp
+++ b/intern/ghost/intern/GHOST_ContextNone.cpp
@@ -27,6 +27,7 @@
/** \file ghost/intern/GHOST_ContextNone.cpp
* \ingroup GHOST
+ *
* Definition of GHOST_ContextNone class.
*/
diff --git a/intern/ghost/intern/GHOST_ContextNone.h
b/intern/ghost/intern/GHOST_ContextNone.h
index 1d66c11..c36873c 100644
--- a/intern/ghost/intern/GHOST_ContextNone.h
+++ b/intern/ghost/intern/GHOST_ContextNone.h
@@ -27,6 +27,7 @@
/** \file ghost/intern/GHOST_ContextNone.h
* \ingroup GHOST
+ *
* Declaration of GHOST_Context class.
*/
diff --git a/intern/ghost/intern/GHOST_ContextWGL.cpp
b/intern/ghost/intern/GHOST_ContextWGL.cpp
index 7dcc82d..ae098c4 100644
--- a/intern/ghost/intern/GHOST_ContextWGL.cpp
+++ b/intern/ghost/intern/GHOST_ContextWGL.cpp
@@ -27,6 +27,7 @@
/** \file ghost/intern/GHOST_ContextWGL.cpp
* \ingroup GHOST
+ *
* Definition of GHOST_ContextWGL class.
*/
@@ -54,7 +55,7 @@ bool GHOST_ContextWGL::s_singleContextMode = false;
* can't be in multiple-devices configuration. */
static bool is_crappy_intel_card()
{
- return strstr((const char*)glGetString(GL_VENDOR), "Intel") != NULL;
+ return strstr((const char *)glGetString(GL_VENDOR), "Intel") != NULL;
}
diff --git a/intern/ghost/intern/GHOST_ContextWGL.h
b/intern/ghost/intern/GHOST_ContextWGL.h
index 0631d27..f4844ed 100644
--- a/intern/ghost/intern/GHOST_ContextWGL.h
+++ b/intern/ghost/intern/GHOST_ContextWGL.h
@@ -27,7 +27,6 @@
/** \file ghost/intern/GHOST_ContextWGL.h
* \ingroup GHOST
- * Declaration of GHOST_ContextWGL class.
*/
#ifndef __GHOST_CONTEXTWGL_H__
@@ -40,7 +39,6 @@
extern "C" WGLEWContext *wglewContext;
-
#ifndef GHOST_OPENGL_WGL_CONTEXT_FLAGS
#define GHOST_OPENGL_WGL_CONTEXT_FLAGS 0
#endif
@@ -50,7 +48,6 @@ extern "C" WGLEWContext *wglewContext;
#endif
-
class GHOST_ContextWGL : public GHOST_Context
{
public:
@@ -175,6 +172,4 @@ private:
static bool s_singleContextMode;
};
-
-
#endif // __GHOST_CONTEXTWGL_H__
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
