Christoph Bumiller [Sat, 10 Oct 2009 11:18:07 +0000 (13:18 +0200)]
nv50: nicer texture format switch
Similar to nv40.
Alex Deucher [Mon, 19 Oct 2009 16:10:59 +0000 (12:10 -0400)]
Merge branch 'mesa_7_6_branch' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa
regenerated lex.yy.c
Mathias Fröhlich [Mon, 19 Oct 2009 15:47:21 +0000 (11:47 -0400)]
r300: fix texture size handling with size > 2048
The in kernel texture check fails because of both
bit11 flags being set on 16x16 textures. It tuns out
that these bits are still set and not cleared in the
pp_txpitch field of the texture. The attached patch
at least helps for this case on my machine. It clears
the bit 11 from the pitch field if the texture is smaller
and masks out that hight bits on the conventional width
and height field.
Fixes bug 24584
Robert Noland [Mon, 19 Oct 2009 14:47:39 +0000 (09:47 -0500)]
r600: Fix size calculation for 24 bit depth
size was being calculated based on 3 bytes per pixel with 24 bit depth
instead of 4 bytes. This caused corruption in the bottom 25% of objects.
This finishes fixing the menu/text corruption in compiz/kde4.
Signed-off-by: Robert Noland <rnoland@2hip.net>
Ben Skeggs [Sun, 18 Oct 2009 23:28:59 +0000 (09:28 +1000)]
nouveau: implement is_{texture,buffer}_referenced properly
Ben Skeggs [Wed, 7 Oct 2009 06:07:34 +0000 (16:07 +1000)]
drm/nv50: write tic/tsc setup to correct slots when skipping units
Corbin Simpson [Sun, 18 Oct 2009 22:54:39 +0000 (15:54 -0700)]
r300g: Fix up a bunch of warnings.
Corbin Simpson [Sun, 18 Oct 2009 17:30:18 +0000 (10:30 -0700)]
r300g: Add another ZTOP condition.
I don't even know if texkill works right now.
José Fonseca [Sun, 18 Oct 2009 13:31:58 +0000 (14:31 +0100)]
llvmpipe: Allocate texture storage for whole quads.
Corbin Simpson [Sun, 18 Oct 2009 04:32:56 +0000 (21:32 -0700)]
gallium: Permit surface_copy and surface_fill to be NULL.
Uf. Lots of files touched. Would people with working vega, xorg, dri1, etc.
please make sure you are not broken, and fix yourself up if you are.
There were only two or three places where the code did not have painful
fallbacks, so I would advise st maintainers to find less painful workarounds,
or consider overhauling util_surface_copy and util_surface_fill.
Per ymanton, darktama, and Dr_Jakob's suggestions, clear has been left as-is.
I will not add PIPE_CAP_BLITTER unless it is deemed necessary.
Corbin Simpson [Sun, 18 Oct 2009 03:53:19 +0000 (20:53 -0700)]
r300g: Squash format warning.
Won't ever be supported.
Corbin Simpson [Sun, 18 Oct 2009 03:47:45 +0000 (20:47 -0700)]
r300g: Use a dirty test to bring framerate back up.
This is just split out from the next commit, that's all.
Corbin Simpson [Sun, 18 Oct 2009 03:29:27 +0000 (20:29 -0700)]
r300g: Also have rs_block keyed to the current shader combo.
Eliminates part of the glxgears corruption here. Need to clean up PSC more,
to get rid of the rest of it.
Corbin Simpson [Sun, 18 Oct 2009 03:05:23 +0000 (20:05 -0700)]
r300g: Fix u_hash_table rename.
Corbin Simpson [Sun, 18 Oct 2009 02:58:23 +0000 (19:58 -0700)]
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa
Patrice Mandin [Sat, 17 Oct 2009 18:49:18 +0000 (20:49 +0200)]
nouveau: nv40: Use same workaround as i915 for segfault related to vbo
Patrice Mandin [Sat, 17 Oct 2009 18:46:19 +0000 (20:46 +0200)]
nouveau: nv30: Remove duplicate case. Was a typo for X8R8G8B8, but that will never be use for front buffer.
Patrice Mandin [Sat, 17 Oct 2009 18:27:24 +0000 (20:27 +0200)]
nouveau: nv30: Use same workaround as i915 for segfault related to vbo
José Fonseca [Sat, 17 Oct 2009 10:45:04 +0000 (11:45 +0100)]
util: Rename from u_* to util_* while we're at it.
To be consistent with the rest.
Chris Wilson [Sat, 17 Oct 2009 07:25:48 +0000 (08:25 +0100)]
intel: Disallow relocations to the byte beyond the end of the buffer
Brian Paul [Fri, 16 Oct 2009 15:42:30 +0000 (09:42 -0600)]
mesa: fix/update some comments
Brian Paul [Fri, 16 Oct 2009 15:33:11 +0000 (09:33 -0600)]
mesa: lift default symlinks target into Makefile.template
Driver Makefiles can still add symlink dependencies/rules if needed.
Brian Paul [Fri, 16 Oct 2009 15:25:05 +0000 (09:25 -0600)]
mesa: use EXTRA_MODULES and SUBDIRS to build r300 compiler
This is a bit cleaner and avoids rebuilding the r300_dri.so library all
the time.
Brian Paul [Fri, 16 Oct 2009 15:21:45 +0000 (09:21 -0600)]
mesa: added SUBDIRS support in dri/Makefile.template
Brian Paul [Fri, 16 Oct 2009 14:12:47 +0000 (08:12 -0600)]
mesa: move a comma
Brian Paul [Thu, 15 Oct 2009 21:25:52 +0000 (15:25 -0600)]
mesa: added MESA_GLSL=useprog debug flag
This logs glUseProgram() calls to stderr.
Maciej Cencora [Fri, 16 Oct 2009 18:21:17 +0000 (20:21 +0200)]
r300: fix vertex program parameters limits
Corbin Simpson [Fri, 16 Oct 2009 16:45:07 +0000 (09:45 -0700)]
radeon-gallium: Use debug_get_bool_option instead of getenv.
Corbin Simpson [Fri, 16 Oct 2009 15:39:59 +0000 (08:39 -0700)]
r300g: Use a hash table to look up vertex info.
Need to move rs_block to this, too.
Also, I'm getting massive amounts of flicker for some reason; I bet we've gotta
re-re-examine PSC and friends. :C
Corbin Simpson [Fri, 16 Oct 2009 15:27:56 +0000 (08:27 -0700)]
util: Change function names to begin with u_.
Avoids link-time clashes with Mesa's internal hash table.
Brian Paul [Fri, 16 Oct 2009 13:38:39 +0000 (07:38 -0600)]
docs: document GLSL float parsing bug fix
Brian Paul [Wed, 14 Oct 2009 20:19:03 +0000 (14:19 -0600)]
mesa: use C locale for _mesa_strtod()
_mesa_strtod() is used for shader/program parsing where the decimal
point character is always '.' Use strtod_l() with a "C" locale to
ensure correct string->double conversion when the actual locale uses
another character such as ',' for the decimal point.
Fixes bug 24531.
José Fonseca [Fri, 16 Oct 2009 10:39:29 +0000 (11:39 +0100)]
progs/tests: Use rand() instead of random().
Forgot these on previous commit.
José Fonseca [Fri, 16 Oct 2009 10:39:29 +0000 (11:39 +0100)]
progs/tests: Use rand() instead of random().
More portable. Same implementation on Linux.
Vinson Lee [Fri, 16 Oct 2009 10:36:09 +0000 (11:36 +0100)]
prog/tests: Fix MSVC build.
Corbin Simpson [Thu, 15 Oct 2009 23:58:26 +0000 (16:58 -0700)]
r300g: Set logical ID for each emitted texture/sampler.
multitexarray works on my r300, but texrect doesn't.
Patrice Mandin [Thu, 15 Oct 2009 20:41:09 +0000 (22:41 +0200)]
nouveau: nv30: Hack to enforce same number of bits as front buffer, for render targets
Patrice Mandin [Thu, 15 Oct 2009 19:58:44 +0000 (21:58 +0200)]
nouveau: nv30: refuse binding a colour buffer with a zeta buffer with different bits, till the backend can tell Mesa not to do that.
Zack Rusin [Sun, 11 Oct 2009 16:54:11 +0000 (12:54 -0400)]
st/xorg: refix source over
Brian Paul [Thu, 15 Oct 2009 19:00:03 +0000 (13:00 -0600)]
progs/egl: put declarations before code
Chia-I Wu [Mon, 28 Sep 2009 06:12:39 +0000 (14:12 +0800)]
egl: Rework the synchronization primitives.
This adds error checking to the synchronization primitives. And
eglWaitGL is now implemented by eglWaitClient.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Thu, 15 Oct 2009 03:08:48 +0000 (11:08 +0800)]
egl: Rework eglSwapInterval.
This adds error checking to eglSwapInterval and clamps the swap
interval.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Thu, 15 Oct 2009 03:08:33 +0000 (11:08 +0800)]
egl: Rework error checking in eglSwapBuffers.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Wed, 30 Sep 2009 07:08:34 +0000 (15:08 +0800)]
egl: Update comments about eglapi.c.
Mention that opaque handles are looked up and checked.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Wed, 30 Sep 2009 07:34:45 +0000 (15:34 +0800)]
egl: Rework error checking in eglGetCurrentSurface.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Thu, 1 Oct 2009 10:32:19 +0000 (18:32 +0800)]
egl: Include GL header in eglconfigutil.h.
This is just a cosmetic change.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Sat, 10 Oct 2009 06:39:43 +0000 (14:39 +0800)]
egl: Fix GLX_USE_TLS build.
Remove an extraneous semicolon.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Thu, 1 Oct 2009 08:40:09 +0000 (16:40 +0800)]
egl: Fix eglCheckConfigHandle.
A stupid bug by me made the check void.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Owen Taylor [Wed, 14 Oct 2009 20:20:07 +0000 (16:20 -0400)]
Use the right pitch when rendering to a texture
We need to get the pitch from the texture level we are rendering to,
rather than just using the base texel width.
Robert Noland [Wed, 14 Oct 2009 19:04:24 +0000 (14:04 -0500)]
r600: FRAG_ATTRIB_WPOS and FRAG_ATTRIB_FOGC appear to be supported.
Report unsupported attributes while I'm here.
Signed-off-by: Robert Noland <rnoland@2hip.net>
Robert Noland [Wed, 14 Oct 2009 19:02:12 +0000 (14:02 -0500)]
r600: cleanup in r600_cs_process_relocs().
Signed-off-by: Robert Noland <rnoland@2hip.net>
Robert Noland [Wed, 14 Oct 2009 18:58:56 +0000 (13:58 -0500)]
radeon: return EINVAL for 0 length buffers.
Signed-off-by: Robert Noland <rnoland@2hip.net>
Andre Maasikas [Thu, 15 Oct 2009 15:24:49 +0000 (11:24 -0400)]
r600: fix tfp1 bo size
Setting the wrong bo size resulting in an incomplete
read cache flush when reading the texture. This fixes the
compiz text corruption.
[agd5f: take hw pitch alignment into account]
Andre Maasikas [Mon, 12 Oct 2009 11:57:45 +0000 (14:57 +0300)]
r600: implement ProgramStringNotify
need this to properly test with piglit/glean vert/fragprog tests
copied mostly from r300, many thanks to osiris, nha, airlied, others...
Andre Maasikas [Mon, 12 Oct 2009 09:58:40 +0000 (12:58 +0300)]
r600: LIT dst.y gets value from src.x
seems I overlooked this when removing hardcoded swizzles for this
one previously
Andre Maasikas [Mon, 12 Oct 2009 09:20:26 +0000 (12:20 +0300)]
r600: DPH adds w comp of second operand, so set first one to 1 instead
Andre Maasikas [Fri, 9 Oct 2009 07:46:12 +0000 (10:46 +0300)]
r600: fixup KIL instruction a bit
- KILLGT takes 2 arguments
- arb KIL has no dst register
- add TODO about clause ending but currently piglit fp-kil passes and
does not hang the card
Andre Maasikas [Mon, 28 Sep 2009 08:23:49 +0000 (11:23 +0300)]
r600: use CB_TARGET_MASK instead of CB_SHADER_MASK for setting color mask
makes blend functions work better
Signed-off-by: Dave Airlie <airlied@linux.ie>
Andre Maasikas [Mon, 28 Sep 2009 07:42:35 +0000 (10:42 +0300)]
r600: user correct alpha blend factor
Signed-off-by: Dave Airlie <airlied@linux.ie>
Andre Maasikas [Tue, 29 Sep 2009 06:46:29 +0000 (09:46 +0300)]
r600: clear position enable bit when when wpos is not used by FP
Makes doom3 alot nicer..
Brian Paul [Thu, 15 Oct 2009 14:59:13 +0000 (08:59 -0600)]
mesa: regenerated lex.yy.c w/ _mesa_strtod()
Neil Roberts [Wed, 14 Oct 2009 22:25:04 +0000 (23:25 +0100)]
mesa: Use _mesa_strtod in the lexer for assembly shaders
See bug 24531.
Brian Paul [Wed, 14 Oct 2009 15:37:40 +0000 (09:37 -0600)]
progs/Makefile: remove extra quoting
This reverts part of commit
115edf24a9128b79dfa5f30482c990e2cb898357 and
fixes the error: "/bin/sh: line 0: test: too many arguments".
Jakob Bornecrantz [Wed, 14 Oct 2009 09:44:09 +0000 (11:44 +0200)]
trace: Handle transfer returning null
Zack Rusin [Sun, 11 Oct 2009 10:08:42 +0000 (06:08 -0400)]
st/xorg: fix most of the composition modes
Corbin Simpson [Thu, 15 Oct 2009 03:06:38 +0000 (20:06 -0700)]
r300g: Move ZTOP to its own state atom.
It may seem pointless, but this avoids a fair amount of predicted CSO pain.
Brian Paul [Thu, 15 Oct 2009 01:13:32 +0000 (19:13 -0600)]
progs/demos: try different depth formats in fbo_firecube.c
Brian Paul [Wed, 14 Oct 2009 17:28:28 +0000 (11:28 -0600)]
docs: document more MESA_GLSL env var options
Brian Paul [Wed, 14 Oct 2009 16:56:29 +0000 (10:56 -0600)]
mesa: assorted top-level Makefile clean-ups
Brian Paul [Wed, 14 Oct 2009 22:24:35 +0000 (16:24 -0600)]
mesa: added VERBOSE_SWAPBUFFERS
Brian Paul [Wed, 14 Oct 2009 22:23:52 +0000 (16:23 -0600)]
vbo: clean-ups, reformatting
Brian Paul [Wed, 14 Oct 2009 22:23:22 +0000 (16:23 -0600)]
mesa: added MESA_VERBOSE option 'draw' to debug glDrawArrays/Elements, etc.
Brian Paul [Wed, 14 Oct 2009 21:46:25 +0000 (15:46 -0600)]
mesa: rename VERBOSE_IMMEDIATE->VERBOSE_MATERIAL to reflect what it does
Brian Paul [Wed, 14 Oct 2009 21:11:12 +0000 (15:11 -0600)]
mesa: remove unused ctx->Driver.PrioritizeTextures() hook
Brian Paul [Wed, 14 Oct 2009 21:00:50 +0000 (15:00 -0600)]
mesa: remove unused ctx->Driver.TextureMatrix() hook
Tom Fogal [Tue, 13 Oct 2009 17:55:34 +0000 (10:55 -0700)]
Fix build when PROGRAM_DIRS is empty.
SUBDIRS just takes PROGRAM_DIRS value. If PROGRAM_DIRS gets set
to the empty string (as can happen when building only OSMesa), a
'for' loop will lack anything to iterate over, causing a parse
error.
This fixes the issue by making sure SUBDIRS is the null string
when PROGRAM_DIRS is, and wrapping the for loops in if's, causing
them only to execute if there are directories to iterate over.
Tom Fogal [Tue, 13 Oct 2009 17:55:33 +0000 (10:55 -0700)]
ac: Fix AIX shared library builds.
AIX uses ".a" for both static and shared library extensions.
Jakob Bornecrantz [Tue, 13 Oct 2009 09:56:35 +0000 (11:56 +0200)]
st/xorg: Fix dpms include problems
Jakob Bornecrantz [Thu, 15 Oct 2009 00:24:53 +0000 (01:24 +0100)]
autoconf: Fix case for not having package
Zack Rusin [Sun, 11 Oct 2009 05:07:26 +0000 (01:07 -0400)]
st/xorg: get transparency on fills working (fixes Qt/KDE apps)
Jakob Bornecrantz [Tue, 13 Oct 2009 14:32:04 +0000 (15:32 +0100)]
i915g: Fix warnings
Alex Deucher [Wed, 14 Oct 2009 18:18:36 +0000 (14:18 -0400)]
r600: enable EXT_vertex_array_bgra extensions
José Fonseca [Wed, 14 Oct 2009 16:27:06 +0000 (17:27 +0100)]
util: Fix cpu detection on Windows. Cleanup.
José Fonseca [Wed, 14 Oct 2009 16:11:30 +0000 (17:11 +0100)]
llvmpipe: Use ALIGN_STACK.
José Fonseca [Wed, 14 Oct 2009 16:11:08 +0000 (17:11 +0100)]
gallium: New ALIGN_STACK macro to tell gcc to align stack pointer.
José Fonseca [Wed, 14 Oct 2009 15:16:40 +0000 (16:16 +0100)]
scons: Disable SSE intrinsics on MinGW.
-mstackrealign causes stack corruption on MinGW. And without it the ability
to use SSE instrinsics goes down the drain. Even if we use
__attribute__((force_align_arg_pointer)) for the functions we explicitly
use SSE instrinsics, the SSE code automatically generated by gcc will
cause assertion failures. What a nightmare.
Thankfully LLVM gets this right, so all runtime generated SSE code just
works. rtasm code doesn't assume 16byte alignment. Therefore the bulk of
our performance sensitive code is not affected by this.
Still, intrinsics can be convenient, and it would be nice
to get this working again some day, sp will try to get a reduced test
case.
Brian Paul [Wed, 14 Oct 2009 15:40:05 +0000 (09:40 -0600)]
Merge branch 'mesa_7_6_branch'
Brian Paul [Wed, 14 Oct 2009 15:22:30 +0000 (09:22 -0600)]
Merge branch 'mesa_7_6_branch'
Brian Paul [Wed, 14 Oct 2009 13:52:26 +0000 (07:52 -0600)]
mesa: remove left-over debug printf
Vinson Lee [Wed, 14 Oct 2009 13:43:18 +0000 (07:43 -0600)]
prog/tests: Fix MSVC build.
Corbin Simpson [Wed, 14 Oct 2009 10:09:41 +0000 (03:09 -0700)]
r300g: Move ztop to derived state.
Need to get it into its own atom instead of piggybacking on DSA.
Corbin Simpson [Wed, 14 Oct 2009 08:58:18 +0000 (01:58 -0700)]
r300g: Compiler warning cleanup.
Dave Airlie [Wed, 14 Oct 2009 08:24:34 +0000 (18:24 +1000)]
r300g: remove buffer add that should be unnecessary.
This should be handled in the emit fine
Dave Airlie [Wed, 14 Oct 2009 08:24:05 +0000 (18:24 +1000)]
r300g: add QUERY to KITCHEN_SINK
I missed this, thanks to Corbin for pointing it out.
Dave Airlie [Wed, 14 Oct 2009 08:05:14 +0000 (18:05 +1000)]
r300g: add one more ZTOP disable bit.
Still missing the frag uses kill support, hopefully nha can point that out.
Dave Airlie [Wed, 14 Oct 2009 07:44:19 +0000 (17:44 +1000)]
r300g: port over last parts of oq support.
Add support for begin/end in each CS so we don't get any other
processes rendering in between.
TODO:
blame other parts of driver for this not working like Z.
Dave Airlie [Wed, 14 Oct 2009 07:14:43 +0000 (17:14 +1000)]
r300g: convert query to a state for emitting.
This means we don't emit in the begin query but when we have
to flush. Similiar to classic.
TODO:
make query object actually work.
Dave Airlie [Wed, 14 Oct 2009 06:53:12 +0000 (16:53 +1000)]
r300g: fixup arb occulsion query support.
1: add rv530 support
- num z pipes cap
- add proper start/finish query options for rv530
2: convert to use linked list properly.
3: add flushing required check.
4: initial Z top disabling support.
TODO:
make it actually work on my rv530.
Dave Airlie [Wed, 14 Oct 2009 05:13:25 +0000 (15:13 +1000)]
r300g: attempt to make bo space check sane.
This attempts to make r300g do proper bo space checking as opposed
to whatever it was doing now.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Dave Airlie [Wed, 14 Oct 2009 01:42:05 +0000 (11:42 +1000)]
r300g: fix case where texture unit 0 is disabled but unit 1 is enabled.
to reproduce, start texrect, disable 0 texture in menu.
Signed-off-by: Dave Airlie <airlied@redhat.com>