X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fselect.cpp;h=e905729d84229877e09ce0fb7b1ad69a0c3d0939;hb=ceae2a27dfc58310c5bab7e3aa3fedf0fa9a1f49;hp=f19dd3ef62819c4f32d5356b7c838a3294e3e5a3;hpb=f098a871fc6dc7b61a5aca5581fa327e4124c036;p=libs%2Fgl.git

diff --git a/source/select.cpp b/source/select.cpp
index f19dd3ef..e905729d 100644
--- a/source/select.cpp
+++ b/source/select.cpp
@@ -5,18 +5,16 @@ Copyright © 2007  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <GL/gl.h>
-#include "error.h"
+#include "except.h"
+#include "gl.h"
 #include "select.h"
 
 using namespace std;
 
 namespace {
 
-using namespace Msp::GL;
-
-vector<SelectRecord> *select_buf=0;
-vector<uint> select_buf_int;
+vector<Msp::GL::SelectRecord> *select_buf=0;
+vector<unsigned> select_buf_int;
 
 }
 
@@ -30,14 +28,34 @@ void select_buffer(vector<SelectRecord> &buf)
 	select_buf=&buf;
 }
 
-void parse_select_records(const uint *buf, uint count, vector<SelectRecord> &tbuf)
+void init_names()
+{
+	glInitNames();
+}
+
+void push_name(unsigned n)
+{
+	glPushName(n);
+}
+
+void pop_name()
+{
+	glPopName();
+}
+
+void load_name(unsigned n)
+{
+	glLoadName(n);
+}
+
+void parse_select_records(const unsigned *buf, unsigned count, vector<SelectRecord> &tbuf)
 {
-	uint i=0;
+	unsigned i=0;
 	while(count--)
 	{
 		SelectRecord record;
 
-		uint n_names=buf[i++];
+		unsigned n_names=buf[i++];
 		record.min_depth=buf[i++];
 		record.max_depth=buf[i++];
 
@@ -49,10 +67,10 @@ void parse_select_records(const uint *buf, uint count, vector<SelectRecord> &tbu
 	}
 }
 
-void _parse_internal_select_records(uint count)
+void _parse_internal_select_records(unsigned count)
 {
 	if(!select_buf)
-		throw InvalidOperation("No select buffer specified");
+		throw InvalidState("No select buffer specified");
 	parse_select_records(&select_buf_int[0], count, *select_buf);
 }