Ian Romanick
e24d35a5b5
glsl: Wrap ast_type_qualifier contents in a struct in a union
...
This will ease adding non-bit fields in the near future.
2010-10-08 14:21:22 -07:00
Ian Romanick
5ff4cfb788
glsl: Clear type_qualifier using memset
2010-10-08 14:21:22 -07:00
Ian Romanick
fd2aa7d313
glsl: Slight refactor of error / warning checking for ARB_fcc layout
2010-10-08 14:21:22 -07:00
Ian Romanick
dd93035a4d
glsl: Refactor 'layout' grammar to match GLSL 1.60 spec grammar
2010-10-08 14:21:22 -07:00
Ian Romanick
4b5489dd6f
glsl: Fail linking if assign_attribute_locations fails
2010-10-08 14:21:22 -07:00
Vinson Lee
3b16c591a4
r600g: Silence uninitialized variable warning.
2010-10-08 14:17:14 -07:00
Vinson Lee
36b65a373a
r600g: Silence uninitialized variable warning.
2010-10-08 14:14:16 -07:00
Vinson Lee
131485efae
r600g: Silence uninitialized variable warning.
2010-10-08 14:08:50 -07:00
Vinson Lee
5e90971475
gallivm: Remove unnecessary header.
2010-10-08 14:03:10 -07:00
Eric Anholt
c52a0b5c7d
i965: Add register coalescing to the new FS backend.
...
Improves performance of my GLSL demo 14.3% (+/- 4%, n=4) by
eliminating the moves used in ir_assignment and ir_swizzle handling.
Still 16.5% to go to catch up to the Mesa IR backend, presumably
because instructions are almost perfectly mis-scheduled now.
2010-10-08 13:22:27 -07:00
Eric Anholt
80c0077a6f
i965: Enable attribute swizzling (repositioning) in the gen6 SF.
...
We were trying to remap a fully-filled array down to only handing the
WM the components it uses. This is called attribute swizzling, and if
you don't enable it you just get 1:1 mappings of inputs to outputs.
This almost fixes glsl-routing, except for the highest gl_TexCoord[]
indices.
2010-10-08 12:00:04 -07:00
Eric Anholt
cac04a9397
i965: Fix new FS gen6 interpolation for sparsely-populated arrays.
...
We'd overwrite the same element twice.
2010-10-08 11:59:19 -07:00
Eric Anholt
624ce6f61b
i965: Fix gen6 WM push constants updates.
...
We would compute a new buffer, but never point the hardware at the new
buffer. This partially fixes glsl-routing, as now it get the updated
uniform for which attribute to draw.
2010-10-08 11:59:19 -07:00
José Fonseca
3fde8167a5
gallivm: Help for combined extraction and broadcasting.
...
Doesn't change generated code quality, but saves some typing.
2010-10-08 19:48:16 +01:00
José Fonseca
438390418d
llvmpipe: First minify the texture size, then broadcast.
2010-10-08 19:11:52 +01:00
José Fonseca
f5b5fb32d3
gallivm: Move into the as much of the second level code as possible.
...
Also, pass more stuff trhough the sample build context, instead of
arguments.
2010-10-08 19:11:52 +01:00
Eric Anholt
5b24d69fcd
i965: Handle swizzles in the addition of YUV texture constants.
...
If someone happened to land a set in a different swizzle order, we
would have assertion failed.
2010-10-08 10:24:30 -07:00
Eric Anholt
0534e958c9
i965: Drop the check for YUV constants in the param list.
...
_mesa_add_unnamed_constant() already does that.
2010-10-08 10:24:29 -07:00
Eric Anholt
fa8aba9da4
i965: Drop the check for duplicate _mesa_add_state_reference.
...
_mesa_add_state_reference does that check for us anyway.
2010-10-08 10:24:29 -07:00
Eric Anholt
e310c22bb7
mesa: Simplify a bit of _mesa_add_state_reference using memcmp.
2010-10-08 10:24:29 -07:00
José Fonseca
6b0c79e058
gallivm: Warn when doing inefficient integer comparisons.
2010-10-08 17:43:15 +01:00
José Fonseca
d5ef59d8b0
gallivm: Avoid control flow for two-sided stencil test.
2010-10-08 17:43:15 +01:00
Keith Whitwell
ef3407672e
llvmpipe: fix off-by-one in tri_16
2010-10-08 17:30:08 +01:00
Keith Whitwell
0ff132e5a6
llvmpipe: add rast_tri_4_16 for small lines and points
2010-10-08 17:30:08 +01:00
Keith Whitwell
eeb13e2352
llvmpipe: clean up setup_tri a little
2010-10-08 17:30:08 +01:00
Keith Whitwell
e191bf4a85
gallivm: round rather than truncate in new 4x4f->1x16ub conversion path
2010-10-08 17:30:08 +01:00
José Fonseca
f91b4266c6
gallivm: Use the wrappers for SSE pack intrinsics.
...
Fixes assertion failures on LLVM 2.6.
2010-10-08 17:30:08 +01:00
Keith Whitwell
607e3c542c
gallivm: special case conversion 4x4f to 1x16ub
...
Nice reduction in the number of operations required for final color
output in many shaders.
2010-10-08 17:30:08 +01:00
Keith Whitwell
29d6a1483d
llvmpipe: avoid overflow in triangle culling
...
Avoid multiplying fixed-point values. Calculate triangle area in
floating point use that for culling.
Lift area calculations up a level as we are already doing this in the
triangle_both() case.
Would like to share the calculated area with attribute interpolation,
but the way the code is structured makes this difficult.
2010-10-08 17:30:08 +01:00
Keith Whitwell
ad6730fadb
llvmpipe: fail gracefully on oom in scene creation
2010-10-08 17:26:29 +01:00
José Fonseca
eb605701aa
gallivm: Implement brilinear filtering.
2010-10-08 15:50:28 +01:00
José Fonseca
c8179ef5e8
gallivm: Fix copy'n'paste typo in previous commit.
2010-10-08 14:09:22 +01:00
José Fonseca
df7a2451b1
gallivm: Clamp mipmap level and zero mip weight simultaneously.
2010-10-08 14:06:38 +01:00
José Fonseca
0d84b64a4f
gallivm: Use lp_build_ifloor_fract for lod computation.
...
Forgot this one before.
2010-10-08 14:06:38 +01:00
José Fonseca
4f2e2ca4e3
gallivm: Don't compute the second mipmap level when frac(lod) == 0
2010-10-08 14:06:37 +01:00
José Fonseca
05fe33b71c
gallivm: Simplify lp_build_mipmap_level_sizes' interface.
2010-10-08 14:06:37 +01:00
José Fonseca
4eb222a3e6
gallivm: Do not do mipfiltering when magnifying.
...
If lod < 0, then invariably follows that ilevel0 == ilevel1 == 0.
2010-10-08 14:06:37 +01:00
Vinson Lee
1f01f5cfcf
r600g: Remove unnecessary header.
2010-10-08 04:56:49 -07:00
Dave Airlie
8d6a38d7b3
r600g: drop width/height per level storage.
...
these aren't used anywhere, so just waste memory.
2010-10-08 19:55:05 +10:00
Eric Anholt
bbb840049e
i965: Normalize cubemap coordinates like is done in the Mesa IR path.
...
Fixes glsl-fs-texturecube-2-*
2010-10-07 16:41:13 -07:00
Eric Anholt
4d202da7a4
i965: Disable emitting if () statements on gen6 until we really fix them.
2010-10-07 16:41:13 -07:00
Dave Airlie
1ae5cc2e67
r600g: add some RG texture format support.
2010-10-08 09:37:02 +10:00
Kristian Høgsberg
1d595c7cd4
gles2: Add GL_EXT_texture_format_BGRA8888 support
2010-10-07 17:08:50 -04:00
José Fonseca
321ec1a224
gallivm: Vectorize the rho computation.
2010-10-07 22:08:42 +01:00
Dave Airlie
51f9cc4759
r600g: fix Z export enable bits.
...
we should be checking output array not input to decide.
Signed-off-by: Dave Airlie <airlied@redhat.com>
2010-10-07 15:32:05 +10:00
Dave Airlie
97eea87bde
r600g: use format from the sampler view not from the texture.
...
we want to use the format from the sampler view which isn't always the
same as the texture format when creating sampler views.
2010-10-07 15:17:28 +10:00
Andre Maasikas
84457701b0
r600g: fix evergreen interpolation setup
...
interp data is stored in gpr0 so first interp overwrote it
and subsequent ones got wrong values
reserve register 0 so it's not used for attribs.
alternative is to interpolate attrib0 last (reverse, as r600c does)
2010-10-07 07:51:32 +03:00
Chia-I Wu
b2c0ef8b51
st/vega: Fix version check in context creation.
...
This fixes a regression since 4531356817
.
2010-10-07 12:15:31 +08:00
Chia-I Wu
da495ee870
targets/egl: Fix linking with libdrm.
2010-10-07 12:06:59 +08:00
Eric Anholt
d3163912c1
i965: Fix gen6 pointsize handling to match pre-gen6.
...
Fixes point-line-no-cull.
Bug #30532
2010-10-06 17:29:29 -07:00
Eric Anholt
b380531fd4
i965: Don't assume that WPOS is always provided on gen6 in the new FS.
...
We sensibly only provide it if the FS asks for it. We could actually
skip WPOS unless the FS needed WPOS.zw, but that's something for
later.
Fixes: glsl-texture2d and probably many others.
2010-10-06 12:13:08 -07:00
Eric Anholt
1fdc8c007e
i965: Add support for gl_FrontFacing on gen6.
...
Fixes glsl1-gl_FrontFacing var (2) with new FS.
2010-10-06 12:13:08 -07:00
Eric Anholt
a760b5b509
i965: Refactor gl_FrontFacing setup out of general variable setup.
2010-10-06 12:13:08 -07:00
Eric Anholt
75270f705f
i965: Gen6's sampler messages are the same as Ironlake.
...
This should fix texturing in the new FS backend.
2010-10-06 12:13:08 -07:00
Eric Anholt
fe6efc25ed
i965: Don't do 1/w multiplication in new FS for gen6
...
Not needed now that we're doing barycentric.
2010-10-06 12:13:08 -07:00
Eric Anholt
5d99b01501
i965: Add some clarification of the WECtrl field.
2010-10-06 12:13:08 -07:00
Eric Anholt
5eeaf3671e
i965: Fix botch in the header_present case in the new FS.
...
I only set it on the color_regions == 0 case, missing the important
case, causing GPU hangs on pre-gen6.
2010-10-06 12:13:08 -07:00
José Fonseca
9fe510ef35
llvmpipe: Cleanup depth-stencil clears.
...
Only cosmetic changes. No actual practical difference.
2010-10-06 19:08:21 +01:00
José Fonseca
33f88b3492
util: Cleanup util_pack_z_stencil and friends.
...
- Handle PIPE_FORMAT_Z32_FLOAT packing correctly.
- In the integer version z shouldn't be passed as as double.
- Make it clear that the integer versions should only be used for masks.
- Make integer type sizes explicit (uint32_t for now, although
uint64_t will be necessary later to encode f32_s8_x24).
2010-10-06 19:08:18 +01:00
José Fonseca
87dd859b34
gallivm: Compute lod as integer whenever possible.
...
More accurate/faster results for PIPE_TEX_MIPFILTER_NEAREST. Less
FP <-> SI conversion overall.
2010-10-06 18:51:25 +01:00
José Fonseca
1c32583581
gallivm: Only apply min/max_lod when necessary.
2010-10-06 18:50:57 +01:00
Keith Whitwell
5849a6ab64
gallivm: don't apply zero lod_bias
2010-10-06 18:49:32 +01:00
José Fonseca
af05f61576
gallivm: Combined ifloor & fract helper.
...
The only way to ensure we don't do redundant FP <-> SI conversions.
2010-10-06 18:47:01 +01:00
José Fonseca
012d57737b
gallivm: Fast implementation of iround(log2(x))
...
Not tested yet, but should be correct.
2010-10-06 18:46:59 +01:00
José Fonseca
4648846bd6
gallivm: Use a faster (and less accurate) log2 in lod computation.
2010-10-06 18:46:29 +01:00
José Fonseca
df3505b193
gallivm: Take the type signedness in consideration in round/ceil/floor.
2010-10-06 18:46:08 +01:00
Eric Anholt
feca660939
i965: Fix up IF/ELSE/ENDIF for gen6.
...
The jump delta is now in the part of the instruction where the
destination fields used to be, and the src args are ignored (or not,
for the new non-predicated IF that we don't use yet).
2010-10-06 10:09:45 -07:00
Eric Anholt
f7cb28fad9
i965: Gen6 no longer has the IFF instruction; always use IF.
2010-10-06 10:09:45 -07:00
Eric Anholt
3c97c00e38
i965: Add back gen6 headerless FB writes to the new FS backend.
...
It's not that hard to detect when we need the header.
2010-10-06 10:09:44 -07:00
Jerome Glisse
3fabd218a0
r600g: fix dirty state handling
...
Avoid having object ending up in dead list of dirty object.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
2010-10-06 13:01:31 -04:00
Eric Anholt
634abbf7b2
i965: Also do constant propagation for the second operand of CMP.
...
We could do the first operand as well by flipping the comparison, but
this covered several CMPs in code I was looking at.
2010-10-06 09:33:26 -07:00
Eric Anholt
dcd0261aff
i965: Enable the constant propagation code.
...
A debug disable had slipped in.
2010-10-06 09:33:26 -07:00
Jerome Glisse
1644bb0f40
r600g: avoid segfault due to unintialized list pointer
...
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
2010-10-06 09:41:19 -04:00
José Fonseca
06472ad7e8
llvmpipe: Fix sprite coord perspective interpolation of Q.
...
Q coordinate's coefficients also need to be multiplied by w, otherwise
it will have 1/w, causing problems with TXP.
2010-10-06 11:46:41 +01:00
José Fonseca
e74955eba3
llvmpipe: Fix perspective interpolation for point sprites.
...
Once a fragment is generated with LP_INTERP_PERSPECTIVE set for an input,
it will do a divide by w for that input. Therefore it's not OK to treat LP_INTERP_PERSPECTIVE as
LP_INTERP_LINEAR or vice-versa, even if the attribute is known to not
vary.
A better strategy would be to take the primitive in consideration when
generating the fragment shader key, and therefore avoid the per-fragment
perspective divide.
2010-10-06 11:44:59 +01:00
José Fonseca
446dbb9217
llvmpipe: Dump a few missing shader key flags.
2010-10-06 11:41:08 +01:00
Keith Whitwell
591e1bc34f
llvmpipe: make debug_fs_variant respect variant->nr_samplers
2010-10-06 11:40:30 +01:00
José Fonseca
5661e51c01
retrace: Handle clear_render_target and clear_depth_stencil.
2010-10-06 11:37:49 +01:00
Dave Airlie
9528fc2107
r600g: add evergreen stencil support.
...
this sets the stencil up for evergreen properly.
2010-10-06 09:21:16 +10:00
Jerome Glisse
ea5a74fb58
r600g: userspace fence to avoid kernel call for testing bo busy status
...
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
2010-10-05 17:04:25 -04:00
Brian Paul
3d6eec0a87
st/mesa: replace assertion w/ conditional in framebuffer invalidation
...
https://bugs.freedesktop.org/show_bug.cgi?id=30632
NOTE: this is a candidate for the 7.9 branch.
2010-10-05 14:33:17 -06:00
Jerome Glisse
2cf3199ee3
r600g: simplify block relocation
...
Since flush rework there could be only one relocation per
register in a block.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
2010-10-05 15:23:07 -04:00
Bas Nieuwenhuizen
ac8a1ebe55
r600g: use dirty list to track dirty blocks
...
Got a speed up by tracking the dirty blocks in a seperate list instead of looping through all blocks. This version should work with block that get their dirty state disabled again and I added a dirty check during the flush as some blocks were already dirty.
2010-10-05 15:16:06 -04:00
Nicolas Kaiser
71fd35d1ad
nv50: fix always true conditional in shader optimization
2010-10-05 18:53:15 +02:00
Jerome Glisse
585e4098aa
r600g: improve bo flushing
...
Flush read cache before writting register. Track flushing inside
of a same cs and avoid reflushing same bo if not necessary. Allmost
properly force flush if bo rendered too and then use as a texture
in same cs (missing pipeline flush dunno if it's needed or not).
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
2010-10-05 10:43:23 -04:00
Jerome Glisse
12d16e5f14
r600g: store reloc information in bo structure
...
Allow fast lookup of relocation information & id which
was a CPU time consumming operation.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
2010-10-05 10:42:56 -04:00
Dave Airlie
bf21b7006c
pb: fix numDelayed accounting
...
we weren't decreasing when removing from the list.
2010-10-05 19:08:41 +10:00
Dave Airlie
12be1568d0
r600g: avoid unneeded bo wait
...
if we know the bo has gone not busy, no need to add another bo wait
thanks to Andre (taiu) on irc for pointing this out.
2010-10-05 16:00:48 +10:00
Dave Airlie
d2c06b5037
r600g: drop use_mem_constant.
...
since we plan on using dx10 constant buffers everywhere.
2010-10-05 16:00:23 +10:00
Dave Airlie
46997d4fc2
r600g: drop mman allocator
...
we don't use this since constant buffers are now being used on all gpus.
2010-10-05 15:57:57 +10:00
Dave Airlie
05813ad5f4
r600g: add bo busy backoff.
...
When we go to do a lot of bos in one draw like constant bufs we need
to avoid bouncing off the busy ioctl, this mitigates by backing off
on busy bos for a short amount of times.
2010-10-05 15:51:38 +10:00
Dave Airlie
49866c8f34
pb: don't keep checking buffers after first busy
...
If we assume busy buffers are added to the list in order its unlikely
we'd fine one after the first busy one that isn't busy.
2010-10-05 15:50:58 +10:00
Dave Airlie
3c38e4f138
r600g: add bo fenced list.
...
this just keeps a list of bos submitted together, and uses them to decide
bo busy state for the whole group.
2010-10-05 15:35:52 +10:00
Brian Paul
fb5e6f88fc
swrast: fix choose_depth_texture_level() to respect mipmap filtering state
...
NOTE: this is a candidate for the 7.9 branch.
2010-10-04 19:59:46 -06:00
Marek Olšák
d0408cf55d
r300g: fix microtiling for 16-bits-per-channel formats
...
These texture formats (like R16G16B16A16_UNORM) were untested until now
because st/mesa doesn't use them. I am testing this with a hacked st/mesa
here.
2010-10-05 02:57:00 +02:00
Eric Anholt
ea909be58d
i965: Add support for gen6 FB writes to the new FS.
...
This uses message headers for now, since we'll need it for MRT. We
can cut out the header later.
2010-10-04 16:08:17 -07:00
Eric Anholt
739aec39bd
i965: In disasm, gen6 fb writes don't put msg reg # in destreg_conditionalmod.
...
It instead sensibly appears in the src0 slot.
2010-10-04 16:08:17 -07:00
Eric Anholt
3bf8774e9c
i965: Add initial folding of constants into operand immediate slots.
...
We could try to detect this in expression handling and do it
proactively there, but it seems like less logic to do it in one
optional pass at the end.
2010-10-04 16:08:17 -07:00
Eric Anholt
e27c88d8e6
i965: Add trivial dead code elimination in the new FS backend.
...
The glsl core should be handling most dead code issues for us, but we
generate some things in codegen that may not get used, like the 1/w
value or pixel deltas. It seems a lot easier this way than trying to
work out up front whether we're going to use those values or not.
2010-10-04 16:08:17 -07:00
Eric Anholt
9faf64bc32
i965: Be more conservative on live interval calculation.
...
This also means that our intervals now highlight dead code.
2010-10-04 16:08:17 -07:00