Alan Hourihane
e8a1b31ddf
fix conflict breakage
2008-12-08 15:03:29 +00:00
Alan Hourihane
33a1f495d4
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
progs/glsl/Makefile
2008-12-08 14:29:50 +00:00
José Fonseca
d26a43f6c6
python/retrace: Dump vertex buffer contents.
2008-12-08 17:26:02 +09:00
Pekka Paalanen
bcd5dda435
nouveau: make nv20 use NV{20,25}TCL objects
...
Up till now, nv20 driver has been using NV10TCL, and being
really an nv10 driver. That has changed.
Signed-off-by: Pekka Paalanen <pq@iki.fi>
2008-12-07 22:33:02 +02:00
Eric Anholt
f849d364c2
mesa: Fix GenerateMipmapEXT(GL_TEXTURE_CUBE_MAP_ARB).
...
The ctx->Driver.GenerateMipmap() hook only expects cubemap face enums, not
CUBE_MAP_ARB, so walk all faces when we encounter that. Fixes oglconform
fbo.c segfault with both swrast and i965 drivers.
2008-12-06 22:41:52 -08:00
Eric Anholt
8b661a5d33
intel: Fall back on rendering to a texture attachment with a border.
...
Fixes a segfault in oglconform fbo.c test.
2008-12-06 22:41:52 -08:00
Eric Anholt
75b26e18a6
intel: Fix crash in automatic mipmap generation for glCopyTex{Sub,}Image.
...
The images aren't mapped at this point, so we want the generic Mesa path for
GenerateMipmapEXT that does the mapping/unmapping for us. Ideally Mesa would
just call it for us.
2008-12-06 22:41:52 -08:00
Eric Anholt
bdc8ac4426
intel: Put CopyTexImage fallback under DEBUG_FALLBACKS not DEBUG_TEXTURE.
2008-12-06 22:41:51 -08:00
Eric Anholt
a0625fa281
intel: Fix glCopyPixels blit acceleration for FBO destinations.
...
This was another opportunity to either get clipped to screen size or not get
clipped enough and draw outside of object boundaries.
2008-12-06 22:41:51 -08:00
Eric Anholt
cb433d91c6
intel: Fix glBitmap blit acceleration for FBO destinations.
...
Bug #18914 . Fixes fbo_firecube hang due to drawing outside the FBO bounds.
Thanks to Pierre Willenbrock for debugging the issue.
2008-12-06 22:41:51 -08:00
Jakob Bornecrantz
54a6dcb70f
i915: Silence warnings
2008-12-05 17:24:34 +01:00
Brian
6e0f8b174d
mesa: assorted clean-ups, updated comments, etc.
2008-12-05 09:20:06 -07:00
Brian
249e1e4d30
mesa: replace large macros with inline functions
2008-12-05 09:20:06 -07:00
Brian
b9604fe769
softpipe: plug in softpipe's texture samplers into draw module.
2008-12-04 09:58:54 -07:00
Brian
f2bccfd3c8
gallium: added draw_texture_samplers() to support texture fetches from vertex shaders
...
This may only be practical for the softpipe driver at this time.
2008-12-04 09:58:54 -07:00
Brian
1d9360b678
gallium: query PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS to set ctx->Constants.MaxVertexTextureImageUnits
2008-12-04 09:58:54 -07:00
Brian
7eb8b37735
gallium: added PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS query
2008-12-04 09:58:54 -07:00
Brian
9271662ae9
gallium: check vertex shaders for samplers/texture usage as we do for fragment shaders
2008-12-04 09:58:54 -07:00
Brian
39091cc638
demos: added simple vertex shader texture test.
...
Draw a quadmesh where Z coord is taken from a texture map.
2008-12-03 18:55:25 -07:00
Jeremy Huddleston
f18880038b
darwin: Use -Os instead of -O2
...
(cherry picked from commit 456dbb143a0d11b69d8af0d493cd84efb0596273)
2008-12-03 17:03:35 -08:00
Eric Anholt
264cba6f70
i965: Fix failure to upload new constant data when changing programs.
...
This is fallout from the ffvertex_prog.c work. It doesn't call
ProgramStringNotify, so we don't set param_state, so we wouldn't track when
VP parameters changed, and constants wouldn't get uploaded. Instead, remove
param_state entirely and just use the real value that we want to be tracking.
Fixes rendering in openarena since BRW_NEW_BATCH got disentangled from
BRW_NEW_INDICES.
Bug #18822 .
2008-12-03 11:45:16 -08:00
Eric Anholt
8a1e7086c7
i965: Fix stray character that the compile whined about.
2008-12-03 11:30:58 -08:00
Younes Manton
4371a24c32
nouveau: Calc pitch for swizzled textures appropriately.
2008-12-02 16:15:13 -05:00
Younes Manton
25eee19cd6
mesa: Update some .gitignore files.
2008-12-02 16:15:13 -05:00
Younes Manton
6b4776df35
nouveau: Use swizzled textures & render targets on nv40 when possible.
2008-12-02 16:15:12 -05:00
Younes Manton
a6b7c0bcbe
nouveau: nv04-nv40 linear <-> swizzled conversion.
2008-12-02 16:15:12 -05:00
Younes Manton
1c22c04525
gallium: Make room for custom PIPE_TEXTURE_USAGE_* flags.
2008-12-02 16:15:12 -05:00
Younes Manton
d585fdf318
g3dvl: Map/unmap incoming block texture once per frame.
...
(Technically once per flush, but we flush once per frame.)
2008-12-02 16:15:12 -05:00
Younes Manton
c064d5a1ba
g3dvl: Use texture instead of surface for backbuffer.
2008-12-02 16:15:12 -05:00
Younes Manton
bacacd5ada
g3dvl: Move MC shaders to a seperate file, #included in the original.
2008-12-02 16:15:12 -05:00
Kristian Høgsberg
154a9e5317
Bump dri2proto requirement to 1.99.3, drop CopyRegion bitmask from protocol.
2008-12-01 21:44:03 -05:00
Dave Airlie
cd031749a7
intel: restore old vertex submit paths for i8xx hardware.
...
Intel docs state that only 830/845 have VBOs, 855/865 don't. So
lets just not use them on i8xx at all.
This restores the old pre-vbo code and uses it on all 8xx hw.
2008-12-02 20:31:14 +10:00
Brian
36b941cdbf
softpipe: minor tweaks, clean-ups
2008-12-01 18:36:56 -07:00
Brian
38bee46e83
softpipe: compute nearest/linear texcoords four at a time.
...
A small step toward SIMD-izing the code.
2008-12-01 18:36:56 -07:00
Brian
dd55083ac1
gallium: minor texture-related clean-ups, comments, etc
2008-12-01 18:36:56 -07:00
Brian
1e2f574251
mesa: fix conditional in save_Lightfv(), bug 18838
2008-12-01 18:32:47 -07:00
José Fonseca
129c6ed678
scons: Target Windows XP on userspace.
2008-12-01 11:53:26 -08:00
Pekka Paalanen
dbcfc0dcde
Nouveau: minor winsys API fix
...
Signed-off-by: Pekka Paalanen <pq@iki.fi>
2008-11-30 20:54:02 +02:00
Pekka Paalanen
bb29d066dc
Nouveau: nv{10,20} set_primitive API fix
...
Also changes nvgl_primitive() to return zero, i.e. error, on unknown
primitive.
Signed-off-by: Pekka Paalanen <pq@iki.fi>
2008-11-30 20:40:55 +02:00
Pekka Paalanen
830e4a6ec3
Nouveau: nv20 build fix: forgotten include
...
Signed-off-by: Pekka Paalanen <pq@iki.fi>
2008-11-30 20:35:29 +02:00
Pekka Paalanen
fd645c7f8a
Nouveau: fix minor API change in surface_copy
...
Signed-off-by: Pekka Paalanen <pq@iki.fi>
2008-11-30 20:32:14 +02:00
Pekka Paalanen
578af7d6f6
Nouveau: update nouveau_class.h
...
Fresh from renouveau.
Signed-off-by: Pekka Paalanen <pq@iki.fi>
2008-11-30 20:04:28 +02:00
Pekka Paalanen
988ece3b42
Nouveau: nv20 (nv10) immediate vertex submission
...
This is nv10 commands, but is in nv20 source files.
Signed-off-by: Pekka Paalanen <pq@iki.fi>
2008-11-30 12:16:45 +02:00
Pekka Paalanen
3cb0858510
Nouveau: properly redo nv20_vertex_layout.
...
This is still for NV10 hardware.
Signed-off-by: Pekka Paalanen <pq@iki.fi>
2008-11-30 12:07:49 +02:00
Eric Anholt
e476acb105
i965: Add a new state flag BRW_NEW_NR_SURFACES instead of CACHE_NEW_SURFACE
...
The CACHE_NEW_SURFACE bit always gets spammed since we get many different
surface BOs per state emit, but the only consumer of it wanted to just know
how many surfaces were enabled.
2008-11-28 17:09:46 -08:00
Eric Anholt
8e5639577c
i965: Fix clashing enums for BRW_NEW_INDICES/VERTICES versus BATCH/DEPTH_BUFFER.
...
Fixes upload of large amounts of state for every new primitive emit.
2008-11-28 17:09:46 -08:00
Eric Anholt
287d719a93
i965: Remove BRW_WM_LOCK dirty bit, introduced to work around lack of relocs.
...
This was causing a prepare of wm state at every primitive emit.
2008-11-28 17:09:46 -08:00
Eric Anholt
3f973de07c
i965: Add debug code for dumping how frequently different dirty bits are set.
2008-11-28 17:09:46 -08:00
Eric Anholt
8e76ac070d
i915: Remove dead early z enable bit which was always on.
2008-11-28 17:09:46 -08:00
Eric Anholt
7855b2aef6
i965: Reduce fast-pathiness of brw_try_draw_prims, bringing in important checks.
...
Later primitives, even if they caused a full state validate, wouldn't check
that there was enough space in the batchbuffer, occasionally triggering the
sanity check. We also skipped the aperture space check, even if it would
mean bringing in new programs and associated state.
2008-11-28 17:09:45 -08:00