X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fpreprocessor.cpp;h=354b2a7a84b6d8f6a0fda875f8b396caaba211df;hb=2b87464682733c875966c1aa3b3369efbd60b310;hp=3c190221952ab7758fdbbc984c071abb41d39c8f;hpb=d3ceb2186dc79130508093b3d0c944771a53534f;p=libs%2Fgl.git

diff --git a/source/glsl/preprocessor.cpp b/source/glsl/preprocessor.cpp
index 3c190221..354b2a7a 100644
--- a/source/glsl/preprocessor.cpp
+++ b/source/glsl/preprocessor.cpp
@@ -14,8 +14,6 @@ Preprocessor::Preprocessor(Tokenizer &t):
 
 void Preprocessor::preprocess()
 {
-	tokenizer.expect("#");
-
 	string token = tokenizer.peek_token();
 	if(token=="pragma")
 		preprocess_pragma();
@@ -66,13 +64,13 @@ void Preprocessor::preprocess_stage()
 	tokenizer.expect("stage");
 	tokenizer.expect("(");
 	string token = tokenizer.parse_token();
-	StageType stage = SHARED;
+	Stage::Type stage = Stage::SHARED;
 	if(token=="vertex")
-		stage = VERTEX;
+		stage = Stage::VERTEX;
 	else if(token=="geometry")
-		stage = GEOMETRY;
+		stage = Stage::GEOMETRY;
 	else if(token=="fragment")
-		stage = FRAGMENT;
+		stage = Stage::FRAGMENT;
 	else
 		throw parse_error(tokenizer.get_location(), token, "stage identifier");
 	tokenizer.expect(")");