Commit graph

28288 commits

Author SHA1 Message Date
Andre Maasikas
4e86cedf5b r600: add assembler support for literal(inline) constants
and use it in cubemap instruction sequence for testing
2009-12-08 15:43:12 +02:00
Andre Maasikas
602ba357ed r600: merge alu_instruction/alu_instruction2 2009-12-08 15:39:57 +02:00
Andre Maasikas
17e212e263 r600: add ABS support for source regs to assembler
use it in tex cube instruction sequence
2009-12-08 15:39:45 +02:00
Andre Maasikas
50ab51101e r600: glsl - allow specifying texture sampler via uniforms
looks kinda hackish, should rethink later
2009-12-08 15:39:39 +02:00
Andre Maasikas
94723b60cf r600: implement FRAG_ATTRIB_FACE, glsl/twoside works 2009-12-08 15:39:29 +02:00
Andre Maasikas
323d1fb391 r600: quick hack to get KIL_NV working - does condition TR only for now 2009-12-08 15:39:20 +02:00
Andre Maasikas
c1d79a4235 r600: wip glsl - refactor conditional instructions a bit
remember the dst register which is used for cond updates
when it's time to use the cond codes issue a separate PRED instruction
2009-12-08 15:39:08 +02:00
Andre Maasikas
94c6ec5809 r600: execute SET funtions on all channels
seems assemble_LOGIC was meant for non-condition-code instructions
so execute in for all components as previously
2009-12-08 15:38:59 +02:00
Alan Hourihane
2aebc5e01f move assert to avoid crash in debug build. 2009-12-08 13:12:02 +00:00
Michel Dänzer
eaa3a025da Merge branch 'mesa_7_7_branch' 2009-12-08 12:25:34 +01:00
Michel Dänzer
32ccc9b0bb vmware/xorg: Fix SCons build.
Not sure how vmw_screen.c could build at all though...
2009-12-08 11:45:19 +01:00
Michel Dänzer
9e42683fb3 vmware/xorg: Avoid warning about HAVE_STDINT_H being redefined. 2009-12-08 11:43:22 +01:00
Andre Maasikas
b5e256c76d Merge branch 'mesa_7_7_branch'
Conflicts:
	src/mesa/drivers/dri/r600/r700_assembler.c
	src/mesa/main/version.h
2009-12-08 11:57:24 +02:00
Andre Maasikas
0d4a05445c Merge branch 'mesa_7_6_branch' into mesa_7_7_branch 2009-12-08 10:16:14 +02:00
Andre Maasikas
369669ff9a r600: add support for TXB instruction
makes testing other things easier - does not hang the card
TODO: enable TEX dependency tracking in vertex programs
2009-12-08 10:02:23 +02:00
Andre Maasikas
dc0777d3e3 r600: reorder state for render_target and blend
First time around render targets are not enabled yet (done in
r700SendRenderTargetState) so blend state is not emitted for any targets.
Affects first glClear in some mesa tests.
As a quick fix reorder state emit so that target is set first
2009-12-08 09:41:10 +02:00
Vinson Lee
add6dfbba6 llvmpipe: Initialize variables in emit_instruction. 2009-12-07 19:04:07 -08:00
Vinson Lee
3e8b2fda21 progs/test: Initialize variable in prog_parameter.
Silences uninitialized variable compiler warning.
2009-12-07 18:40:37 -08:00
Ian Romanick
ba167f812c mesa: set version string to 7.7-rc1
Also modify the Makefile to use the correct version for the tarballs.
2009-12-07 17:18:56 -08:00
Ian Romanick
8fc433fa0f Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
	progs/demos/projtex.c
	progs/xdemos/glxinfo.c
	src/mesa/main/version.h

To fix the confilicts in projtex.c and glxinfo.c I just took the code from
mesa_7_6_branch.  The conflicts seem to have occured from cherry-picks from
mesa_7_7_branch to mesa_7_6_branch followed by commmits just to
mesa_7_6_branch.
2009-12-07 17:16:10 -08:00
Ian Romanick
bb64c9bcdf Revert "intel: Make RGB renderbuffers use XRGB8888 like we do for RGB system buffers."
This reverts commit 4598942b1b.

XRGB8888 doesn't work as intended.  Revert this for now, and we'll revisit it
for 7.8 or something.
2009-12-07 17:06:07 -08:00
Ian Romanick
9dbd47fc6b mesa: set version string to 7.6.1-rc3 2009-12-07 16:59:59 -08:00
Maciej Cencora
9921b3048e radeon: fix cases when only first image where put directly into miptree.
Make sure that minimal width, height and depth of texture image is 1.
2009-12-07 22:33:11 +01:00
Maciej Cencora
013cf1d63d radeon: fix image migration for small compressed textures
memcpy would give incorrect results if src rowstride != dst rowstride
2009-12-07 22:29:11 +01:00
Vinson Lee
7d84169865 progs/demos: Fix memory leak in projtex.c. 2009-12-07 12:31:08 -08:00
Michal Krol
ac66598ed8 util/tile: Support R8G8B8A8_UNORM format. 2009-12-07 18:21:37 +01:00
Brian Paul
c90baf444c st/mesa: remove debug code 2009-12-07 09:05:40 -07:00
Brian Paul
0311d9ccf4 progs/glsl: updates to deriv.c test
Pass window size into the shader so scaling the window doesn't effect
the colors.
2009-12-07 09:03:41 -07:00
Brian Paul
8ce1713443 st/mesa: negate DDY to match GL semantics
This fixes the regression from commit 884007546c
Fixes bug 25456 (piglit derivs regression).
2009-12-07 09:00:59 -07:00
Brian Paul
8468234bfa st/mesa: fix up comment 2009-12-07 08:59:38 -07:00
Brian Paul
8796dbf519 progs/glsl: added texture mapping to bump demo
Press 't' to toggle texture map.
2009-12-07 07:46:02 -07:00
Corbin Simpson
12981589b7 radeong: Automatically softpipe for non-r3xx.
Well, technically non-r[345]xx. At any rate...

$ glxgears
libGL: OpenDriver: trying /home/simpson/mesa/lib/gallium/r600_dri.so
131 frames in 5.0 seconds = 26.107 FPS

I'm sure you can see where this is going. :3
2009-12-06 23:55:58 -08:00
Corbin Simpson
e3a3ca097c radeong: Call softpipe_create directly.
Allows us to finally remove radeon_winsys_softpipe.
2009-12-06 23:50:31 -08:00
Corbin Simpson
d8d8b0d244 softpipe: sp_winsys.h should define/include what it needs. 2009-12-06 23:49:02 -08:00
Corbin Simpson
c99fb991a3 r300g: Clean up previous commit.
If *I* can't read it, there's a strong possibility others can't,
either.
2009-12-06 23:34:53 -08:00
Marek Olšák
7091afed78 r300g: enhance ZTOP conditions 2009-12-06 23:34:53 -08:00
Younes Manton
c574f515f0 nouveau: Work around nv04-nv40 miptrees not matching nouveau_miptree.
Thanks to Bob Gleitsmann for the patch.

I'll clean this up in a better way later if noone else beats me to it.
2009-12-06 12:34:27 -05:00
Vinson Lee
7005f7cd1a st/egl: Fix memory leak in egl_tracker.c.
(cherry picked from commit 052b127842)
2009-12-06 01:15:24 -08:00
Marek Olšák
0748764351 r300g: don't render if everything is culled by scissoring
Otherwise a CS is refused by kernel 2.6.31 (and maybe all later
versions, not sure).
2009-12-06 01:13:37 -08:00
Marek Olšák
e1380cae88 r300g: remove redundant code and clean up 2009-12-06 01:13:36 -08:00
Vinson Lee
c994f08eb1 dri: Fix potential null pointer dereference in driBindContext.
(cherry picked from commit 919898e92f)
2009-12-06 01:01:55 -08:00
Vinson Lee
f622b649fb dri: Fix potential null pointer deference in dri_put_drawable.
(cherry picked from commit 364070b1f2)
2009-12-06 01:00:20 -08:00
Vinson Lee
76b3523d75 glx: Prevent potential null pointer deference in driCreateContext.
(cherry picked from commit 4b0b250aae)
2009-12-06 00:56:20 -08:00
Vinson Lee
978b80c8e3 progs/tests: Add tests to Makefile.
(cherry picked from commit 76d2ec3a0a)
2009-12-05 21:20:54 -08:00
Alex Deucher
df02bc42b3 radeon/r200/r600: fix drivers for changes in 433f0a82f5 2009-12-05 18:24:41 -05:00
Vinson Lee
3cd745515e draw: Initialize variable in draw_pt.c.
(cherry picked from commit ea98e9820d)
2009-12-05 15:11:41 -08:00
Vinson Lee
b2953ee1a6 mesa: Fix array out-of-bounds access by _mesa_TexGenf.
_mesa_TexGenf calls _mesa_TexGenfv, which uses the params argument
as an array.
(cherry picked from commit ca5a7aadb4)
2009-12-05 13:00:35 -08:00
Vinson Lee
d74cd04e61 mesa: Fix array out-of-bounds access by _mesa_TexGeni.
_mesa_TexGeni calls _mesa_TexGeniv, which uses the params argument
as an array.
(cherry picked from commit d55fb7c835)
2009-12-05 12:59:34 -08:00
Vinson Lee
ca8a2150c7 mesa: Fix array out-of-bounds access by _mesa_TexParameterf.
_mesa_TexParameterf calls set_tex_parameterf, which uses the params
argument as an array.
(cherry picked from commit 270d36da14)
2009-12-05 12:50:56 -08:00
Vinson Lee
4071d065c2 mesa: Fix array out-of-bounds access by _mesa_TexParameterf.
_mesa_TexParameterf calls set_tex_parameteri, which uses the params
argument as an array.
(cherry picked from commit a201dfb6bf)
2009-12-05 12:47:40 -08:00