OSDN Git Service
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.
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.
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>
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
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: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".
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>
Brian Paul [Tue, 13 Oct 2009 22:33:17 +0000 (16:33 -0600)]
mesa: minor tweak to printf string
Brian Paul [Tue, 13 Oct 2009 22:32:15 +0000 (16:32 -0600)]
mesa: rework _mesa_read_shader() debug hook
Look for shaders named "newshader_<CHECKSUM>" to replace the incoming
shader text. For debug purposes.
Brian Paul [Tue, 13 Oct 2009 22:18:06 +0000 (16:18 -0600)]
mesa: don't print pointer in _mesa_fprint_parameter_list()
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.
Ian Romanick [Fri, 9 Oct 2009 00:28:02 +0000 (17:28 -0700)]
Store clipping distance for user clip planes as part of vertex processing
Once the clipping distance is calculated and stored per vertex, the
distances can be re-used when clipping is actually performed. This
doesn't have any immediate benefit, but it paves the way for
implementing gl_ClipDistance in vertex shaders and result.clip[] in
vertex programs.
This has not produces any oglconform regressions on my G31 system
which uses software TNL.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Patrice Mandin [Tue, 13 Oct 2009 20:53:32 +0000 (22:53 +0200)]
nouveau: nv30: use texture width,height for render target dimensions
Chia-I Wu [Tue, 29 Sep 2009 08:11:06 +0000 (16:11 +0800)]
egl: Improve logging facility.
Add _eglSetLogger and _eglSetLogLevel to allow drivers to change the
message logger or report level.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Mon, 17 Aug 2009 07:53:54 +0000 (15:53 +0800)]
egl: Allow binding to any client API.
As a result, EGL_NONE is no longer a valid client API. And it is
possible that no config supports the current bound API.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Mon, 28 Sep 2009 09:39:07 +0000 (17:39 +0800)]
egl: Preload a driver if eglGetProcAddress is called early.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Sat, 15 Aug 2009 14:44:46 +0000 (22:44 +0800)]
egl: Remove core functions from eglGetProcAddress.
eglGetProcAddress may not be used to query core (non-extension)
functions.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Mon, 28 Sep 2009 09:25:48 +0000 (17:25 +0800)]
egl: Add support for driver built-in.
This allows an EGL driver to be compiled together with libEGL.so. It
eliminates the need to specify a driver, or support module loading on
new platforms.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Zack Rusin [Sat, 10 Oct 2009 09:24:32 +0000 (05:24 -0400)]
st/xorg: solid fills with masks are supported
gradients are supported, but not enabled by default due to little
testing they got
Brian Paul [Tue, 13 Oct 2009 16:37:39 +0000 (10:37 -0600)]
intel: fix broken sw generate mipmap path
Need to restore code that fixed up the intel_texture_image state.
Zack Rusin [Sat, 10 Oct 2009 08:45:41 +0000 (04:45 -0400)]
st/xorg: fix and enable by default xrender acceleration
src in mask was broken
Brian Paul [Tue, 13 Oct 2009 15:04:54 +0000 (09:04 -0600)]
mesa: whitespace fixes
Brian Paul [Tue, 13 Oct 2009 15:04:14 +0000 (09:04 -0600)]
mesa: do RTT check in _mesa_meta_check_generate_mipmap_fallback()
We need to check that we can actually render to the texture's format
before doing mipmap generation.
This may fix bug 24219.
Corbin Simpson [Tue, 13 Oct 2009 04:26:46 +0000 (21:26 -0700)]
r300g: More debug flags.
Corbin Simpson [Tue, 13 Oct 2009 03:55:57 +0000 (20:55 -0700)]
r300g: Surface debug.
It gets really annoying watching r300g tell me how it's filling surfaces.
Or falling back during filling surfaces.
Corbin Simpson [Tue, 13 Oct 2009 03:47:00 +0000 (20:47 -0700)]
r300g: Fallback on surfaces we can't render to or from.
Still not sure why st keeps handing down things we can't render to.
Corbin Simpson [Tue, 6 Oct 2009 23:00:27 +0000 (16:00 -0700)]
r300g: Prevent multiple-use textures from getting incorrectly approved.
Corbin Simpson [Tue, 6 Oct 2009 22:30:39 +0000 (15:30 -0700)]
r300g: Clean up texture formats.
Brian Paul [Tue, 13 Oct 2009 00:11:31 +0000 (18:11 -0600)]
mesa: save/set/restore texture base/wrap state in blitframebuffer_texture()
Brian Paul [Tue, 13 Oct 2009 00:09:32 +0000 (18:09 -0600)]
mesa: minor clean up in check_begin_texture_render()
Brian Paul [Tue, 13 Oct 2009 00:08:42 +0000 (18:08 -0600)]
intel: whitespace/formatting clean-up
Brian Paul [Mon, 12 Oct 2009 23:41:47 +0000 (17:41 -0600)]
intel: replace extern decl with #include
Brian Paul [Mon, 12 Oct 2009 23:41:14 +0000 (17:41 -0600)]
intel: added INLINE keyword to minify()
This is mainly just to silence some warnings.
Brian Paul [Mon, 12 Oct 2009 23:40:33 +0000 (17:40 -0600)]
intel: code clean-ups
Brian Paul [Mon, 12 Oct 2009 23:37:06 +0000 (17:37 -0600)]
intel: pass zslice to intel_miptree_image_offset()
This lets us get rid of intel_miptree_depth_offsets() and simplify all
of the calling code.
Brian Paul [Mon, 12 Oct 2009 23:32:16 +0000 (17:32 -0600)]
i965: remove unused var