[Gridflow-cvs] [svn] commit: r6010 - /trunk/src/opengl.cxx

svn-gridflow at artengine.ca svn-gridflow at artengine.ca
Tue Aug 10 16:23:45 EDT 2010


Author: matju
Date: Tue Aug 10 16:23:42 2010
New Revision: 6010

Log:
not much

Modified:
    trunk/src/opengl.cxx

Modified: trunk/src/opengl.cxx
==============================================================================
--- trunk/src/opengl.cxx (original)
+++ trunk/src/opengl.cxx Tue Aug 10 16:23:42 2010
@@ -282,7 +282,7 @@
 	.D(GL_BLUE_SCALE)	.D(GL_BLUE_BIAS)
 	.D(GL_ALPHA_SCALE)	.D(GL_ALPHA_BIAS)
 	.D(GL_DEPTH_SCALE)	.D(GL_DEPTH_BIAS)
-	#ifdef ARB
+	//#ifdef ARB
 	.D(GL_POST_COLOR_MATRIX_RED_SCALE)	.D(GL_POST_COLOR_MATRIX_RED_BIAS)
 	.D(GL_POST_COLOR_MATRIX_GREEN_SCALE)	.D(GL_POST_COLOR_MATRIX_GREEN_BIAS)
 	.D(GL_POST_COLOR_MATRIX_BLUE_SCALE)	.D(GL_POST_COLOR_MATRIX_BLUE_BIAS)
@@ -291,7 +291,7 @@
 	.D(GL_POST_CONVOLUTION_RED_BIAS)	.D(GL_POST_CONVOLUTION_GREEN_SCALE)
 	.D(GL_POST_CONVOLUTION_BLUE_SCALE)	.D(GL_POST_CONVOLUTION_BLUE_BIAS)
 	.D(GL_POST_CONVOLUTION_ALPHA_SCALE)	.D(GL_POST_CONVOLUTION_ALPHA_BIAS)
-	#endif
+	//#endif
 	;
 	shade_model
 	.D(GL_FLAT)
@@ -413,10 +413,8 @@
 	.D(GL_GREEN)
 	.D(GL_BLUE)
 	.D(GL_ALPHA)
-	.D(GL_RGB)
-	.D(GL_BGR)
-	.D(GL_RGBA)
-	.D(GL_BGRA)
+	.D(GL_RGB) .D(GL_BGR)
+	.D(GL_RGBA).D(GL_BGRA)
 	.D(GL_LUMINANCE)
 	.D(GL_LUMINANCE_ALPHA)
 	;
@@ -429,18 +427,12 @@
 	.D(GL_UNSIGNED_INT)
 	.D(GL_INT)
 	.D(GL_FLOAT)
-	.D(GL_UNSIGNED_BYTE_3_3_2)
-	.D(GL_UNSIGNED_BYTE_2_3_3_REV)
-	.D(GL_UNSIGNED_SHORT_5_6_5)
-	.D(GL_UNSIGNED_SHORT_5_6_5_REV)
-	.D(GL_UNSIGNED_SHORT_4_4_4_4)
-	.D(GL_UNSIGNED_SHORT_4_4_4_4_REV)
-	.D(GL_UNSIGNED_SHORT_5_5_5_1)
-	.D(GL_UNSIGNED_SHORT_1_5_5_5_REV)
-	.D(GL_UNSIGNED_INT_8_8_8_8)
-	.D(GL_UNSIGNED_INT_8_8_8_8_REV)
-	.D(GL_UNSIGNED_INT_10_10_10_2)
-	.D(GL_UNSIGNED_INT_2_10_10_10_REV)
+	.D(GL_UNSIGNED_BYTE_3_3_2)	.D(GL_UNSIGNED_BYTE_2_3_3_REV)
+	.D(GL_UNSIGNED_SHORT_5_6_5)	.D(GL_UNSIGNED_SHORT_5_6_5_REV)
+	.D(GL_UNSIGNED_SHORT_4_4_4_4)	.D(GL_UNSIGNED_SHORT_4_4_4_4_REV)
+	.D(GL_UNSIGNED_SHORT_5_5_5_1)	.D(GL_UNSIGNED_SHORT_1_5_5_5_REV)
+	.D(GL_UNSIGNED_INT_8_8_8_8)	.D(GL_UNSIGNED_INT_8_8_8_8_REV)
+	.D(GL_UNSIGNED_INT_10_10_10_2)	.D(GL_UNSIGNED_INT_2_10_10_10_REV)
 	;
 	polygon_mode
 	.D(GL_POINT)
@@ -482,12 +474,9 @@
 	.D(GL_COMPILE_AND_EXECUTE)
 	;
 	texture_parameter
-	.D(GL_TEXTURE_MIN_FILTER)
-	.D(GL_TEXTURE_MAG_FILTER)
-	.D(GL_TEXTURE_MIN_LOD)
-	.D(GL_TEXTURE_MAX_LOD)
-	.D(GL_TEXTURE_BASE_LEVEL)
-	.D(GL_TEXTURE_MAX_LEVEL)
+	.D(GL_TEXTURE_MIN_FILTER).D(GL_TEXTURE_MAG_FILTER)
+	.D(GL_TEXTURE_MIN_LOD)   .D(GL_TEXTURE_MAX_LOD)
+	.D(GL_TEXTURE_BASE_LEVEL).D(GL_TEXTURE_MAX_LEVEL)
 	.D(GL_TEXTURE_WRAP_S)
 	.D(GL_TEXTURE_WRAP_T)
 	.D(GL_TEXTURE_WRAP_R)



More information about the Gridflow-cvs mailing list