ruby-opengl 0.50.0 → 0.60.0

data/test/tc_func_12.rb

@@ -98,19 +98,19 @@ class Test_12 < Test::Unit::TestCase
 		assert_equal(glGetConvolutionFilter(GL_CONVOLUTION_2D, GL_RGB, GL_FLOAT),cf)
 
 		glConvolutionParameterf(GL_CONVOLUTION_1D,GL_CONVOLUTION_BORDER_MODE,GL_CONSTANT_BORDER)
-		assert_equal(glGetConvolutionParameterfv(GL_CONVOLUTION_1D,GL_CONVOLUTION_BORDER_MODE),[GL_CONSTANT_BORDER])
+		assert_equal(glGetConvolutionParameterfv(GL_CONVOLUTION_1D,GL_CONVOLUTION_BORDER_MODE),GL_CONSTANT_BORDER)
 
 		glConvolutionParameterf(GL_CONVOLUTION_1D,GL_CONVOLUTION_BORDER_MODE,GL_REPLICATE_BORDER)
-		assert_equal(glGetConvolutionParameterfv(GL_CONVOLUTION_1D,GL_CONVOLUTION_BORDER_MODE),[GL_REPLICATE_BORDER])
+		assert_equal(glGetConvolutionParameterfv(GL_CONVOLUTION_1D,GL_CONVOLUTION_BORDER_MODE),GL_REPLICATE_BORDER)
 
 		glConvolutionParameterfv(GL_CONVOLUTION_1D,GL_CONVOLUTION_BORDER_MODE,[GL_CONSTANT_BORDER])
-		assert_equal(glGetConvolutionParameterfv(GL_CONVOLUTION_1D,GL_CONVOLUTION_BORDER_MODE),[GL_CONSTANT_BORDER])
+		assert_equal(glGetConvolutionParameterfv(GL_CONVOLUTION_1D,GL_CONVOLUTION_BORDER_MODE),GL_CONSTANT_BORDER)
 
 		glConvolutionParameteri(GL_CONVOLUTION_1D,GL_CONVOLUTION_BORDER_MODE,GL_REPLICATE_BORDER)
-		assert_equal(glGetConvolutionParameteriv(GL_CONVOLUTION_1D,GL_CONVOLUTION_BORDER_MODE),[GL_REPLICATE_BORDER])
+		assert_equal(glGetConvolutionParameteriv(GL_CONVOLUTION_1D,GL_CONVOLUTION_BORDER_MODE),GL_REPLICATE_BORDER)
 
 		glConvolutionParameteriv(GL_CONVOLUTION_1D,GL_CONVOLUTION_BORDER_MODE,[GL_CONSTANT_BORDER])
-		assert_equal(glGetConvolutionParameteriv(GL_CONVOLUTION_1D,GL_CONVOLUTION_BORDER_MODE),[GL_CONSTANT_BORDER])
+		assert_equal(glGetConvolutionParameteriv(GL_CONVOLUTION_1D,GL_CONVOLUTION_BORDER_MODE),GL_CONSTANT_BORDER)
 	end
 
 	def test_separablefilter
@@ -128,9 +128,9 @@ class Test_12 < Test::Unit::TestCase
 		glEnable(GL_HISTOGRAM)
 
 		glHistogram(GL_HISTOGRAM,1,GL_RGB8,GL_FALSE)
-		assert_equal(glGetHistogramParameterfv(GL_HISTOGRAM,GL_HISTOGRAM_WIDTH),[1])
-		assert_equal(glGetHistogramParameteriv(GL_HISTOGRAM,GL_HISTOGRAM_FORMAT),[GL_RGB8])
-		assert_equal(glGetHistogramParameteriv(GL_HISTOGRAM,GL_HISTOGRAM_SINK),[GL_FALSE])
+		assert_equal(glGetHistogramParameterfv(GL_HISTOGRAM,GL_HISTOGRAM_WIDTH),1)
+		assert_equal(glGetHistogramParameteriv(GL_HISTOGRAM,GL_HISTOGRAM_FORMAT),GL_RGB8)
+		assert_equal(glGetHistogramParameteriv(GL_HISTOGRAM,GL_HISTOGRAM_SINK),GL_FALSE)
 
 		glDrawPixels(2,1,GL_RGB,GL_FLOAT,[1,1,1,1,1,1].pack("f*"))
 		h = glGetHistogram(GL_HISTOGRAM,GL_FALSE,GL_RGB,GL_FLOAT)
@@ -148,9 +148,9 @@ class Test_12 < Test::Unit::TestCase
 		glEnable(GL_MINMAX)		
 
 		glMinmax(GL_MINMAX,GL_RGB8,GL_FALSE)
-		assert_equal(glGetMinmaxParameteriv(GL_MINMAX,GL_MINMAX_FORMAT),[GL_RGB8])
-		assert_equal(glGetMinmaxParameterfv(GL_MINMAX,GL_MINMAX_FORMAT),[GL_RGB8])
-		assert_equal(glGetMinmaxParameterfv(GL_MINMAX,GL_MINMAX_SINK),[GL_FALSE])
+		assert_equal(glGetMinmaxParameteriv(GL_MINMAX,GL_MINMAX_FORMAT),GL_RGB8)
+		assert_equal(glGetMinmaxParameterfv(GL_MINMAX,GL_MINMAX_FORMAT),GL_RGB8)
+		assert_equal(glGetMinmaxParameteriv(GL_MINMAX,GL_MINMAX_SINK),GL_FALSE)
 
 		glDrawPixels(2,1,GL_RGB,GL_FLOAT,[0,0,0,1,1,1].pack("f*"))
 		mm = glGetMinmax(GL_MINMAX,GL_FALSE,GL_RGB,GL_FLOAT)

data/test/tc_func_13.rb

@@ -28,10 +28,10 @@ class Test_13 < Test::Unit::TestCase
 		return if not supported?(1.3)
 		glSampleCoverage(0.0,GL_TRUE)
 		assert_equal(glGetDoublev(GL_SAMPLE_COVERAGE_VALUE),0.0)
-		assert_equal(glGetDoublev(GL_SAMPLE_COVERAGE_INVERT),GL_TRUE)
+		assert_equal(glGetBooleanv(GL_SAMPLE_COVERAGE_INVERT),GL_TRUE)
 		glSampleCoverage(1.0,GL_FALSE)
 		assert_equal(glGetDoublev(GL_SAMPLE_COVERAGE_VALUE),1.0)
-		assert_equal(glGetDoublev(GL_SAMPLE_COVERAGE_INVERT),GL_FALSE)
+		assert_equal(glGetBooleanv(GL_SAMPLE_COVERAGE_INVERT),GL_FALSE)
 	end
 
 	def test_multitexture
@@ -68,6 +68,26 @@ class Test_13 < Test::Unit::TestCase
 		glLoadIdentity()
 		glMultTransposeMatrixd(m_b)
 		assert_equal(glGetDoublev(GL_TRANSPOSE_MODELVIEW_MATRIX), m_b)
+
+		# 2
+		m = Matrix.rows([[1,2,3,4],[5,6,7,8],[9,10,11,12],[13,14,15,16]])
+		glMatrixMode(GL_MODELVIEW)
+		glLoadTransposeMatrixf(m)
+		assert_equal(glGetDoublev(GL_MODELVIEW_MATRIX), m.to_a.transpose)
+		glLoadIdentity()
+		glLoadTransposeMatrixd(m)
+		assert_equal(glGetDoublev(GL_MODELVIEW_MATRIX), m.to_a.transpose)
+		glLoadIdentity()
+		glMultTransposeMatrixf(m)
+		assert_equal(glGetDoublev(GL_MODELVIEW_MATRIX), m.to_a.transpose)
+		glLoadIdentity()
+		glMultTransposeMatrixd(m)
+		assert_equal(glGetDoublev(GL_MODELVIEW_MATRIX), m.to_a.transpose)
+
+		assert_raise ArgumentError do glLoadTransposeMatrixf([1,2,3,4]) end
+		assert_raise ArgumentError do glLoadTransposeMatrixd([1,2,3,4]) end
+		assert_raise ArgumentError do glMultTransposeMatrixf([1,2,3,4]) end
+		assert_raise ArgumentError do glMultTransposeMatrixd([1,2,3,4]) end
 	end
 	
 	def test_texturecompression
@@ -86,18 +106,18 @@ class Test_13 < Test::Unit::TestCase
 		# Note: 1D and 3D compressed textures are not supported by S3TC/DXTn, and usually not supported at all
 
 		# 1D
-		glCompressedTexImage1D(GL_TEXTURE_1D,0,GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,4,0,16,image_1)
-		err = glGetError()
-		assert(err == 0 || err == GL_INVALID_ENUM || err == GL_INVALID_OPERATION)
-		if (err == 0)
+		begin 
+			glCompressedTexImage1D(GL_TEXTURE_1D,0,GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,4,0,16,image_1)
 			assert_equal(glGetCompressedTexImage(GL_TEXTURE_1D,0), image_1)
+		rescue Gl::Error => err
+			assert(err.id == GL_INVALID_ENUM || err.id == GL_INVALID_OPERATION)
 		end
 
-		glCompressedTexSubImage1D(GL_TEXTURE_1D,0,0,4,GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,16,image_2)
-		err = glGetError()
-		assert(err == 0 || err == GL_INVALID_ENUM || err == GL_INVALID_OPERATION)
-		if (err == 0)
+		begin 
+			glCompressedTexSubImage1D(GL_TEXTURE_1D,0,0,4,GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,16,image_2)
 			assert_equal(glGetCompressedTexImage(GL_TEXTURE_1D,0), image_2)
+		rescue Gl::Error => err
+			assert(err.id == GL_INVALID_ENUM || err.id == GL_INVALID_OPERATION)
 		end
 
 		# 2D
@@ -108,18 +128,18 @@ class Test_13 < Test::Unit::TestCase
 		assert_equal(glGetCompressedTexImage(GL_TEXTURE_2D,0), image_2)
 
 		# 3D
-		glCompressedTexImage3D(GL_TEXTURE_3D,0,GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,2,2,1,0,16,image_1)
-		err = glGetError()
-		assert(err == 0 || err == GL_INVALID_ENUM || err == GL_INVALID_OPERATION)
-		if (err == 0)
+		begin 
+			glCompressedTexImage3D(GL_TEXTURE_3D,0,GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,2,2,1,0,16,image_1)
 			assert_equal(glGetCompressedTexImage(GL_TEXTURE_3D,0), image_1)
+		rescue Gl::Error => err
+			assert(err.id == GL_INVALID_ENUM || err.id == GL_INVALID_OPERATION)
 		end
 
-		glCompressedTexSubImage3D(GL_TEXTURE_3D,0, 0,0,0, 2,2,1, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, 16, image_2)
-		err = glGetError()
-		assert(err == 0 || err == GL_INVALID_ENUM || err == GL_INVALID_OPERATION)
-		if (err == 0)
+		begin 
+			glCompressedTexSubImage3D(GL_TEXTURE_3D,0, 0,0,0, 2,2,1, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, 16, image_2)
 			assert_equal(glGetCompressedTexImage(GL_TEXTURE_3D,0), image_2)
+		rescue Gl::Error => err
+			assert(err.id == GL_INVALID_ENUM || err.id == GL_INVALID_OPERATION)
 		end
 		
 		glDeleteTextures(textures)

data/test/tc_func_14.rb

@@ -128,11 +128,11 @@ class Test_14 < Test::Unit::TestCase
 		assert(approx_equal(glGetDoublev(GL_CURRENT_SECONDARY_COLOR),[0.0,1.0,0.0,1.0]))
 		glSecondaryColor3d(1.0,0.0,1.0)
 		assert(approx_equal(glGetDoublev(GL_CURRENT_SECONDARY_COLOR),[1.0,0.0,1.0,1.0]))
-		glSecondaryColor3dv(0.0,1.0,0.0)
+		glSecondaryColor3dv([0.0,1.0,0.0])
 		assert(approx_equal(glGetDoublev(GL_CURRENT_SECONDARY_COLOR),[0.0,1.0,0.0,1.0]))
 		glSecondaryColor3f(1.0,0.0,1.0)
 		assert(approx_equal(glGetDoublev(GL_CURRENT_SECONDARY_COLOR),[1.0,0.0,1.0,1.0]))
-		glSecondaryColor3fv(0.0,1.0,0.0)
+		glSecondaryColor3fv([0.0,1.0,0.0])
 		assert(approx_equal(glGetDoublev(GL_CURRENT_SECONDARY_COLOR),[0.0,1.0,0.0,1.0]))
 		glSecondaryColor3i(2**31-1,0,2**31-1)
 		assert(approx_equal(glGetDoublev(GL_CURRENT_SECONDARY_COLOR),[1.0,0.0,1.0,1.0]))

data/test/tc_func_15.rb

@@ -30,7 +30,7 @@ class Test_15 < Test::Unit::TestCase
 		assert_equal(queries.size,2)
 
 		glBeginQuery(GL_SAMPLES_PASSED,queries[1])
-		assert_equal(glIsQuery(queries[1]),GL_TRUE)
+		assert_equal(glIsQuery(queries[1]),true)
 		
 		glBegin(GL_TRIANGLES)
 		glVertex2i(0,0)
@@ -38,27 +38,27 @@ class Test_15 < Test::Unit::TestCase
 		glVertex2i(1,1)
 		glEnd()
 
-		assert_equal(glGetQueryiv(GL_SAMPLES_PASSED,GL_CURRENT_QUERY),[queries[1]])
+		assert_equal(glGetQueryiv(GL_SAMPLES_PASSED,GL_CURRENT_QUERY),queries[1])
 	
 		glEndQuery(GL_SAMPLES_PASSED)
 		
 		r = glGetQueryObjectiv(queries[1],GL_QUERY_RESULT_AVAILABLE)
-		assert((r==[GL_TRUE] || r==[GL_FALSE]))
+		assert((r==GL_TRUE || r==GL_FALSE))
 
-		if (r==[GL_TRUE])
+		if (r==GL_TRUE)
 		assert(glGetQueryObjectiv(queries[1],GL_QUERY_RESULT)[0] > 0)
 		assert(glGetQueryObjectuiv(queries[1],GL_QUERY_RESULT)[0] > 0)
 		end
 		
 		glDeleteQueries(queries)
-		assert_equal(glIsQuery(queries[1]),GL_FALSE)
+		assert_equal(glIsQuery(queries[1]),false)
 	end
 	
 	def test_buffers
 		return if not supported?(1.5)
 		buffers = glGenBuffers(2)
 		glBindBuffer(GL_ARRAY_BUFFER,buffers[0])
-		assert_equal(glIsBuffer(buffers[0]),GL_TRUE)		
+		assert_equal(glIsBuffer(buffers[0]),true)		
 
 		data = [0,1,2,3].pack("C*")
 		data2 = [4,5,6,7].pack("C*")
@@ -66,16 +66,16 @@ class Test_15 < Test::Unit::TestCase
 		glBufferData(GL_ARRAY_BUFFER,4,data,GL_STREAM_READ)
 		assert_equal(glGetBufferSubData(GL_ARRAY_BUFFER,0,4),data)
 
-		assert_equal(glGetBufferParameteriv(GL_ARRAY_BUFFER,GL_BUFFER_USAGE),[GL_STREAM_READ])
+		assert_equal(glGetBufferParameteriv(GL_ARRAY_BUFFER,GL_BUFFER_USAGE),GL_STREAM_READ)
 
 		glBufferSubData(GL_ARRAY_BUFFER,0,4,data2)
 		assert_equal(glGetBufferSubData(GL_ARRAY_BUFFER,0,4),data2)
 
 		assert_equal(glMapBuffer(GL_ARRAY_BUFFER,GL_READ_ONLY),data2)
 		r = glUnmapBuffer(GL_ARRAY_BUFFER)
-		assert(r == GL_TRUE || r == GL_FALSE)
+		assert(r == true || r == false)
 		glDeleteBuffers(buffers)		
-		assert_equal(glIsBuffer(buffers[0]),GL_FALSE)
+		assert_equal(glIsBuffer(buffers[0]),false)
 
 		# FIXME: GetBufferPointerv not yet implemented
 	end
@@ -191,7 +191,7 @@ class Test_15 < Test::Unit::TestCase
 		assert_equal(glGetDoublev(GL_CURRENT_NORMAL),[0,1,0])
 		assert_equal(glGetDoublev(GL_CURRENT_COLOR),[1,0,1,0])
 		assert_equal(glGetDoublev(GL_CURRENT_TEXTURE_COORDS),[1,0,1,0])
-		assert_equal(glGetDoublev(GL_EDGE_FLAG),GL_FALSE)
+		assert_equal(glGetBooleanv(GL_EDGE_FLAG),GL_FALSE)
 
 		glDisable(GL_EDGE_FLAG_ARRAY)
 		glDisable(GL_TEXTURE_COORD_ARRAY)

data/test/tc_func_20.rb

@@ -172,10 +172,10 @@ class Test_20 < Test::Unit::TestCase
 		vertex_shader_source = "void main() { gl_Position = ftransform();}"
 	
 		program = glCreateProgram()
-		assert_equal(glIsProgram(program),GL_TRUE)
+		assert_equal(glIsProgram(program),true)
 
 		vs = glCreateShader(GL_VERTEX_SHADER)
-		assert_equal(glIsShader(vs),GL_TRUE)
+		assert_equal(glIsShader(vs),true)
 
 		glShaderSource(vs,vertex_shader_source)
 		assert_equal(glGetShaderSource(vs),vertex_shader_source)
@@ -188,7 +188,7 @@ class Test_20 < Test::Unit::TestCase
 		assert_equal(vslog.class,String)
 
 		glAttachShader(program,vs)
-		assert_equal(glGetAttachedShaders(program),[vs])
+		assert_equal(glGetAttachedShaders(program),vs)
 		glDetachShader(program,vs)
 		assert_equal(glGetAttachedShaders(program),nil)
 		glAttachShader(program,vs)
@@ -208,10 +208,10 @@ class Test_20 < Test::Unit::TestCase
 
 		glDetachShader(program,vs)
 		glDeleteShader(vs)
-		assert_equal(glIsShader(vs),GL_FALSE)
+		assert_equal(glIsShader(vs),false)
 
 		glDeleteProgram(program)
-		assert_equal(glIsProgram(program),GL_FALSE)
+		assert_equal(glIsProgram(program),false)
 	end
 
 	def test_shaders_2
@@ -248,7 +248,7 @@ class Test_20 < Test::Unit::TestCase
 
 		# f
 		glUniform1f(tv1l,2.0)
-		assert_equal(glGetUniformfv(program,tv1l),[2.0])
+		assert_equal(glGetUniformfv(program,tv1l),2.0)
 		glUniform2f(tv2l,2.0,2.0)
 		assert_equal(glGetUniformfv(program,tv2l),[2.0,2.0])
 		glUniform3f(tv3l,2.0,2.0,2.0)
@@ -257,7 +257,7 @@ class Test_20 < Test::Unit::TestCase
 		assert_equal(glGetUniformfv(program,tv4l),[2.0,2.0,2.0,2.0])
 		# i 
 		glUniform1i(tv1il,3)
-		assert_equal(glGetUniformiv(program,tv1il),[3])
+		assert_equal(glGetUniformiv(program,tv1il),3)
 		glUniform2i(tv2il,3,3)
 		assert_equal(glGetUniformiv(program,tv2il),[3,3])
 		glUniform3i(tv3il,3,3,3)
@@ -265,22 +265,22 @@ class Test_20 < Test::Unit::TestCase
 		glUniform4i(tv4il,3,3,3,3)
 		assert_equal(glGetUniformiv(program,tv4il),[3,3,3,3])
 		# fv
-		glUniform1fv(tv1l,1,[3.0])
-		assert_equal(glGetUniformfv(program,tv1l),[3.0])
-		glUniform2fv(tv2l,1,[3.0,3.0])
+		glUniform1fv(tv1l,[3.0])
+		assert_equal(glGetUniformfv(program,tv1l),3.0)
+		glUniform2fv(tv2l,[3.0,3.0])
 		assert_equal(glGetUniformfv(program,tv2l),[3.0,3.0])
-		glUniform3fv(tv3l,1,[3.0,3.0,3.0])
+		glUniform3fv(tv3l,[3.0,3.0,3.0])
 		assert_equal(glGetUniformfv(program,tv3l),[3.0,3.0,3.0])
-		glUniform4fv(tv4l,1,[3.0,3.0,3.0,3.0])
+		glUniform4fv(tv4l,[3.0,3.0,3.0,3.0])
 		assert_equal(glGetUniformfv(program,tv4l),[3.0,3.0,3.0,3.0])
 		# iv
-		glUniform1iv(tv1il,1,[2])
-		assert_equal(glGetUniformiv(program,tv1il),[2])
-		glUniform2iv(tv2il,1,[2,2])
+		glUniform1iv(tv1il,[2])
+		assert_equal(glGetUniformiv(program,tv1il),2)
+		glUniform2iv(tv2il,[2,2])
 		assert_equal(glGetUniformiv(program,tv2il),[2,2])
-		glUniform3iv(tv3il,1,[2,2,2])
+		glUniform3iv(tv3il,[2,2,2])
 		assert_equal(glGetUniformiv(program,tv3il),[2,2,2])
-		glUniform4iv(tv4il,1,[2,2,2,2])
+		glUniform4iv(tv4il,[2,2,2,2])
 		assert_equal(glGetUniformiv(program,tv4il),[2,2,2,2])
 
 		glDeleteShader(vs)
@@ -309,13 +309,13 @@ class Test_20 < Test::Unit::TestCase
 		assert((tm3l = glGetUniformLocation(program,"testmat3"))>=0)
 		assert((tm4l = glGetUniformLocation(program,"testmat4"))>=0)
 
-		glUniformMatrix2fv(tm2l, 1, GL_TRUE, [0,1, 1,0])
+		glUniformMatrix2fv(tm2l, GL_TRUE, [0,1, 1,0])
 		assert_equal(glGetUniformfv(program,tm2l),[0,1,1,0])
 
-		glUniformMatrix3fv(tm3l, 1, GL_TRUE, [0,1,0, 1,0,1, 0,1,0])
+		glUniformMatrix3fv(tm3l, GL_TRUE, [0,1,0, 1,0,1, 0,1,0])
 		assert_equal(glGetUniformfv(program,tm3l),[0,1,0, 1,0,1, 0,1,0])
 
-		glUniformMatrix4fv(tm4l, 1, GL_TRUE, [0,1,0,1, 1,0,1,0, 0,1,0,1, 1,0,1,0])
+		glUniformMatrix4fv(tm4l, GL_TRUE, [0,1,0,1, 1,0,1,0, 0,1,0,1, 1,0,1,0])
 		assert_equal(glGetUniformfv(program,tm4l),[0,1,0,1, 1,0,1,0, 0,1,0,1, 1,0,1,0])
 	end
 

data/test/tc_func_21.rb

@@ -49,20 +49,51 @@ class Test_21 < Test::Unit::TestCase
 		assert((tm34l = glGetUniformLocation(program,"testmat34"))>=0)
 		assert((tm43l = glGetUniformLocation(program,"testmat43"))>=0)
 
-		glUniformMatrix2x3fv(tm23l, 1, GL_FALSE, [0,1, 1,0, 0,1])
+		glUniformMatrix2x3fv(tm23l, GL_FALSE, [0,1, 1,0, 0,1])
 		assert_equal(glGetUniformfv(program,tm23l),[0,1, 1,0, 0,1])
-		glUniformMatrix3x2fv(tm32l, 1, GL_FALSE, [1,0, 0,1, 1,0])
+		glUniformMatrix3x2fv(tm32l, GL_FALSE, [1,0, 0,1, 1,0])
 		assert_equal(glGetUniformfv(program,tm32l),[1,0, 0,1, 1,0])
 
-		glUniformMatrix2x4fv(tm24l, 1, GL_FALSE, [0,1, 1,0, 0,1, 1,0])
+		glUniformMatrix2x4fv(tm24l, GL_FALSE, [0,1, 1,0, 0,1, 1,0])
 		assert_equal(glGetUniformfv(program,tm24l),[0,1, 1,0, 0,1, 1,0])
-		glUniformMatrix4x2fv(tm42l, 1, GL_FALSE, [1,0, 0,1, 1,0, 0,1])
+		glUniformMatrix4x2fv(tm42l, GL_FALSE, [1,0, 0,1, 1,0, 0,1])
 		assert_equal(glGetUniformfv(program,tm42l),[1,0, 0,1, 1,0, 0,1])
 
-		glUniformMatrix3x4fv(tm34l, 1, GL_FALSE, [0,1,1, 1,0,1, 0,1,1, 1,0,1])
+		glUniformMatrix3x4fv(tm34l, GL_FALSE, [0,1,1, 1,0,1, 0,1,1, 1,0,1])
 		assert_equal(glGetUniformfv(program,tm34l),[0,1,1, 1,0,1, 0,1,1, 1,0,1])
-		glUniformMatrix4x3fv(tm43l, 1, GL_FALSE, [1,0,0, 0,1,0, 1,0,0, 0,1,0])
+		glUniformMatrix4x3fv(tm43l, GL_FALSE, [1,0,0, 0,1,0, 1,0,0, 0,1,0])
 		assert_equal(glGetUniformfv(program,tm43l),[1,0,0, 0,1,0, 1,0,0, 0,1,0])
+
+		# 2
+		m = Matrix.rows([[0,1],[1,0],[0,1]])
+		glUniformMatrix2x3fv(tm23l, GL_FALSE, m)
+		assert_equal(glGetUniformfv(program,tm23l),[0,1, 1,0, 0,1])
+		m = Matrix.rows([[0,1,1],[0,0,1]])
+		glUniformMatrix3x2fv(tm32l, GL_FALSE, m)
+		assert_equal(glGetUniformfv(program,tm32l),[0,1,1, 0,0,1])
+
+		m = Matrix.rows([[0,1],[1,0],[0,1],[1,0]])
+		glUniformMatrix2x4fv(tm24l, GL_FALSE, m)
+		assert_equal(glGetUniformfv(program,tm24l),[0,1, 1,0, 0,1, 1,0])
+		m = Matrix.rows([[0,1,1,1],[0,0,1,1]])
+		glUniformMatrix4x2fv(tm42l, GL_FALSE, m)
+		assert_equal(glGetUniformfv(program,tm42l),[0,1,1,1, 0,0,1,1])
+
+		m = Matrix.rows([[0,1,0],[1,0,1],[0,1,0],[1,0,1]])
+		glUniformMatrix3x4fv(tm34l, GL_FALSE, m)
+		assert_equal(glGetUniformfv(program,tm34l),[0,1,0, 1,0,1, 0,1,0, 1,0,1])
+
+		m = Matrix.rows([[0,1,1,1],[0,0,1,1],[1,1,0,0]])
+		glUniformMatrix4x3fv(tm43l, GL_FALSE, m)
+		assert_equal(glGetUniformfv(program,tm43l),[0,1,1,1, 0,0,1,1, 1,1,0,0])
+
+		# 3
+		assert_raise ArgumentError do glUniformMatrix2x3fv(tm23l, GL_FALSE, [1,2,3,4]) end
+		assert_raise ArgumentError do glUniformMatrix3x2fv(tm32l, GL_FALSE, [1,2,3,4]) end
+		assert_raise ArgumentError do glUniformMatrix2x4fv(tm24l, GL_FALSE, [1,2,3,4]) end
+		assert_raise ArgumentError do glUniformMatrix4x2fv(tm42l, GL_FALSE, [1,2,3,4]) end
+		assert_raise ArgumentError do glUniformMatrix3x4fv(tm34l, GL_FALSE, [1,2,3,4]) end
+		assert_raise ArgumentError do glUniformMatrix4x3fv(tm43l, GL_FALSE, [1,2,3,4]) end
 	end
 
 	def test_pixelunpack_bitmap
@@ -186,19 +217,19 @@ class Test_21 < Test::Unit::TestCase
 
 		# 1D
 		glBindBuffer(GL_PIXEL_UNPACK_BUFFER,buffers[0])
-		glCompressedTexImage1D(GL_TEXTURE_1D,0,GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,4,0,16,0)
-		err = glGetError()
-		assert(err == 0 || err == GL_INVALID_ENUM || err == GL_INVALID_OPERATION)
-		if (err == 0)
+		begin
+			glCompressedTexImage1D(GL_TEXTURE_1D,0,GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,4,0,16,0)
 			assert_equal(glGetCompressedTexImage(GL_TEXTURE_1D,0), image_1)
+		rescue Gl::Error => err
+			assert(err.id == GL_INVALID_ENUM || err.id == GL_INVALID_OPERATION)
 		end
 
 		glBindBuffer(GL_PIXEL_UNPACK_BUFFER,buffers[1])
-		glCompressedTexSubImage1D(GL_TEXTURE_1D,0,0,4,GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,16,0)
-		err = glGetError()
-		assert(err == 0 || err == GL_INVALID_ENUM || err == GL_INVALID_OPERATION)
-		if (err == 0)
+		begin
+			glCompressedTexSubImage1D(GL_TEXTURE_1D,0,0,4,GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,16,0)
 			assert_equal(glGetCompressedTexImage(GL_TEXTURE_1D,0), image_2)
+		rescue Gl::Error => err
+			assert(err.id == GL_INVALID_ENUM || err.id == GL_INVALID_OPERATION)
 		end
 		
 		# 2D
@@ -212,19 +243,19 @@ class Test_21 < Test::Unit::TestCase
 		
 		# 3D
 		glBindBuffer(GL_PIXEL_UNPACK_BUFFER,buffers[0])
-		glCompressedTexImage3D(GL_TEXTURE_3D,0,GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,2,2,1,0,16,0)
-		err = glGetError()
-		assert(err == 0 || err == GL_INVALID_ENUM || err == GL_INVALID_OPERATION)
-		if (err == 0)
+		begin
+			glCompressedTexImage3D(GL_TEXTURE_3D,0,GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,2,2,1,0,16,0)
 			assert_equal(glGetCompressedTexImage(GL_TEXTURE_3D,0), image_1)
+		rescue Gl::Error => err
+			assert(err.id == GL_INVALID_ENUM || err.id == GL_INVALID_OPERATION)
 		end
 		
 		glBindBuffer(GL_PIXEL_UNPACK_BUFFER,buffers[1])
-		glCompressedTexSubImage3D(GL_TEXTURE_3D,0, 0,0,0, 2,2,1, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, 16, 0)
-		err = glGetError()
-		assert(err == 0 || err == GL_INVALID_ENUM || err == GL_INVALID_OPERATION)
-		if (err == 0)
+		begin
+			glCompressedTexSubImage3D(GL_TEXTURE_3D,0, 0,0,0, 2,2,1, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, 16, 0)
 			assert_equal(glGetCompressedTexImage(GL_TEXTURE_3D,0), image_2)
+		rescue Gl::Error => err
+			assert(err.id == GL_INVALID_ENUM || err.id == GL_INVALID_OPERATION)
 		end
 
 		glDeleteBuffers(buffers)

data/test/tc_glu.rb

@@ -97,10 +97,12 @@ class Test_GLU < Test::Unit::TestCase
 		assert_equal(pos,[$window_size,$window_size,1])
 
 		mp = glGetDoublev(GL_PROJECTION_MATRIX)
-		mm = glGetDoublev(GL_MODELVIEW_MATRIX)
+		mm = Matrix.rows(glGetDoublev(GL_MODELVIEW_MATRIX))
 		view = glGetDoublev(GL_VIEWPORT)
 		pos = gluProject(1,1,1,mp,mm,view)
 		assert_equal(pos,[$window_size,$window_size,1])
+
+		assert_raise ArgumentError do pos = gluProject(1,1,1,mp,[1,2,3,4],view) end
 	end
 
 	def test_gluunproject
@@ -108,10 +110,11 @@ class Test_GLU < Test::Unit::TestCase
 		assert_equal(pos,[1,1,1])
 		
 		mp = glGetDoublev(GL_PROJECTION_MATRIX)
-		mm = glGetDoublev(GL_MODELVIEW_MATRIX)
+		mm = Matrix.rows(glGetDoublev(GL_MODELVIEW_MATRIX))
 		view = glGetDoublev(GL_VIEWPORT)
 		pos = gluUnProject($window_size,$window_size,1,mp,mm,view)
 		assert_equal(pos,[1,1,1])
+		assert_raise ArgumentError do	pos = gluUnProject($window_size,$window_size,1,mp,[1,2,3,4],view) end
 	end
 
 	def test_glupickmatrix
@@ -192,14 +195,16 @@ class Test_GLU < Test::Unit::TestCase
 		end
 	
 		m = [[1,0,0,0],[0,1,0,0],[0,0,1,0],[0,0,0,1]]
+		m2 = Matrix.rows(m)
 		
 		n = gluNewNurbsRenderer()
 		gluNurbsCallback(n,GLU_ERROR,n_error)
 		gluNurbsProperty(n,GLU_SAMPLING_TOLERANCE,40)
 		assert_equal(gluGetNurbsProperty(n,GLU_SAMPLING_TOLERANCE),40)
 		
-		gluLoadSamplingMatrices(n,m,m,glGetIntegerv(GL_VIEWPORT))
-		
+		gluLoadSamplingMatrices(n,m,m2,glGetIntegerv(GL_VIEWPORT))
+		assert_raise ArgumentError do gluLoadSamplingMatrices(n,m,[1,2,3,4],glGetIntegerv(GL_VIEWPORT)) end
+
 		knots = [0,0,0,0,1,1,1,1]
 		ctlpoints_curve = [[50,50,0],[400,50,0],[400,400,0],[50,400,0]]