Brian Paul [Thu, 24 Sep 2009 17:03:16 +0000 (11:03 -0600)]
Merge branch 'mesa_7_6_branch'
Conflicts:
src/mesa/drivers/dri/r600/r700_assembler.c
src/mesa/drivers/dri/r600/r700_chip.c
src/mesa/drivers/dri/r600/r700_render.c
src/mesa/drivers/dri/r600/r700_vertprog.c
src/mesa/drivers/dri/r600/r700_vertprog.h
src/mesa/drivers/dri/radeon/radeon_span.c
Brian Paul [Thu, 24 Sep 2009 16:52:15 +0000 (10:52 -0600)]
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
Brian Paul [Thu, 24 Sep 2009 16:47:42 +0000 (10:47 -0600)]
gallium/trace: casts to silence warnings
Brian Paul [Thu, 24 Sep 2009 15:54:36 +0000 (09:54 -0600)]
tgsi/sse: remove old comments
Brian Paul [Thu, 24 Sep 2009 15:51:05 +0000 (09:51 -0600)]
tgsi/sse: implement SEQ, SGT, SLE, SNE
Brian Paul [Thu, 24 Sep 2009 16:26:56 +0000 (10:26 -0600)]
tgsi/sse: Pass the lodbias, not zero. More comments.
This fixes the glean/glsl1 "texture2D(), with bias" test when using SSE.
Brian Paul [Wed, 23 Sep 2009 21:44:37 +0000 (15:44 -0600)]
mesa: added default case return to silence warning
Brian Paul [Wed, 23 Sep 2009 21:44:18 +0000 (15:44 -0600)]
glsl: init var to silence warning
Brian Paul [Wed, 23 Sep 2009 21:44:02 +0000 (15:44 -0600)]
glsl: fix missing initializers warning
Keith Whitwell [Thu, 24 Sep 2009 15:52:14 +0000 (16:52 +0100)]
progs/perf: fix warnings in readpixels test
Keith Whitwell [Thu, 24 Sep 2009 15:50:27 +0000 (16:50 +0100)]
progs/perf: fix typo in sconscript
Keith Whitwell [Thu, 24 Sep 2009 15:49:40 +0000 (16:49 +0100)]
trace: fix printf warnings
Keith Whitwell [Thu, 24 Sep 2009 15:49:27 +0000 (16:49 +0100)]
softpipe: fix compiler warnings
Keith Whitwell [Thu, 24 Sep 2009 15:49:05 +0000 (16:49 +0100)]
pipebuffer: fix printf warnings
Keith Whitwell [Thu, 24 Sep 2009 15:48:49 +0000 (16:48 +0100)]
pipebuffer: fix warnings
Keith Whitwell [Thu, 24 Sep 2009 15:44:58 +0000 (16:44 +0100)]
draw: fix warning
Keith Whitwell [Wed, 23 Sep 2009 18:03:07 +0000 (19:03 +0100)]
progs/perf: accept GL3.x also
Richard Li [Thu, 24 Sep 2009 15:26:15 +0000 (11:26 -0400)]
r600 : fix draw_prim bug: vertex fetcher setting.
José Fonseca [Thu, 24 Sep 2009 14:27:19 +0000 (15:27 +0100)]
softpipe: Use portable INLINE macro.
José Fonseca [Thu, 24 Sep 2009 14:27:03 +0000 (15:27 +0100)]
softpipe: Update SConscript.
Richard Li [Thu, 24 Sep 2009 14:12:40 +0000 (10:12 -0400)]
r600 : disable draw_prim for now.
Andre Maasikas [Wed, 23 Sep 2009 11:20:59 +0000 (14:20 +0300)]
r600: add support for CUBE textures, also TXP
seems to work here ...
Alex Deucher [Mon, 21 Sep 2009 20:48:55 +0000 (16:48 -0400)]
r600: fix typo in the last commit
128 gprs, 256 reg-based consts
Alex Deucher [Mon, 21 Sep 2009 20:30:14 +0000 (16:30 -0400)]
r600: various cleanups
- max texture size is 8k, but mesa doesn't support
that at the moment.
- attempt to set shader limits to what the hw actually
supports
- clean up some old r300 cruft
- no need to explicitly disable irqs. This is fixed
in the drm now.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Andre Maasikas [Mon, 21 Sep 2009 14:14:25 +0000 (10:14 -0400)]
r600: fix some issues with LIT instruction
- MUL_LIT is ALU.Trans instruction
- some Trans instructions can take 3 arguments
- don't clobber dst.x, use dst.z as temp, it'll get written correct
value in last insn
- respect source swizzles
Alex Deucher [Sat, 19 Sep 2009 19:18:42 +0000 (15:18 -0400)]
r600: fix point sizes
registers takes radius
Alex Deucher [Sat, 19 Sep 2009 18:46:06 +0000 (14:46 -0400)]
r600: fix polygon offset
Alex Deucher [Tue, 15 Sep 2009 21:12:03 +0000 (17:12 -0400)]
radeon: don't build non-r600 span code on r600
Alex Deucher [Tue, 15 Sep 2009 20:58:37 +0000 (16:58 -0400)]
r600: minor span cleanups
Andre Maasikas [Tue, 15 Sep 2009 15:27:51 +0000 (11:27 -0400)]
r600: support position_invariant programs
Alex Deucher [Mon, 14 Sep 2009 22:05:15 +0000 (18:05 -0400)]
r600: add span support for 1D tiles
1D tile span support for depth/stencil/color/textures
Z and stencil buffers are always tiled, so this fixes
sw access to Z and stencil buffers. color and textures
are currently linear, but this adds span support when we
implement 1D tiling.
This fixes the text in progs/demos/engine and progs/tests/z*
Alex Deucher [Mon, 14 Sep 2009 21:08:26 +0000 (17:08 -0400)]
r600: fix warning
Noticed by rnoland on IRC.
Andre Maasikas [Fri, 11 Sep 2009 19:59:55 +0000 (15:59 -0400)]
r600: fix texcoords from constants
with some minor updates from Richard.
Andre Maasikas [Fri, 11 Sep 2009 14:59:05 +0000 (10:59 -0400)]
r600: enable caching of vertex programs
Alex Deucher [Wed, 9 Sep 2009 15:14:17 +0000 (11:14 -0400)]
r600: check if textures are actually enabled before submission
noticed by taiu on IRC.
Alex Deucher [Wed, 9 Sep 2009 05:41:46 +0000 (01:41 -0400)]
r600: fix ftp for dri1
We use t->bo for dri1 since r600 uses CS for dri1.
Dave Airlie [Wed, 9 Sep 2009 05:02:16 +0000 (15:02 +1000)]
r600: don't setup hardware state if TFP
if we have a BO here it means TFP and we should have set it
up already.
tested by b0le on #radeon
Alex Deucher [Tue, 8 Sep 2009 20:03:25 +0000 (16:03 -0400)]
r600: fix dri2 clipping
José Fonseca [Thu, 24 Sep 2009 12:09:40 +0000 (13:09 +0100)]
gdi: Update for WGL state tracker interface changes.
José Fonseca [Thu, 24 Sep 2009 12:08:34 +0000 (13:08 +0100)]
wgl: DWM integration.
José Fonseca [Thu, 24 Sep 2009 12:05:27 +0000 (13:05 +0100)]
scons: Don't require -liberty on MinGW.
Not always present.
José Fonseca [Thu, 24 Sep 2009 11:36:11 +0000 (12:36 +0100)]
mesa: Fix missing finite symbol error on Windows.
Caused by some weird logic regarding the __WIN32__ define which made
the finite definition dependent on the header include order.
Alex Deucher [Wed, 23 Sep 2009 23:42:07 +0000 (19:42 -0400)]
r600: fix up ordering of functions in draw prims path
Shaders and IB need to be updated and allocated before
calling validatebuffers.
Maciej Cencora [Sat, 19 Sep 2009 16:45:59 +0000 (18:45 +0200)]
r300: fallback to software rendering if we are out of free texcoords
Fixes #22741
Alex Deucher [Wed, 23 Sep 2009 20:54:12 +0000 (16:54 -0400)]
r600: fix r700PredictRenderSize for draw prims path
Richard Li [Wed, 23 Sep 2009 20:10:20 +0000 (16:10 -0400)]
r600 : add hw index buffer draw support.
Brian Paul [Wed, 23 Sep 2009 20:04:38 +0000 (14:04 -0600)]
progs/perf: added glReadPixels benchmark
Brian Paul [Wed, 23 Sep 2009 20:04:25 +0000 (14:04 -0600)]
progs/perf: also request a stencil buffer
Brian Paul [Wed, 23 Sep 2009 19:35:03 +0000 (13:35 -0600)]
swrast: add lod bias when texture sampling
Mostly fixes progs/demos/lodbias when MESA_TEX_PROG=1. But the LOD still
seems off by -1 or so.
May be an issue with the params passed to _swrast_compute_lambda()
Brian Paul [Wed, 23 Sep 2009 19:34:30 +0000 (13:34 -0600)]
mesa: don't bias LOD in shader interpreter; do it in swrast
Brian Paul [Wed, 23 Sep 2009 18:54:14 +0000 (12:54 -0600)]
swrast: fix typo in partial derivatives parameter passing
Adam Jackson [Wed, 23 Sep 2009 19:22:19 +0000 (15:22 -0400)]
Finish removing glcore
Alex Deucher [Wed, 23 Sep 2009 19:02:19 +0000 (15:02 -0400)]
r600: fix copy/paste typo
Alex Deucher [Wed, 23 Sep 2009 18:56:56 +0000 (14:56 -0400)]
r600: fix some warnings
Andre Maasikas [Wed, 23 Sep 2009 11:20:59 +0000 (14:20 +0300)]
r600: add support for CUBE textures, also TXP
seems to work here ...
Michal Krol [Wed, 23 Sep 2009 18:24:35 +0000 (20:24 +0200)]
progs/perf: Actually bind the newly created vbo.
Keith Whitwell [Wed, 23 Sep 2009 13:40:45 +0000 (14:40 +0100)]
st/mesa: trim calculated userbuffer size
In get_array_bounds we were previously defining a user buffer sized as
(nr_vertices * stride). The trouble is that if the vertex data
occupies less than stride bytes, the extra tailing (stride - size)
bytes may extend outside the memory actually allocated by the app and
caused a segfault.
To fix this, define a the buffer bounds to be:
ptr .. ptr + (nr-1)*stride + element_size
Brian Paul [Wed, 23 Sep 2009 17:08:12 +0000 (11:08 -0600)]
llvmpipe: move tile cache datatypes into .c file since they're private
Brian Paul [Wed, 23 Sep 2009 17:51:52 +0000 (11:51 -0600)]
softpipe: replace macros with inline functions
And update comments.
Brian Paul [Wed, 23 Sep 2009 17:35:33 +0000 (11:35 -0600)]
softpipe: white-space/formatting fixes and updated comments
Brian Paul [Wed, 23 Sep 2009 17:04:57 +0000 (11:04 -0600)]
llvmpipe: added max texture/surface size sanity check
Carried over from softpipe driver.
Brian Paul [Wed, 23 Sep 2009 17:04:07 +0000 (11:04 -0600)]
llvmpipe: increase MAX_WIDTH/HEIGHT to match max texture size
Brian Paul [Wed, 23 Sep 2009 17:00:04 +0000 (11:00 -0600)]
Merge branch 'mesa_7_6_branch'
Conflicts:
src/gallium/drivers/softpipe/sp_tile_cache.c
Brian Paul [Wed, 23 Sep 2009 16:50:38 +0000 (10:50 -0600)]
softpipe: added max texture/surface size sanity check
Brian Paul [Tue, 22 Sep 2009 21:35:05 +0000 (15:35 -0600)]
softpipe: increase MAX_WIDTH/HEIGTH 4096 to match max texture size
Keith Whitwell [Wed, 23 Sep 2009 16:37:28 +0000 (17:37 +0100)]
Merge branch 'softpipe-opt'
Conflicts:
progs/demos/cubemap.c
src/gallium/drivers/softpipe/sp_tex_sample.c
src/gallium/drivers/softpipe/sp_texture.c
Keith Whitwell [Thu, 17 Sep 2009 18:18:39 +0000 (19:18 +0100)]
gallium/include: update some comments
Zack Rusin [Wed, 23 Sep 2009 16:05:13 +0000 (12:05 -0400)]
st/xorg: fix a typo
it'd be too easy, eh
Zack Rusin [Tue, 22 Sep 2009 21:49:53 +0000 (17:49 -0400)]
st/xorg: keep the user buffer contents around
Michel noticed that they were getting out of scope
Brian Paul [Wed, 23 Sep 2009 14:06:29 +0000 (08:06 -0600)]
progs/perf: set TexSubImage4=FALSE
José Fonseca [Tue, 22 Sep 2009 17:51:41 +0000 (18:51 +0100)]
wgl: Eliminate the shared layer; implement WGL API on top of the ICD callbacks.
While the WGL API has been stale for decades now, the ICD interface has
been updated with new Windows versions, so it is much easier to define
everything in terms of the ICD interfaces, which is pretty much what
Microsoft's opengl32.dll does anyway.
José Fonseca [Tue, 22 Sep 2009 16:42:47 +0000 (17:42 +0100)]
gdi: Update for WGL statetracker source reorg.
José Fonseca [Tue, 22 Sep 2009 16:40:20 +0000 (17:40 +0100)]
wgl: Flatten the source tree.
It is easier to have the WGL API on top of the ICD callbacks as
Microsoft's own implementation does, than to have a seperate shared
entity. This source reorganization is in antecipation of that.
José Fonseca [Tue, 22 Sep 2009 16:25:22 +0000 (17:25 +0100)]
wgl: Fix debug_printf format specifiers.
José Fonseca [Tue, 22 Sep 2009 16:16:35 +0000 (17:16 +0100)]
gallium: Update vendor string.
root [Wed, 23 Sep 2009 02:14:05 +0000 (20:14 -0600)]
softpipe: fix bugs in POT texture sampling when texture is not square
Before, if level was greater than the logbase2(base size) we were
doing a negative bit shift and winding up with garbage values.
Brian Paul [Tue, 22 Sep 2009 22:59:28 +0000 (16:59 -0600)]
softpipe: additional assertions
Brian Paul [Tue, 22 Sep 2009 22:42:15 +0000 (16:42 -0600)]
softpipe: disable a _debug_printf()
Brian Paul [Tue, 22 Sep 2009 22:06:18 +0000 (16:06 -0600)]
Merge branch 'mesa_7_6_branch'
Brian Paul [Tue, 22 Sep 2009 21:58:12 +0000 (15:58 -0600)]
mesa: don't re-use the meta glDrawPixels VBO; create a new one each time
This should help to work around bugs 24083 and 23670.
Brian Paul [Tue, 22 Sep 2009 21:28:34 +0000 (15:28 -0600)]
progs/perf: added glCopyTex[Sub]Image2D test
Richard Li [Tue, 22 Sep 2009 21:26:23 +0000 (17:26 -0400)]
r600 : add draw_prim support, make up one lost change.
Richard Li [Tue, 22 Sep 2009 20:39:11 +0000 (16:39 -0400)]
r600 : add draw_prim support.
Brian Paul [Tue, 22 Sep 2009 19:47:49 +0000 (13:47 -0600)]
mesa: fix more buffer object error messages
Keith Whitwell [Tue, 22 Sep 2009 19:47:37 +0000 (20:47 +0100)]
softpipe: need to write depth/stencil values even when stencil fails
Keith Whitwell [Tue, 22 Sep 2009 19:47:07 +0000 (20:47 +0100)]
softpipe: set quad->facing value
Brian Paul [Tue, 22 Sep 2009 19:44:43 +0000 (13:44 -0600)]
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
Conflicts:
src/mesa/main/bufferobj.c
Brian Paul [Tue, 22 Sep 2009 19:19:05 +0000 (13:19 -0600)]
glx: include string.h to silence missing memset() prototype warning
Brian Paul [Tue, 22 Sep 2009 19:14:55 +0000 (13:14 -0600)]
mesa: fix error message text
Nicolai Hähnle [Tue, 22 Sep 2009 18:57:05 +0000 (20:57 +0200)]
r300: Fix crash reported in bug #24066
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
Keith Whitwell [Tue, 22 Sep 2009 18:38:34 +0000 (19:38 +0100)]
softpipe: fix polygon stipple
Brian Paul [Tue, 22 Sep 2009 18:25:32 +0000 (12:25 -0600)]
progs/perf: test glGetTexImage() also
Keith Whitwell [Tue, 22 Sep 2009 18:26:08 +0000 (19:26 +0100)]
softpipe: fix occlusion counting
Jakob Bornecrantz [Tue, 22 Sep 2009 17:59:26 +0000 (10:59 -0700)]
st/xorg: Fix two leeks
We where leaking both surfaces in the composit code
and textures from pixmaps.
Jakob Bornecrantz [Tue, 22 Sep 2009 18:00:58 +0000 (11:00 -0700)]
i915g: Activate trace
Jakob Bornecrantz [Tue, 22 Sep 2009 17:55:41 +0000 (10:55 -0700)]
i915g: Do propper references of surfaces in context
Brian Paul [Tue, 22 Sep 2009 17:14:58 +0000 (11:14 -0600)]
progs/perf: add missing texture enable in fbobind.c
Brian Paul [Tue, 22 Sep 2009 17:03:43 +0000 (11:03 -0600)]
progs/perf: added fbobind.c test to test FBO binding speed
Brian Paul [Tue, 22 Sep 2009 17:02:04 +0000 (11:02 -0600)]
progs/perf: added PerfExtensionSupported() helper
Keith Whitwell [Tue, 22 Sep 2009 16:59:24 +0000 (17:59 +0100)]
teximage: add more tests, image formats
Add a test which creates a new texture from scratch before uploading.
Add more image formats.
Don't run all tests on all image formats.