From: José Fonseca Date: Sun, 11 Dec 2011 12:36:06 +0000 (+0000) Subject: Check tri state. X-Git-Url: https://git.cworth.org/git?p=apitrace-tests;a=commitdiff_plain;h=2a5b8c481348e3c6818612dfe71a34397604cdba;ds=sidebyside Check tri state. --- diff --git a/.gitignore b/.gitignore index a90aef1..00e5a4e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,8 @@ *.so *.diff.* *.thumb.* +*.src.* +*.diff.* index.html CMakeCache.txt CMakeFiles diff --git a/apps/gl/tri.ref.json b/apps/gl/tri.ref.json new file mode 100644 index 0000000..8a26781 --- /dev/null +++ b/apps/gl/tri.ref.json @@ -0,0 +1,10 @@ +{ + "parameters": { + "GL_CURRENT_COLOR": [0, 0, 0.699999988, 1], + "GL_VIEWPORT": [0, 0, 250, 250], + "GL_PROJECTION_MATRIX": [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, -0.00199900055, 0, 0, 0, -0.99900049, 1], + "GL_SCISSOR_BOX": [0, 0, 250, 250], + "GL_COLOR_CLEAR_VALUE": [0.300000012, 0.100000001, 0.300000012, 1], + "GL_TRANSPOSE_PROJECTION_MATRIX": [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, -0.00199900055, -0.99900049, 0, 0, 0, 1] + } +} diff --git a/apps/gl/tri.ref.txt b/apps/gl/tri.ref.txt index ae43f86..90dd8aa 100644 --- a/apps/gl/tri.ref.txt +++ b/apps/gl/tri.ref.txt @@ -15,3 +15,4 @@ glVertex3f(x = 0, y = 0.9, z = -30) glEnd() glFlush() #image tri.ref.png +#state tri.ref.json diff --git a/driver.py b/driver.py index 0a0dc5b..e488e13 100755 --- a/driver.py +++ b/driver.py @@ -140,7 +140,7 @@ class TraceChecker: sys.stdout.write(line + '\n') mo = self.call_re.match(line) if mo: - self.call_no = int(mo.group(1)) + self.callNo = int(mo.group(1)) function_name = mo.group(2) if function_name.find('SwapBuffers') != -1 or \ line.find('kCGLPFADoubleBuffer') != -1: @@ -310,6 +310,7 @@ class TestCase: if not match: prefix = '%s.%u' % (self.getNamePrefix(), callNo) srcImageFileName = prefix + '.src.png' + srcImage.save(srcImageFileName) diffImageFileName = prefix + '.diff.png' comparer.write_diff(diffImageFileName) fail('snapshot from call %u does not match %s' % (callNo, refImageFileName))