diff options
| author | Jason Ekstrand <[email protected]> | 2016-02-05 15:03:04 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-02-05 15:03:44 -0800 |
| commit | 741744f691d6ef63e9f9a4c03136f969f2ffb0bf (patch) | |
| tree | 7c9192a0648c2d90bb08efbc21ebcb7a6e2b873a /src/compiler/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected | |
| parent | 9645b8eb1f1b79e537ad8ddb683507df7bc9da58 (diff) | |
| parent | eb63640c1d38a200a7b1540405051d3ff79d0d8a (diff) | |
Merge commit mesa-public/master into vulkan
This pulls in the patches that move all of the compiler stuff around
Diffstat (limited to 'src/compiler/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected')
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/compiler/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected b/src/compiler/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected new file mode 100644 index 00000000000..36f66992539 --- /dev/null +++ b/src/compiler/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected @@ -0,0 +1,3 @@ + +onetoken + |