Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
Silences MSVC.
|
|
This fixes cases such as:
vec4 v4;
vec2 v2;
v4.xz.yx = v2;
The last line now correctly compiles into MOV TEMP[1].xz, TEMP[0].yyxw;
Helps to fix the Humus Domino demo. See bug 19189.
(cherry picked from commit 9736d8f03364068c9ca786f88a4c2881d98d5768)
|
|
(cherry picked from commit 724ed5b84bc2491da244d091de889d5b35503b5d)
|
|
Now only the samplers that are actually used by texture() functions are
saved in the uniform variable list. Before, we could run out of samplers
if too many were declared while only some of them were actually used.
(cherry picked from commit 1fad6ccb756ae33ca3115f59c99ca8abbeb0321e)
Conflicts:
src/mesa/shader/slang/slang_link.c
|
|
(cherry picked from commit dfada459aabf1a02dc2dbdb6644283fc95df2586)
|
|
Fixes incorrect size information. See bug 19273.
(cherry picked from commit e8d7db31e2a6784c765911233cb3d888f612837f)
|
|
This allows code such as "vec4 a = gl_LightSource[i].ambient;" to work.
When a built-in uniform array is indexed with a variable index we need to
"unroll" the whole array into the parameter list (aka constant buffer) because
we don't know which elements may be accessed at compile-time. In the case of
the gl_LightSource array of size [8], we emit 64 state references into the
parameter array (8 elements times 8 vec4s per gl_LightSourceParameters
struct).
Previously, we only allowed constant-indexed references to uniform arrays
(such as gl_LightSource[2].position) which resulted in a single state reference
being added to the parameter array, not 64. We still optimize this case.
Users should be aware that using "gl_LightSource[i].ambient" in their shaders
is a bit expensive since state validation will involve updating all 64
light source entries in the parameter list.
(cherry picked from commit c6537ac8b8130cf2271c8d1e51137a575073c762)
|
|
(cherry picked from commit ca0540e25c86b8095511868b0cbe96d7e85f7437)
|
|
(cherry picked from commit 3be8d6db9e8bfbd1b3ebf9ac382857ad1e6ef753)
|
|
array.length() wasn't working.
Swizzle mask for accessing elements of float arrays was incorrect.
(cherry picked from commit 368df1615ef65afed96a44e1f43ade8cc703696f)
|
|
(cherry picked from commit c4341fe80acf75bf5417ffeb85fe6902218b752a)
|
|
And update some copyrights.
(cherry picked from commit 4561307a27e07e37319fdf993c37f2c1b85ee3e9)
|
|
(cherry picked from commit 49543d7177fabc848822431891266e33bc13c818)
|
|
(cherry picked from commit a1229cc9e7c78c59cad8d0df30b1f28d9bc81faf)
|
|
(cherry picked from commit a66ff046cc169c6479b00b1e7fc5d87b93ad60ed)
|
|
This allows uniform declarations with scalar/array initializers.
The code is rough though, and will be cleaned up.
(cherry picked from commit aa1b90463676ea71f24c1956dcf51deec1bf664c)
|
|
For example, a declaration like
const float[3] xxx = float[3](1.1, 2.2, 3.3);
will place the array in the constant buffer whereas a regular, non-const array
would be placed in the temporary register file.
Next up: do the same thing for uniform arrays.
|
|
(cherry picked from commit 0da44c62cc91c60d392f6e57aa047473b67ffb9b)
|
|
(cherry picked from commit d4be09fb2b4a2a45a95a388f536aee566e05f96a)
|
|
(cherry picked from commit 240e211c711b0ebfe6c3daa6cb70a3fa8fc8b656)
|
|
(cherry picked from commit 4d49fc83f11ec2f333e06e94af5ac0d24b93caa8)
|
|
(cherry picked from commit 81253be3347312eb7539eb61ee9362f76370eba7)
|
|
For example: float[3] xxx = float[3](1.1, 2.2, 3.3);
Optimizations for const-qualified arrays next.
(cherry picked from commit 5c0c5e5af9c72c170991f48628673faba85bc6f4)
|
|
(cherry picked from commit c20d00f04bdbdc0d3abdae8984ff5c874c4f0a10)
|
|
(cherry picked from commit 9016331d0fd0783d1e46c9d4b651797d6af4a60f)
|
|
(cherry picked from commit 87a00959ba40ee0aeaebbc8a86ca081cf3b81c75)
|
|
Function that return arrays should work now.
(cherry picked from commit 8571401d7d7c9c91c6f053e5dc8c94a4567140fe)
|
|
(cherry picked from commit d5367622a3f1cffe67af0fb6fca99ad02eefd374)
|
|
(cherry picked from commit b4019483dea406e997ae1c6b61b41cc49786c8ce)
|
|
(cherry picked from commit 456a4e274ff60122ab7e23dad2d462be3d910599)
|
|
(cherry picked from commit 9a174ef4090189e19831092bb2bae4bfc5396968)
|
|
(cherry picked from commit aeeb9bca2712dbf8540486fc584e214a8af4c7c4)
|
|
(cherry picked from commit ea9dc3879f4cbbaa8ce9e305884a4afdc1fdd28a)
|
|
(cherry picked from commit 19ca2908be5df2240d694c67c6f190982e9f7922)
|
|
(cherry picked from commit ade777ea1b62e2280c9f05fa09927a8f9bb63f4f)
|
|
(cherry picked from commit 1737f2dbdd8d9d6b1da140340323cbf83f7bd592)
|
|
More code consolidation coming...
(cherry picked from commit 2760bca1e13e62943affd762ed560bc30fbcc27a)
|
|
(cherry picked from commit 05ed9f7fe934249eaa5a16123b5b5f7f62b0ad26)
|
|
(cherry picked from commit 929eb00b32dfea9b1ac58923c88d5573872adea1)
|
|
This allows things like float[3] x = float[3](1., 2., 3.);
Parsing and AST construction now. Codegen not working yet.
(cherry picked from commit 2dc3de016cd0306bf5b492ed781e824864788f11)
|
|
exceeded
(cherry picked from commit e8f5c1a5e89fe43ddfa277d7392dcaf8ac1d6c88)
|
|
(cherry picked from commit 1e2f57425153d73646fde7c91c16aa5559491556)
|
|
(cherry picked from commit 001b1cbb0dacf76dd09cda56840c30226abd3534)
|
|
(cherry picked from commit aa40de5c6f7f70844d4a4c726456cceaee9f0e4d)
|
|
(cherry picked from commit fea3a32e17502ac16ec9a12dc9d18742cea2efd5)
|
|
(cherry picked from commit 4de360e67d83cd6503fb8ad053bb8afe507db5fa)
|
|
This is the only method supported in GLSL 1.20 so we take a few short-cuts.
(cherry picked from commit 8d95e66cf78921cd067c4bcf6a1053a7ec3a2ed4)
|