diff --git a/GL/glext.h b/GL/glext.h
index 8d33527fac..a3873a613f 100644
--- a/GL/glext.h
+++ b/GL/glext.h
@@ -33,7 +33,7 @@ extern "C" {
 ** used to make the header, and the header can be found at
 **   http://www.opengl.org/registry/
 **
-** Khronos $Revision: 28798 $ on $Date: 2014-10-30 03:27:48 -0700 (Thu, 30 Oct 2014) $
+** Khronos $Revision: 29735 $ on $Date: 2015-02-02 19:00:01 -0800 (Mon, 02 Feb 2015) $
 */
 
 #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
@@ -53,7 +53,7 @@ extern "C" {
 #define GLAPI extern
 #endif
 
-#define GL_GLEXT_VERSION 20141030
+#define GL_GLEXT_VERSION 20150202
 
 /* Generated C header for:
  * API: gl
@@ -2594,7 +2594,6 @@ GLAPI void APIENTRY glBindVertexBuffers (GLuint first, GLsizei count, const GLui
 #define GL_MAX_COMBINED_CLIP_AND_CULL_DISTANCES 0x82FA
 #define GL_TEXTURE_TARGET                 0x1006
 #define GL_QUERY_TARGET                   0x82EA
-#define GL_TEXTURE_BINDING                0x82EB
 #define GL_GUILTY_CONTEXT_RESET           0x8253
 #define GL_INNOCENT_CONTEXT_RESET         0x8254
 #define GL_UNKNOWN_CONTEXT_RESET          0x8255
@@ -2607,25 +2606,25 @@ GLAPI void APIENTRY glBindVertexBuffers (GLuint first, GLsizei count, const GLui
 typedef void (APIENTRYP PFNGLCLIPCONTROLPROC) (GLenum origin, GLenum depth);
 typedef void (APIENTRYP PFNGLCREATETRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint *ids);
 typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKBUFFERBASEPROC) (GLuint xfb, GLuint index, GLuint buffer);
-typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC) (GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizei size);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC) (GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
 typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKIVPROC) (GLuint xfb, GLenum pname, GLint *param);
 typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKI_VPROC) (GLuint xfb, GLenum pname, GLuint index, GLint *param);
 typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKI64_VPROC) (GLuint xfb, GLenum pname, GLuint index, GLint64 *param);
 typedef void (APIENTRYP PFNGLCREATEBUFFERSPROC) (GLsizei n, GLuint *buffers);
-typedef void (APIENTRYP PFNGLNAMEDBUFFERSTORAGEPROC) (GLuint buffer, GLsizei size, const void *data, GLbitfield flags);
-typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAPROC) (GLuint buffer, GLsizei size, const void *data, GLenum usage);
-typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizei size, const void *data);
-typedef void (APIENTRYP PFNGLCOPYNAMEDBUFFERSUBDATAPROC) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizei size);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERSTORAGEPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
+typedef void (APIENTRYP PFNGLCOPYNAMEDBUFFERSUBDATAPROC) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
 typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERDATAPROC) (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data);
-typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizei size, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
 typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFERPROC) (GLuint buffer, GLenum access);
-typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFERRANGEPROC) (GLuint buffer, GLintptr offset, GLsizei length, GLbitfield access);
+typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFERRANGEPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access);
 typedef GLboolean (APIENTRYP PFNGLUNMAPNAMEDBUFFERPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC) (GLuint buffer, GLintptr offset, GLsizei length);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length);
 typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERIVPROC) (GLuint buffer, GLenum pname, GLint *params);
 typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERI64VPROC) (GLuint buffer, GLenum pname, GLint64 *params);
 typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPOINTERVPROC) (GLuint buffer, GLenum pname, void **params);
-typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizei size, void *data);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data);
 typedef void (APIENTRYP PFNGLCREATEFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers);
 typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERRENDERBUFFERPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
 typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERPARAMETERIPROC) (GLuint framebuffer, GLenum pname, GLint param);
@@ -2650,7 +2649,7 @@ typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLuint re
 typedef void (APIENTRYP PFNGLGETNAMEDRENDERBUFFERPARAMETERIVPROC) (GLuint renderbuffer, GLenum pname, GLint *params);
 typedef void (APIENTRYP PFNGLCREATETEXTURESPROC) (GLenum target, GLsizei n, GLuint *textures);
 typedef void (APIENTRYP PFNGLTEXTUREBUFFERPROC) (GLuint texture, GLenum internalformat, GLuint buffer);
-typedef void (APIENTRYP PFNGLTEXTUREBUFFERRANGEPROC) (GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizei size);
+typedef void (APIENTRYP PFNGLTEXTUREBUFFERRANGEPROC) (GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
 typedef void (APIENTRYP PFNGLTEXTURESTORAGE1DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width);
 typedef void (APIENTRYP PFNGLTEXTURESTORAGE2DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
 typedef void (APIENTRYP PFNGLTEXTURESTORAGE3DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
@@ -2730,25 +2729,25 @@ typedef void (APIENTRYP PFNGLTEXTUREBARRIERPROC) (void);
 GLAPI void APIENTRY glClipControl (GLenum origin, GLenum depth);
 GLAPI void APIENTRY glCreateTransformFeedbacks (GLsizei n, GLuint *ids);
 GLAPI void APIENTRY glTransformFeedbackBufferBase (GLuint xfb, GLuint index, GLuint buffer);
-GLAPI void APIENTRY glTransformFeedbackBufferRange (GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizei size);
+GLAPI void APIENTRY glTransformFeedbackBufferRange (GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
 GLAPI void APIENTRY glGetTransformFeedbackiv (GLuint xfb, GLenum pname, GLint *param);
 GLAPI void APIENTRY glGetTransformFeedbacki_v (GLuint xfb, GLenum pname, GLuint index, GLint *param);
 GLAPI void APIENTRY glGetTransformFeedbacki64_v (GLuint xfb, GLenum pname, GLuint index, GLint64 *param);
 GLAPI void APIENTRY glCreateBuffers (GLsizei n, GLuint *buffers);
-GLAPI void APIENTRY glNamedBufferStorage (GLuint buffer, GLsizei size, const void *data, GLbitfield flags);
-GLAPI void APIENTRY glNamedBufferData (GLuint buffer, GLsizei size, const void *data, GLenum usage);
-GLAPI void APIENTRY glNamedBufferSubData (GLuint buffer, GLintptr offset, GLsizei size, const void *data);
-GLAPI void APIENTRY glCopyNamedBufferSubData (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizei size);
+GLAPI void APIENTRY glNamedBufferStorage (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags);
+GLAPI void APIENTRY glNamedBufferData (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage);
+GLAPI void APIENTRY glNamedBufferSubData (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
+GLAPI void APIENTRY glCopyNamedBufferSubData (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
 GLAPI void APIENTRY glClearNamedBufferData (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data);
-GLAPI void APIENTRY glClearNamedBufferSubData (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizei size, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glClearNamedBufferSubData (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
 GLAPI void *APIENTRY glMapNamedBuffer (GLuint buffer, GLenum access);
-GLAPI void *APIENTRY glMapNamedBufferRange (GLuint buffer, GLintptr offset, GLsizei length, GLbitfield access);
+GLAPI void *APIENTRY glMapNamedBufferRange (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access);
 GLAPI GLboolean APIENTRY glUnmapNamedBuffer (GLuint buffer);
-GLAPI void APIENTRY glFlushMappedNamedBufferRange (GLuint buffer, GLintptr offset, GLsizei length);
+GLAPI void APIENTRY glFlushMappedNamedBufferRange (GLuint buffer, GLintptr offset, GLsizeiptr length);
 GLAPI void APIENTRY glGetNamedBufferParameteriv (GLuint buffer, GLenum pname, GLint *params);
 GLAPI void APIENTRY glGetNamedBufferParameteri64v (GLuint buffer, GLenum pname, GLint64 *params);
 GLAPI void APIENTRY glGetNamedBufferPointerv (GLuint buffer, GLenum pname, void **params);
-GLAPI void APIENTRY glGetNamedBufferSubData (GLuint buffer, GLintptr offset, GLsizei size, void *data);
+GLAPI void APIENTRY glGetNamedBufferSubData (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data);
 GLAPI void APIENTRY glCreateFramebuffers (GLsizei n, GLuint *framebuffers);
 GLAPI void APIENTRY glNamedFramebufferRenderbuffer (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
 GLAPI void APIENTRY glNamedFramebufferParameteri (GLuint framebuffer, GLenum pname, GLint param);
@@ -2773,7 +2772,7 @@ GLAPI void APIENTRY glNamedRenderbufferStorageMultisample (GLuint renderbuffer,
 GLAPI void APIENTRY glGetNamedRenderbufferParameteriv (GLuint renderbuffer, GLenum pname, GLint *params);
 GLAPI void APIENTRY glCreateTextures (GLenum target, GLsizei n, GLuint *textures);
 GLAPI void APIENTRY glTextureBuffer (GLuint texture, GLenum internalformat, GLuint buffer);
-GLAPI void APIENTRY glTextureBufferRange (GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizei size);
+GLAPI void APIENTRY glTextureBufferRange (GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
 GLAPI void APIENTRY glTextureStorage1D (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width);
 GLAPI void APIENTRY glTextureStorage2D (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
 GLAPI void APIENTRY glTextureStorage3D (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
@@ -9554,13 +9553,11 @@ GLAPI void APIENTRY glProgramBufferParametersIuivNV (GLenum target, GLuint bindi
 #define GL_SKIP_MISSING_GLYPH_NV          0x90A9
 #define GL_USE_MISSING_GLYPH_NV           0x90AA
 #define GL_PATH_ERROR_POSITION_NV         0x90AB
-#define GL_PATH_FOG_GEN_MODE_NV           0x90AC
 #define GL_ACCUM_ADJACENT_PAIRS_NV        0x90AD
 #define GL_ADJACENT_PAIRS_NV              0x90AE
 #define GL_FIRST_TO_REST_NV               0x90AF
 #define GL_PATH_GEN_MODE_NV               0x90B0
 #define GL_PATH_GEN_COEFF_NV              0x90B1
-#define GL_PATH_GEN_COLOR_FORMAT_NV       0x90B2
 #define GL_PATH_GEN_COMPONENTS_NV         0x90B3
 #define GL_PATH_STENCIL_FUNC_NV           0x90B7
 #define GL_PATH_STENCIL_REF_NV            0x90B8
@@ -9629,8 +9626,6 @@ GLAPI void APIENTRY glProgramBufferParametersIuivNV (GLenum target, GLuint bindi
 #define GL_FONT_UNDERLINE_POSITION_BIT_NV 0x04000000
 #define GL_FONT_UNDERLINE_THICKNESS_BIT_NV 0x08000000
 #define GL_FONT_HAS_KERNING_BIT_NV        0x10000000
-#define GL_PRIMARY_COLOR_NV               0x852C
-#define GL_SECONDARY_COLOR_NV             0x852D
 #define GL_ROUNDED_RECT_NV                0xE8
 #define GL_RELATIVE_ROUNDED_RECT_NV       0xE9
 #define GL_ROUNDED_RECT2_NV               0xEA
@@ -9654,6 +9649,10 @@ GLAPI void APIENTRY glProgramBufferParametersIuivNV (GLenum target, GLuint bindi
 #define GL_EYE_LINEAR_NV                  0x2400
 #define GL_OBJECT_LINEAR_NV               0x2401
 #define GL_CONSTANT_NV                    0x8576
+#define GL_PATH_FOG_GEN_MODE_NV           0x90AC
+#define GL_PRIMARY_COLOR_NV               0x852C
+#define GL_SECONDARY_COLOR_NV             0x852D
+#define GL_PATH_GEN_COLOR_FORMAT_NV       0x90B2
 #define GL_PATH_PROJECTION_NV             0x1701
 #define GL_PATH_MODELVIEW_NV              0x1700
 #define GL_PATH_MODELVIEW_STACK_DEPTH_NV  0x0BA3
@@ -9691,9 +9690,6 @@ typedef void (APIENTRYP PFNGLSTENCILSTROKEPATHNVPROC) (GLuint path, GLint refere
 typedef void (APIENTRYP PFNGLSTENCILFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum transformType, const GLfloat *transformValues);
 typedef void (APIENTRYP PFNGLSTENCILSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum transformType, const GLfloat *transformValues);
 typedef void (APIENTRYP PFNGLPATHCOVERDEPTHFUNCNVPROC) (GLenum func);
-typedef void (APIENTRYP PFNGLPATHCOLORGENNVPROC) (GLenum color, GLenum genMode, GLenum colorFormat, const GLfloat *coeffs);
-typedef void (APIENTRYP PFNGLPATHTEXGENNVPROC) (GLenum texCoordSet, GLenum genMode, GLint components, const GLfloat *coeffs);
-typedef void (APIENTRYP PFNGLPATHFOGGENNVPROC) (GLenum genMode);
 typedef void (APIENTRYP PFNGLCOVERFILLPATHNVPROC) (GLuint path, GLenum coverMode);
 typedef void (APIENTRYP PFNGLCOVERSTROKEPATHNVPROC) (GLuint path, GLenum coverMode);
 typedef void (APIENTRYP PFNGLCOVERFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
@@ -9706,10 +9702,6 @@ typedef void (APIENTRYP PFNGLGETPATHDASHARRAYNVPROC) (GLuint path, GLfloat *dash
 typedef void (APIENTRYP PFNGLGETPATHMETRICSNVPROC) (GLbitfield metricQueryMask, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLsizei stride, GLfloat *metrics);
 typedef void (APIENTRYP PFNGLGETPATHMETRICRANGENVPROC) (GLbitfield metricQueryMask, GLuint firstPathName, GLsizei numPaths, GLsizei stride, GLfloat *metrics);
 typedef void (APIENTRYP PFNGLGETPATHSPACINGNVPROC) (GLenum pathListMode, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLfloat advanceScale, GLfloat kerningScale, GLenum transformType, GLfloat *returnedSpacing);
-typedef void (APIENTRYP PFNGLGETPATHCOLORGENIVNVPROC) (GLenum color, GLenum pname, GLint *value);
-typedef void (APIENTRYP PFNGLGETPATHCOLORGENFVNVPROC) (GLenum color, GLenum pname, GLfloat *value);
-typedef void (APIENTRYP PFNGLGETPATHTEXGENIVNVPROC) (GLenum texCoordSet, GLenum pname, GLint *value);
-typedef void (APIENTRYP PFNGLGETPATHTEXGENFVNVPROC) (GLenum texCoordSet, GLenum pname, GLfloat *value);
 typedef GLboolean (APIENTRYP PFNGLISPOINTINFILLPATHNVPROC) (GLuint path, GLuint mask, GLfloat x, GLfloat y);
 typedef GLboolean (APIENTRYP PFNGLISPOINTINSTROKEPATHNVPROC) (GLuint path, GLfloat x, GLfloat y);
 typedef GLfloat (APIENTRYP PFNGLGETPATHLENGTHNVPROC) (GLuint path, GLsizei startSegment, GLsizei numSegments);
@@ -9729,6 +9721,13 @@ typedef GLenum (APIENTRYP PFNGLPATHGLYPHINDEXARRAYNVPROC) (GLuint firstPathName,
 typedef GLenum (APIENTRYP PFNGLPATHMEMORYGLYPHINDEXARRAYNVPROC) (GLuint firstPathName, GLenum fontTarget, GLsizeiptr fontSize, const void *fontData, GLsizei faceIndex, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
 typedef void (APIENTRYP PFNGLPROGRAMPATHFRAGMENTINPUTGENNVPROC) (GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat *coeffs);
 typedef void (APIENTRYP PFNGLGETPROGRAMRESOURCEFVNVPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLfloat *params);
+typedef void (APIENTRYP PFNGLPATHCOLORGENNVPROC) (GLenum color, GLenum genMode, GLenum colorFormat, const GLfloat *coeffs);
+typedef void (APIENTRYP PFNGLPATHTEXGENNVPROC) (GLenum texCoordSet, GLenum genMode, GLint components, const GLfloat *coeffs);
+typedef void (APIENTRYP PFNGLPATHFOGGENNVPROC) (GLenum genMode);
+typedef void (APIENTRYP PFNGLGETPATHCOLORGENIVNVPROC) (GLenum color, GLenum pname, GLint *value);
+typedef void (APIENTRYP PFNGLGETPATHCOLORGENFVNVPROC) (GLenum color, GLenum pname, GLfloat *value);
+typedef void (APIENTRYP PFNGLGETPATHTEXGENIVNVPROC) (GLenum texCoordSet, GLenum pname, GLint *value);
+typedef void (APIENTRYP PFNGLGETPATHTEXGENFVNVPROC) (GLenum texCoordSet, GLenum pname, GLfloat *value);
 #ifdef GL_GLEXT_PROTOTYPES
 GLAPI GLuint APIENTRY glGenPathsNV (GLsizei range);
 GLAPI void APIENTRY glDeletePathsNV (GLuint path, GLsizei range);
@@ -9756,9 +9755,6 @@ GLAPI void APIENTRY glStencilStrokePathNV (GLuint path, GLint reference, GLuint
 GLAPI void APIENTRY glStencilFillPathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum transformType, const GLfloat *transformValues);
 GLAPI void APIENTRY glStencilStrokePathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum transformType, const GLfloat *transformValues);
 GLAPI void APIENTRY glPathCoverDepthFuncNV (GLenum func);
-GLAPI void APIENTRY glPathColorGenNV (GLenum color, GLenum genMode, GLenum colorFormat, const GLfloat *coeffs);
-GLAPI void APIENTRY glPathTexGenNV (GLenum texCoordSet, GLenum genMode, GLint components, const GLfloat *coeffs);
-GLAPI void APIENTRY glPathFogGenNV (GLenum genMode);
 GLAPI void APIENTRY glCoverFillPathNV (GLuint path, GLenum coverMode);
 GLAPI void APIENTRY glCoverStrokePathNV (GLuint path, GLenum coverMode);
 GLAPI void APIENTRY glCoverFillPathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
@@ -9771,10 +9767,6 @@ GLAPI void APIENTRY glGetPathDashArrayNV (GLuint path, GLfloat *dashArray);
 GLAPI void APIENTRY glGetPathMetricsNV (GLbitfield metricQueryMask, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLsizei stride, GLfloat *metrics);
 GLAPI void APIENTRY glGetPathMetricRangeNV (GLbitfield metricQueryMask, GLuint firstPathName, GLsizei numPaths, GLsizei stride, GLfloat *metrics);
 GLAPI void APIENTRY glGetPathSpacingNV (GLenum pathListMode, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLfloat advanceScale, GLfloat kerningScale, GLenum transformType, GLfloat *returnedSpacing);
-GLAPI void APIENTRY glGetPathColorGenivNV (GLenum color, GLenum pname, GLint *value);
-GLAPI void APIENTRY glGetPathColorGenfvNV (GLenum color, GLenum pname, GLfloat *value);
-GLAPI void APIENTRY glGetPathTexGenivNV (GLenum texCoordSet, GLenum pname, GLint *value);
-GLAPI void APIENTRY glGetPathTexGenfvNV (GLenum texCoordSet, GLenum pname, GLfloat *value);
 GLAPI GLboolean APIENTRY glIsPointInFillPathNV (GLuint path, GLuint mask, GLfloat x, GLfloat y);
 GLAPI GLboolean APIENTRY glIsPointInStrokePathNV (GLuint path, GLfloat x, GLfloat y);
 GLAPI GLfloat APIENTRY glGetPathLengthNV (GLuint path, GLsizei startSegment, GLsizei numSegments);
@@ -9794,6 +9786,13 @@ GLAPI GLenum APIENTRY glPathGlyphIndexArrayNV (GLuint firstPathName, GLenum font
 GLAPI GLenum APIENTRY glPathMemoryGlyphIndexArrayNV (GLuint firstPathName, GLenum fontTarget, GLsizeiptr fontSize, const void *fontData, GLsizei faceIndex, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
 GLAPI void APIENTRY glProgramPathFragmentInputGenNV (GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat *coeffs);
 GLAPI void APIENTRY glGetProgramResourcefvNV (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLfloat *params);
+GLAPI void APIENTRY glPathColorGenNV (GLenum color, GLenum genMode, GLenum colorFormat, const GLfloat *coeffs);
+GLAPI void APIENTRY glPathTexGenNV (GLenum texCoordSet, GLenum genMode, GLint components, const GLfloat *coeffs);
+GLAPI void APIENTRY glPathFogGenNV (GLenum genMode);
+GLAPI void APIENTRY glGetPathColorGenivNV (GLenum color, GLenum pname, GLint *value);
+GLAPI void APIENTRY glGetPathColorGenfvNV (GLenum color, GLenum pname, GLfloat *value);
+GLAPI void APIENTRY glGetPathTexGenivNV (GLenum texCoordSet, GLenum pname, GLint *value);
+GLAPI void APIENTRY glGetPathTexGenfvNV (GLenum texCoordSet, GLenum pname, GLfloat *value);
 #endif
 #endif /* GL_NV_path_rendering */
 
@@ -10820,6 +10819,10 @@ GLAPI void APIENTRY glVideoCaptureStreamParameterdvNV (GLuint video_capture_slot
 #endif
 #endif /* GL_NV_video_capture */
 
+#ifndef GL_NV_viewport_array2
+#define GL_NV_viewport_array2 1
+#endif /* GL_NV_viewport_array2 */
+
 #ifndef GL_OML_interlace
 #define GL_OML_interlace 1
 #define GL_INTERLACE_OML                  0x8980
@@ -11398,10 +11401,10 @@ GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *equation);
 
 #ifndef GL_SGIX_resample
 #define GL_SGIX_resample 1
-#define GL_PACK_RESAMPLE_SGIX             0x842C
-#define GL_UNPACK_RESAMPLE_SGIX           0x842D
-#define GL_RESAMPLE_REPLICATE_SGIX        0x842E
-#define GL_RESAMPLE_ZERO_FILL_SGIX        0x842F
+#define GL_PACK_RESAMPLE_SGIX             0x842E
+#define GL_UNPACK_RESAMPLE_SGIX           0x842F
+#define GL_RESAMPLE_REPLICATE_SGIX        0x8433
+#define GL_RESAMPLE_ZERO_FILL_SGIX        0x8434
 #define GL_RESAMPLE_DECIMATE_SGIX         0x8430
 #endif /* GL_SGIX_resample */
 
diff --git a/rpcs3/Emu/RSX/GL/GLProgram.cpp b/rpcs3/Emu/RSX/GL/GLProgram.cpp
index 32f9d709bd..da5f7e6952 100644
--- a/rpcs3/Emu/RSX/GL/GLProgram.cpp
+++ b/rpcs3/Emu/RSX/GL/GLProgram.cpp
@@ -10,9 +10,9 @@ GLProgram::GLProgram() : id(0)
 
 int GLProgram::GetLocation(const std::string& name)
 {
-	for(u32 i=0; i<m_locations.size(); ++i)
+	for (u32 i=0; i < m_locations.size(); ++i)
 	{
-		if(!m_locations[i].name.compare(name))
+		if (!m_locations[i].name.compare(name))
 		{
 			return m_locations[i].loc;
 		}
@@ -34,7 +34,9 @@ bool GLProgram::IsCreated() const
 
 void GLProgram::Create(const u32 vp, const u32 fp)
 {
-	if(IsCreated()) Delete();
+	if (IsCreated())
+		Delete();
+
 	id = glCreateProgram();
 
 	glAttachShader(id, vp);
@@ -44,14 +46,14 @@ void GLProgram::Create(const u32 vp, const u32 fp)
 
 	GLint linkStatus = GL_FALSE;
 	glGetProgramiv(id, GL_LINK_STATUS, &linkStatus);
-	if(linkStatus != GL_TRUE)
+	if (linkStatus != GL_TRUE)
 	{
 		GLint bufLength = 0;
 		glGetProgramiv(id, GL_INFO_LOG_LENGTH, &bufLength);
 
 		if (bufLength)
 		{
-			char* buf = new char[bufLength+1]();
+			char* buf = new char[bufLength + 1]();
 			glGetProgramInfoLog(id, bufLength, NULL, buf);
 			LOG_ERROR(RSX, "Could not link program: %s", buf);
 			delete[] buf;
@@ -59,10 +61,10 @@ void GLProgram::Create(const u32 vp, const u32 fp)
 			return;
 		}
 	}
-	//else LOG_NOTICE(HLE, "program linked!");
+	//else LOG_NOTICE(HLE, "Program linked!");
 
 	glGetProgramiv(id, GL_VALIDATE_STATUS, &linkStatus);
-	if(linkStatus != GL_TRUE)
+	if (linkStatus != GL_TRUE)
 	{
 		GLint bufLength = 0;
 		glGetProgramiv(id, GL_INFO_LOG_LENGTH, &bufLength);
@@ -87,7 +89,8 @@ void GLProgram::UnUse()
 
 void GLProgram::Use()
 {
-	glUseProgram(id);
+	if (id != 0)
+		glUseProgram(id);
 	checkForGlError("glUseProgram");
 }
 
@@ -107,7 +110,9 @@ void GLProgram::SetVTex(u32 index)
 
 void GLProgram::Delete()
 {
-	if(!IsCreated()) return;
+	if (!IsCreated())
+		return;
+
 	glDeleteProgram(id);
 	id = 0;
 	m_locations.clear();
diff --git a/rpcs3/Emu/SysCalls/Modules/cellCamera.cpp b/rpcs3/Emu/SysCalls/Modules/cellCamera.cpp
index ab8f5d4526..3dd0d99cc3 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellCamera.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellCamera.cpp
@@ -179,109 +179,115 @@ int cellCameraGetAttribute(s32 dev_num, CellCameraAttribute attrib, vm::ptr<u32>
 	if (!cellCameraInstance.m_bInitialized)
 		return CELL_CAMERA_ERROR_NOT_INIT;
 
-	if (attrib == 0)
-		*arg1 = cellCameraInstance.m_camera.attributes.GAIN;
-	else if (attrib == 1)
-		*arg1 = cellCameraInstance.m_camera.attributes.REDBLUEGAIN;
-	else if (attrib == 2)
-		*arg1 = cellCameraInstance.m_camera.attributes.SATURATION;
-	else if (attrib == 3)
-		*arg1 = cellCameraInstance.m_camera.attributes.EXPOSURE;
-	else if (attrib == 4)
-		*arg1 = cellCameraInstance.m_camera.attributes.BRIGHTNESS;
-	else if (attrib == 5)
-		*arg1 = cellCameraInstance.m_camera.attributes.AEC;
-	else if (attrib == 6)
-		*arg1 = cellCameraInstance.m_camera.attributes.AGC;
-	else if (attrib == 7)
-		*arg1 = cellCameraInstance.m_camera.attributes.AWB;
-	else if (attrib == 8)
-		*arg1 = cellCameraInstance.m_camera.attributes.ABC;
-	else if (attrib == 9)
-		*arg1 = cellCameraInstance.m_camera.attributes.LED;
-	else if (attrib == 10)
-		*arg1 = cellCameraInstance.m_camera.attributes.AUDIOGAIN;
-	else if (attrib == 11)
-		*arg1 = cellCameraInstance.m_camera.attributes.QS;
-	else if (attrib == 12)
+	switch (attrib)
+	{
+	case 0:
+		*arg1 = cellCameraInstance.m_camera.attributes.GAIN; break;
+	case 1:
+		*arg1 = cellCameraInstance.m_camera.attributes.REDBLUEGAIN; break;
+	case 2:
+		*arg1 = cellCameraInstance.m_camera.attributes.SATURATION; break;
+	case 3:
+		*arg1 = cellCameraInstance.m_camera.attributes.EXPOSURE; break;
+	case 4:
+		*arg1 = cellCameraInstance.m_camera.attributes.BRIGHTNESS; break;
+	case 5:
+		*arg1 = cellCameraInstance.m_camera.attributes.AEC; break;
+	case 6:
+		*arg1 = cellCameraInstance.m_camera.attributes.AGC; break;
+	case 7:
+		*arg1 = cellCameraInstance.m_camera.attributes.AWB; break;
+	case 8:
+		*arg1 = cellCameraInstance.m_camera.attributes.ABC; break;
+	case 9:
+		*arg1 = cellCameraInstance.m_camera.attributes.LED; break;
+	case 10:
+		*arg1 = cellCameraInstance.m_camera.attributes.AUDIOGAIN; break;
+	case 11:
+		*arg1 = cellCameraInstance.m_camera.attributes.QS; break;
+	case 12:
 	{
 		*arg1 = cellCameraInstance.m_camera.attributes.NONZEROCOEFFS[0];
 		*arg2 = cellCameraInstance.m_camera.attributes.NONZEROCOEFFS[1];
+		break;
+	}
+	case 13:
+		*arg1 = cellCameraInstance.m_camera.attributes.YUVFLAG; break;
+	case 14:
+		*arg1 = cellCameraInstance.m_camera.attributes.JPEGFLAG; break;
+	case 15:
+		*arg1 = cellCameraInstance.m_camera.attributes.BACKLIGHTCOMP; break;
+	case 16:
+		*arg1 = cellCameraInstance.m_camera.attributes.MIRRORFLAG; break;
+	case 17:
+		*arg1 = cellCameraInstance.m_camera.attributes.MEASUREDQS; break;
+	case 18:
+		*arg1 = cellCameraInstance.m_camera.attributes._422FLAG; break;
+	case 19:
+		*arg1 = cellCameraInstance.m_camera.attributes.USBLOAD; break;
+	case 20:
+		*arg1 = cellCameraInstance.m_camera.attributes.GAMMA; break;
+	case 21:
+		*arg1 = cellCameraInstance.m_camera.attributes.GREENGAIN; break;
+	case 22:
+		*arg1 = cellCameraInstance.m_camera.attributes.AGCLIMIT; break;
+	case 23:
+		*arg1 = cellCameraInstance.m_camera.attributes.DENOISE; break;
+	case 24:
+		*arg1 = cellCameraInstance.m_camera.attributes.FRAMERATEADJUST; break;
+	case 25:
+		*arg1 = cellCameraInstance.m_camera.attributes.PIXELOUTLIERFILTER; break;
+	case 26:
+		*arg1 = cellCameraInstance.m_camera.attributes.AGCLOW; break;
+	case 27:
+		*arg1 = cellCameraInstance.m_camera.attributes.AGCHIGH; break;
+	case 28:
+		*arg1 = cellCameraInstance.m_camera.attributes.DEVICELOCATION; break;
+	case 29:
+		*arg1 = cellCameraInstance.m_camera.attributes.FORMATCAP; break;
+	case 30:
+		*arg1 = cellCameraInstance.m_camera.attributes.FORMATINDEX; break;
+	case 31:
+		*arg1 = cellCameraInstance.m_camera.attributes.NUMFRAME; break;
+	case 32:
+		*arg1 = cellCameraInstance.m_camera.attributes.FRAMEINDEX; break;
+	case 33:
+		*arg1 = cellCameraInstance.m_camera.attributes.FRAMESIZE; break;
+	case 34:
+		*arg1 = cellCameraInstance.m_camera.attributes.INTERVALTYPE; break;
+	case 35:
+		*arg1 = cellCameraInstance.m_camera.attributes.INTERVALINDEX; break;
+	case 36:
+		*arg1 = cellCameraInstance.m_camera.attributes.INTERVALVALUE; break;
+	case 37:
+		*arg1 = cellCameraInstance.m_camera.attributes.COLORMATCHING; break;
+	case 38:
+		*arg1 = cellCameraInstance.m_camera.attributes.PLFREQ; break;
+	case 39:
+		*arg1 = cellCameraInstance.m_camera.attributes.DEVICEID; break;
+	case 40:
+		*arg1 = cellCameraInstance.m_camera.attributes.DEVICECAP; break;
+	case 41:
+		*arg1 = cellCameraInstance.m_camera.attributes.DEVICESPEED; break;
+	case 42:
+		*arg1 = cellCameraInstance.m_camera.attributes.UVCREQCODE; break;
+	case 43:
+		*arg1 = cellCameraInstance.m_camera.attributes.UVCREQDATA; break;
+	case 44:
+		*arg1 = cellCameraInstance.m_camera.attributes.DEVICEID2; break;
+	case 45:
+		*arg1 = cellCameraInstance.m_camera.attributes.READMODE; break;
+	case 46:
+		*arg1 = cellCameraInstance.m_camera.attributes.GAMEPID; break;
+	case 47:
+		*arg1 = cellCameraInstance.m_camera.attributes.PBUFFER; break;
+	case 48:
+		*arg1 = cellCameraInstance.m_camera.attributes.READFINISH; break;
+	case 49:
+		*arg1 = cellCameraInstance.m_camera.attributes.ATTRIBUTE_UNKNOWN; break;
+	default:
+		cellCamera.Error("Unexpected cellCameraGetAttribute attribute: %d", attrib); break;
 	}
-	else if (attrib == 13)
-		*arg1 = cellCameraInstance.m_camera.attributes.YUVFLAG;
-	else if (attrib == 14)
-		*arg1 = cellCameraInstance.m_camera.attributes.JPEGFLAG;
-	else if (attrib == 15)
-		*arg1 = cellCameraInstance.m_camera.attributes.BACKLIGHTCOMP;
-	else if (attrib == 16)
-		*arg1 = cellCameraInstance.m_camera.attributes.MIRRORFLAG;
-	else if (attrib == 17)
-		*arg1 = cellCameraInstance.m_camera.attributes.MEASUREDQS;
-	else if (attrib == 18)
-		*arg1 = cellCameraInstance.m_camera.attributes._422FLAG;
-	else if (attrib == 19)
-		*arg1 = cellCameraInstance.m_camera.attributes.USBLOAD;
-	else if (attrib == 20)
-		*arg1 = cellCameraInstance.m_camera.attributes.GAMMA;
-	else if (attrib == 21)
-		*arg1 = cellCameraInstance.m_camera.attributes.GREENGAIN;
-	else if (attrib == 22)
-		*arg1 = cellCameraInstance.m_camera.attributes.AGCLIMIT;
-	else if (attrib == 23)
-		*arg1 = cellCameraInstance.m_camera.attributes.DENOISE;
-	else if (attrib == 24)
-		*arg1 = cellCameraInstance.m_camera.attributes.FRAMERATEADJUST;
-	else if (attrib == 25)
-		*arg1 = cellCameraInstance.m_camera.attributes.PIXELOUTLIERFILTER;
-	else if (attrib == 26)
-		*arg1 = cellCameraInstance.m_camera.attributes.AGCLOW;
-	else if (attrib == 27)
-		*arg1 = cellCameraInstance.m_camera.attributes.AGCHIGH;
-	else if (attrib == 28)
-		*arg1 = cellCameraInstance.m_camera.attributes.DEVICELOCATION;
-	else if (attrib == 29)
-		*arg1 = cellCameraInstance.m_camera.attributes.FORMATCAP;
-	else if (attrib == 30)
-		*arg1 = cellCameraInstance.m_camera.attributes.FORMATINDEX;
-	else if (attrib == 31)
-		*arg1 = cellCameraInstance.m_camera.attributes.NUMFRAME;
-	else if (attrib == 32)
-		*arg1 = cellCameraInstance.m_camera.attributes.FRAMEINDEX;
-	else if (attrib == 33)
-		*arg1 = cellCameraInstance.m_camera.attributes.FRAMESIZE;
-	else if (attrib == 34)
-		*arg1 = cellCameraInstance.m_camera.attributes.INTERVALTYPE;
-	else if (attrib == 35)
-		*arg1 = cellCameraInstance.m_camera.attributes.INTERVALINDEX;
-	else if (attrib == 36)
-		*arg1 = cellCameraInstance.m_camera.attributes.INTERVALVALUE;
-	else if (attrib == 37)
-		*arg1 = cellCameraInstance.m_camera.attributes.COLORMATCHING;
-	else if (attrib == 38)
-		*arg1 = cellCameraInstance.m_camera.attributes.PLFREQ;
-	else if (attrib == 39)
-		*arg1 = cellCameraInstance.m_camera.attributes.DEVICEID;
-	else if (attrib == 40)
-		*arg1 = cellCameraInstance.m_camera.attributes.DEVICECAP;
-	else if (attrib == 41)
-		*arg1 = cellCameraInstance.m_camera.attributes.DEVICESPEED;
-	else if (attrib == 42)
-		*arg1 = cellCameraInstance.m_camera.attributes.UVCREQCODE;
-	else if (attrib == 43)
-		*arg1 = cellCameraInstance.m_camera.attributes.UVCREQDATA;
-	else if (attrib == 44)
-		*arg1 = cellCameraInstance.m_camera.attributes.DEVICEID2;
-	else if (attrib == 45)
-		*arg1 = cellCameraInstance.m_camera.attributes.READMODE;
-	else if (attrib == 46)
-		*arg1 = cellCameraInstance.m_camera.attributes.GAMEPID;
-	else if (attrib == 47)
-		*arg1 = cellCameraInstance.m_camera.attributes.PBUFFER;
-	else if (attrib == 48)
-		*arg1 = cellCameraInstance.m_camera.attributes.READFINISH;
-	else if (attrib == 49)
-		*arg1 = cellCameraInstance.m_camera.attributes.ATTRIBUTE_UNKNOWN;
 
 	return CELL_OK;
 }
@@ -293,109 +299,115 @@ int cellCameraSetAttribute(s32 dev_num, CellCameraAttribute attrib, u32 arg1, u3
 	if (!cellCameraInstance.m_bInitialized)
 		return CELL_CAMERA_ERROR_NOT_INIT;
 
-	if (attrib == 0)
-		cellCameraInstance.m_camera.attributes.GAIN = arg1;
-	else if (attrib == 1)
-		cellCameraInstance.m_camera.attributes.REDBLUEGAIN = arg1;
-	else if (attrib == 2)
-		cellCameraInstance.m_camera.attributes.SATURATION = arg1;
-	else if (attrib == 3)
-		cellCameraInstance.m_camera.attributes.EXPOSURE = arg1;
-	else if (attrib == 4)
-		cellCameraInstance.m_camera.attributes.BRIGHTNESS = arg1;
-	else if (attrib == 5)
-		cellCameraInstance.m_camera.attributes.AEC = arg1;
-	else if (attrib == 6)
-		cellCameraInstance.m_camera.attributes.AGC = arg1;
-	else if (attrib == 7)
-		cellCameraInstance.m_camera.attributes.AWB = arg1;
-	else if (attrib == 8)
-		cellCameraInstance.m_camera.attributes.ABC = arg1;
-	else if (attrib == 9)
-		cellCameraInstance.m_camera.attributes.LED = arg1;
-	else if (attrib == 10)
-		cellCameraInstance.m_camera.attributes.AUDIOGAIN = arg1;
-	else if (attrib == 11)
-		cellCameraInstance.m_camera.attributes.QS = arg1;
-	else if (attrib == 12)
+	switch (attrib)
+	{
+	case 0:
+		cellCameraInstance.m_camera.attributes.GAIN = arg1; break;
+	case 1:
+		cellCameraInstance.m_camera.attributes.REDBLUEGAIN = arg1; break;
+	case 2:
+		cellCameraInstance.m_camera.attributes.SATURATION = arg1; break;
+	case 3:
+		cellCameraInstance.m_camera.attributes.EXPOSURE = arg1; break;
+	case 4:
+		cellCameraInstance.m_camera.attributes.BRIGHTNESS = arg1; break;
+	case 5:
+		cellCameraInstance.m_camera.attributes.AEC = arg1; break;
+	case 6:
+		cellCameraInstance.m_camera.attributes.AGC = arg1; break;
+	case 7:
+		cellCameraInstance.m_camera.attributes.AWB = arg1; break;
+	case 8:
+		cellCameraInstance.m_camera.attributes.ABC = arg1; break;
+	case 9:
+		cellCameraInstance.m_camera.attributes.LED = arg1; break;
+	case 10:
+		cellCameraInstance.m_camera.attributes.AUDIOGAIN = arg1; break;
+	case 11:
+		cellCameraInstance.m_camera.attributes.QS = arg1; break;
+	case 12:
 	{
 		cellCameraInstance.m_camera.attributes.NONZEROCOEFFS[0] = arg1;
 		cellCameraInstance.m_camera.attributes.NONZEROCOEFFS[1] = arg2;
+		break;
+	}
+	case 13:
+		cellCameraInstance.m_camera.attributes.YUVFLAG = arg1; break;
+	case 14:
+		cellCameraInstance.m_camera.attributes.JPEGFLAG = arg1; break;
+	case 15:
+		cellCameraInstance.m_camera.attributes.BACKLIGHTCOMP = arg1; break;
+	case 16:
+		cellCameraInstance.m_camera.attributes.MIRRORFLAG = arg1; break;
+	case 17:
+		return CELL_CAMERA_ERROR_PARAM; break;
+	case 18:
+		cellCameraInstance.m_camera.attributes._422FLAG = arg1; break;
+	case 19:
+		cellCameraInstance.m_camera.attributes.USBLOAD = arg1; break;
+	case 20:
+		cellCameraInstance.m_camera.attributes.GAMMA = arg1; break;
+	case 21:
+		cellCameraInstance.m_camera.attributes.GREENGAIN = arg1; break;
+	case 22:
+		cellCameraInstance.m_camera.attributes.AGCLIMIT = arg1; break;
+	case 23:
+		cellCameraInstance.m_camera.attributes.DENOISE = arg1; break;
+	case 24:
+		cellCameraInstance.m_camera.attributes.FRAMERATEADJUST = arg1; break;
+	case 25:
+		cellCameraInstance.m_camera.attributes.PIXELOUTLIERFILTER = arg1; break;
+	case 26:
+		cellCameraInstance.m_camera.attributes.AGCLOW = arg1; break;
+	case 27:
+		cellCameraInstance.m_camera.attributes.AGCHIGH = arg1; break;
+	case 28:
+		cellCameraInstance.m_camera.attributes.DEVICELOCATION = arg1; break;
+	case 29:
+		cellCamera.Error("Tried to write to read-only (?) value: FORMATCAP"); break;
+	case 30:
+		cellCameraInstance.m_camera.attributes.FORMATINDEX = arg1; break;
+	case 31:
+		cellCameraInstance.m_camera.attributes.NUMFRAME = arg1; break;
+	case 32:
+		cellCameraInstance.m_camera.attributes.FRAMEINDEX = arg1; break;
+	case 33:
+		cellCameraInstance.m_camera.attributes.FRAMESIZE = arg1; break;
+	case 34:
+		cellCameraInstance.m_camera.attributes.INTERVALTYPE = arg1; break;
+	case 35:
+		cellCameraInstance.m_camera.attributes.INTERVALINDEX = arg1; break;
+	case 36:
+		cellCameraInstance.m_camera.attributes.INTERVALVALUE = arg1; break;
+	case 37:
+		cellCameraInstance.m_camera.attributes.COLORMATCHING = arg1; break;
+	case 38:
+		cellCameraInstance.m_camera.attributes.PLFREQ = arg1; break;
+	case 39:
+		return CELL_CAMERA_ERROR_PARAM; break;
+	case 40:
+		cellCameraInstance.m_camera.attributes.DEVICECAP = arg1; break;
+	case 41:
+		cellCameraInstance.m_camera.attributes.DEVICESPEED = arg1; break;
+	case 42:
+		cellCameraInstance.m_camera.attributes.UVCREQCODE = arg1; break;
+	case 43:
+		cellCameraInstance.m_camera.attributes.UVCREQDATA = arg1; break;
+	case 44:
+		return CELL_CAMERA_ERROR_PARAM; break;
+	case 45:
+		cellCamera.Error("Tried to write to read-only (?) value: READMODE"); break;
+	case 46:
+		cellCameraInstance.m_camera.attributes.GAMEPID = arg1; break;
+	case 47:
+		cellCameraInstance.m_camera.attributes.PBUFFER = arg1; break;
+	case 48:
+		cellCameraInstance.m_camera.attributes.READFINISH = arg1; break;
+	case 49:
+		cellCamera.Error("Tried to write to read-only (?) value: ATTRIBUTE_UNKNOWN"); break;
+	default:
+		cellCamera.Error("Unexpected cellCameraGetAttribute attribute: %d", attrib); break;
 	}
-	else if (attrib == 13)
-		cellCameraInstance.m_camera.attributes.YUVFLAG = arg1;
-	else if (attrib == 14)
-		cellCameraInstance.m_camera.attributes.JPEGFLAG = arg1;
-	else if (attrib == 15)
-		cellCameraInstance.m_camera.attributes.BACKLIGHTCOMP = arg1;
-	else if (attrib == 16)
-		cellCameraInstance.m_camera.attributes.MIRRORFLAG = arg1;
-	else if (attrib == 17)
-		return CELL_CAMERA_ERROR_PARAM;
-	else if (attrib == 18)
-		cellCameraInstance.m_camera.attributes._422FLAG = arg1;
-	else if (attrib == 19)
-		cellCameraInstance.m_camera.attributes.USBLOAD = arg1;
-	else if (attrib == 20)
-		cellCameraInstance.m_camera.attributes.GAMMA = arg1;
-	else if (attrib == 21)
-		cellCameraInstance.m_camera.attributes.GREENGAIN = arg1;
-	else if (attrib == 22)
-		cellCameraInstance.m_camera.attributes.AGCLIMIT = arg1;
-	else if (attrib == 23)
-		cellCameraInstance.m_camera.attributes.DENOISE = arg1;
-	else if (attrib == 24)
-		cellCameraInstance.m_camera.attributes.FRAMERATEADJUST = arg1;
-	else if (attrib == 25)
-		cellCameraInstance.m_camera.attributes.PIXELOUTLIERFILTER = arg1;
-	else if (attrib == 26)
-		cellCameraInstance.m_camera.attributes.AGCLOW = arg1;
-	else if (attrib == 27)
-		cellCameraInstance.m_camera.attributes.AGCHIGH = arg1;
-	else if (attrib == 28)
-		cellCameraInstance.m_camera.attributes.DEVICELOCATION = arg1;
-	else if (attrib == 29)
-		cellCamera.Error("Tried to write to read-only (?) value: FORMATCAP");
-	else if (attrib == 30)
-		cellCameraInstance.m_camera.attributes.FORMATINDEX = arg1;
-	else if (attrib == 31)
-		cellCameraInstance.m_camera.attributes.NUMFRAME = arg1;
-	else if (attrib == 32)
-		cellCameraInstance.m_camera.attributes.FRAMEINDEX = arg1;
-	else if (attrib == 33)
-		cellCameraInstance.m_camera.attributes.FRAMESIZE = arg1;
-	else if (attrib == 34)
-		cellCameraInstance.m_camera.attributes.INTERVALTYPE = arg1;
-	else if (attrib == 35)
-		cellCameraInstance.m_camera.attributes.INTERVALINDEX = arg1;
-	else if (attrib == 36)
-		cellCameraInstance.m_camera.attributes.INTERVALVALUE = arg1;
-	else if (attrib == 37)
-		cellCameraInstance.m_camera.attributes.COLORMATCHING = arg1;
-	else if (attrib == 38)
-		cellCameraInstance.m_camera.attributes.PLFREQ = arg1;
-	else if (attrib == 39)
-		return CELL_CAMERA_ERROR_PARAM;
-	else if (attrib == 40)
-		cellCameraInstance.m_camera.attributes.DEVICECAP = arg1;
-	else if (attrib == 41)
-		cellCameraInstance.m_camera.attributes.DEVICESPEED = arg1;
-	else if (attrib == 42)
-		cellCameraInstance.m_camera.attributes.UVCREQCODE = arg1;
-	else if (attrib == 43)
-		cellCameraInstance.m_camera.attributes.UVCREQDATA = arg1;
-	else if (attrib == 44)
-		return CELL_CAMERA_ERROR_PARAM;
-	else if (attrib == 45)
-		cellCamera.Error("Tried to write to read-only (?) value: READMODE");
-	else if (attrib == 46)
-		cellCameraInstance.m_camera.attributes.GAMEPID = arg1;
-	else if (attrib == 47)
-		cellCameraInstance.m_camera.attributes.PBUFFER = arg1;
-	else if (attrib == 48)
-		cellCameraInstance.m_camera.attributes.READFINISH = arg1;
-	else if (attrib == 49)
-		cellCamera.Error("Tried to write to read-only (?) value: ATTRIBUTE_UNKNOWN");
 
 	return CELL_OK;
 }
diff --git a/rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp b/rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp
index de4aca27dc..ac6ba2ab74 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp
@@ -85,6 +85,7 @@ int cellNetCtlNetStartDialogLoadAsync(vm::ptr<CellNetCtlNetStartDialogParam> par
 
 	// TODO: Actually sign into PSN
 	sysutilSendSystemCommand(CELL_SYSUTIL_NET_CTL_NETSTART_FINISHED, 0);
+
 	return CELL_OK;
 }
 
@@ -100,6 +101,7 @@ int cellNetCtlNetStartDialogUnloadAsync(vm::ptr<CellNetCtlNetStartDialogResult>
 	cellNetCtl.Warning("cellNetCtlNetStartDialogUnloadAsync(result_addr=0x%x)", result.addr());
 
 	sysutilSendSystemCommand(CELL_SYSUTIL_NET_CTL_NETSTART_UNLOADED, 0);
+
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellNetCtl.h b/rpcs3/Emu/SysCalls/Modules/cellNetCtl.h
index a09167848e..3b3b0db019 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellNetCtl.h
+++ b/rpcs3/Emu/SysCalls/Modules/cellNetCtl.h
@@ -3,79 +3,79 @@
 // Error Codes
 enum
 {
-	CELL_NET_CTL_ERROR_NOT_INITIALIZED = 0x80130101,
-	CELL_NET_CTL_ERROR_NOT_TERMINATED = 0x80130102,
-	CELL_NET_CTL_ERROR_HANDLER_MAX = 0x80130103,
-	CELL_NET_CTL_ERROR_ID_NOT_FOUND = 0x80130104,
-	CELL_NET_CTL_ERROR_INVALID_ID = 0x80130105,
-	CELL_NET_CTL_ERROR_INVALID_CODE = 0x80130106,
-	CELL_NET_CTL_ERROR_INVALID_ADDR = 0x80130107,
-	CELL_NET_CTL_ERROR_NOT_CONNECTED = 0x80130108,
-	CELL_NET_CTL_ERROR_NOT_AVAIL = 0x80130109,
-	CELL_NET_CTL_ERROR_INVALID_TYPE = 0x8013010a,
-	CELL_NET_CTL_ERROR_INVALID_SIZE = 0x8013010b,
-	CELL_NET_CTL_ERROR_NET_DISABLED = 0x80130181,
-	CELL_NET_CTL_ERROR_NET_NOT_CONNECTED = 0x80130182,
-	CELL_NET_CTL_ERROR_NP_NO_ACCOUNT = 0x80130183,
-	CELL_NET_CTL_ERROR_NP_RESERVED1 = 0x80130184,
-	CELL_NET_CTL_ERROR_NP_RESERVED2 = 0x80130185,
+	CELL_NET_CTL_ERROR_NOT_INITIALIZED         = 0x80130101,
+	CELL_NET_CTL_ERROR_NOT_TERMINATED          = 0x80130102,
+	CELL_NET_CTL_ERROR_HANDLER_MAX             = 0x80130103,
+	CELL_NET_CTL_ERROR_ID_NOT_FOUND            = 0x80130104,
+	CELL_NET_CTL_ERROR_INVALID_ID              = 0x80130105,
+	CELL_NET_CTL_ERROR_INVALID_CODE            = 0x80130106,
+	CELL_NET_CTL_ERROR_INVALID_ADDR            = 0x80130107,
+	CELL_NET_CTL_ERROR_NOT_CONNECTED           = 0x80130108,
+	CELL_NET_CTL_ERROR_NOT_AVAIL               = 0x80130109,
+	CELL_NET_CTL_ERROR_INVALID_TYPE            = 0x8013010a,
+	CELL_NET_CTL_ERROR_INVALID_SIZE            = 0x8013010b,
+	CELL_NET_CTL_ERROR_NET_DISABLED            = 0x80130181,
+	CELL_NET_CTL_ERROR_NET_NOT_CONNECTED       = 0x80130182,
+	CELL_NET_CTL_ERROR_NP_NO_ACCOUNT           = 0x80130183,
+	CELL_NET_CTL_ERROR_NP_RESERVED1            = 0x80130184,
+	CELL_NET_CTL_ERROR_NP_RESERVED2            = 0x80130185,
 	CELL_NET_CTL_ERROR_NET_CABLE_NOT_CONNECTED = 0x80130186,
-	CELL_NET_CTL_ERROR_DIALOG_CANCELED = 0x80130190,
-	CELL_NET_CTL_ERROR_DIALOG_ABORTED = 0x80130191,
+	CELL_NET_CTL_ERROR_DIALOG_CANCELED         = 0x80130190,
+	CELL_NET_CTL_ERROR_DIALOG_ABORTED          = 0x80130191,
 
-	CELL_NET_CTL_ERROR_WLAN_DEAUTHED = 0x80130137,
+	CELL_NET_CTL_ERROR_WLAN_DEAUTHED                 = 0x80130137,
 	CELL_NET_CTL_ERROR_WLAN_KEYINFO_EXCHNAGE_TIMEOUT = 0x8013013d,
-	CELL_NET_CTL_ERROR_WLAN_ASSOC_FAILED = 0x8013013e,
-	CELL_NET_CTL_ERROR_WLAN_AP_DISAPPEARED = 0x8013013f,
-	CELL_NET_CTL_ERROR_PPPOE_SESSION_INIT = 0x80130409,
-	CELL_NET_CTL_ERROR_PPPOE_SESSION_NO_PADO = 0x8013040a,
-	CELL_NET_CTL_ERROR_PPPOE_SESSION_NO_PADS = 0x8013040b,
-	CELL_NET_CTL_ERROR_PPPOE_SESSION_GET_PADT = 0x8013040d,
-	CELL_NET_CTL_ERROR_PPPOE_SESSION_SERVICE_NAME = 0x8013040f,
-	CELL_NET_CTL_ERROR_PPPOE_SESSION_AC_SYSTEM = 0x80130410,
-	CELL_NET_CTL_ERROR_PPPOE_SESSION_GENERIC = 0x80130411,
-	CELL_NET_CTL_ERROR_PPPOE_STATUS_AUTH = 0x80130412,
-	CELL_NET_CTL_ERROR_PPPOE_STATUS_NETWORK = 0x80130413,
-	CELL_NET_CTL_ERROR_PPPOE_STATUS_TERMINATE = 0x80130414,
-	CELL_NET_CTL_ERROR_DHCP_LEASE_TIME = 0x80130504,
+	CELL_NET_CTL_ERROR_WLAN_ASSOC_FAILED             = 0x8013013e,
+	CELL_NET_CTL_ERROR_WLAN_AP_DISAPPEARED           = 0x8013013f,
+	CELL_NET_CTL_ERROR_PPPOE_SESSION_INIT            = 0x80130409,
+	CELL_NET_CTL_ERROR_PPPOE_SESSION_NO_PADO         = 0x8013040a,
+	CELL_NET_CTL_ERROR_PPPOE_SESSION_NO_PADS         = 0x8013040b,
+	CELL_NET_CTL_ERROR_PPPOE_SESSION_GET_PADT        = 0x8013040d,
+	CELL_NET_CTL_ERROR_PPPOE_SESSION_SERVICE_NAME    = 0x8013040f,
+	CELL_NET_CTL_ERROR_PPPOE_SESSION_AC_SYSTEM       = 0x80130410,
+	CELL_NET_CTL_ERROR_PPPOE_SESSION_GENERIC         = 0x80130411,
+	CELL_NET_CTL_ERROR_PPPOE_STATUS_AUTH             = 0x80130412,
+	CELL_NET_CTL_ERROR_PPPOE_STATUS_NETWORK          = 0x80130413,
+	CELL_NET_CTL_ERROR_PPPOE_STATUS_TERMINATE        = 0x80130414,
+	CELL_NET_CTL_ERROR_DHCP_LEASE_TIME               = 0x80130504,
 };
 
 // Network connection states
 enum
 {
 	CELL_NET_CTL_STATE_Disconnected = 0,
-	CELL_NET_CTL_STATE_Connecting = 1,
-	CELL_NET_CTL_STATE_IPObtaining = 2,
-	CELL_NET_CTL_STATE_IPObtained = 3,
+	CELL_NET_CTL_STATE_Connecting   = 1,
+	CELL_NET_CTL_STATE_IPObtaining  = 2,
+	CELL_NET_CTL_STATE_IPObtained   = 3,
 };
 
 // Transition connection states
 enum
 {
-	CELL_NET_CTL_EVENT_CONNECT_REQ = 0,
-	CELL_NET_CTL_EVENT_ESTABLISH = 1,
-	CELL_NET_CTL_EVENT_GET_IP = 2,
-	CELL_NET_CTL_EVENT_DISCONNECT_REQ = 3,
-	CELL_NET_CTL_EVENT_ERROR = 4,
+	CELL_NET_CTL_EVENT_CONNECT_REQ       = 0,
+	CELL_NET_CTL_EVENT_ESTABLISH         = 1,
+	CELL_NET_CTL_EVENT_GET_IP            = 2,
+	CELL_NET_CTL_EVENT_DISCONNECT_REQ    = 3,
+	CELL_NET_CTL_EVENT_ERROR             = 4,
 	CELL_NET_CTL_EVENT_LINK_DISCONNECTED = 5,
-	CELL_NET_CTL_EVENT_AUTO_RETRY = 6,
+	CELL_NET_CTL_EVENT_AUTO_RETRY        = 6,
 };
 
 // Network connection devices
 enum
 {
-	CELL_NET_CTL_DEVICE_WIRED = 0,
+	CELL_NET_CTL_DEVICE_WIRED    = 0,
 	CELL_NET_CTL_DEVICE_WIRELESS = 1,
 };
 
 // Cable connection types
 enum
 {
-	CELL_NET_CTL_LINK_TYPE_AUTO = 0,
-	CELL_NET_CTL_LINK_TYPE_10BASE_HALF = 1,
-	CELL_NET_CTL_LINK_TYPE_10BASE_FULL = 2,
-	CELL_NET_CTL_LINK_TYPE_100BASE_HALF = 3,
-	CELL_NET_CTL_LINK_TYPE_100BASE_FULL = 4,
+	CELL_NET_CTL_LINK_TYPE_AUTO          = 0,
+	CELL_NET_CTL_LINK_TYPE_10BASE_HALF   = 1,
+	CELL_NET_CTL_LINK_TYPE_10BASE_FULL   = 2,
+	CELL_NET_CTL_LINK_TYPE_100BASE_HALF  = 3,
+	CELL_NET_CTL_LINK_TYPE_100BASE_FULL  = 4,
 	CELL_NET_CTL_LINK_TYPE_1000BASE_HALF = 5,
 	CELL_NET_CTL_LINK_TYPE_1000BASE_FULL = 6,
 };
@@ -84,88 +84,88 @@ enum
 enum
 {
 	CELL_NET_CTL_LINK_DISCONNECTED = 0,
-	CELL_NET_CTL_LINK_CONNECTED = 1,
+	CELL_NET_CTL_LINK_CONNECTED    = 1,
 };
 
 // Wireless connection security measures
 enum
 {
-	CELL_NET_CTL_WLAN_SECURITY_NOAUTH = 0,
-	CELL_NET_CTL_WLAN_SECURITY_WEP = 1,
+	CELL_NET_CTL_WLAN_SECURITY_NOAUTH      = 0,
+	CELL_NET_CTL_WLAN_SECURITY_WEP         = 1,
 	CELL_NET_CTL_WLAN_SECURITY_WPAPSK_TKIP = 2,
-	CELL_NET_CTL_WLAN_SECURITY_WPAPSK_AES = 3,
+	CELL_NET_CTL_WLAN_SECURITY_WPAPSK_AES  = 3,
 	CELL_NET_CTL_WLAN_SECURITY_UNSUPPORTED = 4,
 };
 
 // 802.1X settings
 enum
 {
-	CELL_NET_CTL_8021X_NONE = 0,
+	CELL_NET_CTL_8021X_NONE    = 0,
 	CELL_NET_CTL_8021X_EAP_MD5 = 1,
 };
 
 // IP settings
 enum
 {
-	CELL_NET_CTL_IP_DHCP = 0,
+	CELL_NET_CTL_IP_DHCP   = 0,
 	CELL_NET_CTL_IP_STATIC = 1,
-	CELL_NET_CTL_IP_PPPOE = 2,
+	CELL_NET_CTL_IP_PPPOE  = 2,
 };
 
 // HTTP proxy settings
 enum
 {
 	CELL_NET_CTL_HTTP_PROXY_OFF = 0,
-	CELL_NET_CTL_HTTP_PROXY_ON = 1,
+	CELL_NET_CTL_HTTP_PROXY_ON  = 1,
 };
 
 // UPnP settings
 enum
 {
-	CELL_NET_CTL_UPNP_ON = 0,
+	CELL_NET_CTL_UPNP_ON  = 0,
 	CELL_NET_CTL_UPNP_OFF = 1,
 };
 
 // Codes for information
 enum
 {
-	CELL_NET_CTL_INFO_DEVICE = 1,
-	CELL_NET_CTL_INFO_ETHER_ADDR = 2,
-	CELL_NET_CTL_INFO_MTU = 3,
-	CELL_NET_CTL_INFO_LINK = 4,
-	CELL_NET_CTL_INFO_LINK_TYPE = 5,
-	CELL_NET_CTL_INFO_BSSID = 6,
-	CELL_NET_CTL_INFO_SSID = 7,
-	CELL_NET_CTL_INFO_WLAN_SECURITY = 8,
-	CELL_NET_CTL_INFO_8021X_TYPE = 9,
-	CELL_NET_CTL_INFO_8021X_AUTH_NAME = 10,
-	CELL_NET_CTL_INFO_RSSI = 11,
-	CELL_NET_CTL_INFO_CHANNEL = 12,
-	CELL_NET_CTL_INFO_IP_CONFIG = 13,
-	CELL_NET_CTL_INFO_DHCP_HOSTNAME = 14,
-	CELL_NET_CTL_INFO_PPPOE_AUTH_NAME = 15,
-	CELL_NET_CTL_INFO_IP_ADDRESS = 16,
-	CELL_NET_CTL_INFO_NETMASK = 17,
-	CELL_NET_CTL_INFO_DEFAULT_ROUTE = 18,
-	CELL_NET_CTL_INFO_PRIMARY_DNS = 19,
-	CELL_NET_CTL_INFO_SECONDARY_DNS = 20,
+	CELL_NET_CTL_INFO_DEVICE            = 1,
+	CELL_NET_CTL_INFO_ETHER_ADDR        = 2,
+	CELL_NET_CTL_INFO_MTU               = 3,
+	CELL_NET_CTL_INFO_LINK              = 4,
+	CELL_NET_CTL_INFO_LINK_TYPE         = 5,
+	CELL_NET_CTL_INFO_BSSID             = 6,
+	CELL_NET_CTL_INFO_SSID              = 7,
+	CELL_NET_CTL_INFO_WLAN_SECURITY     = 8,
+	CELL_NET_CTL_INFO_8021X_TYPE        = 9,
+	CELL_NET_CTL_INFO_8021X_AUTH_NAME   = 10,
+	CELL_NET_CTL_INFO_RSSI              = 11,
+	CELL_NET_CTL_INFO_CHANNEL           = 12,
+	CELL_NET_CTL_INFO_IP_CONFIG         = 13,
+	CELL_NET_CTL_INFO_DHCP_HOSTNAME     = 14,
+	CELL_NET_CTL_INFO_PPPOE_AUTH_NAME   = 15,
+	CELL_NET_CTL_INFO_IP_ADDRESS        = 16,
+	CELL_NET_CTL_INFO_NETMASK           = 17,
+	CELL_NET_CTL_INFO_DEFAULT_ROUTE     = 18,
+	CELL_NET_CTL_INFO_PRIMARY_DNS       = 19,
+	CELL_NET_CTL_INFO_SECONDARY_DNS     = 20,
 	CELL_NET_CTL_INFO_HTTP_PROXY_CONFIG = 21,
 	CELL_NET_CTL_INFO_HTTP_PROXY_SERVER = 22,
-	CELL_NET_CTL_INFO_HTTP_PROXY_PORT = 23,
-	CELL_NET_CTL_INFO_UPNP_CONFIG = 24,
+	CELL_NET_CTL_INFO_HTTP_PROXY_PORT   = 23,
+	CELL_NET_CTL_INFO_UPNP_CONFIG       = 24,
 };
 
 // Network start dialogs
 enum
 {
 	CELL_NET_CTL_NETSTART_TYPE_NET = 0,
-	CELL_NET_CTL_NETSTART_TYPE_NP = 1,
+	CELL_NET_CTL_NETSTART_TYPE_NP  = 1,
 };
 
 // Network start dialog statuses
 enum
 {
-	CELL_SYSUTIL_NET_CTL_NETSTART_LOADED = 0x0801,
+	CELL_SYSUTIL_NET_CTL_NETSTART_LOADED   = 0x0801,
 	CELL_SYSUTIL_NET_CTL_NETSTART_FINISHED = 0x0802,
 	CELL_SYSUTIL_NET_CTL_NETSTART_UNLOADED = 0x0803,
 };
@@ -174,16 +174,16 @@ enum
 enum
 {
 	CELL_NET_CTL_NATINFO_UPNP_UNCHECKED = 0,
-	CELL_NET_CTL_NATINFO_UPNP_NO = 1,
-	CELL_NET_CTL_NATINFO_UPNP_USED = 2,
+	CELL_NET_CTL_NATINFO_UPNP_NO        = 1,
+	CELL_NET_CTL_NATINFO_UPNP_USED      = 2,
 };
 
 // STUN NAT statuses
 enum
 {
 	CELL_NET_CTL_NATINFO_STUN_UNCHECKED = 0,
-	CELL_NET_CTL_NATINFO_STUN_FAILED = 1,
-	CELL_NET_CTL_NATINFO_STUN_OK = 2,
+	CELL_NET_CTL_NATINFO_STUN_FAILED    = 1,
+	CELL_NET_CTL_NATINFO_STUN_OK        = 2,
 };
 
 // NAT types