f9ffccb06b
ir_to_mesa: Support user-defined varyings using the linker's locations.
...
Fixes glsl-reload-source.
2010-06-28 14:49:59 -07:00
ad8ad338f4
ir_to_mesa: Actually add the header file for the interface.
2010-06-28 13:45:43 -07:00
8f62ad6d0f
ir_to_mesa: Fix binop_sqrt for multi-channel and negative source channels.
...
Fixes glsl-fs-sqrt-branch.
2010-06-28 13:03:10 -07:00
d5a5df45a4
ir_to_mesa: Fix indexes of temps used in expressions.
...
It looks like I managed to horribly mangle this in some rebase of the
branch. Fixes:
glsl-fs-fragcoord
glsl-fs-mix
2010-06-28 12:49:28 -07:00
7dc1e0b326
ir_to_mesa: Notify the driver when we generate new Mesa programs for GLSL.
...
Fixes glsl-fs-if-*.
2010-06-28 12:38:19 -07:00
904b5bfe99
ir_to_mesa: Add support for the pow expression.
...
Fixes glsl-algebraic-pow-two.
2010-06-28 12:26:19 -07:00
cbe52c8012
ir_to_mesa: Fix EmitCondCodes for boolean vars as condition.
...
Fixes glsl-vs-if-bool.
2010-06-28 12:17:25 -07:00
854fd66cbb
ir_to_mesa: Respect EmitCondCodes for IF statements.
...
Fixes glsl-vs-if-* for the 965 driver.
2010-06-28 12:01:23 -07:00
0a52e8b691
ir_to_mesa: Traverse the "else" instrs after "else", instead of "then" again.
2010-06-28 11:45:10 -07:00
3f3f41357d
ir_to_mesa: Fix matrix * scalar multiplication.
...
We're accessing in terms of columns, so we need to do MUL/MAD/MAD/MAD
instead of DP4s.
Fixes:
glsl-fs-exp2
glsl-fs-log2
glsl-fs-mix-constant
glsl-fs-sqrt-zero
glsl-vs-sqrt-zero
2010-06-28 11:14:47 -07:00
ad2dc740b9
ir_to_mesa: Check the right element for matrix * scalar multiplication.
2010-06-28 11:14:47 -07:00
bd3b835e7c
glsl2: Add support for some builtin matrices.
2010-06-28 11:14:47 -07:00
81b7b79c47
ir_to_mesa: Fix copy and wasted InputsRead/OutputsWritten setup.
2010-06-28 11:14:47 -07:00
5f3fe44595
Use a more sensible context in copy propagation.
2010-06-28 11:14:47 -07:00
a815f7fb83
Use more sensible contexts in ir_dead_code_local.
2010-06-28 11:14:47 -07:00
22c23dedad
glsl2: Add option to stand-alone GLSL compiler to dump IR before optimizations
2010-06-28 10:04:22 -07:00
26b5d33dce
glsl2: Use i2b and f2b IR opcodes for casting int or float to bool
2010-06-28 10:04:18 -07:00
0bef5b97a9
glsl2: Add support for non-float constants in Mesa IR.
...
Fixes glsl-vs-vec4-indexing-4.
2010-06-25 18:01:20 -07:00
6152fa16a1
glsl2: Take out the spamming of debug flags I'd added.
2010-06-25 17:23:31 -07:00
b2d7ed2aba
glsl2: Don't clear swizzles for Mesa IR constants after fetching them.
...
Missed this while hacking in constants support. Fixes:
glsl-algebraic-mul-*
glsl-algebraic-rcp-*
glsl-vs-swizzle-swizzle-lhs
glsl-vs-vec4-indexing-6
2010-06-25 17:20:46 -07:00
78062273de
ir_reader: Free memory for S-Expressions earlier.
...
There's no point in keeping it around once we've read the IR.
Also, remove an unnecessary talloc_parent call.
2010-06-25 17:07:42 -07:00
85c978f38c
glsl2: Start trying to hook up uniforms.
...
This should be resolved with linker.cpp's location assignment, as
currently we drop that location assignment on the ground. However,
this gets basic programs using uniforms working for now.
2010-06-25 16:35:36 -07:00
0fd97db8b0
glsl2: Associate the GLenum for the type with builtin GLSL types.
2010-06-25 16:35:22 -07:00
bda27424cf
glsl2: Use the parser state as the talloc context for dead code elimination.
...
This cuts runtime by around 20% from talloc_parent() lookups.
2010-06-25 13:38:38 -07:00
abc4e52992
glsl2: Emit OPCODE_END at the end of the Mesa program.
...
The 965 driver can now run a glsl2-generated shader!
2010-06-25 13:28:16 -07:00
582b73fe69
glsl2: Hook up constant parameters in ir_to_mesa.
2010-06-25 13:27:57 -07:00
ffc845a50a
glsl2: Set InputsRead and OutputsWritten on the generated programs.
2010-06-25 12:52:01 -07:00
364fcd8ee1
glsl2: Start integrating ir_to_mesa.cpp into shader_api.h
...
The compiler is now called by the driver, and generates program
instructions. Parameter lists are still not set up, so the driver
chokes on it shortly thereafter.
2010-06-25 12:37:21 -07:00
7f2bf62d25
glsl2: Use Mesa types instead of duping them into our program.h.
2010-06-25 12:25:19 -07:00
2a3d46dd46
glsl2: Fix dependencies. (at least partially)
2010-06-25 12:23:20 -07:00
0a1b54df7a
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-24 17:23:21 -07:00
3d6012303c
glsl2: Wrap includes of C interfaces with extern "C".
2010-06-24 17:23:19 -07:00
f4869f3326
glsl2: Remove files that had been imported for standalone.
2010-06-24 17:14:00 -07:00
e82ddb781a
glsl2: Stop .gitignoring the old standalone build system.
2010-06-24 15:52:56 -07:00
9aa0b6d728
glsl2: Move the Mesa IR codegen into mesa/shader/
2010-06-24 15:49:18 -07:00
bcc13b7444
Merge branch 'glsl2-head' into glsl2
...
This brings in the standalone GLSL compiler that we are planning on
replacing the existing Mesa GLSL compiler. It currently targets GLSL
1.20 and the Mesa IR.
2010-06-24 15:47:40 -07:00
e5cf3aadb8
glsl2: Add a README file for the new compiler.
2010-06-24 15:46:53 -07:00
2928588267
glsl2: Move the compiler to the subdirectory it will live in in Mesa.
2010-06-24 15:36:00 -07:00
0ee7d80269
Merge branch 'mesa'
...
This brings in the ir_to_mesa.cpp code I've been developing to codegen
to the Mesa IR. It does not actually generate a complete Mesa
fragment/vertex program yet.
2010-06-24 15:27:10 -07:00
6b01b50888
Move the talloc_parent lookup down in a few hot paths.
...
talloc_parent is still 80% of our runtime, but likely talloc_parent
lookups will be reduced as we improve the handling of memory
ownership.
2010-06-24 15:18:39 -07:00
e33c10328c
Merge remote branch 'cworth/master'
...
Conflicts:
ast_to_hir.cpp
ir.cpp
This brings in the talloc-based memory management work, so that the
compiler (almost) no longer leaks memory.
2010-06-24 15:13:03 -07:00
8364fc85b8
ir_to_mesa: Handle a limited subset of matrix multiplication.
...
glsl-mvp.vert now generates believable code, and mesa mode fails only
5 tests that master doesn't. I must have left out some asserts...
2010-06-24 15:05:21 -07:00
7672064756
ir_to_mesa: Handle constant matrices.
...
There's not much to it since we're not actually storing constant data yet.
2010-06-24 15:05:21 -07:00
f4bd7f262e
ir_to_mesa: Fix copy-and-wasted second argument to compare expresssion ops.
...
Fixes CorrectParse2.vert assertion due to uninitialized values.
2010-06-24 15:05:21 -07:00
4006424f5b
ir_to_mesa: Don't allocate temps for swizzles.
...
We do them in place by actually, you know, swizzling.
2010-06-24 15:05:21 -07:00
a9b619bb3b
ir_to_mesa: Set up storage for uniform vars.
2010-06-24 15:05:21 -07:00
554dbcce77
ir_to_mesa: Move the classes into the file now that we don't have the burg.
...
At 1kloc, it doesn't look like I'll want to split the ir_to_mesa file
up even once it's feature-complete. Move definitions closer to usage,
and prevent rebuilding the world when changing the definitions.
2010-06-24 15:05:21 -07:00
2401338ef8
ir_to_mesa: Remove old monoburg structure.
2010-06-24 15:05:21 -07:00
9cd8cad9f3
ir_to_mesa: Restrict dst writemasks like we did in the monoburg setup.
2010-06-24 15:05:21 -07:00
9d2b8e0b70
ir_to_mesa: Fix copy-and-wasted DIV instruction sequence.
2010-06-24 15:05:21 -07:00
Eric Anholt