mesa.git
15 years agomesa: Ensure gl* symbols are marked as dllexport on windows.
José Fonseca [Tue, 6 Jan 2009 16:20:12 +0000 (16:20 +0000)]
mesa: Ensure gl* symbols are marked as dllexport on windows.

15 years agoscons: Choose the appropriate MSVC CRT.
José Fonseca [Tue, 6 Jan 2009 16:16:38 +0000 (16:16 +0000)]
scons: Choose the appropriate MSVC CRT.

15 years agomesa: Use explicit casts when precision is lost.
José Fonseca [Tue, 6 Jan 2009 16:01:11 +0000 (16:01 +0000)]
mesa: Use explicit casts when precision is lost.

Silences MSVC.

15 years agomesa: fix a GLSL swizzled writemask bug
Brian Paul [Mon, 5 Jan 2009 20:12:12 +0000 (13:12 -0700)]
mesa: fix a GLSL swizzled writemask bug

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)

15 years agomesa: fix warning about possibly undefined var in GLSL compiler
Brian Paul [Sat, 3 Jan 2009 00:30:08 +0000 (17:30 -0700)]
mesa: fix warning about possibly undefined var in GLSL compiler

(cherry picked from commit 724ed5b84bc2491da244d091de889d5b35503b5d)

15 years agomesa: fix another "out of samplers" problem
Brian Paul [Tue, 6 Jan 2009 16:20:55 +0000 (09:20 -0700)]
mesa: fix another "out of samplers" problem

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

15 years agomesa: updated comments about GLSL constants
Brian Paul [Thu, 1 Jan 2009 15:07:54 +0000 (08:07 -0700)]
mesa: updated comments about GLSL constants

(cherry picked from commit dfada459aabf1a02dc2dbdb6644283fc95df2586)

15 years agomesa: fix bug in evaluation of structure fields
Brian Paul [Wed, 31 Dec 2008 00:50:39 +0000 (17:50 -0700)]
mesa: fix bug in evaluation of structure fields

Fixes incorrect size information.  See bug 19273.

(cherry picked from commit e8d7db31e2a6784c765911233cb3d888f612837f)

15 years agomesa: allow variable indexing into the predefined uniform variable arrays
Brian Paul [Wed, 31 Dec 2008 00:11:32 +0000 (17:11 -0700)]
mesa: allow variable indexing into the predefined uniform variable arrays

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)

15 years agomesa: better error message when running out of GLSL samplers
Brian Paul [Wed, 31 Dec 2008 00:03:09 +0000 (17:03 -0700)]
mesa: better error message when running out of GLSL samplers

(cherry picked from commit ca0540e25c86b8095511868b0cbe96d7e85f7437)

15 years agomesa: disable debug output
Brian Paul [Tue, 16 Dec 2008 22:25:58 +0000 (15:25 -0700)]
mesa: disable debug output

(cherry picked from commit 3be8d6db9e8bfbd1b3ebf9ac382857ad1e6ef753)

15 years agomesa: fix some GLSL array regressions
Brian Paul [Tue, 16 Dec 2008 21:29:52 +0000 (14:29 -0700)]
mesa: fix some GLSL array regressions

array.length() wasn't working.
Swizzle mask for accessing elements of float arrays was incorrect.

(cherry picked from commit 368df1615ef65afed96a44e1f43ade8cc703696f)

15 years agomesa: updated GLSL docs
Brian Paul [Tue, 16 Dec 2008 01:30:40 +0000 (18:30 -0700)]
mesa: updated GLSL docs

(cherry picked from commit c4341fe80acf75bf5417ffeb85fe6902218b752a)

15 years agomesa: bump glsl grammar revision
Brian Paul [Tue, 16 Dec 2008 01:24:16 +0000 (18:24 -0700)]
mesa: bump glsl grammar revision

And update some copyrights.

(cherry picked from commit 4561307a27e07e37319fdf993c37f2c1b85ee3e9)

15 years agomesa: more re-org of variable declarations in glsl compiler
Brian Paul [Tue, 16 Dec 2008 01:18:08 +0000 (18:18 -0700)]
mesa: more re-org of variable declarations in glsl compiler

(cherry picked from commit 49543d7177fabc848822431891266e33bc13c818)

15 years agomesa: more comments, clean up
Brian Paul [Mon, 15 Dec 2008 23:57:37 +0000 (16:57 -0700)]
mesa: more comments, clean up

(cherry picked from commit a1229cc9e7c78c59cad8d0df30b1f28d9bc81faf)

15 years agomesa: added comments, remove unused code
Brian Paul [Mon, 15 Dec 2008 23:49:32 +0000 (16:49 -0700)]
mesa: added comments, remove unused code
(cherry picked from commit a66ff046cc169c6479b00b1e7fc5d87b93ad60ed)

15 years agomesa: checkpoint: handle uniform vars in _slang_gen_var_decl()
Brian Paul [Mon, 15 Dec 2008 23:44:55 +0000 (16:44 -0700)]
mesa: checkpoint: handle uniform vars in _slang_gen_var_decl()

This allows uniform declarations with scalar/array initializers.
The code is rough though, and will be cleaned up.

(cherry picked from commit aa1b90463676ea71f24c1956dcf51deec1bf664c)

15 years agomesa: place glsl constant arrays in constant memory
Brian Paul [Sat, 13 Dec 2008 01:00:47 +0000 (18:00 -0700)]
mesa: place glsl constant arrays in constant memory

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.

15 years agomesa: remove old size=4 limit
Brian Paul [Sat, 13 Dec 2008 01:00:19 +0000 (18:00 -0700)]
mesa: remove old size=4 limit

(cherry picked from commit 0da44c62cc91c60d392f6e57aa047473b67ffb9b)

15 years agomesa: code clean-up in glsl compiler
Brian Paul [Fri, 12 Dec 2008 23:20:31 +0000 (16:20 -0700)]
mesa: code clean-up in glsl compiler

(cherry picked from commit d4be09fb2b4a2a45a95a388f536aee566e05f96a)

15 years agomesa: remove unneeded swizzle init code in glsl compiler
Brian Paul [Fri, 12 Dec 2008 23:02:31 +0000 (16:02 -0700)]
mesa: remove unneeded swizzle init code in glsl compiler

(cherry picked from commit 240e211c711b0ebfe6c3daa6cb70a3fa8fc8b656)

15 years agomesa: disable glsl debug output
Brian Paul [Fri, 12 Dec 2008 22:34:58 +0000 (15:34 -0700)]
mesa: disable glsl debug output

(cherry picked from commit 4d49fc83f11ec2f333e06e94af5ac0d24b93caa8)

15 years agomesa: remove unused varpool code in glsl compiler
Brian Paul [Fri, 12 Dec 2008 22:11:08 +0000 (15:11 -0700)]
mesa: remove unused varpool code in glsl compiler

(cherry picked from commit 81253be3347312eb7539eb61ee9362f76370eba7)

15 years agomesa: basic array constructors work now
Brian Paul [Fri, 12 Dec 2008 22:07:21 +0000 (15:07 -0700)]
mesa: basic array constructors work now

For example: float[3] xxx = float[3](1.1, 2.2, 3.3);

Optimizations for const-qualified arrays next.

(cherry picked from commit 5c0c5e5af9c72c170991f48628673faba85bc6f4)

15 years agomesa: copy array_len in slang_fully_specified_type_copy()
Brian Paul [Fri, 12 Dec 2008 22:01:00 +0000 (15:01 -0700)]
mesa: copy array_len in slang_fully_specified_type_copy()

(cherry picked from commit c20d00f04bdbdc0d3abdae8984ff5c874c4f0a10)

15 years agomesa: remove incorrect array_len assignment
Brian Paul [Fri, 12 Dec 2008 22:00:06 +0000 (15:00 -0700)]
mesa: remove incorrect array_len assignment

(cherry picked from commit 9016331d0fd0783d1e46c9d4b651797d6af4a60f)

15 years agomesa: array size fix in _slang_typeof_operation()
Brian Paul [Fri, 12 Dec 2008 20:18:30 +0000 (13:18 -0700)]
mesa: array size fix in _slang_typeof_operation()

(cherry picked from commit 87a00959ba40ee0aeaebbc8a86ca081cf3b81c75)

15 years agomesa: fix some more GLSL 1.20 array things.
Brian Paul [Fri, 12 Dec 2008 20:05:29 +0000 (13:05 -0700)]
mesa: fix some more GLSL 1.20 array things.

Function that return arrays should work now.

(cherry picked from commit 8571401d7d7c9c91c6f053e5dc8c94a4567140fe)

15 years agomesa: more glsl function renaming
Brian Paul [Fri, 12 Dec 2008 17:32:56 +0000 (10:32 -0700)]
mesa: more glsl function renaming

(cherry picked from commit d5367622a3f1cffe67af0fb6fca99ad02eefd374)

15 years agomesa: use _slang_alloc()
Brian Paul [Fri, 12 Dec 2008 17:29:15 +0000 (10:29 -0700)]
mesa: use _slang_alloc()

(cherry picked from commit b4019483dea406e997ae1c6b61b41cc49786c8ce)

15 years agomesa: glsl compiler function renaming
Brian Paul [Fri, 12 Dec 2008 17:22:47 +0000 (10:22 -0700)]
mesa: glsl compiler function renaming

(cherry picked from commit 456a4e274ff60122ab7e23dad2d462be3d910599)

15 years agomesa: more glsl type/function movement
Brian Paul [Fri, 12 Dec 2008 17:17:58 +0000 (10:17 -0700)]
mesa: more glsl type/function movement

(cherry picked from commit 9a174ef4090189e19831092bb2bae4bfc5396968)

15 years agomesa: move some glsl compiler functions to different files to be more consistant
Brian Paul [Fri, 12 Dec 2008 17:11:41 +0000 (10:11 -0700)]
mesa: move some glsl compiler functions to different files to be more consistant

(cherry picked from commit aeeb9bca2712dbf8540486fc584e214a8af4c7c4)

15 years agomesa: move _slang_locate_function() to different file
Brian Paul [Fri, 12 Dec 2008 17:03:31 +0000 (10:03 -0700)]
mesa: move _slang_locate_function() to different file

(cherry picked from commit ea9dc3879f4cbbaa8ce9e305884a4afdc1fdd28a)

15 years agomesa: remove unused fixup table code in glsl compiler
Brian Paul [Fri, 12 Dec 2008 16:58:18 +0000 (09:58 -0700)]
mesa: remove unused fixup table code in glsl compiler

(cherry picked from commit 19ca2908be5df2240d694c67c6f190982e9f7922)

15 years agomesa: checkpoint: GLSL 1.20 array constructors
Brian Paul [Fri, 12 Dec 2008 16:56:13 +0000 (09:56 -0700)]
mesa: checkpoint: GLSL 1.20 array constructors

(cherry picked from commit ade777ea1b62e2280c9f05fa09927a8f9bb63f4f)

15 years agomesa: consolidate variable declaration initializer code for globals too
Brian Paul [Fri, 12 Dec 2008 02:34:43 +0000 (19:34 -0700)]
mesa: consolidate variable declaration initializer code for globals too

(cherry picked from commit 1737f2dbdd8d9d6b1da140340323cbf83f7bd592)

15 years agomesa: move variable initializer IR generation into _slang_gen_var_decl()
Brian Paul [Fri, 12 Dec 2008 02:28:22 +0000 (19:28 -0700)]
mesa: move variable initializer IR generation into _slang_gen_var_decl()

More code consolidation coming...

(cherry picked from commit 2760bca1e13e62943affd762ed560bc30fbcc27a)

15 years agomesa: simplify some glsl variable declaration code
Brian Paul [Fri, 12 Dec 2008 02:10:58 +0000 (19:10 -0700)]
mesa: simplify some glsl variable declaration code

(cherry picked from commit 05ed9f7fe934249eaa5a16123b5b5f7f62b0ad26)

15 years agomesa: glsl clean-ups
Brian Paul [Fri, 12 Dec 2008 01:49:28 +0000 (18:49 -0700)]
mesa: glsl clean-ups

(cherry picked from commit 929eb00b32dfea9b1ac58923c88d5573872adea1)

15 years agomesa: checkpoint commit of GLSL 1.20 array syntax.
Brian Paul [Fri, 12 Dec 2008 01:02:19 +0000 (18:02 -0700)]
mesa: checkpoint commit of GLSL 1.20 array syntax.

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)

15 years agomesa: in slang linker, replace assertion with link error when max samplers exceeded
Brian Paul [Tue, 9 Dec 2008 21:30:42 +0000 (14:30 -0700)]
mesa: in slang linker, replace assertion with link error when max samplers exceeded

(cherry picked from commit e8f5c1a5e89fe43ddfa277d7392dcaf8ac1d6c88)

15 years agomesa: fix conditional in save_Lightfv(), bug 18838
Brian [Tue, 2 Dec 2008 01:32:47 +0000 (18:32 -0700)]
mesa: fix conditional in save_Lightfv(), bug 18838

(cherry picked from commit 1e2f57425153d73646fde7c91c16aa5559491556)

15 years agomesa: add missing type check for function calls
Brian Paul [Wed, 26 Nov 2008 16:35:26 +0000 (09:35 -0700)]
mesa: add missing type check for function calls

(cherry picked from commit 001b1cbb0dacf76dd09cda56840c30226abd3534)

15 years agomesa: add missing size check for assignment optimization
Brian Paul [Wed, 26 Nov 2008 16:35:08 +0000 (09:35 -0700)]
mesa: add missing size check for assignment optimization

(cherry picked from commit aa40de5c6f7f70844d4a4c726456cceaee9f0e4d)

15 years agomesa: remove debug code
Brian Paul [Wed, 26 Nov 2008 16:02:37 +0000 (09:02 -0700)]
mesa: remove debug code

(cherry picked from commit fea3a32e17502ac16ec9a12dc9d18742cea2efd5)

15 years agogallium: added centroid/invarient fields to declarations
Brian Paul [Tue, 25 Nov 2008 16:02:27 +0000 (09:02 -0700)]
gallium: added centroid/invarient fields to declarations

(cherry picked from commit 4de360e67d83cd6503fb8ad053bb8afe507db5fa)

15 years agomesa: added support for GLSL 1.20 array.length() method
Brian Paul [Tue, 25 Nov 2008 00:18:56 +0000 (17:18 -0700)]
mesa: added support for GLSL 1.20 array.length() method

This is the only method supported in GLSL 1.20 so we take a few short-cuts.

(cherry picked from commit 8d95e66cf78921cd067c4bcf6a1053a7ec3a2ed4)

15 years agomesa: support for GLSL 1.20 array types
Brian Paul [Mon, 24 Nov 2008 22:28:21 +0000 (15:28 -0700)]
mesa: support for GLSL 1.20 array types

This allows syntax like "float[8] foo, bar;"

(cherry picked from commit 0fab514ff5e7887767936427b5e02b676abebf3a)

15 years agomesa: pass shader centroid/invariant info through to the TGSI shader
Brian Paul [Mon, 24 Nov 2008 21:36:00 +0000 (14:36 -0700)]
mesa: pass shader centroid/invariant info through to the TGSI shader

(cherry picked from commit c5b52b5e0e6f6e47c3953076fa788921b1c5a5e2)

15 years agotgsi: add tgsi_declaration fields for centroid sampling, invariant optimization
Brian Paul [Mon, 24 Nov 2008 17:02:44 +0000 (10:02 -0700)]
tgsi: add tgsi_declaration fields for centroid sampling, invariant optimization

(cherry picked from commit 434e255eae90b0f3d836d452b7d3b0c5aadf78b8)

15 years agomesa: add gl_program::Input/OutputFlags[] array
Brian Paul [Mon, 24 Nov 2008 20:04:04 +0000 (13:04 -0700)]
mesa: add gl_program::Input/OutputFlags[] array

These arrays will indicate per-input or per-output options for vertex/fragment
programs such as centroid-sampling and invariance.

(cherry picked from commit b730d0d3e9b202b17a0815cb820fc9905f35cb98)

15 years agomesa: copy centroid/invariance/precision info in parse_init_declarator()
Brian Paul [Mon, 24 Nov 2008 16:28:25 +0000 (09:28 -0700)]
mesa: copy centroid/invariance/precision info in parse_init_declarator()

(cherry picked from commit a2037137385671c0673d1de6eb1c36dbd3cd78f3)

15 years agomesa: check that varying variable qualifiers agree
Brian Paul [Mon, 24 Nov 2008 16:25:05 +0000 (09:25 -0700)]
mesa: check that varying variable qualifiers agree

(cherry picked from commit dc1107c08d0ccbeeb063f2e46be598f16cbe9f21)

15 years agomesa: copy precision/variant/centroid info in slang_fully_specified_type_copy()
Brian Paul [Mon, 24 Nov 2008 16:13:14 +0000 (09:13 -0700)]
mesa: copy precision/variant/centroid info in slang_fully_specified_type_copy()

(cherry picked from commit 0e2f757413a68f0edb6643ea23ad8d879d077f11)

15 years agomesa: set flags for varying vars
Brian Paul [Mon, 24 Nov 2008 16:05:49 +0000 (09:05 -0700)]
mesa: set flags for varying vars

(cherry picked from commit 3197954554bfc492283c7db009d10ab408664cad)

15 years agomesa: rename program parameter flags to match other Mesa conventions
Brian Paul [Mon, 24 Nov 2008 16:04:52 +0000 (09:04 -0700)]
mesa: rename program parameter flags to match other Mesa conventions

(cherry picked from commit f490ec9797a396da9d182f1ad4393f1c5c2df440)

15 years agomesa: copy Flags in _mesa_clone_parameter_list()
Brian Paul [Mon, 24 Nov 2008 16:04:11 +0000 (09:04 -0700)]
mesa: copy Flags in _mesa_clone_parameter_list()

(cherry picked from commit 08b825a77179a9e7ed902c9c57387f127cd007bc)

15 years agomesa: dump/debug varying vars list
Brian Paul [Mon, 24 Nov 2008 16:03:47 +0000 (09:03 -0700)]
mesa: dump/debug varying vars list

(cherry picked from commit 3f6668a4bf28109eb806be019fb235663572b7da)

15 years agomesa: added PROG_PARAM_ bits for invariant, flat/linear interpolation
Brian Paul [Mon, 24 Nov 2008 15:43:38 +0000 (08:43 -0700)]
mesa: added PROG_PARAM_ bits for invariant, flat/linear interpolation

Plus, update the print/debug code.

(cherry picked from commit 777a5c4f2e7c6c6ec0227a239b1af6c6b86dfab2)

15 years agomesa: add Flags field to gl_program_parameter
Brian Paul [Mon, 24 Nov 2008 15:33:49 +0000 (08:33 -0700)]
mesa: add Flags field to gl_program_parameter

Only one flag defined so far: PROG_PARAM_CENTROID_BIT

(cherry picked from commit 0f228d7ab3b7c03328df369b8db50c469ac5dcd6)

15 years agomesa: issue error, don't crash, when calling a prototyped, but undefined function
Brian Paul [Sat, 22 Nov 2008 00:22:16 +0000 (17:22 -0700)]
mesa: issue error, don't crash, when calling a prototyped, but undefined function

Bug #18659.

(cherry picked from commit 4f05893415a2d6f29b29f4daf991ea95a1891a81)

15 years agomesa: better variable name: s/aux/store/
Brian Paul [Fri, 21 Nov 2008 21:24:28 +0000 (14:24 -0700)]
mesa: better variable name: s/aux/store/

(cherry picked from commit b63a31b36f2e1a198c214f41e0518991b1a8fa49)

15 years agomesa: minor comment reformattting
Brian Paul [Wed, 19 Nov 2008 23:04:37 +0000 (16:04 -0700)]
mesa: minor comment reformattting

(cherry picked from commit bab4e78734dc462387fea32f0b05103e31f2d6f6)

15 years agomesa: glsl compiler debug code
Brian Paul [Wed, 19 Nov 2008 22:08:46 +0000 (15:08 -0700)]
mesa: glsl compiler debug code

RETURN0 macro reports file/line before returning zero.

(cherry picked from commit bf7f9d2143a892bc11a5e2b84e3d6d3ed69fb5e8)

15 years agomesa: rework GLSL array code generation
Brian Paul [Wed, 19 Nov 2008 21:12:25 +0000 (14:12 -0700)]
mesa: rework GLSL array code generation

We now express arrays in terms of indirect addressing.  For example:
  dst = a[i];
becomes:
  MOV dst, TEMP[1 + TEMP[2].y];
At instruction-emit time indirect addressing is converted into ARL/
ADDR-relative form:
  ARL ADDR.x, TEMP[2].y;
  MOV dst, TEMP[1 + ADDR.x];
This fixes a number of array-related issues.  Arrays of arrays and complex
array/struct nesting works now.
There may be some regressions, but more work is coming.

(cherry picked from commit ae0ff8097b85d3537a7be1674d55a44a9bd6018e)

15 years agomesa: don't realloc instruction buffer so often
Brian Paul [Fri, 14 Nov 2008 20:19:42 +0000 (13:19 -0700)]
mesa: don't realloc instruction buffer so often

(cherry picked from commit e709d68d92ef6f2392b118d0a22452e8f4c53e9a)

15 years agomesa: updated comment
Brian Paul [Fri, 14 Nov 2008 20:19:31 +0000 (13:19 -0700)]
mesa: updated comment

(cherry picked from commit d9fa9e3290611944d5fd52301645367eeeb24f03)

15 years agomesa: fix merge conflict left-overs
Brian Paul [Tue, 6 Jan 2009 15:48:27 +0000 (08:48 -0700)]
mesa: fix merge conflict left-overs

15 years agomesa: no longer need Writemask field in GLSL IR nodes
Brian Paul [Fri, 14 Nov 2008 01:18:07 +0000 (18:18 -0700)]
mesa: no longer need Writemask field in GLSL IR nodes

The Swizzle and Size fields carry all the info we need now.

(cherry picked from commit 80d6379722a1249ce13db79a898d340644936f67)

15 years agomesa: revamp GLSL instruction emit code
Brian Paul [Fri, 14 Nov 2008 00:02:11 +0000 (17:02 -0700)]
mesa: revamp GLSL instruction emit code

This is a step toward better array handling code.  In particular, when more
than one operand of an instruction uses indirect addressing, we'll need some
temporary instructions and registers.  By converting IR storage to instruction
operands all in one place (emit_instruction()) we can be smarter about this.

Also, somewhat better handling of dst register swizzle/writemask handling.
This results in tighter writemasks on some instructions which is good for
SOA execution.

And, cleaner instruction commenting with inst_comment().

Next: remove some more dead code and additional clean-ups...

(cherry picked from commit 3a7ed9779b159f9dccbc98d1d556be2cd83cc1fd)

15 years agomesa: make writemask_string() non-static
Brian Paul [Tue, 6 Jan 2009 15:47:05 +0000 (08:47 -0700)]
mesa: make writemask_string() non-static

(cherry picked from commit 610c2461ce0683ca5412e4b2b7a496f67e9d3704)

Conflicts:

src/mesa/shader/prog_print.c

15 years agomesa: remove some do-nothing GLSL code
Brian Paul [Thu, 13 Nov 2008 23:31:27 +0000 (16:31 -0700)]
mesa: remove some do-nothing GLSL code

(cherry picked from commit 4c167f8fc1e56b6c82d8917c237e70531e3d57b9)

15 years agomesa: fix accidental regression in GLSL built-in texture matrix lookup
Brian Paul [Tue, 6 Jan 2009 15:45:53 +0000 (08:45 -0700)]
mesa: fix accidental regression in GLSL built-in texture matrix lookup

Was broken by commit 9aca9a4b72b2a7b378e50bd88f9c3324d07375ec.

(cherry picked from commit fe984aed5a9ee7c6e000d48a0a584b964fefa848)

Conflicts:

src/mesa/shader/slang/slang_builtin.c

15 years agomesa: remove unused/obsolete __NormalMatrixTranspose matrix
Brian Paul [Wed, 12 Nov 2008 23:47:03 +0000 (16:47 -0700)]
mesa: remove unused/obsolete __NormalMatrixTranspose matrix

(cherry picked from commit e556cc82f83716a734ed9d76356ba49bb670004f)

15 years agomesa: tweak program register printing for RelAddr case
Brian Paul [Wed, 12 Nov 2008 18:12:10 +0000 (11:12 -0700)]
mesa: tweak program register printing for RelAddr case

(cherry picked from commit 557fde9531289b4388a3080b89c2ebaa38abeaee)

15 years agomesa: allow relative indexing into all register files and indirect dst register indexing
Brian Paul [Tue, 6 Jan 2009 15:42:40 +0000 (08:42 -0700)]
mesa: allow relative indexing into all register files and indirect dst register indexing

(cherry picked from commit f4361540f8dd3016571523863b33481cba7a0c07)

Conflicts:

src/mesa/shader/prog_execute.c

15 years agomesa: track initialization status of uniform variables. Plus, asst clean-ups.
Brian Paul [Mon, 10 Nov 2008 19:33:17 +0000 (12:33 -0700)]
mesa: track initialization status of uniform variables.  Plus, asst clean-ups.

(cherry picked from commit 2d76a0d77af7be9539f89cba37ce84338c1cdda4)

15 years agomesa: initial support for uniform variable initializers.
Brian Paul [Mon, 10 Nov 2008 18:42:42 +0000 (11:42 -0700)]
mesa: initial support for uniform variable initializers.

This lets one specify initial values for uniforms in the code, avoiding
the need to call glUniform() in some cases.

(cherry picked from commit 379ff8c9567940ebff44870cf7b0202882445fa6)

15 years agomesa: allows 'f' suffix on GLSL float literals
Brian Paul [Mon, 10 Nov 2008 17:25:01 +0000 (10:25 -0700)]
mesa: allows 'f' suffix on GLSL float literals

(cherry picked from commit 80c8017a643dfb655e4e1500e1c57e3908529c27)

15 years agomesa: add support for 'centroid' qualifier in GLSL 1.20
Brian Paul [Tue, 6 Jan 2009 15:36:30 +0000 (08:36 -0700)]
mesa: add support for 'centroid' qualifier in GLSL 1.20

(cherry picked from commit 87d1a26ba38e75f6988e094dbfbc0f77c0ae502b)

Conflicts:

src/mesa/shader/slang/library/slang_vertex_builtin_gc.h

15 years agomesa: add support for 'invariant' keyword for GLSL 1.20
Brian Paul [Tue, 6 Jan 2009 15:35:16 +0000 (08:35 -0700)]
mesa: add support for 'invariant' keyword for GLSL 1.20

(cherry picked from commit 448156f769ebf271a6a8c03c61588c3e6c6363f0)

Conflicts:

src/mesa/shader/slang/library/slang_vertex_builtin_gc.h

15 years agomesa: reformat comments, rewrap lines, etc for a little better readability
Brian Paul [Fri, 7 Nov 2008 21:28:00 +0000 (14:28 -0700)]
mesa: reformat comments, rewrap lines, etc for a little better readability
(cherry picked from commit b632e5aa7f948ed5bbf7104682ec3ee463af4c0a)

15 years agogallium: Fix typeo in mipmap filter for GL_UNSIGNED_SHORT_1_5_5_5_REV
Brian Paul [Fri, 19 Dec 2008 23:14:48 +0000 (16:14 -0700)]
gallium: Fix typeo in mipmap filter for GL_UNSIGNED_SHORT_1_5_5_5_REV

This is copied from Ian's commit a330933bb75c38148668637cd22b90d75d39506f

15 years agoscons: Specify C99 throughout all the tree.
José Fonseca [Tue, 30 Dec 2008 17:13:38 +0000 (17:13 +0000)]
scons: Specify C99 throughout all the tree.

MSVC may not support full C99, but supports more than plain C90. And
-pedantic without -std=c99 generates too many spurious warnings
(specially C++ style comments) to be of any use.

Note that using certain C99 features in the cross-platform parts of Gallium
is still not possible; namely mid-of-scope variable declarations and named
structure initializers will break MSVC builds.

15 years agogallium: implement TGSI_OPCODE_DP2A, add sqrt to NRM3/NRM4
Brian Paul [Fri, 7 Nov 2008 20:02:43 +0000 (13:02 -0700)]
gallium: implement TGSI_OPCODE_DP2A, add sqrt to NRM3/NRM4

15 years agotgsi: fix incomplete rename of loop counter variable
Keith Whitwell [Tue, 23 Dec 2008 18:16:49 +0000 (18:16 +0000)]
tgsi: fix incomplete rename of loop counter variable

15 years agodraw: allow driver-override of draw_need_pipeline()
Keith Whitwell [Tue, 23 Dec 2008 13:26:25 +0000 (13:26 +0000)]
draw: allow driver-override of draw_need_pipeline()

15 years agotgsi: Dump indirect register swizzle.
Michal Krol [Tue, 23 Dec 2008 14:13:59 +0000 (15:13 +0100)]
tgsi: Dump indirect register swizzle.

15 years agotgsi: Return 0.0 for negative constant register indices.
Michal Krol [Fri, 14 Nov 2008 12:31:06 +0000 (13:31 +0100)]
tgsi: Return 0.0 for negative constant register indices.

15 years agotgsi: Keep address register as a floating point.
Michal Krol [Fri, 14 Nov 2008 12:26:01 +0000 (13:26 +0100)]
tgsi: Keep address register as a floating point.

15 years agosoftpipe: Don't fill surfaces's winsys fields.
José Fonseca [Mon, 22 Dec 2008 20:23:59 +0000 (20:23 +0000)]
softpipe: Don't fill surfaces's winsys fields.

This is sometimes checked to distinguish between texture views and
(deprecated) standalone surfaces.

15 years agosoftpipe: Call surface_alloc_storage to get the pipebuffer for display targets.
José Fonseca [Mon, 22 Dec 2008 20:20:58 +0000 (20:20 +0000)]
softpipe: Call surface_alloc_storage to get the pipebuffer for display targets.

Otherwise blitting from display target surfaces to front screen fails in
several platforms.

15 years agosoftpipe: initialize refcount and winsys
Jerome Glisse [Thu, 18 Dec 2008 18:56:45 +0000 (19:56 +0100)]
softpipe: initialize refcount and winsys

15 years agosoftpipe: convert to use texture instead of surface
Jerome Glisse [Thu, 18 Dec 2008 12:34:27 +0000 (13:34 +0100)]
softpipe: convert to use texture instead of surface

15 years agogallium: const correctness.
José Fonseca [Mon, 22 Dec 2008 16:55:27 +0000 (16:55 +0000)]
gallium: const correctness.

15 years agoIgnore new tests executables.
José Fonseca [Sun, 21 Dec 2008 13:48:43 +0000 (13:48 +0000)]
Ignore new tests executables.

15 years agogallium: Fix typo in define name.
José Fonseca [Sat, 20 Dec 2008 12:59:51 +0000 (12:59 +0000)]
gallium: Fix typo in define name.

15 years agogallium: Simple and efficient cache.
José Fonseca [Fri, 19 Dec 2008 20:06:11 +0000 (20:06 +0000)]
gallium: Simple and efficient cache.

Fixed size hash table. Collisions are handled by simply destroying the
previous entry.

It hasn't received much testing yet.