Commit Graph

28750 Commits

Author SHA1 Message Date
Jeremy Huddleston 5bbdc7f420 osmesa: Fix a copy/paste error in building libOSMesa
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-12-21 17:49:43 -08:00
Brian Paul 9eb7fc6661 Merge branch 'mesa_7_7_branch'
Conflicts:
	src/mesa/main/version.h
	src/mesa/state_tracker/st_atom_shader.c
2009-12-21 18:35:54 -07:00
Brian Paul b57abd3bea Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
	configure.ac
	progs/demos/morph3d.c
	progs/demos/textures.c
	progs/glsl/shtest.c
	progs/glsl/texaaline.c
	progs/tests/packedpixels.c
	progs/xdemos/corender.c
	src/mesa/main/version.h
2009-12-21 18:23:53 -07:00
Fabio Pedretti bf064ce0c3 configure.ac: fix for libdrm_radeon API changes. 2009-12-22 10:44:53 +10:00
Fabio Pedretti e46ad402f1 configure.ac: fix for libdrm_radeon API changes. 2009-12-22 10:44:28 +10:00
Fabio Pedretti ae1c0a06e8 configure.ac: fix for libdrm_radeon API changes. 2009-12-22 10:43:35 +10:00
Dave Airlie bd9e0ebaff radeon/r600: use new libdrm_radeon api 2009-12-22 10:25:47 +10:00
Dave Airlie bce03f7174 radeon: drop assert accessing cref which is meant to be hidden 2009-12-22 10:25:05 +10:00
Dave Airlie 34671efa29 radeon: drop unused members of radeon_state. 2009-12-22 10:24:57 +10:00
Dave Airlie e77bfc436d r600: move structs for legacy cmdbuf into cmdbuf C file.
these really shouldn't be exposed here
2009-12-22 10:24:47 +10:00
Dave Airlie 9373287a1b radeon/r600: use new libdrm_radeon api 2009-12-22 10:23:41 +10:00
Dave Airlie 9d2910ee0f radeon: drop assert accessing cref which is meant to be hidden 2009-12-22 10:23:41 +10:00
Dave Airlie 43d8727301 radeon: drop unused members of radeon_state. 2009-12-22 10:23:40 +10:00
Dave Airlie 1703628011 r600: move structs for legacy cmdbuf into cmdbuf C file.
these really shouldn't be exposed here
2009-12-22 09:58:33 +10:00
Vinson Lee 07b54fe35b progs/redbook: Silence compiler warnings. 2009-12-21 15:20:01 -08:00
Brian Paul fdae39c289 progs/perf: added check for GL_ARB_framebuffer_object 2009-12-21 13:49:25 -07:00
Brian Paul 79e74cda73 progs/demos: report pixel rate in million pixels / sec 2009-12-21 13:49:25 -07:00
Brian Paul bd5fbcf92b osmesa: added new GLSL libs 2009-12-21 13:37:49 -07:00
Brian Paul d26cdaaa23 progs/osmes: add missing libGL dependency, remove unneeded lines 2009-12-21 13:37:11 -07:00
Christoph Bumiller c020a83fae util: draw cube mipmaps with TEX CUBE 2009-12-21 19:04:06 +00:00
Roland Scheidegger 8f1d2ab590 python: fix some pipe_format_simplify merge damage 2009-12-21 18:20:31 +01:00
Roland Scheidegger ba25137655 svga: fix typo 2009-12-21 18:20:01 +01:00
Dave Airlie 753f0a1dea r600: fix glFrontFace(GL_CW)
fd.o bug #25290

Suggested fix from Rafael Monica
2009-12-21 10:40:19 -05:00
Andre Maasikas 764899d7ab r600: support more of arb_point_sprite and also sprite_coord_origin 2009-12-21 15:23:37 +02:00
Andre Maasikas 69728a2ae2 r600: disallow negative offsets for relative addressing for now
otherwise for example const[ADDR-3] gets us 253 - ALU_SRC_LITERAL which
expects immediate floats to follow and hangs
2009-12-21 15:23:27 +02:00
Michal Krol 3d3480abbc vega: Add missing actual argument. 2009-12-21 11:58:17 +01:00
Younes Manton ace937f165 st/mesa: Check for single level mipmap trees.
The assert in util_gen_mipmap() caught it, although
it does the right thing anyway.
2009-12-21 00:59:06 -05:00
Jeremy Huddleston b96a5df514 darwin: mklib: Use lipo rather than file to figure out architectures of object files
(cherry picked from commit ad7f9d71e2)
2009-12-20 21:36:41 -08:00
Jeremy Huddleston f926eff263 darwin: Cleanup CPPFLAGS a bit
(cherry picked from commit 4a1e103858)
2009-12-20 21:36:39 -08:00
Jeremy Huddleston ad7f9d71e2 darwin: mklib: Use lipo rather than file to figure out architectures of object files 2009-12-20 21:34:27 -08:00
Jeremy Huddleston 4a1e103858 darwin: Cleanup CPPFLAGS a bit 2009-12-20 21:32:35 -08:00
Dave Airlie 393857a2f5 r600: fix glFrontFace(GL_CW)
fd.o bug #25290

Suggested fix from Rafael Monica
2009-12-21 10:21:28 +10:00
Corbin Simpson 32d737397c r300g: Add a few more params. 2009-12-20 15:47:48 -08:00
Dave Airlie 55c43ee315 glsl: make stack compile.
it would be nice if this stuff would be test built on mesa's primary
platform with mesa's primary build system.

Signed-off-by: Dave Airlie <airlied@redhat.com>
2009-12-21 09:10:21 +10:00
Dave Airlie b065aec840 radeon/r600: use new libdrm_radeon api 2009-12-21 08:09:11 +10:00
Michal Krol 1071ad70f5 glsl/apps: Update after glsl cl interface changes. 2009-12-20 21:19:10 +01:00
Michal Krol 1cc9610f88 slang: Update after glsl cl interface changes. 2009-12-20 21:19:09 +01:00
Michal Krol d801c296c6 glsl: Do syntax parsing inline with processing. 2009-12-20 21:19:07 +01:00
Michal Krol 5fb345c422 slang: Add gitignore for autogenerated files. 2009-12-20 21:19:06 +01:00
Michal Krol ec73cd011d slang: Update after glsl pp changes. 2009-12-20 21:19:05 +01:00
Michal Krol 9c15948125 glsl/apps: Update after glsl pp interface changes. 2009-12-20 21:19:03 +01:00
Michal Krol e0f57a37b2 glsl/apps: Do not print number of eaten tokens in version.
This is due to the glsl pp interface changes.
2009-12-20 21:19:02 +01:00
Michal Krol 0874ce48a6 glsl/apps: Print error line number in compile. 2009-12-20 21:19:01 +01:00
Michal Krol d696cb279d glsl/pp: Do processing inline with tokenisation. 2009-12-20 21:18:59 +01:00
Michal Krol 7631dca25b glsl/pp: Remove outdated TODO.
Already implemented in mesa compiler using predefined symbols.
2009-12-20 21:18:58 +01:00
Michal Krol e9aa65d2b7 glsl/pp: Report correct error line for purify and tokeniser errors. 2009-12-20 21:18:57 +01:00
Christoph Bumiller a6e663def4 util: util_format_get_blocksizebits() returns bits per block. 2009-12-20 19:09:35 +01:00
Christoph Bumiller b3ac75f7eb nv50: make address reg allocation a little less hacky
Before I tried to distinguish int +0 and -0, and regs
relative to $a1 would have been considered reserved
for TGSI.
This would probably never occur, let it be fixed even so.
2009-12-20 14:15:51 +01:00
Christoph Bumiller 2ed083dda9 nv50: use BREAKADDR and BREAK for loops
This is easier, we don't have to record all the BRK branches
to fill in the address at ENDLOOP - which wasn't done before
and thus made all but the last BRK branch jump to the start.

Also, we don't risk reactivting threads that already left
the loop if we join threads after a conditional with a BRK
(although it might be wiser to remove the join altogether
in such cases).
2009-12-20 14:15:51 +01:00
Christoph Bumiller 3c7f109d67 nv50: handle TGSI_OPCODE_RET,KILP 2009-12-20 14:15:51 +01:00