aboutsummaryrefslogtreecommitdiffstats
path: root/src/glsl
Commit message (Collapse)AuthorAgeFilesLines
* scons: Add glsl_symbol_table.cppJosé Fonseca2010-08-261-0/+1
|
* glsl2: Remove a couple FINISHME comments that have already been resolvedIan Romanick2010-08-261-7/+1
|
* glsl: Move built-ins to live beyond the global scope.Kenneth Graunke2010-08-261-4/+20
| | | | | | | | | | Per the GLSL 1.20 specification (presumably a clarification of 1.10). Also, when creating user functions, make a new ir_function that shadows the built-in ir_function, rather than adding new signatures. User functions are supposed to hide built-ins, not overload them. Fixes piglit tests redeclaration-{04, 12, 14}.vert.
* glsl: Move is_built_in flag from ir_function_signature to ir_function.Kenneth Graunke2010-08-268-18/+13
| | | | | | Also rename it to "is_builtin" for consistency. Signed-off-by: Ian Romanick <[email protected]>
* glsl: Refactor variable declaration handling.Kenneth Graunke2010-08-261-36/+41
| | | | | | | | | | | | | Moving the check for an earlier variable declaration helps cleanly separate out the re-declaration vs. new declaration code a bit. With that in place, conflicts between variable names and structure types or function names aren't caught by the earlier "redeclaration" error message, so check the return type on glsl_symbol_table::add_variable and issue an error there. If one occurs, don't emit the initializer. Fixes redeclaration-01.vert and redeclaration-09.vert. Signed-off-by: Ian Romanick <[email protected]>
* glsl: Don't add overloads to existing structure constructors.Kenneth Graunke2010-08-263-4/+9
| | | | | | Instead, make a new ir_function and try to add it to the symbol table. Fixes piglit test redeclaration-08.vert.
* glsl: Remove name_declared_this_scope check when adding functions.Kenneth Graunke2010-08-261-9/+8
| | | | | | Instead, rely on the symbol table's rules. Fixes redeclaration-02.vert.
* glsl: Use a single shared namespace in the symbol table.Kenneth Graunke2010-08-2611-576/+686
| | | | | | | | | | | | As of 1.20, variable names, function names, and structure type names all share a single namespace, and should conflict with one another in the same scope, or hide each other in nested scopes. However, in 1.10, variables and functions can share the same name in the same scope. Structure types, however, conflict with/hide both. Fixes piglit tests redeclaration-06.vert, redeclaration-11.vert, redeclaration-19.vert, and struct-05.vert.
* glsl2: Move ir_expression_flattening to using the rvalue visitor class.Eric Anholt2010-08-261-110/+14
| | | | | | The previous implementation was missing handling of some rvalues, such as "if" conditions, leading to glsl-mat-int-from-ctor-* not getting caught.
* glsl: Don't consider things with a type containing a sampler as an lvalue.Eric Anholt2010-08-251-0/+23
| | | | | | | | | | | | | | | We had ad-hoc handled some common cases by flagging sampler-typed variables as read_only, and rejected initializers of samplers. However, people could sneak them in in all sorts of surprising ways, like using whole-array or structure assignment. Fixes: glslparsertest/glsl2/sampler-01.frag glslparsertest/glsl2/sampler-03.frag glslparsertest/glsl2/sampler-04.frag glslparsertest/glsl2/sampler-06.frag Bug #27403.
* glsl: fix crash with variable indexing into array in a structAras Pranckevicius2010-08-251-1/+7
| | | | Signed-off-by: Ian Romanick <[email protected]>
* ir_to_mesa: Convert this code to using linker.cpp's uniform locations.Eric Anholt2010-08-251-0/+1
| | | | Fixes: glsl-fs-uniform-array-4.
* glsl: Make uniform linking generate separate uniforms for struct members.Eric Anholt2010-08-251-42/+89
| | | | | This is a step towards making the linker code usable as our uniform setup, instead of having it wedged into ir_to_mesa.cpp.
* glsl/mesa: fixes for MSVCAras Pranckevicius2010-08-251-0/+1
| | | | Signed-off-by: Brian Paul <[email protected]>
* glsl: Don't dead-code eliminate a uniform initializer.Eric Anholt2010-08-241-0/+8
| | | | Partial fix for glsl-uniform-initializer-5.
* glsl2: rename local variable_entry classBrian Paul2010-08-241-17/+22
| | | | | | | | | With MSVC it seems that this class and its constructor is colliding with the one in ir_variable_refcount.cpp. Rename the class here to avoid the collision. This is a bit of a hack. Can the two variable_entry classes be merged and shared?
* glsl2: move constructor into .cpp file to work around compiler bugBrian Paul2010-08-242-8/+13
| | | | | | | Fixes fd.o bug 29770 The refcount==0 assertion only failed on some systems. One example being 32-bit Linux with gcc 4.4.4.
* glsl: Add assert to check variable_entry referenced_count after construction.Vinson Lee2010-08-241-0/+1
| | | | | | | | | | A variable_entry after construction should have its referenced_count member set to 0. However, occassionally this isn't the case and entry->referenced_count has been observed to be a garbage value. This leads to crashes of several tests in the Piglit test suite. This patch adds an assert to check that a variable_entry instance has its referenced_count member initialized to 0 after construction.
* glsl: make 'make clean' work properly.Dave Airlie2010-08-241-1/+1
| | | | this has make clean remove all the objects.
* glsl: Silence unused variable warning.Vinson Lee2010-08-231-0/+1
| | | | The variable is used but only in the body of an assert.
* glsl: Include main/core.h.Chia-I Wu2010-08-2418-30/+16
| | | | Make glsl include only main/core.h from core mesa.
* glsl: Rely on talloc_autofree_context() instead of trying to free on our own.Eric Anholt2010-08-231-6/+1
| | | | | | | | | | | Because the static types talloc their names at dlopen time, talloc_freeing the types at DRI driver screen teardown means that if the screen gets brought back up again, the names will point at freed memory. talloc_autofree_context() exists to do just what we want here: Free memory referenced across the program's lifetime so that we avoid noise in memory leak checkers. Fixes: bug #29722 (assertion failure in unigine).
* glsl: When unable to assign the initializer for a const variable, set it to 0.Eric Anholt2010-08-231-13/+21
| | | | | | | This prevents assertion failures or cascading errors after we've logged the fact that we were unable to handle the initializer. Fixes unsized-array-non-const-index-2.vert
* glsl: Cleanly fail when a function has an unknown return type.Eric Anholt2010-08-231-1/+7
| | | | Bug #29608.
* glsl: Rebuild builtins for any() change.Eric Anholt2010-08-231-3/+3
|
* mesa: Add new ir_unop_any() expression operation.Eric Anholt2010-08-236-3/+21
| | | | | | | The previous any() implementation would generate arg0.x || arg0.y || arg0.z. Having an expression operation for this makes it easy for the backend to generate something easier (DPn + SNE for 915 FS, .any predication on 965 VS)
* glsl: Regenerate builtins with the new sorting.Eric Anholt2010-08-231-5089/+5089
|
* glsl: Count function call outvals as writing to variables for linker checks.Eric Anholt2010-08-231-0/+21
| | | | Fixes: glsl-vs-position-outval. Bug #28138 (regnum online)
* glsl2: Include imports.h to get snprintf wrapper for MSVCIan Romanick2010-08-232-1/+2
| | | | Signed-off-by: José Fonseca <[email protected]>
* generate_builtins.py: Generate output in sorted order.Kenneth Graunke2010-08-231-5/+6
|
* glcpp: Make standalone preprocessor work with a tty as stdinCarl Worth2010-08-231-33/+49
| | | | | | | | | | | | Previously glcpp would silently abort if it couldn't fstat the file being read, (so it would work with stdin redirected from a file, but would not work with stdin as a tty). The stat was so that glcpp could allocate a buffer for the file content in a single call. We now use talloc_realloc instead, (even if the fstat is possible). This is theoretically less efficient, but quite irrelevant, (particularly because the standalone preprocessor is used only for testing).
* glcpp: Fix test suite to avoid flagging failed tests as valgrind errors.Carl Worth2010-08-231-4/+5
| | | | | | | | | | We recently added several tests that intentionally trigger preprocessor errors. During valgrind-based testing, our test script was noticing the non-zero return value from the preprocessor and incorrectly flagging the valgrind-based test as failing. To fix this, we make valgrind return an error code that is otherwise unused by the preprocessor.
* glcpp: Fix segfault in standalone preprocessor for "file not found", etc.Carl Worth2010-08-231-4/+17
| | | | | | | | This error message was missing so that the program would simply segfault if the provided filename could not be opened for some reason. While we're at it, we add explicit support for a filename of "-" to indicate input from stdin.
* glcpp: Update generated glcpp-lex.c for the last two changes.Carl Worth2010-08-231-191/+186
| | | | | This fixes both "#line 0" and "#line XXX YYY" as described in the two most recent commits.
* glcpp: Fix handling of "#line 0"Carl Worth2010-08-231-2/+3
| | | | | | | | | | | | | | | | The existing DECIMAL_INTEGER pattern is the correct thing to use when looking for a C decimal integer, (that is, a digit-sequence not starting with 0 which would instead be an octal integer). But for #line, we really want to accept any digit sequence, (including "0"), and always interpret it as a decimal constant. So we add a new DIGITS pattern for this case. This should fix the compilation failure noted in bug #28138 https://bugs.freedesktop.org/show_bug.cgi?id=28138 (Though the generated file will not be updated until the next commit.)
* glcpp: Fix source numbers set with "#line LINE_NUMBER SOURCE_NUMBER"Carl Worth2010-08-231-2/+7
| | | | | | | Previously, the YY_USER_ACTION was overwriting the yylloc->source value in every action, (after that value had been carefully set by the handling of the #line directive). Instead, we want to initialize it once in YY_USER_INIT and then not touch it at all in YY_USER_ACTION.
* glcpp: Add new test for #line directive.Carl Worth2010-08-232-0/+21
| | | | | | | | | | | | This test exposes two current bugs: 1. The source number is not being correctly emitted in error messages (instead, it's always 0). 2. A directive of "#line 0" is resulting in the following parse error: preprocessor error: Invalid tokens after #
* glcpp: Update README file (new specifications and fewer limitations).Carl Worth2010-08-231-12/+14
| | | | | | | The README file had grown a little bit stale. We've been using newer versions of both the GLSL and C99 specifications, so list those. Also, several of the documented known limitations have since been fixed, so remove those.
* glcpp: Add test for the #error directive.Carl Worth2010-08-232-0/+4
| | | | | | | This directive is already implemented nicely, but wasn't previously tested. It will be convenient to use this directive in further tests that rely on error messages, (such as ensuring that #line correctly sets the line number in the error message).
* glsl: Trim the size of uniform arrays to the maximum element used.Eric Anholt2010-08-232-0/+57
| | | | Fixes glsl-getactiveuniform-array-size.
* glsl2: Add missing sig_iter.next() to the no-constant-folding-to-outvals fix.Eric Anholt2010-08-232-0/+2
|
* glsl: Don't constant-fold in a constant in place of a function outval.Eric Anholt2010-08-221-0/+22
|
* glsl: Convert constant folding to the rvalue visitor.Eric Anholt2010-08-221-181/+19
| | | | | | | | | | This should be mostly a noop, except that a plain dereference of a variable that is not part of a constant expression could now get "constant folded". I expect that for all current backends this will be either a noop, or possibly a win when it provokes more ir_algebraic. It'll also ensure that when new features are added, tree walking will work normally. Before this, constants weren't getting folded inside of loops.
* glsl: Don't tree-graft in an expression in place of a function outval.Eric Anholt2010-08-221-0/+5
| | | | Fixes: glsl-constant-folding-call-1 (bug #29737)
* mesa: AC_SUBST the talloc libs/cflags so the ./configure results are saved.Eric Anholt2010-08-221-1/+2
| | | | | | | | | | I had used pkg-config from the Makefile because I didn't want to screw around with the non-autoconf build, but that doesn't work because the PKG_CONFIG_PATH or TALLOC_LIBS/TALLOC_CFLAGS that people set at configure time needs to be respected and may not be present at build time. Bug #29585
* glsl: Silence uninitialized variable warning.Vinson Lee2010-08-211-0/+3
| | | | | | | i686-apple-darwin10-gcc-4.2.1 generated the following warning. warning: 'score' may be used uninitialized in this function GCC 4.4.3 on Linux didn't generate the above warning.
* glsl: Silence unused variable warning.Vinson Lee2010-08-211-0/+1
| | | | The variable is actually used but only in the body of an assert.
* glsl: Handle array declarations in function parameters.Kenneth Graunke2010-08-211-4/+13
| | | | | | | | | The 'vec4[12] foo' style already worked, but the 'vec4 foo[12]' style did not. Also, 'vec4[] foo' was wrongly accepted. Fixes piglit test cases array-19.vert and array-21.vert. May fix fd.o bug #29684 (or at least part of it).
* generate_builtins.py: Remove unused import sys.Vinson Lee2010-08-211-1/+1
|
* Delete more vestiges of the old shader compiler.Kenneth Graunke2010-08-207-1207/+0
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-03 10:26:07 +0000