summaryrefslogtreecommitdiff
path: root/src/glsl
AgeCommit message (Collapse)Author
2011-02-28glsl: Enable GL_OES_texture_3D extension for ES2.Kenneth Graunke
2011-02-28glsl: Use reralloc instead of plain realloc.Kenneth Graunke
Plugs a memory leak when compiling shaders with user defined structures. NOTE: This is a candidate for the 7.9 and 7.10 branches.
2011-02-27glsl/builtins: Fix return type for textureSize sampler2DArray variants.Kenneth Graunke
A copy and paste error.
2011-02-26glsl/Makefile: Remove builtin_function.cpp if generation fails.Arkadiusz Miskiewicz
Fixes bug #34346. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
2011-02-21Use C-style system headers in C++ code to avoid issues with std:: namespaceIan Romanick
2011-02-19glsl: Remove $(PWD) from Makefile in favor of .Kenneth Graunke
Hopefully should fix bug #34468.
2011-02-15linker: Fix off-by-one error implicit array sizingIan Romanick
Arrays are zero based. If the highest element accessed is 6, the array needs to have 7 elements. Fixes piglit test glsl-fs-implicit-array-size-03 and bugzilla #34198. NOTE: This is a candidate for the 7.9 and 7.10 branches.
2011-02-15glsl: Reinstate constant-folding for division by zeroChad Versace
Fixes regression: https://bugs.freedesktop.org/show_bug.cgi?id=34160 Commit e7c1f058d18f62aa4871aec623f994d7b68cb8c1 disabled constant-folding when division-by-zero occured. This was a mistake, because the spec does allow division by zero. (From section 5.9 of the GLSL 1.20 spec: Dividing by zero does not cause an exception but does result in an unspecified value.) For floating-point division, the original pre-e7c1f05 behavior is reinstated. For integer division, constant-fold 1/0 to 0.
2011-02-15Revert "glsl: Fix constant-folding for reciprocal expressions"Chad Versace
This reverts commit b3cf92aa916ee0537ee37723c23a9897ac9cd3e0. The reverted commit prevented constant-folding of reciprocal expressions when the reciprocated expression was 0. However, since the spec allows division by zero, constant-folding *is* permissible in this case. From Section 5.9 of the GLSL 1.20 spec: Dividing by zero does not cause an exception but does result in an unspecified value.
2011-02-11mesa: Optionally build a dricore support library (v3)Christopher James Halse Rogers
This an adds --enable-shared-dricore option to configure. When enabled, DRI modules will link against a shared copy of the common mesa routines rather than statically linking these. This saves about 30MB on disc with a full complement of classic DRI drivers. v2: Only enable with a gcc-compatible compiler that handles rpath Handle DRI_CFLAGS without filter-out magic Build shared libraries with the full mklib voodoo Fix typos v3: Resolve conflicts with talloc removal patches Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
2011-02-11glcpp: regerated filesIan Romanick
These should have been committed right after fd1252ab, but they were missed. Soon, we'll never have to do this again...
2011-02-11glsl: Regenerate files modified by previous commitsIan Romanick
2011-02-11glsl: Finish out the reduce/reduce error fixesIan Romanick
Track variables, functions, and types during parsing. Use this information in the lexer to return the currect "type" for identifiers. Change the handling of structure constructors. They will now show up in the AST as constructors (instead of plain function calls). Fixes piglit tests constructor-18.vert, constructor-19.vert, and constructor-20.vert. Also fixes bugzilla #29926. NOTE: This is a candidate for the 7.9 and 7.10 branches.
2011-02-11glsl: Eliminate reduce/reduce conflicts in glsl grammarKeith Packard
This requires lexical disambiguation between variable and type identifiers (as most C compilers do). Signed-off-by: Keith Packard <keithp@keithp.com> NOTE: This is a candidate for the 7.9 and 7.10 branches.
2011-02-11scons: builtin_glsl_function on windows needs bundled getopt.José Fonseca
2011-02-11scons: Try to support building 64bit binaries on 32bit windows.José Fonseca
2011-02-11glsl: Fix parallel build.Tobias Jakobi
Broken since e0c1fc32832b66b52e6352ba563288ee48a1face. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
2011-02-10glsl/Makefile: glcpp doesn't need libglsl.a.Kenneth Graunke
Also, add a 'glcpp' target so you can type 'make glcpp' instead of 'make glcpp/glcpp'.
2011-02-08glsl: Disable the new copy propagation pass until it gets fixed.Eric Anholt
It apparently regressed a bunch of ES2 cases.
2011-02-08glsl: Set operators '%' and '%=' to be reserved when GLSL < 1.30Chad Versace
From section 5.9 of the GLSL 1.20 spec: The operator modulus (%) is reserved for future use. From section 5.8 of the GLSL 1.20 spec: The assignments modulus into (%=), left shift by (<<=), right shift by (>>=), inclusive or into ( |=), and exclusive or into ( ^=). These operators are reserved for future use. The GLSL ES 1.00 spec and GLSL 1.10 spec have similiar language. Fixes bug: https://bugs.freedesktop.org//show_bug.cgi?id=33916 Fixes Piglit tests: spec/glsl-1.00/compiler/arithmetic-operators/modulus-00.frag spec/glsl-1.00/compiler/assignment-operators/modulus-assign-00.frag spec/glsl-1.10/compiler/arithmetic-operators/modulus-00.frag spec/glsl-1.10/compiler/assignment-operators/modulus-assign-00.frag spec/glsl-1.20/compiler/arithmetic-operators/modulus-00.frag spec/glsl-1.20/compiler/assignment-operators/modulus-assign-00.frag
2011-02-04linker: Generate link errors when ES shaders are missing stagesIan Romanick
ES requires that a vertex shader and a fragment shader be present. Fixes bugzilla #32214.
2011-02-04glsl: Add opt_copy_propagation_elements.cpp to SConscript.Vinson Lee
Fixes SCons build.
2011-02-04glsl: Remove extra checks for constant true assignment conditions.Eric Anholt
These are already stripped by opt_constant_folding.cpp.
2011-02-04glsl: Fix a comment typo in copy propagation.Eric Anholt
2011-02-04glsl: Add a new opt_copy_propagation variant that does it channel-wise.Eric Anholt
This patch cleans up many of the extra copies in GLSL IR introduced by i965's scalarizing passes. It doesn't result in a statistically significant performance difference on nexuiz high settings (n=3) or my demo (n=10), due to brw_fs.cpp's register coalescing covering most of those extra moves anyway. However, it does make the debug of wine's GLSL shaders much more tractable, and reduces instruction count of glsl-fs-convolution-2 from 376 to 288.
2011-02-03ralloc: Add missing va_end following va_copy.Vinson Lee
2011-02-03glsl: Add using statements for standard library functions.Vinson Lee
Standard library functions in C++ are in the std namespace. When using C++-style header files for the standard library, some compilers, such as Sun Studio, provide symbols only for the std namespace and not for the global namespace. This patch adds using statements for standard library functions. Another option could have been to prepend standard library function calls with 'std::'. This patch fixes several compilation errors with Sun Studio.
2011-02-02glcpp: Raise error when modulus is zeroChad Versace
For example, this now raises an error: #define XXX 1 / 0 Fixes bug: https://bugs.freedesktop.org//show_bug.cgi?id=33507 Fixes Piglit test: spec/glsl-1.10/preprocessor/modulus-by-zero.vert NOTE: This is a candidate for the 7.9 and 7.10 branches.
2011-02-02glsl: Avoid division-by-zero during constant-foldingChad Versace
Avoid division-by-zero when constant-folding the following expression types: ir_unop_rsq ir_binop_div ir_binop_mod Fixes bugs: https://bugs.freedesktop.org//show_bug.cgi?id=33306 https://bugs.freedesktop.org//show_bug.cgi?id=33508 Fixes Piglit tests: glslparsertest/glsl2/div-by-zero-01.frag glslparsertest/glsl2/div-by-zero-02.frag glslparsertest/glsl2/div-by-zero-03.frag glslparsertest/glsl2/modulus-zero-01.frag glslparsertest/glsl2/modulus-zero-02.frag NOTE: This is a candidate for the 7.9 and 7.10 branches.
2011-02-02glsl: Fix constant-folding for reciprocal expressionsChad Versace
Do not constant-fold a reciprocal if any component of the reciprocated expression is 0. For example, do not constant-fold `1 / vec4(0, 1, 2, 3)`. Incorrect, previous behavior ---------------------------- Reciprocals were constant-folded even when some component of the reciprocated expression was 0. The incorrectly applied arithmetic was: 1 / 0 := 0 For example, 1 / vec4(0, 1, 2, 3) = vec4(0, 1, 1/2, 1/3) NOTE: This is a candidate for the 7.9 and 7.10 branches.
2011-02-01glsl: Fix use of uninitialized values in _mesa_glsl_parse_state ctor.Kenneth Graunke
This has probably existed since e5e34ab18eeaffa465 or so. NOTE: This is a candidate for the 7.9 and 7.10 branches.
2011-02-01glsl: Fix invalid use of ralloc_asprintf in prototype_string.Kenneth Graunke
This was my mistake when converting from talloc to ralloc. I was confused because the other calls in the function are to asprintf_append and the original code used str as the context rather than NULL. Fixes bug #33823.
2011-02-01glsl: Fix printf_length() on MSVC.José Fonseca
2011-02-01glsl: Fix memory error when creating the supported version string.Kenneth Graunke
Passing ralloc_vasprintf_append a 0-byte allocation doesn't work. If passed a non-NULL argument, ralloc calls strlen to find the end of the string. Since there's no terminating '\0', it runs off the end. Fixes a crash introduced in 14880a510a1a288df0778395097d5a52806abfb0.
2011-01-31texture_builtins.py: Fix a warning about mixed tabs/spaces.Kenneth Graunke
2011-01-31glsl: Refresh autogenerated lexer and parser files.Ian Romanick
For the previous commit.
2011-01-31glsl: Reject shader versions not supported by the implementationIan Romanick
Previously we'd happily compile GLSL 1.30 shaders on any driver. We'd also happily compile GLSL 1.10 and 1.20 shaders in an ES2 context. This has been a long standing FINISHME in the compiler. NOTE: This is a candidate for the 7.9 and 7.10 branches
2011-01-31glsl: Ensure that all GLSL versions are supported in the stand-alone compilerIan Romanick
NOTE: This is a candidate for the 7.9 and 7.10 branches
2011-01-31glsl: Fix dependencies / linkage for glsl_compilerIan Romanick
2011-01-31glsl: regerated filesBrian Paul
2011-01-31glsl: make _token_list_is_empty_ignoring_space() staticBrian Paul
To silence warning about missing prototype.
2011-01-31scons/glsl: add top-level 'include' dir to CPPPATHBrian Paul
To avoid using the /usr/include/GL/gl.h file which may be lacking some special #defines.
2011-01-31glsl: add cast to silence signed/unsigned comparison warningBrian Paul
2011-01-31glsl: Define va_copy on MSVC.José Fonseca
2011-01-31glsl/builtins: Uncomment prototypes for texture*Offset functions.Kenneth Graunke
2011-01-31texture_builtins.py: Generate texture*Offset functions.Kenneth Graunke
2011-01-31texture_builtins.py: Generalize the "use_proj" field to support offsets.Kenneth Graunke
Rather than passing "True", pass a bitfield describing the particular variant's features - either projection or offset. This should make the code a bit more readable ("Proj" instead of "True") and make it easier to support offsets in the future.
2011-01-31texture_builtins.py: Refactor coordinate dimension calculations.Kenneth Graunke
For offsets, we'll want the straight sampler dimensionality, without the +1 for array types. Create a new function to do that; refactor.
2011-01-31glsl: Introduce a new "const_in" variable mode.Kenneth Graunke
This annotation is for an "in" function parameter for which it is only legal to pass constant expressions. The only known example of this, currently, is the textureOffset functions. This should never be used for globals.
2011-01-31glsl: Change texel offsets to a single vector rvalue.Kenneth Graunke
Having these as actual integer values makes it difficult to implement the texture*Offset built-in functions, since the offset is actually a function parameter (which doesn't have a constant value). The original rationale was that some hardware needs these offset baked into the instruction opcode. However, at least i965 should be able to support non-constant offsets. Others should be able to rely on inlining and constant propagation.