Keith Whitwell [Wed, 1 Feb 2006 18:42:16 +0000 (1 18:42 +0000)]
Switch between memcpy implementations according to src/dest alignment.
Keith Whitwell [Wed, 1 Feb 2006 18:30:16 +0000 (1 18:30 +0000)]
Debug off
Keith Whitwell [Wed, 1 Feb 2006 18:29:56 +0000 (1 18:29 +0000)]
Quieten depend
Keith Whitwell [Wed, 1 Feb 2006 18:29:25 +0000 (1 18:29 +0000)]
Just build the i915 on this branch
Keith Whitwell [Wed, 1 Feb 2006 18:14:09 +0000 (1 18:14 +0000)]
subtexrate test on this branch too
Keith Whitwell [Wed, 1 Feb 2006 18:13:23 +0000 (1 18:13 +0000)]
gearbox demo on this branch too
Keith Whitwell [Wed, 1 Feb 2006 18:01:04 +0000 (1 18:01 +0000)]
Bump driver date
Keith Whitwell [Wed, 1 Feb 2006 16:40:23 +0000 (1 16:40 +0000)]
Disable check_copytex_fragment_ops - it doesn't really apply.
Keith Whitwell [Wed, 1 Feb 2006 15:54:42 +0000 (1 15:54 +0000)]
Get batchbuffers working natively again. This code still
relies over-heavily on the DRI lock to protect offsets in the
command stream from changing before being queued on the ring,
and should be viewed as being a pretty temporary mechanism
before a more robust alternative is implemented, most likely
based on a batchbuffer relocation list that will be used
to patch prebuilt batchbuffers after validation takes place.
Keith Whitwell [Wed, 1 Feb 2006 15:51:31 +0000 (1 15:51 +0000)]
Remove the last of the old AllocateAgp mechanism.
Move the batchbuffer code to being effectively a ring of
bufmgr buffers.
Keith Whitwell [Wed, 1 Feb 2006 15:50:14 +0000 (1 15:50 +0000)]
Add code to map/unmap all texture images for the software rasterizer.
Add the color and depth buffers to the validation list to ensure they
are fenced correctly by hardware rasterization.
Keith Whitwell [Wed, 1 Feb 2006 15:48:52 +0000 (1 15:48 +0000)]
Ensure that color buffers and textures are mapped (bmBufferMap) before
software rasterizer fallbacks. This has two functions, firstly to
ensure that the Data pointers point to something and secondly to
ensure than any pending fences on those buffers are discharged before
allowing the software rasterizer to read/write the data.
This needs to be integrated with Brian's validate code.
Keith Whitwell [Mon, 30 Jan 2006 15:35:35 +0000 (30 15:35 +0000)]
file gearbox.c was added on branch texman_0_1_branch on 2006-02-01 18:13:23 +0000
Keith Whitwell [Sat, 28 Jan 2006 23:28:14 +0000 (28 23:28 +0000)]
Get hardware-accelerated CopyTexSubImage working well enough to run
Brian's gearbox demo.
Keith Whitwell [Sat, 28 Jan 2006 23:27:39 +0000 (28 23:27 +0000)]
Allow ValidateBuffers to allocate memory for buffers which haven't yet
got it by other methods. Typically this is buffers being written to by
hardware excluding the fixed front/back/depth buffers which are have
pre-allocated memory.
At some point will want to pass BM_READ/BM_WRITE flags to catch the
couple of cases where buffers are treated differently in each case.
Keith Whitwell [Sat, 28 Jan 2006 17:52:50 +0000 (28 17:52 +0000)]
remove debug
Keith Whitwell [Sat, 28 Jan 2006 17:52:05 +0000 (28 17:52 +0000)]
Build fixes
Keith Whitwell [Sat, 28 Jan 2006 17:50:59 +0000 (28 17:50 +0000)]
Use the x86 __memcpy to avoid performance clif for uploads where the
source data is worse than 64-byte aligned.
Keith Whitwell [Fri, 27 Jan 2006 15:44:40 +0000 (27 15:44 +0000)]
file subtexrate.c was added on branch texman_0_1_branch on 2006-02-01 18:14:09 +0000
Keith Whitwell [Fri, 27 Jan 2006 11:58:00 +0000 (27 11:58 +0000)]
initial copytexsubimage code, untested
Brian Paul [Fri, 27 Jan 2006 03:42:56 +0000 (27 03:42 +0000)]
added _swrast_eject_texture_images()
Keith Whitwell [Thu, 26 Jan 2006 18:30:34 +0000 (26 18:30 +0000)]
Get readbuffer correctly.
Keith Whitwell [Thu, 26 Jan 2006 17:21:38 +0000 (26 17:21 +0000)]
- Remove (most of) old agp client memory hack.
- Implement an accelerated version of glCopyPixels using the blitter.
Keith Whitwell [Thu, 26 Jan 2006 14:50:02 +0000 (26 14:50 +0000)]
Expand the buffer manager to include a notion of multiple pools within
a memory space. Allow some pools to be excluded from the upload/evict
processing, meaning that any buffers within those pools are effectively
fixed. Add a mechanism to create buffers in those pools.
This allows the legacy fixed front/depth/back buffers to be represented
in this scheme and will allow other future pinned buffers to be allocated
from fixed pools in such a way that they cannot fragment the rest of
the texture memory.
Brian Paul [Thu, 26 Jan 2006 04:05:53 +0000 (26 04:05 +0000)]
Added _swrast_validate_texture_images() to make sure all textures have
data resident for software rasterization.
Relies on new swrast driver function: ValidateTextureImage()
Keith Whitwell [Wed, 25 Jan 2006 17:16:46 +0000 (25 17:16 +0000)]
Fix confusion over pitch. demos/texobj renders correctly.
Keith Whitwell [Wed, 25 Jan 2006 16:57:36 +0000 (25 16:57 +0000)]
Offset returns weren't being returned.
Keith Whitwell [Wed, 25 Jan 2006 16:46:10 +0000 (25 16:46 +0000)]
Remove silly debug.
Keith Whitwell [Wed, 25 Jan 2006 15:40:50 +0000 (25 15:40 +0000)]
Another texture manager checkpoint:
- Add code to validate textures before use.
- Simplify vertex paths for now.
- Make vertex paths validate textures. This is done pretty
with some pretty heavy-handed use of the dri lock - fixing this is
a priority.
- Add lots of debug statements
demos/texobj renders, but textures are incorrect.
Keith Whitwell [Tue, 24 Jan 2006 18:55:52 +0000 (24 18:55 +0000)]
Remove dead code. Gears runs.
Keith Whitwell [Tue, 24 Jan 2006 18:35:53 +0000 (24 18:35 +0000)]
Checkpoint of texture manager rework for i915.
Compiles but won't do any more than that.
Keith Whitwell [Tue, 24 Jan 2006 16:38:43 +0000 (24 16:38 +0000)]
Add another layer on top of the simple 2d regions in intel_regions.[ch]
which keeps track of a whole, well-defined mipmap tree. These are a
fixed layout on intel hardware and managing them is complicated in the
face of GL's TexImage function calls where data can arrive in any order,
making it difficult to guess a layout ahead of time.
Wrapping mipmap trees up in a struct and programming interface like this
reduces the burden elsewhere.
Keith Whitwell [Mon, 23 Jan 2006 12:53:11 +0000 (23 12:53 +0000)]
layer 2d region semantics and blits on top of bufmgr buffers
Keith Whitwell [Mon, 23 Jan 2006 12:52:28 +0000 (23 12:52 +0000)]
import via texture semantics
Keith Whitwell [Mon, 16 Jan 2006 15:30:45 +0000 (16 15:30 +0000)]
Add a faked-out implementation of the buffer manager that uses the same
techniques as the old dri memory manager behind the new interface. Will
use this to port the i915 driver to this interface to hopefully get
some easy insights from using the interface.
Michal Krol [Mon, 16 Jan 2006 12:34:16 +0000 (16 12:34 +0000)]
remove some test code;
rewrite the intermediate code executor to address
64-bit platforms and global memory;
store built-in library code in a precompiled form only;
Michal Krol [Mon, 16 Jan 2006 12:27:22 +0000 (16 12:27 +0000)]
remove slang_*_gc.h files;
rename slang_*_gc_bin.h files to slang_*_gc.h ones;
store built-in library code in a precompiled form only;
Aapo Tahkola [Sun, 15 Jan 2006 13:53:54 +0000 (15 13:53 +0000)]
Missing bits of code spotted by Tilman Sauerbeck
Aapo Tahkola [Sun, 15 Jan 2006 00:07:11 +0000 (15 00:07 +0000)]
Fix ARB_position_invariant handling
Adam Jackson [Fri, 13 Jan 2006 16:34:00 +0000 (13 16:34 +0000)]
Fix the default target to remake readtex.o if needed
Aapo Tahkola [Fri, 13 Jan 2006 15:11:57 +0000 (13 15:11 +0000)]
namespace pollution fixes (Tilman Sauerbeck)
Aapo Tahkola [Fri, 13 Jan 2006 15:03:57 +0000 (13 15:03 +0000)]
Fix invalid tex coord routing and couple other small things.
Brian Paul [Tue, 10 Jan 2006 15:48:56 +0000 (10 15:48 +0000)]
added a couple new assertions to help debug XGL problem
Aapo Tahkola [Mon, 9 Jan 2006 22:53:38 +0000 (9 22:53 +0000)]
Missing patch from Ben Skeggs:
Lots of changes, and fixes for some badness on my behalf.
1. Disposable data used during fp compile is now per-context,
rather than per-program to save memory.
2. Track usage of INPUT/TEMP registers from Mesa program, free
them when no longer required so the hw temps can be re-used.
3. Changed LAST_NODE to OUTPUT_COLOR (see r300_reg.h)
4. Implemented remaining ARB_f_p instructions, with the exception
of the trig/LIT opcodes.
5. Treat ZERO/ONE swizzles the same way as other native swizzles.
6. emit_arith changes, basically a complete re-write. Should
produce cleaner instructions, but no real functional changes.
internal reg -> hw reg routines shared with emit_tex. A bit
messy still.
Aapo Tahkola [Mon, 9 Jan 2006 20:00:03 +0000 (9 20:00 +0000)]
Fix pow <small> and a very stypid bug with dummy srcs(0 equals to tmp0.x)</small>. demos/cubemap looks perfect now.
Aapo Tahkola [Mon, 9 Jan 2006 19:20:46 +0000 (9 19:20 +0000)]
Fix cube maps.
Aapo Tahkola [Mon, 9 Jan 2006 18:31:42 +0000 (9 18:31 +0000)]
Fix node setup(from Ben Skeggs)
Brian Paul [Mon, 9 Jan 2006 17:57:47 +0000 (9 17:57 +0000)]
s/GLuint/GLbitfield/
Brian Paul [Mon, 9 Jan 2006 17:56:55 +0000 (9 17:56 +0000)]
only call xmesa_set_renderbuffer_funcs() when really necessary
Brian Paul [Mon, 9 Jan 2006 16:59:30 +0000 (9 16:59 +0000)]
check XGetGeometry() return value
Roland Scheidegger [Sat, 7 Jan 2006 20:42:16 +0000 (7 20:42 +0000)]
cube maps on r100 require newer drm than the same feature on r200 (regression from introducing unfied initialization). Fix wrong (so far unused) family assignment for r100 cards.
Keith Whitwell [Thu, 5 Jan 2006 11:01:18 +0000 (5 11:01 +0000)]
Oops - bad file-completion typo.
Keith Whitwell [Thu, 5 Jan 2006 10:57:57 +0000 (5 10:57 +0000)]
add simple test for program local parameters
Brian Paul [Wed, 4 Jan 2006 20:10:16 +0000 (4 20:10 +0000)]
install GLw headers (bug 5396)
Brian Paul [Wed, 4 Jan 2006 20:06:13 +0000 (4 20:06 +0000)]
special-case Darwin (bug 4509)
Jerome Glisse [Mon, 2 Jan 2006 18:47:00 +0000 (2 18:47 +0000)]
Use X11_INCLUDES config macro instead of
hardcoded path in makefile.
Brian Paul [Fri, 30 Dec 2005 19:15:40 +0000 (30 19:15 +0000)]
remove bogus wings3d link
Keith Whitwell [Fri, 30 Dec 2005 13:03:08 +0000 (30 13:03 +0000)]
recalculate state on drawable changes
Keith Whitwell [Fri, 30 Dec 2005 13:02:27 +0000 (30 13:02 +0000)]
properly notify driver on scissor change in MakeCurrent
Dave Airlie [Fri, 30 Dec 2005 11:18:04 +0000 (30 11:18 +0000)]
fill out framebuffer egl stuff enable egl on R300
Dave Airlie [Fri, 30 Dec 2005 10:12:26 +0000 (30 10:12 +0000)]
fixup stamp so driver updates drawable info
Dave Airlie [Thu, 29 Dec 2005 00:56:01 +0000 (29 00:56 +0000)]
add support for PCIE card to EGL, doesn't fully work yet but these changes
need to get off my hard disk
Dave Airlie [Thu, 29 Dec 2005 00:42:25 +0000 (29 00:42 +0000)]
add EGL to r300 makefile
Dave Airlie [Thu, 29 Dec 2005 00:38:12 +0000 (29 00:38 +0000)]
rv370 not rv350
Dave Airlie [Thu, 29 Dec 2005 00:37:24 +0000 (29 00:37 +0000)]
typo
Dave Airlie [Thu, 29 Dec 2005 00:36:07 +0000 (29 00:36 +0000)]
add some card type ioctl support
Dave Airlie [Thu, 29 Dec 2005 00:30:53 +0000 (29 00:30 +0000)]
use card_type not isPCI
Dave Airlie [Wed, 28 Dec 2005 23:42:41 +0000 (28 23:42 +0000)]
add some r300 information
Dave Airlie [Fri, 23 Dec 2005 08:42:29 +0000 (23 08:42 +0000)]
update to new API
Dave Airlie [Fri, 23 Dec 2005 08:17:44 +0000 (23 08:17 +0000)]
this needs to be calloced
Dave Airlie [Fri, 23 Dec 2005 07:58:24 +0000 (23 07:58 +0000)]
fixup driver for some api changes
Aapo Tahkola [Sun, 18 Dec 2005 21:40:13 +0000 (18 21:40 +0000)]
Handle fatal case.
Aapo Tahkola [Sat, 17 Dec 2005 18:59:18 +0000 (17 18:59 +0000)]
Drop output checking.
Aapo Tahkola [Sat, 17 Dec 2005 12:28:58 +0000 (17 12:28 +0000)]
No you arent.
Aapo Tahkola [Sat, 17 Dec 2005 12:20:51 +0000 (17 12:20 +0000)]
Warn only when being enabled.
Aapo Tahkola [Sat, 17 Dec 2005 12:08:41 +0000 (17 12:08 +0000)]
I think this has been tested well enough already.
Aapo Tahkola [Sat, 17 Dec 2005 11:59:13 +0000 (17 11:59 +0000)]
Enable CB_DPATH by default.
Aapo Tahkola [Sat, 17 Dec 2005 11:43:59 +0000 (17 11:43 +0000)]
Fix (likely) typo.
Aapo Tahkola [Sat, 17 Dec 2005 11:39:40 +0000 (17 11:39 +0000)]
Add some missing hooks. This should fix various little problems with window movement and 2d windows flashing on top of 3d windows. This problem was previously shadowed by r300ResetHwState as it gets called frequently.
Brian Paul [Sat, 17 Dec 2005 05:37:15 +0000 (17 05:37 +0000)]
minor code movement
Karl Schultz [Fri, 16 Dec 2005 16:38:44 +0000 (16 16:38 +0000)]
fix thinko in last revision.
Brian Paul [Thu, 15 Dec 2005 15:23:54 +0000 (15 15:23 +0000)]
move va_end() call (Evgeny Kotsuba)
Karl Schultz [Thu, 15 Dec 2005 01:02:37 +0000 (15 01:02 +0000)]
Work In Progress. Move some of the frame buffer, render buffer, etc init code from the create context path to the make current path, where it is lazily initialized. This didn't buy me very much except to make it look closer to the X11 driver. Fix up some of this same code to correct some errors.
The next step is to reorganize the wmesa context data structure to inherit the gl_context by containment so I can have access to the wmesa context in the update state path. The driver is still currently not responding to changes in the Draw and Read Buffer state.
Brian Paul [Wed, 14 Dec 2005 14:23:37 +0000 (14 14:23 +0000)]
regenerate to pick up glGetQueryObject[u]i64vEXT funcs
Keith Whitwell [Wed, 14 Dec 2005 09:31:25 +0000 (14 09:31 +0000)]
Fix typo.
Brian Paul [Wed, 14 Dec 2005 03:06:16 +0000 (14 03:06 +0000)]
use GLbitfield instead of GLuint
Brian Paul [Wed, 14 Dec 2005 03:04:58 +0000 (14 03:04 +0000)]
Removed the GL_SGIX/SGIS_pixel_texture extensions. Same thing can be
done with fragment programs nowadays.
Dave Airlie [Tue, 13 Dec 2005 19:53:28 +0000 (13 19:53 +0000)]
fix from Roland for mipmapped compressed textures
remove some debug
Brian Paul [Mon, 12 Dec 2005 15:27:55 +0000 (12 15:27 +0000)]
silence warning, bug 5318
Keith Whitwell [Mon, 12 Dec 2005 12:57:08 +0000 (12 12:57 +0000)]
Split _MaintainTexEnvProgram into two flags _Maintain and _Use. This
restores the ability to run the software driver with program TNL but
tradtional swrast.
Eric Anholt [Sun, 11 Dec 2005 07:42:37 +0000 (11 07:42 +0000)]
Regenerate for recent glapi changes (GetQueryObjecti64vEXT).
Brian Paul [Sat, 10 Dec 2005 17:59:36 +0000 (10 17:59 +0000)]
s/eglShowSurfaceMESA/eglShowScreenSurfaceMESA/
Brian Paul [Sat, 10 Dec 2005 17:56:00 +0000 (10 17:56 +0000)]
Rename eglDRIShowSurfaceMESA.
s/_eglAddMode/_eglAddNewMode/
Brian Paul [Sat, 10 Dec 2005 17:55:15 +0000 (10 17:55 +0000)]
updates to match other changes elsewhere
Brian Paul [Sat, 10 Dec 2005 17:54:36 +0000 (10 17:54 +0000)]
rename eglShowSurfaceMESA, add EGL_SCREEN_POSITION_GRANULARITY_MESA
Brian Paul [Sat, 10 Dec 2005 17:54:00 +0000 (10 17:54 +0000)]
Some initial per-thread support.
Rename eglShowSurfaceMESA to eglShowScreenSurfaceMESA.
Brian Paul [Sat, 10 Dec 2005 17:53:07 +0000 (10 17:53 +0000)]
Added EGL_SCREEN_POSITION_GRANULARITY_MESA query.
Rename eglShowSurfaceMESA to eglShowScreenSurfaceMESA.
Brian Paul [Sat, 10 Dec 2005 17:52:11 +0000 (10 17:52 +0000)]
lots of updates, mode sorting, etc
Brian Paul [Sat, 10 Dec 2005 17:51:13 +0000 (10 17:51 +0000)]
implement config sorting for eglChooseConfig()
Brian Paul [Thu, 8 Dec 2005 17:49:50 +0000 (8 17:49 +0000)]
'a' key to toggle animation