Commit Graph

37 Commits

Author SHA1 Message Date
Kenneth Graunke
16efab1c4d glsl2: Define new ir_discard instruction. 2010-06-30 14:54:58 -07:00
Eric Anholt
88c20c46b8 ir_to_mesa: Support gl_FragDepth.
Fixes glsl-bug-22603.
2010-06-30 14:55:45 -07:00
Eric Anholt
c64da87611 ir_to_mesa: Fix the indexing of attributes in the program's Attributes.
This fixes GetAttribLocation returning VERT_ATTRIB_GENERIC1 instead of 1,
caught by glsl-dlist-getattriblocation.
2010-06-30 14:44:14 -07:00
Kenneth Graunke
629198b96a glsl2: Preprocessed source doesn't need to live past compile time. 2010-06-30 13:52:24 -07:00
Kenneth Graunke
116f1d4f95 glsl2: Steal the live IR and free the rest of the junk. 2010-06-30 13:52:24 -07:00
Eric Anholt
edcb9c2b06 ir_to_mesa: Tell Mesa about our choices for vertex attribute locations. 2010-06-30 12:02:31 -07:00
Eric Anholt
849e18153c glsl2: Use Mesa's gl_shader_program instead of our own struct glsl_program.
This avoids more allocation and shuffling of data around.
2010-06-30 12:01:42 -07:00
Eric Anholt
16b68b1952 glsl2: Move our data from a glsl_shader* on the side to the main gl_shader *.
This saves recompiling at link time.  gl_shader->ir is made a pointer
so that we don't have to bring exec_list into mtypes.h.
2010-06-30 11:30:26 -07:00
Eric Anholt
524745bc55 ir_to_mesa: Add support for ir_unop_abs. 2010-06-29 17:18:28 -07:00
Eric Anholt
ba9bd708cb ir_to_mesa: Add support for dFdx, dFdy. 2010-06-29 17:18:28 -07:00
Eric Anholt
d4f7e660dd ir_to_mesa: Start adding support for texture instructions.
Fixes:
glsl-fs-bug25902
glsl-fs-sampler-numbering
glsl-lod-bias
2010-06-29 17:18:28 -07:00
Ian Romanick
5e18b051c0 glsl2: Pass MaxDrawBuffers from core Mesa into the GLSL compiler 2010-06-29 15:19:38 -07:00
Ian Romanick
153eca9806 glsl2: Invoke preprocessor before calling the compiler proper 2010-06-29 11:00:58 -07:00
Eric Anholt
59a23d7fb9 ir_to_mesa: Actually initialize the undef register for scalar_op1.
Fixes glsl-sin, glsl-cos on 965, where we rely on unused src arguments
in the VS having a file of PROGRAM_UNDEFINED.
2010-06-28 15:07:19 -07:00
Eric Anholt
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
Eric Anholt
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
Eric Anholt
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
Eric Anholt
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
Eric Anholt
904b5bfe99 ir_to_mesa: Add support for the pow expression.
Fixes glsl-algebraic-pow-two.
2010-06-28 12:26:19 -07:00
Eric Anholt
cbe52c8012 ir_to_mesa: Fix EmitCondCodes for boolean vars as condition.
Fixes glsl-vs-if-bool.
2010-06-28 12:17:25 -07:00
Eric Anholt
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
Eric Anholt
0a52e8b691 ir_to_mesa: Traverse the "else" instrs after "else", instead of "then" again. 2010-06-28 11:45:10 -07:00
Eric Anholt
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
Eric Anholt
ad2dc740b9 ir_to_mesa: Check the right element for matrix * scalar multiplication. 2010-06-28 11:14:47 -07:00
Eric Anholt
bd3b835e7c glsl2: Add support for some builtin matrices. 2010-06-28 11:14:47 -07:00
Eric Anholt
81b7b79c47 ir_to_mesa: Fix copy and wasted InputsRead/OutputsWritten setup. 2010-06-28 11:14:47 -07:00
Eric Anholt
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
Eric Anholt
6152fa16a1 glsl2: Take out the spamming of debug flags I'd added. 2010-06-25 17:23:31 -07:00
Eric Anholt
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
Eric Anholt
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
Eric Anholt
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
Eric Anholt
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
Eric Anholt
582b73fe69 glsl2: Hook up constant parameters in ir_to_mesa. 2010-06-25 13:27:57 -07:00
Eric Anholt
ffc845a50a glsl2: Set InputsRead and OutputsWritten on the generated programs. 2010-06-25 12:52:01 -07:00
Eric Anholt
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
Eric Anholt
0a1b54df7a glsl2: Replace the GLSL compiler with the glsl2 project. 2010-06-24 17:23:21 -07:00
Eric Anholt
9aa0b6d728 glsl2: Move the Mesa IR codegen into mesa/shader/ 2010-06-24 15:49:18 -07:00