Tom Stellard [Fri, 13 Apr 2012 18:29:49 +0000 (14:29 -0400)]
r600g: Use automake to generate Makefile
Eric Anholt [Mon, 16 Apr 2012 20:37:04 +0000 (13:37 -0700)]
Revert "glsl: Refuse to link GLSL 1.40+ shaders that would use fixed function."
This reverts commit
4ec449a6ed1d2cea3bf83d6518b3b352ce5daceb.
I meant to not push this one. Review found that a link error is not
mandated: it should link, but you get undefined rendering if you rely
on a missing stage.
page 42/55 section 2.11 "Vertex Shaders":
"If the program object has no vertex shader, or no program object
is currently in use, the results of vertex shader execution are
undefined."
(and similar for page 160/173 section 3.9 "Fragment Shaders" for FS,
and page 45/58 section 2.11.2 "Program Objects" for program being 0)
It turns out the commit was broken anyway, because it was missing a
"goto done", so linkstatus got smashed back to true later and the
error just showed up as a warning in the infolog.
Eric Anholt [Fri, 13 Apr 2012 19:18:46 +0000 (12:18 -0700)]
docs: Update GLSL 1.40 status.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Fri, 13 Apr 2012 19:09:59 +0000 (12:09 -0700)]
docs: Update that int textures got done for GL3.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Fri, 13 Apr 2012 19:09:11 +0000 (12:09 -0700)]
docs: Update that ARB_draw_instanced is on in i965.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Fri, 13 Apr 2012 19:07:01 +0000 (12:07 -0700)]
docs: Update TBO support.
All I know of that needs finishing in Mesa is to enable the extension
in a GL3.1 core context on i965 -- we're not going to expose it in
non-3.1 core contexts.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Fri, 13 Apr 2012 20:51:34 +0000 (13:51 -0700)]
glsl: Refuse to link GLSL 1.40+ shaders that would use fixed function.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Fri, 13 Apr 2012 22:43:41 +0000 (15:43 -0700)]
glsl: Add remaining *sampler2DRect* texture functions.
Fixes the new piglit texelFetch() tests on these. Note that the rest
of the new functions are not tested (same as the non-2DRect versions
of most of them).
Eric Anholt [Mon, 16 Apr 2012 18:43:47 +0000 (11:43 -0700)]
glsl: Fix the prototype of textureProjGradOffset(sampler2DShadow)
Indirectly caught by Ken's review of my GLSL 1.40 changes where I
copy-and-pasted this line.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Fri, 13 Apr 2012 19:34:45 +0000 (12:34 -0700)]
glsl: Mark [iu]sampler{Buffer,2DRect}as reserved in GLSL 1.40.
The non-integer versions were already reserved in 1.30, but apparently
these were forgotten.
Fixes piglit glsl-1.40/compiler/reserved/
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Thu, 12 Apr 2012 23:28:37 +0000 (16:28 -0700)]
glsl: Add textureSize(*samplerBuffer) support.
Fixes the corresponding new tests in piglit.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Fri, 13 Apr 2012 19:44:33 +0000 (12:44 -0700)]
glsl: Fix comment typo in 1.40 work.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Fri, 13 Apr 2012 19:43:15 +0000 (12:43 -0700)]
mesa: Remove dead _mesa_sizeof_glsl_type().
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Fri, 13 Apr 2012 16:59:00 +0000 (09:59 -0700)]
gtest: Don't actually install a library.
The whole point of importing it was that you're not supposed to
install this library.
Reviewed-by: Matt Turner <mattst88@gmail.com>
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=411825
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Brian Paul [Mon, 16 Apr 2012 16:35:20 +0000 (10:35 -0600)]
svga: add case for PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS
Dylan Noblesmith [Mon, 2 Apr 2012 15:35:38 +0000 (15:35 +0000)]
autoconf: add AM_PROG_CC_C_O
Prevents this error with Automake 1.9:
src/gallium/drivers/Makefile.am: C objects in subdir but
`AM_PROG_CC_C_O' not in `configure.ac'
autoreconf: automake failed with exit status: 1
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Christoph Bumiller [Sun, 15 Apr 2012 22:36:35 +0000 (00:36 +0200)]
nvc0: fix nve4 linear copies
Christoph Bumiller [Sun, 15 Apr 2012 14:40:53 +0000 (16:40 +0200)]
targets/xvmc-nouveau: fix accidental hardcoded include path
5b0cd37324555638661a4a70c2bdf49eeebe876c wasn't meant to be pushed.
Christoph Bumiller [Sun, 15 Apr 2012 14:30:13 +0000 (16:30 +0200)]
nv50: use correct semantic map value for undefined PointSize output
Christoph Bumiller [Fri, 6 Apr 2012 15:02:08 +0000 (17:02 +0200)]
targets/xvmc-nouveau: add libdrm include path
Ben Skeggs [Sun, 15 Apr 2012 12:14:58 +0000 (22:14 +1000)]
nv30: init sample_mask to some default value at context creation time
Fixes demos/lodbias.
Ben Skeggs [Sun, 15 Apr 2012 00:52:06 +0000 (10:52 +1000)]
nv30: fix some sifm transfer issues
José Fonseca [Sun, 15 Apr 2012 10:32:21 +0000 (11:32 +0100)]
scons: Fix egl-static build due to conflicting symbols.
radeonsi and r600 have duplicate symbols, so it's not possible to
statically link both. Remove the newcomer, radeonsi, until duplicate
symbols are fixed.
Christoph Bumiller [Sat, 14 Apr 2012 21:56:56 +0000 (23:56 +0200)]
nvc0: add initial support for nve4+ (Kepler) chipsets
Most things that work on Fermi should work on Kepler too.
There are a few performance optimizations left to do, like better
placement of texture barriers and adding scheduling data to the
shader instructions (without them, a thread group will be masked
for 32 cycles after each single instruction issue).
Tom Stellard [Sat, 14 Apr 2012 21:37:37 +0000 (17:37 -0400)]
radeonsi: s/DUAL_SOURCE_BLEND/MAX_DUAL_SOURCE_RENDER_TARGETS/
Fixes build broken by commit
0d29fb017bce0968240ae875af4b3702c2cd46ef
Christoph Bumiller [Sat, 14 Apr 2012 19:12:22 +0000 (21:12 +0200)]
nv50/ir/opt: extend handleCVT for nv50's SET u32 to f32 chain
Christoph Bumiller [Thu, 12 Apr 2012 19:42:29 +0000 (21:42 +0200)]
nv50/ir: print interpolation mode
Christoph Bumiller [Sun, 8 Apr 2012 15:33:08 +0000 (17:33 +0200)]
nv50: update FP linkage state on one/two-sided lighting switch
Christoph Bumiller [Sun, 18 Mar 2012 22:28:07 +0000 (23:28 +0100)]
nv50: delete old shader compiler files
Christoph Bumiller [Sat, 14 Apr 2012 19:42:52 +0000 (21:42 +0200)]
nv50: hook up to new shader code generator
Christoph Bumiller [Sat, 14 Apr 2012 19:40:35 +0000 (21:40 +0200)]
nv50/ir: import nv50 target
Christoph Bumiller [Sat, 14 Apr 2012 02:44:28 +0000 (04:44 +0200)]
nv50/ir: fix off-by-ones in CSE and nvc0 insnCanLoad
Christoph Bumiller [Sat, 7 Apr 2012 20:46:35 +0000 (22:46 +0200)]
nv50/ir/tgsi: generate UCPs with actual outputs instead of SVs
gl_ClipDistance is treated the same way, this is just nicer and
easier assign slots for them on nv50.
Francisco Jerez [Mon, 9 Apr 2012 16:22:57 +0000 (18:22 +0200)]
nv50/ir: Fix type of the instruction created by mkCmp() for dst in FILE_FLAGS.
Christoph Bumiller [Sun, 8 Apr 2012 21:38:55 +0000 (23:38 +0200)]
nv50/ir: fix Instruction::isCommutationLegal for WAW
Francisco Jerez [Sun, 8 Apr 2012 21:14:15 +0000 (23:14 +0200)]
nv50/ir/opt: Add isOptSupported() check in logical arith optimization.
Francisco Jerez [Tue, 27 Dec 2011 11:43:27 +0000 (12:43 +0100)]
nv50/ir/ra: Fix live set propagation in the secondary passes of buildLiveSets().
Christoph Bumiller [Tue, 7 Feb 2012 21:39:20 +0000 (22:39 +0100)]
nv50/ir/opt: don't regard OP_WRSV as dead code
Christoph Bumiller [Sat, 14 Apr 2012 19:30:52 +0000 (21:30 +0200)]
nv50/ir: add isUniform query to Values
Christoph Bumiller [Mon, 9 Apr 2012 18:58:39 +0000 (20:58 +0200)]
nv50/ir: rewrite the register allocator as GCRA, with spilling
This is more flexible than the linear scan, and we don't need the
separate allocation pass for constrained values anymore.
Christoph Bumiller [Thu, 5 Apr 2012 21:14:33 +0000 (23:14 +0200)]
nv50/ir/tgsi: only export x-component of PSIZE
Christoph Bumiller [Thu, 5 Apr 2012 20:53:46 +0000 (22:53 +0200)]
nvc0: fix emission of 3rd src in SET_AND,OR,XOR
Francisco Jerez [Mon, 9 Apr 2012 18:48:43 +0000 (20:48 +0200)]
nv50/ir: Fix BuildUtil::mkSelect and mkClobber
Christoph Bumiller [Fri, 6 Apr 2012 17:18:05 +0000 (19:18 +0200)]
nv50/ir: fix reg file conflicts with undefined-value placeholders
Christoph Bumiller [Mon, 2 Apr 2012 18:55:03 +0000 (20:55 +0200)]
nv50/ir/opt: silence warning (int < Elements() signedness)
Christoph Bumiller [Mon, 2 Apr 2012 18:53:46 +0000 (20:53 +0200)]
nv50/ir/opt: fix combineSt access to wrong instruction
Christoph Bumiller [Sun, 29 Jan 2012 14:41:52 +0000 (15:41 +0100)]
nv50/ir/opt: another insn NULL check in phi elimination
Francisco Jerez [Sun, 27 Nov 2011 12:06:10 +0000 (13:06 +0100)]
nv50/ir/ssa: Take into account function inputs and outputs.
Francisco Jerez [Tue, 27 Mar 2012 19:48:58 +0000 (21:48 +0200)]
nv50/ir: Clean up before calculating instruction ordering for a new function.
Francisco Jerez [Tue, 15 Nov 2011 16:24:18 +0000 (17:24 +0100)]
nv50/ir/ra: Allocate registers for function arguments.
Francisco Jerez [Fri, 6 Apr 2012 17:16:04 +0000 (19:16 +0200)]
nv50/ir: Take into account function args in the live range calculation code.
Francisco Jerez [Thu, 29 Mar 2012 21:23:53 +0000 (23:23 +0200)]
nv50/ir/ra: Use matching physical regs for function args in caller and callee.
Francisco Jerez [Fri, 6 Apr 2012 17:08:27 +0000 (19:08 +0200)]
nv50/ir/tgsi: Infer function inputs/outputs.
Edit: Don't do it for the main function of (graphics) shaders,
its inputs and outputs always go through TGSI_FILE_INPUT/OUTPUT.
This prevents all TEMPs from counting as live out and reduces
register pressure.
Francisco Jerez [Tue, 27 Mar 2012 15:29:55 +0000 (17:29 +0200)]
nv50/ir/tgsi: Replace the inlining logic with proper function calls.
Francisco Jerez [Tue, 27 Mar 2012 15:30:31 +0000 (17:30 +0200)]
nv50/ir: Decouple DataArray from the dictionary that maps locations to values.
The point is to keep an independent dictionary for each function.
The array that was being used as dictionary has been converted into a
"bimap" for two different reasons: first, because having an almost
empty instance of an array with as many entries as registers there are
in the program, once for every function, would be wasteful, and
second, because we want to be able to map Value pointers back to
locations at some point.
Christoph Bumiller [Thu, 22 Mar 2012 10:59:32 +0000 (11:59 +0100)]
nv50/ir/opt: don't delete instruction in removeFlow before its last use
Christoph Bumiller [Thu, 22 Mar 2012 10:58:31 +0000 (11:58 +0100)]
nv50/ir/opt: check BB equality before instruction ordering in CSE
Christoph Bumiller [Thu, 22 Mar 2012 10:51:52 +0000 (11:51 +0100)]
nv50/ir/opt: don't copy-propagate cond MOVs or MOVs to other reg files
We've never encountered the latter on nvc0, but on nv50 we have moves
between GPRs and address regs.
Christoph Bumiller [Tue, 7 Feb 2012 19:45:03 +0000 (20:45 +0100)]
nv50/ir/opt: don't replace conditional definitions in CSE
Francisco Jerez [Thu, 17 Nov 2011 17:23:28 +0000 (18:23 +0100)]
nv50/ir/opt: Update the symbol size when combining loads and stores.
Christoph Bumiller [Wed, 21 Dec 2011 16:06:27 +0000 (17:06 +0100)]
nv50/ir: initialize FlowInstruction::builtin
Francisco Jerez [Wed, 21 Mar 2012 22:53:01 +0000 (23:53 +0100)]
nv50/ir/opt: Fix for function calls.
Francisco Jerez [Fri, 6 Apr 2012 16:50:56 +0000 (18:50 +0200)]
nv50/ir: Build a "symbol" table with the binary offsets of each function.
Francisco Jerez [Mon, 14 Nov 2011 23:18:28 +0000 (00:18 +0100)]
nv50/ir: Add support for removing functions from a program.
Francisco Jerez [Mon, 9 Apr 2012 19:18:31 +0000 (21:18 +0200)]
nv50/ir: Scan program functions in DFS-postorder.
The reason is that several passes (regalloc, function argument
binding, inlining) are going to require the callees of a function to
be processed before the caller.
Francisco Jerez [Fri, 6 Apr 2012 16:43:29 +0000 (18:43 +0200)]
nv50/ir: Deal with graph iterators using RAII.
Francisco Jerez [Tue, 15 Nov 2011 01:07:21 +0000 (02:07 +0100)]
nv50/ir: Add convenience method for calculating the live sets of a function.
Francisco Jerez [Wed, 21 Mar 2012 20:43:26 +0000 (21:43 +0100)]
nv50/ir: Add support code for calculating the clobber set of a BB or function.
Francisco Jerez [Mon, 9 Apr 2012 18:43:28 +0000 (20:43 +0200)]
nv50/ir/opt: Don't lose modifiers during constant folding.
Francisco Jerez [Tue, 20 Mar 2012 23:39:00 +0000 (00:39 +0100)]
nv50/ir/opt: Improve modifier handling.
Francisco Jerez [Sat, 14 Apr 2012 19:25:22 +0000 (21:25 +0200)]
nv50/ir: Add support for cloning FlowInsns, ImmediateVals and BBs.
Francisco Jerez [Sat, 14 Apr 2012 19:24:16 +0000 (21:24 +0200)]
nv50/ir: Decouple object cloning logic from the sub-object recursion policy.
Francisco Jerez [Sat, 14 Apr 2012 19:23:03 +0000 (21:23 +0200)]
nv50/ir: Make sure that several IR objects are destroyed on takedown.
Christoph Bumiller [Mon, 9 Apr 2012 18:40:35 +0000 (20:40 +0200)]
nv50/ir: make Instruction::src/def container private
Francisco Jerez [Thu, 29 Mar 2012 19:18:24 +0000 (21:18 +0200)]
nv50/ir: Add support for unlimited instruction arguments.
Christoph Bumiller [Thu, 29 Mar 2012 19:32:41 +0000 (21:32 +0200)]
nv50/ir: temporarily exclude nv50 code emitter from build
It's not used yet and shouldn't have been included in the first
place.
Christoph Bumiller [Fri, 6 Apr 2012 16:37:24 +0000 (18:37 +0200)]
nv50/ir: copy value size in SSA-rename pass
Christoph Bumiller [Mon, 9 Apr 2012 18:34:24 +0000 (20:34 +0200)]
nv50/ir/opt: improve post-multiply and check target for support
Christoph Bumiller [Wed, 28 Mar 2012 21:50:32 +0000 (23:50 +0200)]
nv50/ir: add setFlagsDef/Src helper
Will be used by nv50 target.
Christoph Bumiller [Fri, 6 Apr 2012 16:34:44 +0000 (18:34 +0200)]
nv50/ir: add isAccessSupported check for memory access coalescing
Christoph Bumiller [Wed, 28 Mar 2012 19:30:59 +0000 (21:30 +0200)]
nv50/ir: add function for splitting a BasicBlock
Fixes to initial implementation by Francisco Jerez.
Francisco Jerez [Tue, 15 Nov 2011 20:39:52 +0000 (21:39 +0100)]
nv50/ir: Allow attaching two nodes when either one is already inside the graph.
Francisco Jerez [Tue, 15 Nov 2011 20:39:22 +0000 (21:39 +0100)]
nv50/ir: Allow inserting isolated nodes to a graph.
Francisco Jerez [Mon, 14 Nov 2011 23:38:15 +0000 (00:38 +0100)]
nv50/ir: Fix memory corruption in Function::orderInstructions().
"iter" doesn't reference a BasicBlock directly, but a Node::Graph,
i.e. BasicBlock::get() is casting to the wrong pointer type.
Francisco Jerez [Tue, 15 Nov 2011 14:58:04 +0000 (15:58 +0100)]
nv50/ir: Fix up insertion of PHI instructions using bb->insertHead().
Christoph Bumiller [Tue, 15 Nov 2011 23:39:41 +0000 (00:39 +0100)]
nv50/ir: fix insertHead and remove for BBs with PHI ops only
Francisco Jerez [Sat, 19 Nov 2011 20:31:28 +0000 (21:31 +0100)]
nv50/ir: Don't crash on zero sized BitSets.
Francisco Jerez [Tue, 15 Nov 2011 00:50:58 +0000 (01:50 +0100)]
nv50/ir: Fix Interval::clear().
Christoph Bumiller [Sun, 25 Dec 2011 17:34:35 +0000 (18:34 +0100)]
nv50/ir/tgsi: handle inferSrcType(NOT) to be u32
Francisco Jerez [Mon, 14 Nov 2011 22:09:45 +0000 (23:09 +0100)]
nv50/ir/opt: Fix OP_NOT to modifier conversion.
Dave Airlie [Sat, 14 Apr 2012 19:25:59 +0000 (20:25 +0100)]
r600g: disable dual-src hangs evergreen for some reason.
This did work previously, so I've broken something.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Tom Stellard [Sat, 14 Apr 2012 16:11:29 +0000 (12:11 -0400)]
r300/compiler: Exit immediately from rc_vert_fc() if there is an error
This way we correctly report "Too many temporaries" errors.
https://bugs.freedesktop.org/show_bug.cgi?id=48680
Note: This is a candidate for the stable branches.
Tom Stellard [Sat, 14 Apr 2012 14:02:19 +0000 (10:02 -0400)]
r300/compiler: Copy all instruction attributes during local transfoms
Instruction attributes like WriteALUResult and ALUResultCompare
were being discarded during the some of the local transformations.
This fixes the following piglit tests:
glsl1-inequality (vec2, pass)
loopfunc
fs-any-bvec2-using-if
fs-op-ne-bvec2-bvec2-using-if
fs-op-ne-ivec2-ivec2-using-if
fs-op-ne-mat2-mat2-using-if
fs-op-ne-vec2-vec2-using-if
fs-op-ne-mat2x3-mat2x3-using-if
fs-op-ne-mat2x4-mat2x4-using-if
https://bugs.freedesktop.org/show_bug.cgi?id=45921
NOTE: This is a candidate for the stable branches.
Tom Stellard [Wed, 21 Sep 2011 04:05:55 +0000 (21:05 -0700)]
r300/compiler: Fix nested flow control in r500 vertex shaders
Tom Stellard [Fri, 13 Apr 2012 02:07:40 +0000 (22:07 -0400)]
r300/compiler: Clear loop registers in vertex shaders w/o loops
The loop registers weren't being cleared, so any shader that was
executed after a shader containing loops was at risk of having a loop
randomly inserted into it.
This fixes over one hundred piglit tests, although these test
only failed during full piglit runs and would pass if
run individually. The exact number of piglit tests that this patch
fixes will vary depending on the version of piglit and the order the
tests are run.
NOTE: This is a candidate for the stable branches.
Eric Anholt [Fri, 16 Mar 2012 22:44:25 +0000 (15:44 -0700)]
glsl: If an "if" has no "then" or "else" code left, remove it.
Cuts 8/1068 instructions from glyphy's fragment shaders on i965.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Eric Anholt [Mon, 19 Mar 2012 23:37:23 +0000 (16:37 -0700)]
glsl: Add a helper for generating temporary variables in ir_builder.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Mon, 19 Mar 2012 23:27:34 +0000 (16:27 -0700)]
glsl: Add a helper for ir_builder to make dereferences for assignments.
v2: Fix writemask setup for non-vec4 assignments.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Mon, 19 Mar 2012 23:01:52 +0000 (16:01 -0700)]
glsl: Make a little tracking class for emitting IR lists.
This lets us significantly shorten p->instructions->push_tail(ir), and
will be used in a few more places.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Mon, 19 Mar 2012 21:26:04 +0000 (14:26 -0700)]
glsl: Add common swizzles to ir_builder.
Now we can fold a bunch of our expression setup in ff_fragment_shader
into single-line, parseable commits.
v2: Make it actually work. I wasn't setting num_components in the
mask structure, and not setting up a mask structure is way easier.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>