Pauli Nieminen [Sun, 23 Aug 2009 23:01:15 +0000 (02:01 +0300)]
r600: Predict emit size for next rendering.
Pauli Nieminen [Sun, 23 Aug 2009 22:54:01 +0000 (01:54 +0300)]
radeon: Fix dri1 ctx emit size.
Pauli Nieminen [Sun, 23 Aug 2009 21:57:05 +0000 (00:57 +0300)]
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into r600_state_predict
Conflicts:
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/radeon/radeon_cmdbuf.h
Alex Deucher [Sun, 23 Aug 2009 20:22:01 +0000 (16:22 -0400)]
radeon: add radeon_cs_write_table to the legacy path
Alex Deucher [Sun, 23 Aug 2009 20:06:31 +0000 (16:06 -0400)]
r600: bump reloc_chunk size
This fixes openarena reloc errors. This needs to be
made more dynamic.
Alex Deucher [Sun, 23 Aug 2009 19:32:42 +0000 (15:32 -0400)]
r600: fix count for CB/DB target state
Maciej Cencora [Sun, 23 Aug 2009 19:11:55 +0000 (21:11 +0200)]
r300: fix a typo
Maciej Cencora [Sun, 23 Aug 2009 19:11:13 +0000 (21:11 +0200)]
radeon: use proper macro
Maciej Cencora [Sun, 23 Aug 2009 19:02:12 +0000 (21:02 +0200)]
radeon: use bo_is_idle interface for checking if OQ result is available
Maciej Cencora [Wed, 19 Aug 2009 21:35:00 +0000 (23:35 +0200)]
r300: minor optimization
use properly implemented OUT_BATCH_TABLE where possible
Ian Romanick [Sun, 23 Aug 2009 02:19:40 +0000 (19:19 -0700)]
ARB prog lexer: Fix lexer to eat both DOS and Unix line endings
Alex Deucher [Sun, 23 Aug 2009 17:41:43 +0000 (13:41 -0400)]
r600: use persistent bos for shaders
Alex Deucher [Sun, 23 Aug 2009 16:59:09 +0000 (12:59 -0400)]
r600: always emit CB base
Not doing so seems to cause lock-ups or rendering problems
on some chips. I think there is an logic issue related to
CB and VGT on some chips. We ran into similar issues in
r600_demo IIRC.
Pauli Nieminen [Sun, 23 Aug 2009 11:02:46 +0000 (14:02 +0300)]
radeon: Fix compilation with legacy memory manager.
Pauli Nieminen [Thu, 20 Aug 2009 14:57:37 +0000 (17:57 +0300)]
radeon: Check from kernel if dma buffer is idle.
This makes sure that objects are leaving wait list only when they are processed by gpu.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
Alex Deucher [Sat, 22 Aug 2009 22:02:03 +0000 (18:02 -0400)]
r600: make state emit more fine grained
Gives a nice speed boost in most apps since
we only emit what state we need.
Renato Caldas [Sat, 22 Aug 2009 19:22:03 +0000 (20:22 +0100)]
shader: fix compilation warnings
This patch fixes some "implicit declaration of function" compilation
errors/warnings on the new shader code.
Signed-off-by: Renato Caldas <seventhguardian@gmail.com>
Luo Jinghua [Sat, 22 Aug 2009 05:52:46 +0000 (13:52 +0800)]
ARB prog parser: include imports.h to kill some compiler warnings
Alex Deucher [Sat, 22 Aug 2009 19:03:41 +0000 (15:03 -0400)]
r600: move full state to radeon state atoms
Alex Deucher [Sat, 22 Aug 2009 15:44:05 +0000 (11:44 -0400)]
r600: add support for RS880
Ian Romanick [Sat, 22 Aug 2009 08:35:12 +0000 (01:35 -0700)]
i965: Implement frag prog DPH like DP4
DPH can output to any component, not just to X. This allows fpalu.c
to run without hitting the assertion in emit_dph.
Pauli Nieminen [Sat, 22 Aug 2009 01:37:24 +0000 (04:37 +0300)]
r300: Fix debug output.
Jakob Bornecrantz [Sat, 22 Aug 2009 00:35:10 +0000 (01:35 +0100)]
st/dri: Remove some debug prints
Jakob Bornecrantz [Sat, 22 Aug 2009 01:12:21 +0000 (02:12 +0100)]
st/dri: Find out if the drawable is a pixmap
Part of this code is disabled since no performance gains
where detected with it enabled.
This code only detects if it is a pixmap that it is
rendering to on the st/xorg DDX since it sets the fake
front to the same handle as front.
Jakob Bornecrantz [Sat, 22 Aug 2009 01:11:58 +0000 (02:11 +0100)]
st/dri: Fix frontbuffer rendering with DRI2
Jakob Bornecrantz [Fri, 21 Aug 2009 22:20:46 +0000 (23:20 +0100)]
st/xorg: Handle fake fronts correctly for pixmaps
Jakob Bornecrantz [Sat, 22 Aug 2009 01:06:29 +0000 (02:06 +0100)]
i915g: Remove bad assert on fence
Pauli Nieminen [Fri, 21 Aug 2009 23:43:41 +0000 (02:43 +0300)]
r300: Fix dri1 not to emit state that is not supported in old drm.
Pauli Nieminen [Fri, 21 Aug 2009 23:43:00 +0000 (02:43 +0300)]
radeon/r300: Code clean up and logic fix.
Michel Dänzer [Fri, 21 Aug 2009 23:33:37 +0000 (01:33 +0200)]
glx/dri2: Always use X drawable ID for DRI2 protocol.
Fixes protocol errors in cases where the GLX ID is different.
Michel Dänzer [Fri, 21 Aug 2009 23:24:39 +0000 (01:24 +0200)]
Fix r300 VBO support build on big endian.
Alex Deucher [Fri, 21 Aug 2009 21:41:43 +0000 (17:41 -0400)]
r600: better default state size.
Hopefully suokko's emit size impovements will
land soon.
Pauli Nieminen [Fri, 21 Aug 2009 20:48:39 +0000 (23:48 +0300)]
r300: Remove calls to rcommonEnsureCmdBufSpace.
All rendering is checked in r300PredictTryDrawPrimsSize which mamde these calls useless.
Pauli Nieminen [Fri, 21 Aug 2009 18:21:16 +0000 (21:21 +0300)]
radeon: protect against buffer overflow in state atom debug code.
Ian Romanick [Fri, 21 Aug 2009 18:34:30 +0000 (11:34 -0700)]
Merge branch 'asm-shader-rework-1'
Pauli Nieminen [Fri, 21 Aug 2009 17:44:54 +0000 (20:44 +0300)]
radeon: Improve state emit code.
Trying to make understanding code easier with small refactoring and renaming.
Pauli Nieminen [Fri, 21 Aug 2009 17:10:30 +0000 (20:10 +0300)]
r300: Add debug output to show how much was emited in TryDrawPrims.
Brian Paul [Fri, 21 Aug 2009 17:04:01 +0000 (11:04 -0600)]
radeon: fix incorrect loop limit (warned by -O3)
Brian Paul [Fri, 21 Aug 2009 17:03:30 +0000 (11:03 -0600)]
glx: initialize some local vars to silence warnings with -O3
Pauli Nieminen [Fri, 21 Aug 2009 15:55:34 +0000 (18:55 +0300)]
r300: Predict emit size for next rendering operation.
We do flush for cmd buffer in case there isn't enough space left for whole
rendering operation. This protects dma regions from getting released in middle
of state emit.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
Pauli Nieminen [Fri, 21 Aug 2009 15:29:06 +0000 (18:29 +0300)]
r300: Handle possible fall back if space check fails.
Pauli Nieminen [Fri, 21 Aug 2009 09:37:49 +0000 (12:37 +0300)]
r300: Delay allocation of dma regions in TryDrawprims.
This makes it easier to predict size of next rendering operation so we
can do early flush.
Pauli Nieminen [Thu, 20 Aug 2009 20:02:37 +0000 (23:02 +0300)]
r300: Clean emit code.
This fixes some state atom check functions from returing wrong emit size.
There is emit code cleanup so that emit function selection is done in init
time instead of runtime.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
Pauli Nieminen [Wed, 12 Aug 2009 17:28:54 +0000 (20:28 +0300)]
radeon: Port flush preventation code from r200 to r100.
- emit prediction
- fixes to emit_sizes for data
- clean up of excesive use of radeonEnsureCmdBufferSpace
Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
Pauli Nieminen [Tue, 11 Aug 2009 22:40:17 +0000 (01:40 +0300)]
r200: Make swtcl use state size prediction for flush.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
Pauli Nieminen [Tue, 11 Aug 2009 22:12:23 +0000 (01:12 +0300)]
r200: Remove unnecessery Elts from r200 context.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
Pauli Nieminen [Tue, 11 Aug 2009 21:13:00 +0000 (00:13 +0300)]
r200: Remove unnecessary calls to rcommonEnsureCmdBufSpace.
Calling EnsureCmdBufSpace is not required because rendering pipeline has to quarentee free space.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
Pauli Nieminen [Tue, 11 Aug 2009 21:05:24 +0000 (00:05 +0300)]
r200: Fix atom->check call to return emit size for atom.
This patch makes render emit size prediction count the corect maximum emit size
for state.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
Pauli Nieminen [Tue, 11 Aug 2009 20:43:35 +0000 (23:43 +0300)]
r200: Prevent flush in middle of rendering.
Patch adds prediction functionthat tries to predict emit size to the smallest
possible values that is quarenteed to be higher than worst case scenario in
rendering pipeline.
State emit size prediction code is in place but fix for emit sizes is included
in next patch.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
Pauli Nieminen [Fri, 7 Aug 2009 16:35:55 +0000 (19:35 +0300)]
radeon/r200: Add -Wall to default build flags like it is in r300/r600
Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
Pauli Nieminen [Mon, 3 Aug 2009 22:39:37 +0000 (01:39 +0300)]
glx: Make drawables persistent untill they are changed by glXMakeCurrent
This fixes bug that xdemos/manywin would segfault if it was run with command
./manywin 2. Demo is tring to call glXSwapBuffers while another context was
bind using glXMakeCurrent.
Fix is simple makes drawable and readable persistent untill they change or
context is destroyed.
I found a logic error when same dri context is used for multiple drawables
which caused readable and drawable to fall out of sync in special case. Fix
is simple just updating drawables more often than in original patch.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
Chia-I Wu [Fri, 21 Aug 2009 05:55:30 +0000 (13:55 +0800)]
egl: Make _eglChooseDriver return the filename of the driver.
The real difference is that the driver suffix is now appended. This
also fixes an annoying bug that EGL_DRIVER could not specify the path to
a driver because a suffix was always appended.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Fri, 21 Aug 2009 05:53:36 +0000 (13:53 +0800)]
egl: Remove dependency on libX11.
libX11 is used to determine the screen number, which is in turned used
to determine the DRI driver. However, the sysfs interface for
determining the DRI driver is gone, and no working driver depends on
this mechanism.
Display string parsing is moved to a new function,
_eglSplitDisplayString.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Thu, 20 Aug 2009 11:35:28 +0000 (19:35 +0800)]
egl_softpipe: Do not flush unlinked context.
An unlinked context is destroyed after _eglMakeCurrent. Flushing such
context would cause segfault.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Wed, 19 Aug 2009 05:00:25 +0000 (13:00 +0800)]
egl: Check for null display in handle checking.
The display may be NULL when checking a handle.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Jakob Bornecrantz [Fri, 21 Aug 2009 13:02:48 +0000 (15:02 +0200)]
st/egl: Add support for drmModeDirtyFB command if found
Pauli Nieminen [Thu, 20 Aug 2009 15:57:35 +0000 (18:57 +0300)]
radeon: Add comment to explain logic for freeing dma buffers.
Ian Romanick [Fri, 21 Aug 2009 01:29:41 +0000 (18:29 -0700)]
ARB prog parser: Revert part of previous change to constant parsing
The commit "ARP prog parser: Implement the spec, not what makes sense"
broke the parsing of scalar constants. This commit reverts that part
of that commit. Now vp_swizzle.c passes.
Alex Deucher [Thu, 20 Aug 2009 22:55:41 +0000 (18:55 -0400)]
r600: convert to using common radeon state atoms
switches more state handling to common code. We need
should be more fine grained with the state atoms
eventually.
Alex Deucher [Thu, 20 Aug 2009 21:20:27 +0000 (17:20 -0400)]
r600: improve state emission
Slowing migrating to atom based system like
the other radeon drivers.
Alex Deucher [Thu, 20 Aug 2009 20:07:07 +0000 (16:07 -0400)]
r600: split state emit into block specific functions
We probably want to go finer grained eventually, but
this is a good start.
Brian Paul [Thu, 20 Aug 2009 20:30:08 +0000 (14:30 -0600)]
progs/glsl: report compile/link times in shtest.c
Brian Paul [Thu, 20 Aug 2009 20:29:26 +0000 (14:29 -0600)]
progs/util: added GetShaderCompile/LinkTime() to get compilation/link times
Brian Paul [Thu, 20 Aug 2009 20:19:35 +0000 (14:19 -0600)]
progs/glsl: update multitex.shtest for new texture syntax
Brian Paul [Thu, 20 Aug 2009 20:19:01 +0000 (14:19 -0600)]
progs/glsl: update shtest.c to handle 1D/3D/CUBE/RECT textures
Brian Paul [Thu, 20 Aug 2009 16:58:05 +0000 (10:58 -0600)]
progs/glsl: tweaks to shtest.c
1. Larger sphere to match cube size
2. Allow -geometry option to override window size
3. Cube samplers
Christoph Bumiller [Thu, 20 Aug 2009 19:39:02 +0000 (21:39 +0200)]
nv50: use VTX_ATTR_nF for constant vtxelts
Christoph Bumiller [Thu, 20 Aug 2009 19:30:49 +0000 (21:30 +0200)]
nv50: set vertex buffer limits
Christoph Bumiller [Thu, 20 Aug 2009 19:28:28 +0000 (21:28 +0200)]
nv50: modify vbo format to hw translation, add BGRA swizzle
Jakob Bornecrantz [Thu, 20 Aug 2009 15:33:56 +0000 (17:33 +0200)]
st/egl: Open the first drm node
At least its better then hardcoded to i915
Brian Paul [Thu, 20 Aug 2009 16:44:32 +0000 (10:44 -0600)]
progs/glsl: more comments in shtest.c
Brian Paul [Thu, 20 Aug 2009 16:43:48 +0000 (10:43 -0600)]
tgsi: when printing/dumping programs indent loops and conditionals
Brian Paul [Thu, 20 Aug 2009 16:34:45 +0000 (10:34 -0600)]
tgsi: check for SOA dependencies in SSE and PPC code generators
Fall back to interpreter for now. This doesn't happen very often.
Brian Paul [Thu, 20 Aug 2009 16:28:22 +0000 (10:28 -0600)]
tgsi: handle SOA dependencies for MOV/SWZ
SOA dependencies can happen when a register is used both as a source and
destination and the source is swizzled. For example:
MOV T, T.yxwz; would expand into:
MOV t0, t1;
MOV t1, t0;
MOV t2, t3;
MOV t3, t2;
The second instruction will produce the wrong result since we wrote to t0
in the first instruction. We need to use an intermediate temporary to fix
this.
This will take more work to fix for all TGSI instructions. This seems to
happen with MOV instructions more than anything else so fix that case now
and warn on others.
Fixes piglit glsl-vs-loop test (when not using SSE). See bug 23317.
Brian Paul [Thu, 20 Aug 2009 16:25:42 +0000 (10:25 -0600)]
tgsi: added tgsi_full_instruction::Flags field
Users of the parser can make use of this.
Alex Deucher [Thu, 20 Aug 2009 16:10:42 +0000 (12:10 -0400)]
r600: try and get everything in the draw in one IB
fixes corruption issues with apps like teapot and
geartrain.
Alex Deucher [Thu, 20 Aug 2009 15:33:41 +0000 (11:33 -0400)]
r600: move misc regs from general state
These regs don't use the SET_CONTEXT_REG packet,
so they weren't getting set correctly.
Brian Paul [Thu, 20 Aug 2009 14:10:14 +0000 (08:10 -0600)]
mesa: add GL_DEPTH_STENCIL to glCopyPixels error check
Plus, add a comment about 'type' error checking.
See bug 19087.
Alex Deucher [Thu, 20 Aug 2009 07:19:58 +0000 (03:19 -0400)]
r600: rework emit code
make sure we allocate enough space for relocs
Pauli Nieminen [Wed, 19 Aug 2009 20:11:14 +0000 (23:11 +0300)]
radeon: Update regulary cs processing info from kernel.
This fixes problem that dma buffers were leaking in dri1 mode.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
Brian Paul [Wed, 19 Aug 2009 19:17:03 +0000 (13:17 -0600)]
gallium: rename copy/fill_rect utility functions
Brian Paul [Wed, 19 Aug 2009 19:16:41 +0000 (13:16 -0600)]
gallium: fix tags target in Makefile.template
Alex Deucher [Wed, 19 Aug 2009 17:06:53 +0000 (13:06 -0400)]
radeon: fix typo in last dma patch
Eric Anholt [Wed, 19 Aug 2009 16:30:47 +0000 (09:30 -0700)]
intel: Fix failure to commit -a --amend before last push.
Eric Anholt [Wed, 19 Aug 2009 01:48:54 +0000 (18:48 -0700)]
intel: Align cubemap texture height to its padding requirements.
Eric Anholt [Thu, 13 Aug 2009 02:40:27 +0000 (19:40 -0700)]
intel: Align untiled region height to 2 according to 965 docs.
This may or may not be required pre-965, but it doesn't seem unlikely, and
I'd rather be safe.
Pauli Nieminen [Wed, 19 Aug 2009 12:20:15 +0000 (15:20 +0300)]
radeon: Add debug output for dma buffer object numbers.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
Pauli Nieminen [Wed, 19 Aug 2009 11:47:25 +0000 (14:47 +0300)]
radeon: Fix dma buffer object pool to scale object sizes.
This fixes problems when application is using large vertex arrays for drawing.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
Alex Deucher [Wed, 19 Aug 2009 14:31:17 +0000 (10:31 -0400)]
r600: minor cleanup
Brian Paul [Wed, 19 Aug 2009 14:58:38 +0000 (08:58 -0600)]
progs/xdemos: add multictx to .gitignore
José Fonseca [Mon, 17 Aug 2009 16:48:34 +0000 (17:48 +0100)]
tgsi: Add missing include.
(cherry picked from commit
d2787c02c130b1fe20d0c032d468622f2fdaef79)
José Fonseca [Tue, 18 Aug 2009 14:25:33 +0000 (15:25 +0100)]
tgsi: Fix typo in ureg constant creation.
(cherry picked from commit
aa40c9abc7787fdf46cb661a4d0bb8bec513fc63)
Keith Whitwell [Fri, 14 Aug 2009 17:12:08 +0000 (18:12 +0100)]
st/xlib: remove a couple more 'fake' references
Keith Whitwell [Fri, 14 Aug 2009 17:00:49 +0000 (18:00 +0100)]
st/xlib: remove dead ungrab helper
Keith Whitwell [Wed, 19 Aug 2009 11:00:24 +0000 (12:00 +0100)]
tgsi: silence compiler warning
Keith Whitwell [Wed, 19 Aug 2009 11:00:03 +0000 (12:00 +0100)]
tgsi: remove unused function argument
Keith Whitwell [Wed, 19 Aug 2009 10:54:06 +0000 (11:54 +0100)]
tgsi: add missing functionality to support instructions with labels
Could previously emit opcodes with label arguments, but was no way to
patch them with the actual destinations of those labels.
Adds two functions:
ureg_get_instruction_number - to get the id of the next instruction
to be emitted
ureg_fixup_label - to patch an emitted label to point to a given
instruction number.
Need some more complex examples than u_simple_shader, so far this has
only been compile-tested.
Corbin Simpson [Wed, 19 Aug 2009 04:22:30 +0000 (21:22 -0700)]
r300g: Force off ZTOP optimizations for now.
Corbin Simpson [Wed, 19 Aug 2009 01:14:22 +0000 (18:14 -0700)]
r300g: Utilize DONTBLOCK.
Also ALGYRHYTHMS.
Corbin Simpson [Wed, 19 Aug 2009 01:11:46 +0000 (18:11 -0700)]
radeon-gallium: Oh, look, we *do* already support DONTBLOCK.
Well, okay, the kernel doesn't, but that's no excuse for us! :3