fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-27 01:28:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source 
We used to use the line number from the start of the macro but this doesn't
seem to match the c preprocessor
This commit is contained in:
Jason Ekstrand 2015-05-19 11:26:35 -07:00
parent 1573913194
commit 4bcf58a192
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/vulkan/glsl_scraper.py
View file

@ -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: