OSDN Git Service
Michel Dänzer [Fri, 3 Jul 2009 10:44:19 +0000 (12:44 +0200)]
radeon: Wait for BO idle if necessary before mapping it.
Fixes fighting between GPU and software rendering with TTM.
Michel Dänzer [Fri, 3 Jul 2009 10:44:02 +0000 (12:44 +0200)]
r300: Guard debugging output.
Eric Anholt [Fri, 3 Jul 2009 02:21:22 +0000 (19:21 -0700)]
intel: Fall back on glBitmap with fog enabled.
We would have to build the program with the appropriate fog mode, and
also supply the fog coordinate if appropriate.
Bug #19413.
Eric Anholt [Fri, 3 Jul 2009 01:02:44 +0000 (18:02 -0700)]
intel: Flush when mapping buffer objects so writes don't get reordered.
While GEM covers this for execution it knows about, it doesn't know about
the batchbuffer we're preparing. Fixes piglit vbo-map-remap.c testcase.
Corbin Simpson [Thu, 2 Jul 2009 23:31:24 +0000 (16:31 -0700)]
vbo: If MapBufferRange fails, try MapBuffer instead.
Fixes segfaults with radeon winsys.
(Probably libdrm_radeon doing something that it shouldn't.)
Corbin Simpson [Thu, 2 Jul 2009 16:21:56 +0000 (09:21 -0700)]
Nuke old trace-drm integration.
AFAICT nobody will miss it.
Eric Anholt [Thu, 2 Jul 2009 20:30:20 +0000 (13:30 -0700)]
intel: Fix leak of DRI option info due to using the wrong free routine.
Eric Anholt [Thu, 2 Jul 2009 20:19:11 +0000 (13:19 -0700)]
intel: Clean up leak of driver context structure on context destroy.
Eric Anholt [Thu, 2 Jul 2009 00:08:16 +0000 (17:08 -0700)]
intel: Init num_fences to clean up valgrind warning.
Valgrind doesn't know that a successful getparam sets the target of the
pointer, so just set the value beforehand.
Jakob Bornecrantz [Thu, 2 Jul 2009 13:05:51 +0000 (15:05 +0200)]
r300g: Readd trace driver support
Jakob Bornecrantz [Thu, 2 Jul 2009 13:05:17 +0000 (15:05 +0200)]
i915g: Readd trace driver support
Jakob Bornecrantz [Thu, 2 Jul 2009 12:57:55 +0000 (14:57 +0200)]
trace: Add drm api integration
This is okay since drm_api.h doesn't have any external
dependancies, one could make it only compile on platforms
that support drm.
Dave Airlie [Thu, 2 Jul 2009 10:57:45 +0000 (20:57 +1000)]
radeon/r200/r300: drop radeon renderbuffer private width/height
half stealing the code without taking the intel regions
Dave Airlie [Thu, 2 Jul 2009 10:44:30 +0000 (20:44 +1000)]
radeon/r300: use base width/height.
I suspect this might break TFP in some way but it makes firecube run here
Xiang, Haihao [Thu, 2 Jul 2009 08:32:19 +0000 (16:32 +0800)]
i965: fixes for JMPI
1. the data type of <src1> (JMPI offset) must be D
2. execution size must be 1
3. NoMask
4. instruction compression isn't allowed.
Corbin Simpson [Thu, 2 Jul 2009 06:25:47 +0000 (23:25 -0700)]
r300g: Fix recursive Draw flush.
Also just noticed that demos/copypix walks around the overlapping blit rules.
Bad, bad Mesa. :3
Corbin Simpson [Thu, 2 Jul 2009 06:09:18 +0000 (23:09 -0700)]
r300g: Use floats for surface_copy texcoords, use correct src and dest.
This makes demos/copypix better-looking. Horizontal dimensions are right now.
Corbin Simpson [Thu, 2 Jul 2009 05:33:17 +0000 (22:33 -0700)]
radeon-gallium: Adapt to drm_api changes.
Note that trace debugging is temporarily gone. I'll rework it later.
Eric Anholt [Wed, 1 Jul 2009 05:57:56 +0000 (22:57 -0700)]
intel: Avoid pointer arithmetic on void *.
Bug #22000.
Eric Anholt [Tue, 30 Jun 2009 21:26:06 +0000 (14:26 -0700)]
i965: Increase G4X default VS URB allocation to actually allow 32 threads.
This improves the performance of my GLSL demo by 30%. It also fixes the
VS deadlock that ut2004 had, for reasons I can't explain. Bug #21330.
Ian Romanick [Wed, 1 Jul 2009 00:29:14 +0000 (17:29 -0700)]
demos: Set the depth mask correctly to get the desired blending
Ben Skeggs [Tue, 30 Jun 2009 23:15:51 +0000 (09:15 +1000)]
nouveau: return some supported zeta formats
Ben Skeggs [Tue, 30 Jun 2009 22:56:46 +0000 (08:56 +1000)]
nouveau: deal with PIPE_CAP_TGSI_CONT_SUPPORTED
Ben Skeggs [Tue, 30 Jun 2009 22:50:24 +0000 (08:50 +1000)]
nouveau: fix build...
Jakob Bornecrantz [Tue, 30 Jun 2009 23:16:56 +0000 (01:16 +0200)]
drm/st: Remove drm_api struct from drivers
Remove the drm_api from the functions in the softpipe and
i915simple drivers. Create wrapper functions in the
backends instead.
Brian Paul [Tue, 30 Jun 2009 23:12:34 +0000 (17:12 -0600)]
i965: first attempt at handling URB overflow when there's too many vs outputs
If we can't fit all the VS outputs into the MRF, we need to overflow into
temporary GRF registers, then use some MOVs and a second brw_urb_WRITE()
instruction to place the overflow vertex results into the URB.
This is hit when a vertex/fragment shader pair has a large number of varying
variables (12 or more).
There's still something broken here, but it seems close...
Brian Paul [Tue, 30 Jun 2009 23:08:40 +0000 (17:08 -0600)]
i965: use BRW_MAX_MRF
Brian Paul [Tue, 30 Jun 2009 22:36:11 +0000 (16:36 -0600)]
i965: use BRW_MAX_GRF, BRW_MAX_MRF
Brian Paul [Tue, 30 Jun 2009 22:35:23 +0000 (16:35 -0600)]
i965: move BRW_MAX_GRF, define BRW_MAX_MRF
Brian Paul [Tue, 30 Jun 2009 22:33:09 +0000 (16:33 -0600)]
i965: defined BRW_MAX_MRF
Brian Paul [Tue, 30 Jun 2009 21:36:42 +0000 (15:36 -0600)]
i965: comments and a new assertion
Eric Anholt [Tue, 30 Jun 2009 01:48:27 +0000 (18:48 -0700)]
i915: Fix assertion failure on remapping a non-BO-backed VBO.
Failure to set the obj->Pointer back to null tripped up the assertion.
Bug #22428.
Brian Paul [Tue, 30 Jun 2009 14:56:53 +0000 (08:56 -0600)]
Merge branch 'mesa_7_5_branch'
Conflicts:
src/mesa/vbo/vbo_exec_draw.c
Brian Paul [Tue, 30 Jun 2009 14:51:32 +0000 (08:51 -0600)]
gallium: remove the pipe_sampler_state::shadow_ambient field
This was only present for the sake of GL_ARB_shadow_ambient which we
never implemented in Gallium. If we someday want GL_ARB_shadow_ambient
we can implement it in the state tracker by adding a MAD after the
relevant TEX instructions.
Arthur HUILLET [Tue, 30 Jun 2009 10:46:27 +0000 (12:46 +0200)]
mesa: fix transform_points_3d_no_rot using undefined values in %xmm0
Signed-off-by: Arthur HUILLET <arthur.huillet@free.fr>
Kristof Ralovich [Tue, 30 Jun 2009 14:31:18 +0000 (08:31 -0600)]
glx: plug a leak
Swrast was missing a free for the culmination of driConcatConfigs.
Use free(), not _mesa_free() since we shouldn't be calling any Mesa
functions from the GLX code. driConcatConfigs() should probably use
regular malloc/free to be consistant but the Mesa functions just wrap
the libc functions anyway.
Brian Paul [Tue, 30 Jun 2009 14:27:28 +0000 (08:27 -0600)]
glx: fix null pointer dereference segfault (bug 22546)
Keith Whitwell [Mon, 29 Jun 2009 15:07:14 +0000 (16:07 +0100)]
progs/util: make sure function pointers are initialized
Call Init() from CompileShaderFile, was previously only called for the
Text version of this function.
José Fonseca [Tue, 30 Jun 2009 14:09:34 +0000 (15:09 +0100)]
mesa: Set FLUSH_EXPLICIT_BIT flags when calling FlushMappedBufferRange.
As prescribed by ARB_map_buffer_range.
José Fonseca [Tue, 30 Jun 2009 14:07:54 +0000 (15:07 +0100)]
util: Set PIPE_BUFFER_USAGE_FLUSH_EXPLICIT when calling buffer_flush_mapped_range.
José Fonseca [Tue, 30 Jun 2009 14:07:10 +0000 (15:07 +0100)]
gallium: New PIPE_BUFFER_USAGE_FLUSH_EXPLICIT flag for buffer_flush_mapped_range.
When a buffer was mapped for write and no explicit flush range was provided
the existing semantics were that the whole buffer would be flushed, mostly
for backwards compatability with non map-buffer-range aware code.
However if the buffer was mapped/unmapped with nothing really written --
something that often happens with the vbo -- we were unnecessarily assuming
that the whole buffer was written.
The new PIPE_BUFFER_USAGE_FLUSH_EXPLICIT flag (based from ARB_map_buffer_range
's GL_MAP_FLUSH_EXPLICIT_BIT flag) allows to clearly distinguish the
legacy usage from the nothing written usage.
Jakob Bornecrantz [Tue, 30 Jun 2009 09:57:29 +0000 (11:57 +0200)]
identity: Create a drm_api wrapper
Jakob Bornecrantz [Tue, 30 Jun 2009 09:49:43 +0000 (11:49 +0200)]
drm/st: Return drm_api struct from a function
Brian Paul [Mon, 29 Jun 2009 22:45:02 +0000 (16:45 -0600)]
softpipe: use shadow_compare4() to compare texcoord to four texture samples
Brian Paul [Mon, 29 Jun 2009 21:47:11 +0000 (15:47 -0600)]
softpipe: pass sampler state to shadow_compare()
Younes Manton [Sat, 27 Jun 2009 15:43:01 +0000 (11:43 -0400)]
nouveau: Expect right params to tex_transfer_destroy().
Never crashed on x86, ptx is in the same stack slot in either case.
Thanks to Bob Gleitsmann for catching this.
Younes Manton [Wed, 24 Jun 2009 23:38:52 +0000 (19:38 -0400)]
nouveau: Turn off debug cannon.
Eric Anholt [Mon, 29 Jun 2009 22:13:25 +0000 (15:13 -0700)]
intel: Enable EXT_gpu_program_parameters.
There doesn't appear to be any driver impact for enabling this, and
tests/prog_parameter passes.
Brian Paul [Mon, 29 Jun 2009 21:27:49 +0000 (15:27 -0600)]
Merge branch 'mesa_7_5_branch'
Brian Paul [Mon, 29 Jun 2009 21:24:42 +0000 (15:24 -0600)]
gallium/draw: sketch out some missing pointcoord code
The gl_PointCoord attribute is currently expected to be in the fog coord
register's z/w components. This was never totally fleshed out though.
This is just some placeholder code.
Brian Paul [Mon, 29 Jun 2009 21:13:02 +0000 (15:13 -0600)]
st/mesa: enable GL_ARB_framebuffer_object
All gallium drivers should be able to support mixed-size color/depth/stencil
buffers. If not, we'll need a new PIPE_CAP_ query.
Brian Paul [Mon, 29 Jun 2009 21:12:36 +0000 (15:12 -0600)]
mesa: check for ARB_framebuffer_object for GL_TEXTURE_STENCIL_SIZE_EXT query
Brian Paul [Mon, 29 Jun 2009 20:58:25 +0000 (14:58 -0600)]
mesa: alphabetize lines
Brian Paul [Mon, 29 Jun 2009 21:26:26 +0000 (15:26 -0600)]
intel: added null ptr check
This fixes a segfault seen with piglit's fdo20701 test.
Eric Anholt [Mon, 29 Jun 2009 18:37:21 +0000 (11:37 -0700)]
Revert "intel: Remove unneded pthread mutex in LOCK_HARDWARE."
This reverts commit
de447afff26706e3bf8bdcd5cfb8b1daf49b4b21 but
puts the lock under DRI1-only.
From keithw:
> It's there because the DRI1 code doesn't actually achieve the mutexing
> which it looks as if it should. For multi-threaded applications it was
> always possible to get two threads inside locked regions -- I have no
> idea how, but it certainly was and presumably still is possible.
Eric Anholt [Mon, 29 Jun 2009 16:55:17 +0000 (09:55 -0700)]
intel: Move note_unlock() implementation to the one place it's needed.
Eric Anholt [Mon, 29 Jun 2009 16:48:28 +0000 (09:48 -0700)]
intel: Remove unneded pthread mutex in LOCK_HARDWARE.
This would cause LOCK_HARDWARE to mutex all contexts in this process on
both DRI1 and DRI2. On DRI1, LOCK_HARDWARE already does it for all
processes on the system. On DRI2, LOCK_HARDWARE doesn't, but there shouldn't
be any state outside the context that needs any additional protection.
Notably, the bufmgr is protected by its own mutex and not
LOCK_HARDWARE.
This code was originally introduced with the i915tex code dump, so it's not
clear what it was there for.
Eric Anholt [Mon, 29 Jun 2009 16:45:06 +0000 (09:45 -0700)]
intel: Make LOCK_HARDWARE recursive to avoid hand-rolling recursiveness.
Brian Paul [Mon, 29 Jun 2009 17:20:07 +0000 (11:20 -0600)]
Merge branch 'mesa_7_5_branch'
Brian Paul [Mon, 29 Jun 2009 16:32:04 +0000 (10:32 -0600)]
progs/glsl: link with GLEW library
Keith Whitwell [Mon, 29 Jun 2009 13:13:58 +0000 (14:13 +0100)]
progs/glsl: compile with scons and glew
Get most of these working with scons.
José Fonseca [Mon, 29 Jun 2009 11:56:47 +0000 (12:56 +0100)]
scons: Don't raise an exception when DXSDK is not found.
Unfortunately scons does not check if a tool exists before it invokes
its generate function.
José Fonseca [Sun, 28 Jun 2009 10:12:22 +0000 (11:12 +0100)]
scons: Disable optimizations only for gcc-4.2
gcc-4.2's optimizer has a strange bug where it looses code from inner
loops in certain situations. For example, if the appearently innocent
looking code below is compiled with gcc-4.2 -S -O1, the inner loop's
code is missing from the outputed assembly.
struct Size {
unsigned width;
};
struct Command {
unsigned length;
struct Size sizes[32];
};
extern void emit_command(void *command, unsigned length);
void
create_surface( struct Size size, unsigned faces, unsigned levels)
{
struct Command cmd;
unsigned face;
unsigned level;
cmd.length = faces*levels*sizeof(cmd.sizes[0]);
for(face = 0; face < faces; ++face) {
for(level = 0; level < levels; ++level) {
cmd.sizes[face*levels + level] = size;
// This should generate a shrl statement, but the whole for body
// disappears in gcc-4.2 -O1/-O2/-O3!
size.width >>= 1;
}
}
emit(&cmd, sizeof cmd.length + cmd.length);
}
Note that this is not specific to MinGW's gcc-4.2 crosscompiler (the
version typically found in debian/ubuntu's mingw32 packages). gcc-4.2 on
Linux also displays the same error. gcc-4.3 and above gets this
correctly though.
Updated MinGW debian packages with gcc-4.3 are available from
http://people.freedesktop.org/~jrfonseca/debian/pool/main/m/
José Fonseca [Sun, 28 Jun 2009 09:54:23 +0000 (10:54 +0100)]
scons: Use -Bsymbolic linker option.
This prevents the error
relocation R_X86_64_PC32 against symbol `_gl_DispatchTSD' can not be used when making a shared object; recompile with -fPIC
when building on x86_64 architecture.
Brian Paul [Fri, 26 Jun 2009 22:54:44 +0000 (16:54 -0600)]
docs: detect when too many varying vars are used
Brian Paul [Fri, 26 Jun 2009 22:53:46 +0000 (16:53 -0600)]
glsl: check number of varying variables against the limit
Link fails if too many varying vars.
(cherry picked from master, commit
cc58fbcf2c5c88f406818db60910f537e03610d6)
Brian Paul [Fri, 26 Jun 2009 22:47:57 +0000 (16:47 -0600)]
docs: fix typos, remove old text from relnotes file
Brian Paul [Fri, 26 Jun 2009 22:46:21 +0000 (16:46 -0600)]
docs: bring over news updates from 7.4 branch
Brian Paul [Fri, 26 Jun 2009 22:45:54 +0000 (16:45 -0600)]
docs: bring in 7.4.3 and 7.4.4 release notes, news
Brian Paul [Fri, 26 Jun 2009 22:41:54 +0000 (16:41 -0600)]
docs: increase max varying vars to 16
Brian Paul [Fri, 26 Jun 2009 22:33:46 +0000 (16:33 -0600)]
mesa: raise MAX_VARYING (number of shader varying vars) to 16
16 is the limit for now because of various 32-bit bitfields.
(cherry picked from master, commit
4e762395ef7e8c332c16fd0c11025cfa52763a45)
Ian Romanick [Fri, 26 Jun 2009 20:30:16 +0000 (13:30 -0700)]
intel / DRI2: Additional flush of fake front-buffer to real front-buffer
To maintain correctness, the server will copy the real front-buffer to
a newly allocated fake front-buffer in DRI2GetBuffersWithFormat.
However, if the DRI2GetBuffersWithFormat is triggered by glViewport,
this will copy stale data into the new buffer. Fix this by flushing
the current fake front-buffer to the real front-buffer in
intel_viewport.
Fixes bug #22288.
Brian Paul [Fri, 26 Jun 2009 19:16:08 +0000 (13:16 -0600)]
mesa: bump version to 7.5-rc4
Brian Paul [Fri, 26 Jun 2009 19:15:17 +0000 (13:15 -0600)]
docs: document for/continue bug fix
Brian Paul [Fri, 26 Jun 2009 18:51:05 +0000 (12:51 -0600)]
cell: PIPE_CAP_TGSI_CONT_SUPPORTED query
Brian Paul [Fri, 26 Jun 2009 18:50:58 +0000 (12:50 -0600)]
softpipe: PIPE_CAP_TGSI_CONT_SUPPORTED query
Brian Paul [Fri, 26 Jun 2009 18:50:45 +0000 (12:50 -0600)]
gallium: added PIPE_CAP_TGSI_CONT_SUPPORTED
Brian Paul [Fri, 26 Jun 2009 18:34:03 +0000 (12:34 -0600)]
glsl: move/simplify error checking for 'return' statements
Brian Paul [Fri, 26 Jun 2009 17:33:05 +0000 (11:33 -0600)]
glsl: overhaul 'return' statement handling
A new node type (SLANG_OPER_RETURN_INLINED) is used to denote 'return'
statements inside inlined functions which need special handling.
All glean glsl1 tests pass for EmitContReturn=FALSE and TRUE.
Brian Paul [Thu, 25 Jun 2009 20:01:43 +0000 (14:01 -0600)]
glsl: predicate assignments according to __returnFlag
Fixes glean "function with early return (3)" case (when EmitContReturn=FALSE).
Brian Paul [Thu, 25 Jun 2009 20:02:41 +0000 (14:02 -0600)]
glsl: added slang_variable::is_global field
Brian Paul [Thu, 25 Jun 2009 17:52:37 +0000 (11:52 -0600)]
glsl: silence a problem warning
Brian Paul [Thu, 25 Jun 2009 17:32:37 +0000 (11:32 -0600)]
glsl: code refactoring for return statements
Brian Paul [Thu, 25 Jun 2009 17:12:26 +0000 (11:12 -0600)]
glsl: fix assorted regressions related to early-return-removal
Brian Paul [Thu, 25 Jun 2009 16:20:21 +0000 (10:20 -0600)]
glsl: comments, field reordering
Brian Paul [Thu, 25 Jun 2009 15:50:37 +0000 (09:50 -0600)]
glsl: rework loop nesting code
Brian Paul [Thu, 25 Jun 2009 15:30:53 +0000 (09:30 -0600)]
glsl: remove test for loop unrolling when we hit conditional cont/break
This is no longer needed since we added the new
_slang_loop_contains_continue_or_break() function/test.
Brian Paul [Wed, 24 Jun 2009 23:02:34 +0000 (17:02 -0600)]
glsl: checkpoint: predicate __retVal = expr with __returnFlag
The glean "function with early return (1)" test passes now.
Brian Paul [Wed, 24 Jun 2009 22:37:01 +0000 (16:37 -0600)]
glsl: use new helper functions in _slang_gen_logical_and/or()
Brian Paul [Wed, 24 Jun 2009 22:36:24 +0000 (16:36 -0600)]
glsl: add comments
Brian Paul [Wed, 24 Jun 2009 22:28:32 +0000 (16:28 -0600)]
glsl: checkpoint: replace 'return' with __returnFlag=true;
Needed for "remove early returns" transformation.
Brian Paul [Wed, 24 Jun 2009 22:25:00 +0000 (16:25 -0600)]
glsl: fix up scoping for parent/children in slang_operation_copy()
This will need more testing, but no regressions seen so far.
Brian Paul [Wed, 24 Jun 2009 22:12:20 +0000 (16:12 -0600)]
glsl: fix uninitialized var in _slang_gen_for_without_continue()
Brian Paul [Wed, 24 Jun 2009 22:04:33 +0000 (16:04 -0600)]
glsl: added slang_operation_free_children()
Brian Paul [Wed, 24 Jun 2009 19:16:49 +0000 (13:16 -0600)]
glsl: added slang_oper_num_children() helper
Brian Paul [Wed, 24 Jun 2009 14:40:56 +0000 (08:40 -0600)]
glsl: check-point: declare _returnFlag
Brian Paul [Tue, 23 Jun 2009 23:07:12 +0000 (17:07 -0600)]
glsl: added slang_operation_insert_child()
Brian Paul [Tue, 23 Jun 2009 22:55:10 +0000 (16:55 -0600)]
glsl: use slang_generate_declaration() to consolidate some code
Brian Paul [Tue, 23 Jun 2009 22:17:06 +0000 (16:17 -0600)]
glsl: remove obsolete comment
Brian Paul [Tue, 23 Jun 2009 20:28:43 +0000 (14:28 -0600)]
st/mesa: query PIPE_CAP_TGSI_CONT_SUPPORTED