OSDN Git Service
Dave Airlie [Tue, 24 Mar 2009 01:19:09 +0000 (11:19 +1000)]
radeon/r200/r300: set the texture depth correctly for DRI2
Dave Airlie [Mon, 23 Mar 2009 23:45:26 +0000 (09:45 +1000)]
radeon: actual format is rgba8
Dave Airlie [Mon, 23 Mar 2009 23:45:18 +0000 (09:45 +1000)]
radeon: fix typo
Dave Airlie [Mon, 23 Mar 2009 23:28:52 +0000 (09:28 +1000)]
radeon: setup pipes for r300
Dave Airlie [Mon, 23 Mar 2009 23:26:31 +0000 (09:26 +1000)]
radeon: stupid mesa extension fail
Dave Airlie [Mon, 23 Mar 2009 09:32:10 +0000 (19:32 +1000)]
radeon: fixup wrapper bo name
Dave Airlie [Mon, 23 Mar 2009 08:56:34 +0000 (18:56 +1000)]
Merge branch 'radeon-fbo-hacking' into radeon-rewrite
Dave Airlie [Mon, 23 Mar 2009 08:27:49 +0000 (18:27 +1000)]
raedon/r200/r300: mega-FBO commits.
Re work depth issues.
Do a lot more FBO abstactions
fixup depth/stencil buffer interactions
Dave Airlie [Sun, 22 Mar 2009 09:11:46 +0000 (19:11 +1000)]
radeon fbo: add draw offset calcs
Dave Airlie [Sun, 22 Mar 2009 02:03:24 +0000 (12:03 +1000)]
radeon/r200/r300: add support for new tfp interface
also fixup old interface, gets rid of white boxes in compiz
Dave Airlie [Sun, 22 Mar 2009 02:01:21 +0000 (12:01 +1000)]
Merge remote branch 'origin/master' into HEAD
Dave Airlie [Sun, 22 Mar 2009 01:57:03 +0000 (11:57 +1000)]
radeon: use mipmap fns in FBO code
Dave Airlie [Sun, 22 Mar 2009 01:56:41 +0000 (11:56 +1000)]
radeon: add miptree offset functions
Dave Airlie [Sat, 21 Mar 2009 12:41:42 +0000 (22:41 +1000)]
r200: fix for sure
Dave Airlie [Sat, 21 Mar 2009 12:35:01 +0000 (22:35 +1000)]
radeon/r200: oops make correct fbo init calls
Dave Airlie [Sat, 21 Mar 2009 11:41:25 +0000 (21:41 +1000)]
radeon: add xRGB span functions
same as ARGB need to add a parameter to get ptr32
Dave Airlie [Sat, 21 Mar 2009 11:38:28 +0000 (22:38 +1100)]
radeon: dri2 is hooked up elsewhere now
Dave Airlie [Sat, 21 Mar 2009 11:38:11 +0000 (22:38 +1100)]
radeon/r200: add fbo init
Dave Airlie [Sat, 21 Mar 2009 11:36:18 +0000 (22:36 +1100)]
radeon/r200: add fbo state changes
Dave Airlie [Sat, 21 Mar 2009 11:27:01 +0000 (22:27 +1100)]
r300: fix viewport inversion for FBOs
Michal Krol [Sat, 21 Mar 2009 11:18:09 +0000 (12:18 +0100)]
tgsi: Document KIL, KILP instructions.
Keith Whitwell [Sat, 21 Mar 2009 10:37:33 +0000 (10:37 +0000)]
gallium: remove remaining references to origin_lower_left
Michal Krol [Sat, 21 Mar 2009 10:46:54 +0000 (11:46 +0100)]
st: Silence compiler warnings.
Dave Airlie [Sat, 21 Mar 2009 08:16:21 +0000 (18:16 +1000)]
radeon: align FBO pitch
Dave Airlie [Sat, 21 Mar 2009 08:16:02 +0000 (18:16 +1000)]
radeon: fixup last missing x_off/y_off
Dave Airlie [Sat, 21 Mar 2009 08:07:33 +0000 (18:07 +1000)]
radeon: add cpp/pitch to rrb
Dave Airlie [Sat, 21 Mar 2009 08:05:54 +0000 (18:05 +1000)]
radeon/fbo: add x_off and y_off in correct places
Dave Airlie [Sat, 21 Mar 2009 06:51:46 +0000 (16:51 +1000)]
radeon: dPriv handling is now in cliprects code
Dave Airlie [Sat, 21 Mar 2009 06:08:20 +0000 (16:08 +1000)]
radeon: fixup span code for FBOs
Dave Airlie [Sat, 21 Mar 2009 05:05:34 +0000 (15:05 +1000)]
r300: hw clear buffer 0 hopefully
Dave Airlie [Sat, 21 Mar 2009 04:31:14 +0000 (14:31 +1000)]
radeon: fix up span function setting
Brian Paul [Sat, 21 Mar 2009 02:25:34 +0000 (20:25 -0600)]
gallium: remove use of origin_lower_left
This was used to indicate OpenGL's lower-left origin for fragment window
coordinates for polygon stipple and gl_FragCoord.
Now:
- fragment coordinate origin is always upper-left corner
- GL polygon stipple is inverted and shifted before given to gallium
- GL fragment programs that use INPUT[WPOS] are modified to use an
inverted window coord which is placed in a temp register.
Note: the origin_lower_left field still exists in pipe_rasterizer_state.
Remove it when all the drivers, etc. no longer reference it.
Brian Paul [Sat, 21 Mar 2009 02:15:58 +0000 (20:15 -0600)]
mesa: add new internal state var for window size
Actually, window width - 1, height - 1
Brian Paul [Fri, 20 Mar 2009 23:08:30 +0000 (17:08 -0600)]
mesa: linear scan register allocation for shader programs
This is a check-point commit; not turned on yet.
Use the linear scan register allocation algorithm to re-allocate temporary
registers. This is done by computing the live intervals for registers and
reallocating temps with that information.
For some shaders this dramatically reduces the number of temp registers
needed.
For the time being we give up on a few cases such as relative-indexed temps
and subroutine calls (but we inline most GLSL functions anyway).
Brian Paul [Fri, 20 Mar 2009 15:20:53 +0000 (09:20 -0600)]
docs: updated Mesa extension enum info
Corbin Simpson [Fri, 20 Mar 2009 21:47:49 +0000 (14:47 -0700)]
r300-gallium: Misspelled macro name.
*pulls paper bag down over head*
Corbin Simpson [Fri, 20 Mar 2009 07:48:53 +0000 (00:48 -0700)]
r300-gallium: Put r300_cs_inlines to bed.
Guess it was a mistake in the first place. Oops.
Corbin Simpson [Fri, 20 Mar 2009 07:43:29 +0000 (00:43 -0700)]
r300-gallium: Simplify/neaten up packet3.
Deck chairs on the Hindenburg. :3
Corbin Simpson [Fri, 20 Mar 2009 07:35:38 +0000 (00:35 -0700)]
r300-gallium: Clean up surface_fill, prep for surface_copy code.
Corbin Simpson [Fri, 20 Mar 2009 07:15:03 +0000 (00:15 -0700)]
r300-gallium: Properly offset scissors.
As per r300_reg, classic Mesa, and xf86-video-ati.
Corbin Simpson [Fri, 20 Mar 2009 03:36:59 +0000 (20:36 -0700)]
r300-gallium: Clean up r300_swtcl_emit.
Some compile warnings, some statements without effect.
Corbin Simpson [Fri, 20 Mar 2009 03:32:08 +0000 (20:32 -0700)]
r300-gallium: Clean up some emit, and some state handlers.
Corbin Simpson [Thu, 19 Mar 2009 19:29:03 +0000 (12:29 -0700)]
r300-gallium: A bit more invariant state.
José Fonseca [Wed, 18 Mar 2009 16:54:25 +0000 (16:54 +0000)]
gallium: Explain what happens if buffer_flush_mapped_range isn't called.
Keith Whitwell [Fri, 20 Mar 2009 15:08:59 +0000 (15:08 +0000)]
gallium/util: add upload manager helper module
Add a module that will manage uploading and coalescing multiple
user-buffers, malloc-buffers and other random data that doesn't
happen to be in a GPU buffer already. The module stuffs multiple
little uploads into larger GPU buffers to reduce create/destroy
overheads, etc.
Eric Anholt [Wed, 18 Mar 2009 19:07:09 +0000 (12:07 -0700)]
Fix DRI2 accelerated EXT_texture_from_pixmap with GL_RGB format.
This requires upgrading the interface so that the argument to
glXBindTexImageEXT isn't just dropped on the floor. Note that this only
fixes the accelerated path on Intel, as Mesa's texture format support is
missing x8r8g8b8 support (right now, GL_RGB textures get uploaded as a8r8gb8,
but in this case we're not doing the upload so we can't really work around it
that way).
Fixes bugs with compositors trying to use shaders that use alpha channels, on
windows without a valid alpha channel. Bug #19910 and likely others as well.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Michal Krol [Fri, 20 Mar 2009 15:48:54 +0000 (16:48 +0100)]
progs/wgl: Send a resize message after context have been created.
Michal Krol [Fri, 20 Mar 2009 15:36:23 +0000 (16:36 +0100)]
stw: Do not err on nil context handle in MakeCurrent().
Michal Krol [Fri, 20 Mar 2009 15:16:12 +0000 (16:16 +0100)]
progs/wgl: Create GL context in a thread that actually uses it.
Michal Krol [Fri, 20 Mar 2009 15:13:39 +0000 (16:13 +0100)]
progs/wgl: Make context current to get GL_RENDERER string.
Michal Krol [Fri, 20 Mar 2009 14:45:00 +0000 (15:45 +0100)]
stw: Use u_handle_table to maintain context list.
Dave Airlie [Fri, 20 Mar 2009 12:34:30 +0000 (22:34 +1000)]
r300: init fbos
Dave Airlie [Fri, 20 Mar 2009 12:29:15 +0000 (22:29 +1000)]
more fbo fillin
Dave Airlie [Fri, 20 Mar 2009 12:15:22 +0000 (22:15 +1000)]
r300: enable FBO for a test
Dave Airlie [Fri, 20 Mar 2009 12:07:05 +0000 (22:07 +1000)]
radeon: some more fbo work
Michal Krol [Fri, 20 Mar 2009 12:06:28 +0000 (13:06 +0100)]
winsys/gdi: Init state tracker's per-thread data.
Michal Krol [Fri, 20 Mar 2009 12:05:51 +0000 (13:05 +0100)]
stw: Keep per-thread storage for current context and pixel format.
Michal Krol [Fri, 20 Mar 2009 11:19:40 +0000 (12:19 +0100)]
slang: Use _mesa_snprintf() wrapper.
Dave Airlie [Fri, 20 Mar 2009 08:23:38 +0000 (18:23 +1000)]
radeon: initial couch code copy from radeon
Dave Airlie [Fri, 20 Mar 2009 00:52:17 +0000 (10:52 +1000)]
Merge remote branch 'main/master' into radeon-rewrite
Conflicts:
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r300_swtcl.c
src/mesa/drivers/dri/r300/radeon_ioctl.c
src/mesa/drivers/dri/radeon/radeon_screen.c
Alan Hourihane [Thu, 19 Mar 2009 22:38:01 +0000 (22:38 +0000)]
slang: initialize the context
Alan Hourihane [Thu, 19 Mar 2009 22:06:10 +0000 (22:06 +0000)]
slang: support uniform arrays
Jakob Bornecrantz [Thu, 19 Mar 2009 15:11:05 +0000 (16:11 +0100)]
trace: Formalize on a standard for data size pair
Brian Paul [Thu, 19 Mar 2009 16:26:50 +0000 (10:26 -0600)]
glslcompiler: added new options to override debug/optimization pragmas
Brian Paul [Thu, 19 Mar 2009 16:25:24 +0000 (10:25 -0600)]
glsl: change GLSL #pragma initialization
Initialize the shader's pragma settings before calling the compiler.
Added pragma "Ignore" fields to allow overriding the #pragma directives found
in shader source code.
Alan Hourihane [Thu, 19 Mar 2009 15:39:01 +0000 (15:39 +0000)]
egl: fix comment
Alan Hourihane [Thu, 19 Mar 2009 15:34:45 +0000 (15:34 +0000)]
egl: try harder for eglGetProcAddress()
Brian Paul [Thu, 19 Mar 2009 15:26:20 +0000 (09:26 -0600)]
glsl: when debug pragma is on, emit comments about function calls/inlines
BTW, the debug pragma syntax is "#pragma debug(on)"
Alan Hourihane [Thu, 19 Mar 2009 13:58:04 +0000 (13:58 +0000)]
mesa: check renderbuffer is defined before use.
Dave Airlie [Thu, 19 Mar 2009 05:31:03 +0000 (15:31 +1000)]
radeon/r200/r300: cleanup some of the renderbuffer code
Dave Airlie [Thu, 19 Mar 2009 04:46:52 +0000 (14:46 +1000)]
radeon: fix up locking like the intel driver for pageflip/swaps
Jakob Bornecrantz [Wed, 18 Mar 2009 18:10:32 +0000 (19:10 +0100)]
st/gl: Only transfer needed parts in st_TexSubimage
Alan Hourihane [Thu, 19 Mar 2009 10:16:28 +0000 (10:16 +0000)]
slang: if/else/break & if/else/continue work for unrolled loops
Michal Krol [Thu, 19 Mar 2009 10:16:01 +0000 (11:16 +0100)]
wgl: Add an `-s' option to wglthreads to force single-threaded operation.
Michal Krol [Thu, 19 Mar 2009 09:39:57 +0000 (10:39 +0100)]
swrast: Silence compiler warnings, give better structure to the code as a result.
Michal Krol [Thu, 19 Mar 2009 08:52:50 +0000 (09:52 +0100)]
tgsi: Document vs_2_0 instruction set operations.
Michal Krol [Thu, 19 Mar 2009 08:49:38 +0000 (09:49 +0100)]
tgsi: Document vs_1_1 instruction set operations.
Michal Krol [Thu, 19 Mar 2009 08:44:51 +0000 (09:44 +0100)]
tgsi: Begin documenting ps_2_x instruction set operations.
Corbin Simpson [Wed, 18 Mar 2009 22:17:38 +0000 (15:17 -0700)]
r300-gallium: Emit viewport state.
Note that this will break you, hard, if you're not using RADEON_NO_TCL.
I really need to start vertex shaders soon.
Corbin Simpson [Wed, 18 Mar 2009 20:37:59 +0000 (13:37 -0700)]
r300-gallium: Viewport state storage.
Corbin Simpson [Wed, 18 Mar 2009 20:37:08 +0000 (13:37 -0700)]
r300-gallium: Fixup registers for viewport state.
Brian Paul [Wed, 18 Mar 2009 21:39:11 +0000 (15:39 -0600)]
mesa: use the IROUND() macro in pixel packing code
It turns out some tests are sensitive to rounding vs. truncating when
converting float color values to integers in glReadPixels(). In particular,
this matters when the destination format is 5/6/5 or 4/4/4/4, etc.
Alan Hourihane [Wed, 18 Mar 2009 21:42:14 +0000 (21:42 +0000)]
slang: redo the last commit for if/break & if/continue tests as it
wasn't good enough for deeply nested if's.
Alan Hourihane [Wed, 18 Mar 2009 21:40:03 +0000 (21:40 +0000)]
Revert "slang: if we detect an if/break or if/continue within a loop and we're"
This reverts commit
752296b8f311c5e3844f3ce89d17ba57224ce5ba.
Alan Hourihane [Wed, 18 Mar 2009 21:16:35 +0000 (21:16 +0000)]
slang: if we detect an if/break or if/continue within a loop and we're
trying to unroll, bail, and fallback to doing the real loop.
Keith Whitwell [Wed, 18 Mar 2009 19:14:45 +0000 (19:14 +0000)]
st: call _glapi_check_multithread from st_make_current
This function is called from many OS-dependent versions of MakeCurrent.
Move the check for multithreading to this central location to avoid
having to make this check from all the callers.
Thomas Hellstrom [Wed, 18 Mar 2009 11:28:31 +0000 (12:28 +0100)]
stw: Fix makeCurrent.
Flush if we change current context.
Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
José Fonseca [Wed, 18 Mar 2009 16:37:20 +0000 (16:37 +0000)]
progs: Build the wgl examples with scons.
Jakob Bornecrantz [Wed, 18 Mar 2009 16:24:40 +0000 (17:24 +0100)]
progs/trivial: Make quad-tex-sub repeat patterns
Brian Paul [Wed, 18 Mar 2009 16:23:31 +0000 (10:23 -0600)]
tests: remove/update old comments
Brian Paul [Wed, 18 Mar 2009 16:22:05 +0000 (10:22 -0600)]
st: need to free/realloc pipe texture when we're handed image level > last_level
Fixes progs/tests/tri-fbo-tex-mip.c
Brian Paul [Wed, 18 Mar 2009 16:21:05 +0000 (10:21 -0600)]
st: clean up some if-statment code
Brian Paul [Wed, 18 Mar 2009 16:17:48 +0000 (10:17 -0600)]
softpipe: more texture transfer fixes.
Need to null-out pointers after freeing transfer objects.
Fix mix-ups between tc->transfer and tc->tex_trans fields.
Brian Paul [Wed, 18 Mar 2009 15:55:00 +0000 (09:55 -0600)]
softpipe: need to set tc->transfer=NULL after destroying the transfer object
This fixes a number of crashes/regressions in programs such as lodbias.c,
mipmap_limits.c, etc.
Brian Paul [Wed, 18 Mar 2009 15:40:37 +0000 (09:40 -0600)]
st: update texture comments
Jakob Bornecrantz [Wed, 18 Mar 2009 16:15:40 +0000 (17:15 +0100)]
progs/trivial: Add quad-tex-sub
Tests glTexSubImage
Dan Nicholson [Wed, 18 Mar 2009 06:33:04 +0000 (23:33 -0700)]
Use the specified X11 headers for xlib mesa
The xlib build was using the system's Xlib headers or bombing if they
weren't available.
Keith Whitwell [Wed, 18 Mar 2009 14:01:47 +0000 (14:01 +0000)]
tests: add simplest mipgen test
Keith Whitwell [Wed, 18 Mar 2009 13:27:53 +0000 (13:27 +0000)]
pipe/atomic: dont use ms interlock calls from gcc
Keith Whitwell [Wed, 18 Mar 2009 11:35:58 +0000 (11:35 +0000)]
util: avoid clashprone UINT, UBYTE enum values