Commit graph

41302 commits

Author SHA1 Message Date
Ben Skeggs
e4e1a85bf8 nvc0: fence.bo is mappable, mark it as such 2010-12-21 06:32:13 +10:00
Ben Skeggs
e52ebd6e85 Merge remote branch 'origin/master' into nvc0-new
Conflicts:
	src/gallium/drivers/nouveau/nouveau_winsys.h
2010-12-21 06:30:39 +10:00
Ben Skeggs
5c102dd94f nouveau: fix includes for latest libdrm
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2010-12-21 06:28:08 +10:00
Tom Fogal
cd9ed3da68 Regenerate gl_mangle.h.
NOTE: This is a candidate for the 7.10 branch.
2010-12-20 19:29:48 -07:00
Jerome Glisse
abe9ffc25c r600g: properly unset vertex buffer
Fix bug http://bugs.freedesktop.org/show_bug.cgi?id=32455

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
2010-12-20 15:33:28 -05:00
Vinson Lee
a14f79f801 st/python: remove unused 'buf' parameter in pipe_buffer_unmap
This is a follow-up to commit ec51092a72.

Fixes SCons build.
2010-12-20 11:40:54 -08:00
Marek Olšák
ec51092a72 gallium: remove unused 'buf' parameter in pipe_buffer_unmap 2010-12-20 17:42:55 +01:00
Vinson Lee
c451aade88 st/mesa: Remove comment cruft from st_context.h.
This was unintentionally added by commit
1525fb4afe.
2010-12-20 01:24:26 -08:00
Vinson Lee
2dd788663a st/mesa: Clean up header file inclusion in st_cb_texture.h. 2010-12-20 01:15:04 -08:00
Vinson Lee
10eb0c39d5 st/mesa: Clean up header file inclusion in st_cb_readpixels.h. 2010-12-20 01:00:26 -08:00
Christoph Bumiller
9f2cf89957 nvc0: s/INLIN_RING/IMMED_RING 2010-12-19 22:53:47 +01:00
Christoph Bumiller
608b3c4432 nvc0: improve shader support for texturing
Fixed shadow and cube texture fetches, add array texture fetches.
2010-12-19 21:49:32 +01:00
Christoph Bumiller
ca5deb0c35 nvc0: adapt to array textures interface change 2010-12-19 21:48:39 +01:00
Christoph Bumiller
0f68236a24 Merge remote branch 'origin/master' into nvc0-new 2010-12-19 21:46:33 +01:00
Christoph Bumiller
d047168d81 nvc0: fix clipping with scissors/viewport
Also setup optional path to use proper primitive clipping instead,
which is probably slower.
2010-12-19 21:42:00 +01:00
Christoph Bumiller
e9de2a31a5 nvc0: use BIND_RING to set subchannel classes 2010-12-19 21:40:24 +01:00
Christoph Bumiller
f0f1cce962 nvc0: switch to the proper constants upload path
Makes things suddenly go surprisingly fast.
2010-12-19 21:38:42 +01:00
Christoph Bumiller
99f9a9727c nvc0: add the index buffer offset where missing 2010-12-19 21:33:37 +01:00
Marek Olšák
237880463d r300g: optimize the fallback for misaligned ushort indices 2010-12-19 04:05:34 +01:00
Vinson Lee
c87f82bc40 st/mesa: Clean up header file inclusion in st_cb_program.h. 2010-12-18 01:44:52 -08:00
Vinson Lee
ac09685d2a st/mesa: Clean up header file inclusion in st_cb_accum.h. 2010-12-18 01:28:18 -08:00
Vinson Lee
488e994ba9 mesa: Clean up header file inclusion in prog_statevars.h. 2010-12-18 01:16:53 -08:00
Dave Airlie
aa4d311873 mesa: fix queryobj whitespace.
Had done this before pushing but forgot to amend, doh.
2010-12-18 17:48:21 +10:00
Dave Airlie
ff7aa554a1 mesa/swrast/st: add ARB_occlusion_query2 support.
This gets my vote for most pointless extension of all time, I'm guessing
some driver could possibly optimise for this instead of counting it might
just get a true/false, but I'm not really sure.

need this to eventually advertise 3.3 despite its total uselessness.

Signed-off-by: Dave Airlie <airlied@redhat.com>
2010-12-18 17:33:25 +10:00
Chia-I Wu
7048095513 mapi: Clean up sources.mk.
Rename MAPI_GLAPI_SOURCES to MAPI_UTIL_SOURCES.  Rename macro
MAPI_GLAPI_CURRENT to MAPI_MODE_UTIL.  Update the comments to make it
clear that mapi may be used in two ways and how.
2010-12-18 15:05:58 +08:00
Chia-I Wu
c17d4999f1 mapi: Clean up u_current interface.
Try not to use macros to make u_current.h appear to be glapi.h.  Use
u_current.h to implement glapi.h instead whenever possible.
2010-12-18 15:05:52 +08:00
Chia-I Wu
c7119e281b mapi: Add ABI-tag note.
TLS requires kernel >= 2.4.20.  Per glapi.
2010-12-18 14:46:10 +08:00
Kenneth Graunke
a954dbeb8c Refresh autogenerated file builtin_function.cpp.
NOTE: The 7.9 and 7.10 branches will need their builtins refreshed too.
Rather than cherry-picking this commit, run 'make builtins'.
2010-12-17 19:40:56 -08:00
Kenneth Graunke
d7423a6531 glsl/builtins: Compute the correct value for smoothstep(vec, vec, vec).
These mistakenly computed 't' instead of t * t * (3.0 - 2.0 * t).

Also, properly vectorize the smoothstep(float, float, vec) variants.

NOTE: This is a candidate for the 7.9 and 7.10 branches.
2010-12-17 19:29:22 -08:00
José Fonseca
3f94d96fce gallivm: Cleanup util_format_xxx_fetch_xxx call generation.
No need to register function prototypes in the module now that we call
the C function pointer directly -- less LLVM objects lying around.

Limited testing with lp_test_format.
2010-12-17 20:14:31 +00:00
Kenneth Graunke
5c229e5fbd glsl: Expose a public glsl_type::void_type const pointer.
This is analogous to glsl_type::int_type and all the others.
2010-12-17 10:55:17 -08:00
Marek Olšák
daffaca53e r300g: finally fix the texture corruption on r3xx-r4xx
Even though a bound texture stays bound when calling set_fragment_sampler_views,
it must be assigned a new cache region depending on the occupancy of other
texture units.

This fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=28800

Thanks to Álmos <aaalmosss@gmail.com> for finding the bug in the code.

NOTE: This is a candidate for both the 7.9 and 7.10 branches.
2010-12-17 13:17:52 +01:00
Kenneth Graunke
d0f8eea9a0 Remove OES_compressed_paletted_texture from the ES2 extension list.
We don't support it.
2010-12-16 17:40:50 -08:00
Brian Paul
42a0967a36 softpipe: remove sp_tex_tile_cache_border_color()
With swizzling done at the end of texture sampling, we can greatly
simplify swizzling of the border color.

Fixes http://bugs.freedesktop.org/show_bug.cgi?id=32460
2010-12-16 18:18:57 -07:00
Brian Paul
9d9f8aba0a softpipe: fix depth texture sampling regression
We need to keep using the pipe_get_tile_swizzle() even though there's
no swizzling because we need to explicitly pass in the surface format.

Fixes http://bugs.freedesktop.org/show_bug.cgi?id=32459
2010-12-16 17:40:09 -07:00
Brian Paul
3ecf47af12 gallivm: fix copy&paste error from previous commit
Fixes piglit regression, http://bugs.freedesktop.org/show_bug.cgi?id=32452

NOTE: This is a candidate for the 7.10 branch
2010-12-16 14:30:39 -07:00
richard
fcc7024afe r600c : inline vertex format is not updated in an app, switch to use vfetch constants. For the 7.9 and 7.10 branches as well. 2010-12-16 15:52:55 -05:00
Eric Anholt
290a1141bc intel: Support glCopyTexImage() from XRGB8888 to ARGB8888.
The only mismatch between the two is that we have to clear the
destination's alpha to 1.0.  Fixes WOW performance on my Ironlake,
from a few frames a second to almost playable.
2010-12-16 10:48:19 -08:00
Eric Anholt
ec03b316b4 intel: Try to sanely check that formats match for CopyTexImage.
Before, we were going off of a couple of known (hopeful) matches
between internalFormats and the cpp of the read buffer.  Instead, we
can now just look at the gl_format of the two to see if they match.
We should avoid bad blits that might have been possible before, but
also allow different internalFormats to work without having to
enumerate each one.
2010-12-16 10:48:19 -08:00
Eric Anholt
e65c643792 intel: Drop commented intel_flush from copy_teximage.
The blit that follows appears in the command stream so it's serialized
with previous rendering.  Any queued vertices in the tnl layer were
already flushed up in mesa/main/.
2010-12-16 10:48:19 -08:00
Eric Anholt
99c7840b0c intel: Update renderbuffers before looking up CopyTexImage's read buffer.
Not fixing a particular bug, just noticed by code inspection.
2010-12-16 10:48:19 -08:00
Brian Paul
ee16e97ed1 gallivm: work around LLVM 2.6 bug when calling C functions
Create a constant int pointer to the C function, then cast it to the
function's type.  This avoids using trampoline code which seem to be
inadvertantly freed by LLVM in some situations (which leads to segfaults).
The root issue and work-around were found by José.

NOTE: This is a candidate for the 7.10 branch
2010-12-16 10:19:16 -07:00
Brian Paul
b7e150605d draw: s/varient/variant/ 2010-12-16 10:18:24 -07:00
Brian Paul
2bd9b386e6 svga: s/varient/variant/ 2010-12-16 10:18:24 -07:00
Brian Paul
bd75e4b8be i965g: s/varient/variant/ 2010-12-16 10:18:24 -07:00
Brian Paul
a185d439bd i915g: s/varient/variant/ 2010-12-16 10:18:24 -07:00
Brian Paul
f3955f6fcd softpipe: s/varient/variant 2010-12-16 10:18:23 -07:00
Brian Paul
aa5ba96d29 st/mesa: s/varient/variant 2010-12-16 10:18:23 -07:00
Eric Anholt
c52adfc2e1 i965: Set the alternative floating point mode on gen6 VS and WM.
This matches how we did the math instructions pre-gen6, though it
applies to non-math as well.

Fixes vp1-LIT test 2 (degenerate case: 0 ^ 0 -> 1)
2010-12-16 09:01:14 -08:00
Shuang He
2bd11ea119 i915: Fix INTEL_DEBUG=wm segmentation fault
The program should be disassembled after it's uploaded
2010-12-16 09:01:14 -08:00