--- OpenCL/OpenCL.xs	2012/04/21 19:48:58	1.39
+++ OpenCL/OpenCL.xs	2012/04/21 19:49:40	1.40
@@ -761,22 +761,12 @@
         NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLBuffer, (self, flags, bufobj, &res));
         XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem);
 
-#if !CL_VERSION_1_2 || defined CL_USE_DEPRECATED_OPENCL_1_1_APIS
-
 void
-gl_texture2d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
+gl_renderbuffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint renderbuffer)
 	PPCODE:
-	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture2D, (self, flags, target, miplevel, texture, &res));
+	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLRenderbuffer, (self, flags, renderbuffer, &res));
         XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
 
-void
-gl_texture3d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
-	PPCODE:
-	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture3D, (self, flags, target, miplevel, texture, &res));
-        XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
-
-#endif
-
 #if CL_VERSION_1_2
 
 void
@@ -799,12 +789,22 @@
 
 #endif
 
+#if !CL_VERSION_1_2 || defined CL_USE_DEPRECATED_OPENCL_1_1_APIS
+
 void
-gl_renderbuffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint renderbuffer)
+gl_texture2d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
 	PPCODE:
-	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLRenderbuffer, (self, flags, renderbuffer, &res));
+	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture2D, (self, flags, target, miplevel, texture, &res));
         XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
 
+void
+gl_texture3d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
+	PPCODE:
+	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture3D, (self, flags, target, miplevel, texture, &res));
+        XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
+
+#endif
+
 #endif
 
 void