Commit Graph

16216 Commits

Author SHA1 Message Date
Brian Paul a5cd8fef91 mesa: move some glsl compiler functions to different files to be more consistant
(cherry picked from commit aeeb9bca27)
2009-01-06 09:09:11 -07:00
Brian Paul fbc55bfbb8 mesa: move _slang_locate_function() to different file
(cherry picked from commit ea9dc3879f)
2009-01-06 09:09:03 -07:00
Brian Paul a7e3f85fd6 mesa: remove unused fixup table code in glsl compiler
(cherry picked from commit 19ca2908be)
2009-01-06 09:08:54 -07:00
Brian Paul 593073a3b3 mesa: checkpoint: GLSL 1.20 array constructors
(cherry picked from commit ade777ea1b)
2009-01-06 09:08:35 -07:00
Brian Paul 0d293f6687 mesa: consolidate variable declaration initializer code for globals too
(cherry picked from commit 1737f2dbdd)
2009-01-06 09:08:16 -07:00
Brian Paul 6bc2fa0f82 mesa: move variable initializer IR generation into _slang_gen_var_decl()
More code consolidation coming...

(cherry picked from commit 2760bca1e1)
2009-01-06 09:08:07 -07:00
Brian Paul de4f208866 mesa: simplify some glsl variable declaration code
(cherry picked from commit 05ed9f7fe9)
2009-01-06 09:07:58 -07:00
Brian Paul 6095b7e224 mesa: glsl clean-ups
(cherry picked from commit 929eb00b32)
2009-01-06 09:07:42 -07:00
Brian Paul 9b28d5ecd6 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 2dc3de016c)
2009-01-06 09:07:29 -07:00
Brian Paul 1f8109dd06 mesa: in slang linker, replace assertion with link error when max samplers exceeded
(cherry picked from commit e8f5c1a5e8)
2009-01-06 09:05:53 -07:00
Brian 525145a9f6 mesa: fix conditional in save_Lightfv(), bug 18838
(cherry picked from commit 1e2f574251)
2009-01-06 09:04:31 -07:00
Brian Paul aeb3caeba5 mesa: add missing type check for function calls
(cherry picked from commit 001b1cbb0d)
2009-01-06 09:03:23 -07:00
Brian Paul e42ed1ed0b mesa: add missing size check for assignment optimization
(cherry picked from commit aa40de5c6f)
2009-01-06 09:03:06 -07:00
Brian Paul 96cab36e2e mesa: remove debug code
(cherry picked from commit fea3a32e17)
2009-01-06 09:02:47 -07:00
Brian Paul b8cf2f0076 gallium: added centroid/invarient fields to declarations
(cherry picked from commit 4de360e67d)
2009-01-06 09:01:18 -07:00
Brian Paul 06f2139b82 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 8d95e66cf7)
2009-01-06 09:00:35 -07:00
Brian Paul d450ede4c4 mesa: support for GLSL 1.20 array types
This allows syntax like "float[8] foo, bar;"

(cherry picked from commit 0fab514ff5)
2009-01-06 09:00:24 -07:00
Brian Paul 89acfecd0b mesa: pass shader centroid/invariant info through to the TGSI shader
(cherry picked from commit c5b52b5e0e)
2009-01-06 08:57:58 -07:00
Brian Paul dc48ae97dc tgsi: add tgsi_declaration fields for centroid sampling, invariant optimization
(cherry picked from commit 434e255eae)
2009-01-06 08:57:28 -07:00
Brian Paul a48b004c44 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 b730d0d3e9)
2009-01-06 08:54:23 -07:00
Brian Paul 71c900abc7 mesa: copy centroid/invariance/precision info in parse_init_declarator()
(cherry picked from commit a203713738)
2009-01-06 08:53:46 -07:00
Brian Paul 674d7181f8 mesa: check that varying variable qualifiers agree
(cherry picked from commit dc1107c08d)
2009-01-06 08:53:35 -07:00
Brian Paul 19111c5efc mesa: copy precision/variant/centroid info in slang_fully_specified_type_copy()
(cherry picked from commit 0e2f757413)
2009-01-06 08:53:28 -07:00
Brian Paul c249ac6d14 mesa: set flags for varying vars
(cherry picked from commit 3197954554)
2009-01-06 08:53:01 -07:00
Brian Paul af988262e3 mesa: rename program parameter flags to match other Mesa conventions
(cherry picked from commit f490ec9797)
2009-01-06 08:52:49 -07:00
Brian Paul 64de78723c mesa: copy Flags in _mesa_clone_parameter_list()
(cherry picked from commit 08b825a771)
2009-01-06 08:52:39 -07:00
Brian Paul a92af00e2a mesa: dump/debug varying vars list
(cherry picked from commit 3f6668a4bf)
2009-01-06 08:52:19 -07:00
Brian Paul 36f9d3fa9a mesa: added PROG_PARAM_ bits for invariant, flat/linear interpolation
Plus, update the print/debug code.

(cherry picked from commit 777a5c4f2e)
2009-01-06 08:52:08 -07:00
Brian Paul ee3da89b19 mesa: add Flags field to gl_program_parameter
Only one flag defined so far: PROG_PARAM_CENTROID_BIT

(cherry picked from commit 0f228d7ab3)
2009-01-06 08:51:45 -07:00
Brian Paul 716ccb11a2 mesa: issue error, don't crash, when calling a prototyped, but undefined function
Bug #18659.

(cherry picked from commit 4f05893415)
2009-01-06 08:51:24 -07:00
Brian Paul db2cde413c mesa: better variable name: s/aux/store/
(cherry picked from commit b63a31b36f)
2009-01-06 08:51:00 -07:00
Brian Paul 515a43da16 mesa: minor comment reformattting
(cherry picked from commit bab4e78734)
2009-01-06 08:50:33 -07:00
Brian Paul 620a2bad22 mesa: glsl compiler debug code
RETURN0 macro reports file/line before returning zero.

(cherry picked from commit bf7f9d2143)
2009-01-06 08:50:14 -07:00
Brian Paul e779e33261 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 ae0ff8097b)
2009-01-06 08:49:40 -07:00
Brian Paul ef4bd18a50 mesa: don't realloc instruction buffer so often
(cherry picked from commit e709d68d92)
2009-01-06 08:49:27 -07:00
Brian Paul 2a6c12cf53 mesa: updated comment
(cherry picked from commit d9fa9e3290)
2009-01-06 08:49:08 -07:00
Brian Paul def84fac39 mesa: fix merge conflict left-overs 2009-01-06 08:48:27 -07:00
Brian Paul ebcf06702c 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 80d6379722)
2009-01-06 08:47:40 -07:00
Brian Paul 9681119bbb 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 3a7ed9779b)
2009-01-06 08:47:21 -07:00
Brian Paul e8fa7e500c mesa: make writemask_string() non-static
(cherry picked from commit 610c2461ce)

Conflicts:

	src/mesa/shader/prog_print.c
2009-01-06 08:47:05 -07:00
Brian Paul 2bdf076554 mesa: remove some do-nothing GLSL code
(cherry picked from commit 4c167f8fc1)
2009-01-06 08:46:12 -07:00
Brian Paul ed8f857792 mesa: fix accidental regression in GLSL built-in texture matrix lookup
Was broken by commit 9aca9a4b72b2a7b378e50bd88f9c3324d07375ec.

(cherry picked from commit fe984aed5a)

Conflicts:

	src/mesa/shader/slang/slang_builtin.c
2009-01-06 08:45:53 -07:00
Brian Paul 5b66bc1a83 mesa: remove unused/obsolete __NormalMatrixTranspose matrix
(cherry picked from commit e556cc82f8)
2009-01-06 08:43:55 -07:00
Brian Paul 1ad6daf3a9 mesa: tweak program register printing for RelAddr case
(cherry picked from commit 557fde9531)
2009-01-06 08:43:14 -07:00
Brian Paul 20156ce5da mesa: allow relative indexing into all register files and indirect dst register indexing
(cherry picked from commit f4361540f8)

Conflicts:

	src/mesa/shader/prog_execute.c
2009-01-06 08:42:40 -07:00
Brian Paul 6b05708ce2 mesa: track initialization status of uniform variables. Plus, asst clean-ups.
(cherry picked from commit 2d76a0d77a)
2009-01-06 08:39:06 -07:00
Brian Paul de44547891 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 379ff8c956)
2009-01-06 08:38:29 -07:00
Brian Paul c478a1baca mesa: allows 'f' suffix on GLSL float literals
(cherry picked from commit 80c8017a64)
2009-01-06 08:37:13 -07:00
Brian Paul 45c8d996f6 mesa: add support for 'centroid' qualifier in GLSL 1.20
(cherry picked from commit 87d1a26ba3)

Conflicts:

	src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
2009-01-06 08:36:30 -07:00
Brian Paul 2e77a39d2f mesa: add support for 'invariant' keyword for GLSL 1.20
(cherry picked from commit 448156f769)

Conflicts:

	src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
2009-01-06 08:35:16 -07:00