summaryrefslogtreecommitdiffstats
path: root/src/glsl
Commit message (Collapse)AuthorAgeFilesLines
* glsl: Add support for default precision statementsChad Versace2011-01-174-9/+67
| | | | | | * Add new field ast_type_specifier::is_precision_statement. * Add semantic checks in ast_type_specifier::hir(). * Alter parser rules accordingly.
* glsl: Add semantic checks for precision qualifiersChad Versace2011-01-171-0/+33
| | | | | | | | | | | * Check that precision qualifiers only appear in language versions 1.00, 1.30, and later. * Check that precision qualifiers do not apply to bools and structs. Fixes the following Piglit tests: * spec/glsl-1.30/precision-qualifiers/precision-bool-01.frag * spec/glsl-1.30/precision-qualifiers/precision-struct-01.frag * spec/glsl-1.30/precision-qualifiers/precision-struct-02.frag
* glsl: Fix parser rule for type_specifierChad Versace2011-01-171-0/+3
| | | | | Do not assign a value to ast_type_specifier::precision when no precision qualifier is present.
* glsl: Change default value of ast_type_specifier::precisionChad Versace2011-01-172-4/+5
| | | | | | | | Change default value to ast_precision_none, which denotes the absence of a precision of a qualifier. Previously, the default value was ast_precision_high. This made it impossible to detect if a precision qualifier was present or not.
* glsl: Check that 'centroid in' does not occur in vertex shaderChad Versace2011-01-171-0/+13
| | | | | | | | | | The check is performed only in GLSL versions >= 1.30. From section 4.3.4 of the GLSL 1.30 spec: "It is an error to use centroid in in a vertex shader." Fixes Piglit test spec/glsl-1.30/compiler/storage-qualifiers/vs-centroid-in-01.vert
* glsl: Check that interpolation quals only apply to vertex ins and fragment outsChad Versace2011-01-171-0/+35
| | | | | | | | The check is performed only in GLSL versions >= 1.30. Fixes the following Piglit tests: * spec/glsl-1.30/compiler/interpolation-qualifiers/fs-smooth-02.frag * spec/glsl-1.30/compiler/interpolation-qualifiers/vs-smooth-01.vert
* glsl: Check that interpolation qualifiers do not precede 'varying'Chad Versace2011-01-173-0/+38
| | | | | | | | | | | | | ... and 'centroid varying'. The check is performed only in GLSL versions >= 1.30. From page 29 (page 35 of the PDF) of the GLSL 1.30 spec: "interpolation qualifiers may only precede the qualifiers in, centroid in, out, or centroid out in a declaration. They do not apply to the deprecated storage qualifiers varying or centroid varying." Fixes Piglit test spec/glsl-1.30/compiler/interpolation-qualifiers/smooth-varying-01.frag.
* glsl: Add method ast_type_qualifier::interpolation_string()Chad Versace2011-01-172-0/+25
| | | | | | If an interpolation qualifier is present, then the method returns that qualifier's string representation. For example, if the noperspective bit is set, then it returns "noperspective".
* Merge branch 'draw-instanced'Brian Paul2011-01-156-1/+50
|\ | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/draw/draw_llvm.c src/gallium/drivers/llvmpipe/lp_state_fs.c src/glsl/ir_set_program_inouts.cpp src/mesa/tnl/t_vb_program.c
| * glsl: add support for system values and GL_ARB_draw_instancedBrian Paul2010-12-086-2/+52
| |
* | glsl: fix implicit int to bool warningBrian Paul2011-01-141-1/+1
| | | | | | | | Maybe preprocess() should return a bool.
* | generate_builtins.py: Whitespace fixes.Vinson Lee2011-01-141-7/+7
| | | | | | | | Also removed unnecessary semicolons.
* | generate_builtins.py: Fix builds using Python 2.5.Vinson Lee2011-01-141-0/+2
| |
* | glsl: Emit errors or warnings when 'layout' is used with 'attribute' or ↵Ian Romanick2011-01-131-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'varying' The specs that add 'layout' require the use of 'in' or 'out'. However, a number of implementations, including Mesa, shipped several of these extensions allowing the use of 'varying' and 'attribute'. For these extensions only a warning is emitted. This differs from the behavior of Mesa 7.10. Mesa 7.10 would only accept 'attribute' with 'layout(location)'. This behavior was clearly wrong. Rather than carrying the broken behavior forward, we're just doing the correct thing. This is related to (piglit) bugzilla #31804. NOTE: This is a candidate for the 7.9 and 7.10 branches.
* | glsl: Allow 'in' and 'out' when 'layout' is also availableIan Romanick2011-01-131-2/+5
| | | | | | | | | | | | | | | | | | All of the extensions that add the 'layout' keyword also enable (and required) the use of 'in' and 'out' with shader globals. This is related to (piglit) bugzilla #31804. NOTE: This is a candidate for the 7.9 and 7.10 branches.
* | scons: Fix cross-compilation.José Fonseca2011-01-131-30/+39
| | | | | | | | Hairy stuff. Don't know how to do it better though.
* | glsl/s_expression: Read and ignore Scheme-style comments.Kenneth Graunke2011-01-121-6/+15
| | | | | | | | | | A single-semicolon until the end of the line, i.e. ; this is a comment.
* | glsl/builtins: Remove unnecessary (constant bool (1)) from assignments.Kenneth Graunke2011-01-1212-269/+265
| | | | | | | | This isn't strictly necessary, but is definitely nicer.
* | ir_reader: Make assignment conditions optional.Kenneth Graunke2011-01-122-11/+13
| | | | | | | | | | You can now simply write (assign (xy) <lhs> <rhs>) instead of the verbose (assign (constant bool (1)) (xy) <lhs> <rhs>).
* | ir_reader: Convert to a class.Kenneth Graunke2011-01-121-238/+241
| | | | | | | | | | | | | | This makes it unnecessary to pass _mesa_glsl_parse_state around everywhere, making at least the prototypes a lot easier to read. It's also more C++-ish than a pile of static C functions.
* | ir_reader: Combine the three dereference reading functions into one.Kenneth Graunke2011-01-121-83/+36
| | | | | | | | | | These used to be more complicated, but now are so simple there's no real point in keeping them separate.
* | ir_reader: Relax requirement that function arguments be s_lists.Kenneth Graunke2011-01-121-85/+78
| | | | | | | | | | | | | | | | | | All of these functions used to take s_list pointers so they wouldn't all need SX_AS_LIST conversions and error checking. However, the new pattern matcher conveniently does this for us in one centralized place. So there's no need to insist on s_list. Switching to s_expression saves a bit of code and is somewhat cleaner.
* | ir_reader: Remove s_list::length() method.Kenneth Graunke2011-01-123-18/+8
| | | | | | | | | | Most code now relies on the pattern matcher rather than this function, and for the only remaining case, not using this saves an iteration.
* | ir_reader: Add a pattern matching system and use it everywhere.Kenneth Graunke2011-01-123-308/+294
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the IR reader was riddled with code that: 1. Checked for the right number of list elements (via a linked list walk) 2. Retrieved references to each component (via ->next->next pointers) 3. Downcasted as necessary to make sure that each sub-component was the right type (i.e. symbol, int, list). 4. Checking that the tag (i.e. "declare") was correct. This was all very ad-hoc and a bit ugly. Error checking had to be done at both steps 1, 3, and 4. Most code didn't even check the tag, relying on the caller to do so. Not all callers did. The new pattern matching module performs the whole process in a single straightforward function call, resulting in shorter, more readable code. Unfortunately, MSVC does not support C99-style anonymous arrays, so the pattern must be declared outside of the match call.
* | glsl: remove trailing comma to silence warningBrian Paul2011-01-121-1/+1
| |
* | glsl/Makefile: Fix build with --as-needed.Kenneth Graunke2011-01-121-1/+1
| |
* | glsl: Track variable usage, use that to enforce semanticsIan Romanick2011-01-123-2/+26
| | | | | | | | | | | | | | | | | | In particular, variables cannot be redeclared invariant after being used. Fixes piglit test invariant-05.vert and bugzilla #29164. NOTE: This is a candidate for the 7.9 and 7.10 branches.
* | generate_builtins.py: Add missing import.Vinson Lee2011-01-121-0/+1
| | | | | | | | Import sys for sys.exit.
* | glsl: Make builtin_compiler build on Windows with MSVC.José Fonseca2011-01-121-1/+13
| |
* | glsl: Make builtin_compiler portable for non-unices.José Fonseca2011-01-121-31/+28
| |
* | getopt: Import OpenBSD getopt implementation for MSVC.José Fonseca2011-01-121-0/+4
| |
* | glsl: Add type inference support for remaining expression opcodes.Kenneth Graunke2011-01-111-0/+48
| |
* | glsl: Fix the lowering of variable array indexing to not lose write_masks.Eric Anholt2011-01-111-13/+37
| | | | | | | | Fixes glsl-complex-subscript on 965.
* | glsl: Autogenerate builtin_functions.cpp as part of the build process.Kenneth Graunke2011-01-106-13652/+40
| | | | | | | | | | | | Python is already necessary for other parts of Mesa, so there's no reason we can't just generate it. This patch updates both make and SCons to do so.
* | glsl: Disallow 'in' and 'out' on globals in GLSL 1.20Ian Romanick2011-01-101-5/+5
| | | | | | | | | | | | | | | | Fixes piglit tests glsl-1.20/compiler/qualifiers/in-01.vert and glsl-1.20/compiler/qualifiers/out-01.vert and bugzilla #32910. NOTE: This is a candidate for the 7.9 and 7.10 branches. This patch also depends on the previous two commits.
* | glsl: Refresh autogenerated parser file.Ian Romanick2011-01-101-259/+258
| | | | | | | | For the previous commit.
* | glsl: Add version_string containing properly formatted GLSL versionIan Romanick2011-01-102-14/+14
| |
* | glcpp: Refresh autogenerated lexer and parser files.Ian Romanick2011-01-101-184/+181
| | | | | | | | For the previous commit.
* | glcpp: Generate an error for division by zeroIan Romanick2011-01-101-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When GCC encounters a division by zero in a preprocessor directive, it generates an error. Since the GLSL spec says that the GLSL preprocessor behaves like the C preprocessor, we should generate that same error. It's worth noting that I cannot find any text in the C99 spec that says this should be an error. The only text that I can find is line 5 on page 82 (section 6.5.5 Multiplicative Opertors), which says, "The result of the / operator is the quotient from the division of the first operand by the second; the result of the % operator is the remainder. In both operations, if the value of the second operand is zero, the behavior is undefined." Fixes 093-divide-by-zero.c test and bugzilla #32831. NOTE: This is a candidate for the 7.9 and 7.10 branches.
* | glcpp: Regenerate glcpp-parse.cChad Versace2011-01-101-0/+21
| |
* | glcpp: Fix segfault when validating macro redefinitionsChad Versace2011-01-101-0/+21
| | | | | | | | | | | | | | | | In _token_list_equal_ignoring_space(token_list_t*, token_list_t*), add a guard that prevents dereferncing a null token list. This fixes test src/glsl/glcpp/tests/092-redefine-macro-error-2.c and Bugzilla #32695.
* | glsl: At link-time, check that globals have matching centroid qualifiersChad Versace2011-01-101-0/+6
| | | | | | | | Fixes bug 31923: http://bugs.freedesktop.org/show_bug.cgi?id=31923
* | glsl: Refresh autogenerated lexer and parser files.Ian Romanick2011-01-063-2649/+2700
| | | | | | | | For the previous commit.
* | glsl: Support the 'invariant(all)' pragmaIan Romanick2011-01-064-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously the 'STDGL invariant(all)' pragma added in GLSL 1.20 was simply ignored by the compiler. This adds support for setting all variable invariant. In GLSL 1.10 and GLSL ES 1.00 the pragma is ignored, per the specs, but a warning is generated. Fixes piglit test glsl-invariant-pragma and bugzilla #31925. NOTE: This is a candidate for the 7.9 and 7.10 branches.
* | glsl: Allow less restrictive uses of sampler array indexing in GLSL <= 1.20Ian Romanick2011-01-061-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GLSL 1.10 and 1.20 allow any sort of sampler array indexing. Restrictions were added in GLSL 1.30. Commit f0f2ec4d added support for the 1.30 restrictions, but it broke some valid 1.10/1.20 shaders. This changes the error to a warning in GLSL 1.10, GLSL 1.20, and GLSL ES 1.00. There are some spurious whitespace changes in this commit. I changed the layout (and wording) of the error message so that all three cases would be similar. The 1.10/1.20 and 1.30 text is the same. The only difference is that one is an error, and the other is a warning. The GLSL ES 1.00 wording is similar but not quite the same. Fixes piglit test spec/glsl-1.10/compiler/constant-expressions/sampler-array-index-02.frag and bugzilla #32374.
* | glcpp: Add test for recursive #define.Vinson Lee2011-01-041-0/+3
| |
* | glcpp: Add division by zero test cases.Vinson Lee2011-01-042-0/+4
| |
* | glsl: Check that integer vertex outputs are qualified with flatChad Versace2011-01-041-0/+19
| | | | | | | | | | | | | | | | | | | | Perform this check in ast_declarator_list::hir(). From section 4.3.6 of the GLSL 1.30 spec: "If a vertex output is a signed or unsigned integer or integer vector, then it must be qualified with the interpolation qualifier flat."
* | glsl: Allow redeclaration of gl_Color and its variants in GLSL 1.30Chad Versace2011-01-041-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | Allow redeclaration of the following built-in variables with an interpolation qualifier in language versions >= 1.30: * gl_FrontColor * gl_BackColor * gl_FrontSecondaryColor * gl_BackSecondaryColor * gl_Color * gl_SecondaryColor See section 4.3.7 of the GLSL 1.30 spec.
* | glsl: Comment ast_type_qualifier.flagsChad Versace2011-01-041-1/+5
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 19:08:39 +0000