vk/glsl_scraper: Use the line number from the end of the macro

We used to use the line number from the start of the macro but this doesn't
seem to match the c preprocessor

diff --git a/src/vulkan/glsl_scraper.py b/src/vulkan/glsl_scraper.py
index fa62daf5a2b629c1e9da733e5bbfa58fd36645cc..55885b4bdbfd3a06dfd859db4bdc79ff972b20bb 100644 (file)
--- a/src/vulkan/glsl_scraper.py
+++ b/src/vulkan/glsl_scraper.py
@@ -19,10 +19,9 @@ Options:
 import os, sys, re, cStringIO, tempfile, subprocess, struct, shutil
 
 class Shader:
-   def __init__(self, stage, line):
+   def __init__(self, stage):
       self.stream = cStringIO.StringIO()
       self.stage = stage
-      self.line = line
 
       if self.stage == 'VERTEX':
          self.ext = 'vert'
@@ -42,6 +41,9 @@ class Shader:
    def add_text(self, s):
       self.stream.write(s)
 
+   def finish_text(self, line):
+      self.line = line
+
    def glsl_source(self):
       return self.stream.getvalue()
 
@@ -153,8 +155,6 @@ class Parser:
          self.current_shader.add_text(t)
 
    def handle_macro(self):
-      line_number = self.line_number
-
       t = self.token_iter.next()
       assert t == '('
       t = self.token_iter.next()
@@ -166,9 +166,12 @@ class Parser:
       t = self.token_iter.next()
       assert t == ','
 
-      self.current_shader = Shader(stage, line_number)
+      self.current_shader = Shader(stage)
       self.handle_shader_src()
+      self.current_shader.finish_text(self.line_number)
+
       self.shaders.append(self.current_shader)
+      self.current_shader = None
 
    def run(self):
       for t in self.token_iter: