diff --git a/Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions.h b/Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions.h
index 2d98b64bb..0fa6d6f4a 100644
--- a/Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions.h
+++ b/Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions.h
@@ -1111,6 +1111,9 @@ float2x2 MatrixFromRows(float2 row0, float2 row1)
 out gl_PerVertex
 {
     vec4 gl_Position;
+#ifdef USE_GL_POINT_SIZE
+    float gl_PointSize;
+#endif
 };
 #endif
 
@@ -1140,14 +1143,18 @@ out gl_PerVertex
 in gl_PerVertex
 {
     vec4 gl_Position;
-    //float gl_PointSize;
+#ifdef USE_GL_POINT_SIZE
+    float gl_PointSize;
+#endif
     //float gl_ClipDistance[];
 } gl_in[];
 
 out gl_PerVertex
 {
     vec4 gl_Position;
-    //float gl_PointSize;
+#ifdef USE_GL_POINT_SIZE
+    float gl_PointSize;
+#endif
     //float gl_ClipDistance[];
 };
 
@@ -1166,14 +1173,18 @@ out gl_PerVertex
 in gl_PerVertex
 {
     vec4 gl_Position;
-    //float gl_PointSize;
+#ifdef USE_GL_POINT_SIZE
+    float gl_PointSize;
+#endif
     //float gl_ClipDistance[];
 } gl_in[gl_MaxPatchVertices];
 
 out gl_PerVertex
 {
     vec4 gl_Position;
-    //float gl_PointSize;
+#ifdef USE_GL_POINT_SIZE
+    float gl_PointSize;
+#endif
     //float gl_ClipDistance[];
 } gl_out[];
 
@@ -1219,14 +1230,18 @@ void _SetGLTessLevelInner(float InnerLevel)
 in gl_PerVertex
 {
     vec4 gl_Position;
-    //float gl_PointSize;
+#ifdef USE_GL_POINT_SIZE
+    float gl_PointSize;
+#endif
     //float gl_ClipDistance[];
 } gl_in[gl_MaxPatchVertices];
 
 out gl_PerVertex
 {
     vec4 gl_Position;
-    //float gl_PointSize;
+#ifdef USE_GL_POINT_SIZE
+    float gl_PointSize;
+#endif
     //float gl_ClipDistance[];
 };
 
diff --git a/Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions_inc.h b/Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions_inc.h
index f457bd6f2..c8cc1b6a5 100644
--- a/Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions_inc.h
+++ b/Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions_inc.h
@@ -1111,6 +1111,9 @@
 "out gl_PerVertex\n"
 "{\n"
 "    vec4 gl_Position;\n"
+"#ifdef USE_GL_POINT_SIZE\n"
+"    float gl_PointSize;\n"
+"#endif\n"
 "};\n"
 "#endif\n"
 "\n"
@@ -1140,14 +1143,18 @@
 "in gl_PerVertex\n"
 "{\n"
 "    vec4 gl_Position;\n"
-"    //float gl_PointSize;\n"
+"#ifdef USE_GL_POINT_SIZE\n"
+"    float gl_PointSize;\n"
+"#endif\n"
 "    //float gl_ClipDistance[];\n"
 "} gl_in[];\n"
 "\n"
 "out gl_PerVertex\n"
 "{\n"
 "    vec4 gl_Position;\n"
-"    //float gl_PointSize;\n"
+"#ifdef USE_GL_POINT_SIZE\n"
+"    float gl_PointSize;\n"
+"#endif\n"
 "    //float gl_ClipDistance[];\n"
 "};\n"
 "\n"
@@ -1166,14 +1173,18 @@
 "in gl_PerVertex\n"
 "{\n"
 "    vec4 gl_Position;\n"
-"    //float gl_PointSize;\n"
+"#ifdef USE_GL_POINT_SIZE\n"
+"    float gl_PointSize;\n"
+"#endif\n"
 "    //float gl_ClipDistance[];\n"
 "} gl_in[gl_MaxPatchVertices];\n"
 "\n"
 "out gl_PerVertex\n"
 "{\n"
 "    vec4 gl_Position;\n"
-"    //float gl_PointSize;\n"
+"#ifdef USE_GL_POINT_SIZE\n"
+"    float gl_PointSize;\n"
+"#endif\n"
 "    //float gl_ClipDistance[];\n"
 "} gl_out[];\n"
 "\n"
@@ -1219,14 +1230,18 @@
 "in gl_PerVertex\n"
 "{\n"
 "    vec4 gl_Position;\n"
-"    //float gl_PointSize;\n"
+"#ifdef USE_GL_POINT_SIZE\n"
+"    float gl_PointSize;\n"
+"#endif\n"
 "    //float gl_ClipDistance[];\n"
 "} gl_in[gl_MaxPatchVertices];\n"
 "\n"
 "out gl_PerVertex\n"
 "{\n"
 "    vec4 gl_Position;\n"
-"    //float gl_PointSize;\n"
+"#ifdef USE_GL_POINT_SIZE\n"
+"    float gl_PointSize;\n"
+"#endif\n"
 "    //float gl_ClipDistance[];\n"
 "};\n"
 "\n"