OSDN Git Service
Alan Hourihane [Fri, 12 Dec 2008 23:02:13 +0000 (23:02 +0000)]
Merge commit 'origin/master' into gallium-0.2
Alan Hourihane [Fri, 12 Dec 2008 20:37:21 +0000 (20:37 +0000)]
mesa: move declaration
Alan Hourihane [Fri, 12 Dec 2008 20:31:39 +0000 (20:31 +0000)]
mesa: when we have interleaved arrays, check bounds for both
VBO's and user space objects
Patrice Mandin [Fri, 12 Dec 2008 16:22:41 +0000 (17:22 +0100)]
nouveau: remove useless NOUVEAU_BO_SWIZZLED flag, copy/paste nv40 work to swizzle textures
Roland Scheidegger [Fri, 12 Dec 2008 04:09:56 +0000 (05:09 +0100)]
gallium: fixes for srgb, new srgb formats
add some more srgb texture formats, including compressed ones
various fixes relating to srgb formats
issues: the util code for generating mipmaps will not handle srgb formats
correctly (would need to use a linear->srgb conversion shader)
Roland Scheidegger [Fri, 12 Dec 2008 04:06:48 +0000 (05:06 +0100)]
mesa: fixes for srgb, new srgb formats
add some more srgb texture formats, including compressed ones
various fixes relating to srgb formats
issues: _mesa_get_teximage is completely broken for srgb textures,
both for non-compressed ones (swizzling) and compressed ones
(shouldn't do standard-to-linear conversion)
texelFetch function may be broken for little or big endian
(or both...)
Xiang, Haihao [Fri, 12 Dec 2008 02:02:05 +0000 (10:02 +0800)]
intel: check for null texture. (fix #13902)
Alan Hourihane [Thu, 11 Dec 2008 15:10:55 +0000 (15:10 +0000)]
gallium: catch vertex overflow higher up
Xiang, Haihao [Thu, 11 Dec 2008 06:03:00 +0000 (14:03 +0800)]
i915: fallback for cube map texture.
The i915 (and related graphics cores) only support TEXCOORDMODE_CLAMP and
TEXCOORDMODE_CUBE when using cube map texture coordinates, so fall back to
software rendering for other modes to avoid potential gpu hang issue. This
fixes scorched3d issue on 945GM(see bug 14539).
Brian Paul [Thu, 11 Dec 2008 01:21:40 +0000 (18:21 -0700)]
gallium: added missing brace to fix broken build
Brian Paul [Thu, 11 Dec 2008 01:11:31 +0000 (18:11 -0700)]
Merge commit 'origin/gallium-0.1' into gallium-0.2
Brian Paul [Thu, 11 Dec 2008 01:02:27 +0000 (18:02 -0700)]
gallium: added draw_set_mrd() function to fix polygon offset
The Minimum Resolvable Depth factor depends on the driver and can't just
be computed from the number of Z buffer bits.
Glean's polygon offset test now passes with softpipe.
Still need to determine the MRD factor for other gallium drivers, if they use
the draw module's polygon offset stage...
Brian Paul [Thu, 11 Dec 2008 01:00:59 +0000 (18:00 -0700)]
gallium: only mark back color buffer surfaces as undefined after swapbuffers
Marking all surfaces as undefined was wrong and cause some glean failures
because glReadPixels was used after SwapBuffers.
Brian Paul [Thu, 11 Dec 2008 01:00:36 +0000 (18:00 -0700)]
gallium: restore default_depth_bits() call in xlib winsys
This was accidentally disabled in a long-ago commit.
Alan Hourihane [Wed, 10 Dec 2008 20:21:19 +0000 (20:21 +0000)]
gallium: change 65535 to UNDEFINED_VERTEX_ID
Keith Whitwell [Tue, 25 Nov 2008 20:02:00 +0000 (20:02 +0000)]
mesa: more trivial tests
Keith Whitwell [Tue, 9 Dec 2008 16:57:53 +0000 (16:57 +0000)]
util: new funcs for triming/validating primitives
Keith Whitwell [Tue, 9 Dec 2008 16:54:16 +0000 (16:54 +0000)]
draw: add const qualifiers
Alan Hourihane [Wed, 10 Dec 2008 12:02:24 +0000 (12:02 +0000)]
gallium: more vertex count checks
Alan Hourihane [Wed, 10 Dec 2008 11:30:46 +0000 (11:30 +0000)]
gallium: temporary check for > 65535 vertices
Guillaume Melquiond [Tue, 9 Dec 2008 21:15:05 +0000 (13:15 -0800)]
tnl: Fix zeroing of the 3ub part of a 3ub+1ub attrib pair in SSE.
Bug #16520.
Guillaume Melquiond [Tue, 9 Dec 2008 21:10:56 +0000 (13:10 -0800)]
tnl: Optimize SSE load[23]f_1 since they don't need the identity swizzle.
SSE movss from memory zeroes out everything above the destination dword, so
we get the (a, 0) or (a, 0, 0) result that these functions needed.
Bug #16520.
Guillaume Melquiond [Tue, 9 Dec 2008 19:42:24 +0000 (11:42 -0800)]
tnl: Fix typo that resulted in fallback from SSE for EMIT_3UB_3F_RGB/BGR.
Bug #16520
Guillaume Melquiond [Tue, 9 Dec 2008 17:29:08 +0000 (09:29 -0800)]
tnl: Avoid undefined input value use in insert_3f_viewport_2().
Bug #16520.
Alan Hourihane [Tue, 9 Dec 2008 16:17:57 +0000 (16:17 +0000)]
Merge commit 'origin/master' into gallium-0.2
Alan Hourihane [Tue, 9 Dec 2008 16:17:45 +0000 (16:17 +0000)]
Merge commit 'origin/gallium-0.1' into gallium-0.2
José Fonseca [Tue, 9 Dec 2008 10:37:25 +0000 (19:37 +0900)]
python/retrace: Dump indices too.
José Fonseca [Tue, 9 Dec 2008 10:35:52 +0000 (19:35 +0900)]
gallium: Abort by default on windows user space.
Pierre Willenbrock [Mon, 8 Dec 2008 22:06:51 +0000 (14:06 -0800)]
intel: Require the right amount of space in glBitmap blit acceleration.
This leads to problems when the batchbuffer is flushed, but the bitmap
data could not fit into it.
Alan Hourihane [Mon, 8 Dec 2008 15:03:29 +0000 (15:03 +0000)]
fix conflict breakage
Alan Hourihane [Mon, 8 Dec 2008 14:29:50 +0000 (14:29 +0000)]
Merge commit 'origin/master' into gallium-0.2
Conflicts:
progs/glsl/Makefile
José Fonseca [Mon, 8 Dec 2008 08:26:02 +0000 (17:26 +0900)]
python/retrace: Dump vertex buffer contents.
Pekka Paalanen [Sat, 6 Dec 2008 23:05:54 +0000 (01:05 +0200)]
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>
Eric Anholt [Sun, 7 Dec 2008 05:14:56 +0000 (21:14 -0800)]
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.
Eric Anholt [Sat, 6 Dec 2008 23:47:23 +0000 (15:47 -0800)]
intel: Fall back on rendering to a texture attachment with a border.
Fixes a segfault in oglconform fbo.c test.
Eric Anholt [Sat, 6 Dec 2008 23:21:47 +0000 (15:21 -0800)]
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.
Eric Anholt [Wed, 3 Dec 2008 23:32:51 +0000 (15:32 -0800)]
intel: Put CopyTexImage fallback under DEBUG_FALLBACKS not DEBUG_TEXTURE.
Eric Anholt [Sat, 6 Dec 2008 22:51:17 +0000 (14:51 -0800)]
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.
Eric Anholt [Sat, 6 Dec 2008 22:21:12 +0000 (14:21 -0800)]
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.
Jakob Bornecrantz [Sun, 16 Nov 2008 11:33:58 +0000 (12:33 +0100)]
i915: Silence warnings
Brian [Sun, 30 Nov 2008 00:25:44 +0000 (17:25 -0700)]
mesa: assorted clean-ups, updated comments, etc.
Brian [Sat, 29 Nov 2008 23:03:40 +0000 (16:03 -0700)]
mesa: replace large macros with inline functions
Brian [Wed, 3 Dec 2008 05:40:08 +0000 (22:40 -0700)]
softpipe: plug in softpipe's texture samplers into draw module.
Brian [Wed, 3 Dec 2008 05:38:46 +0000 (22:38 -0700)]
gallium: added draw_texture_samplers() to support texture fetches from vertex shaders
This may only be practical for the softpipe driver at this time.
Brian [Wed, 3 Dec 2008 05:37:35 +0000 (22:37 -0700)]
gallium: query PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS to set ctx->Constants.MaxVertexTextureImageUnits
Brian [Wed, 3 Dec 2008 05:36:27 +0000 (22:36 -0700)]
gallium: added PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS query
Brian [Wed, 3 Dec 2008 03:10:32 +0000 (20:10 -0700)]
gallium: check vertex shaders for samplers/texture usage as we do for fragment shaders
Brian [Wed, 3 Dec 2008 05:51:39 +0000 (22:51 -0700)]
demos: added simple vertex shader texture test.
Draw a quadmesh where Z coord is taken from a texture map.
Jeremy Huddleston [Thu, 4 Dec 2008 01:03:13 +0000 (17:03 -0800)]
darwin: Use -Os instead of -O2
(cherry picked from commit
456dbb143a0d11b69d8af0d493cd84efb0596273)
Eric Anholt [Wed, 3 Dec 2008 19:36:55 +0000 (11:36 -0800)]
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.
Eric Anholt [Wed, 3 Dec 2008 19:30:58 +0000 (11:30 -0800)]
i965: Fix stray character that the compile whined about.
Younes Manton [Tue, 2 Dec 2008 21:12:49 +0000 (16:12 -0500)]
nouveau: Calc pitch for swizzled textures appropriately.
Younes Manton [Tue, 2 Dec 2008 05:23:30 +0000 (00:23 -0500)]
mesa: Update some .gitignore files.
Younes Manton [Tue, 2 Dec 2008 04:48:29 +0000 (23:48 -0500)]
nouveau: Use swizzled textures & render targets on nv40 when possible.
Younes Manton [Tue, 2 Dec 2008 03:24:19 +0000 (22:24 -0500)]
nouveau: nv04-nv40 linear <-> swizzled conversion.
Younes Manton [Tue, 2 Dec 2008 03:08:59 +0000 (22:08 -0500)]
gallium: Make room for custom PIPE_TEXTURE_USAGE_* flags.
Younes Manton [Mon, 24 Nov 2008 22:31:25 +0000 (17:31 -0500)]
g3dvl: Map/unmap incoming block texture once per frame.
(Technically once per flush, but we flush once per frame.)
Younes Manton [Sun, 23 Nov 2008 19:06:20 +0000 (14:06 -0500)]
g3dvl: Use texture instead of surface for backbuffer.
Younes Manton [Sun, 23 Nov 2008 18:28:01 +0000 (13:28 -0500)]
g3dvl: Move MC shaders to a seperate file, #included in the original.
Kristian Høgsberg [Tue, 2 Dec 2008 02:44:03 +0000 (21:44 -0500)]
Bump dri2proto requirement to 1.99.3, drop CopyRegion bitmask from protocol.
Dave Airlie [Fri, 28 Nov 2008 09:38:47 +0000 (19:38 +1000)]
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.
Brian [Sun, 30 Nov 2008 00:56:41 +0000 (17:56 -0700)]
softpipe: minor tweaks, clean-ups
Brian [Fri, 28 Nov 2008 18:32:32 +0000 (11:32 -0700)]
softpipe: compute nearest/linear texcoords four at a time.
A small step toward SIMD-izing the code.
Brian [Fri, 28 Nov 2008 17:28:44 +0000 (10:28 -0700)]
gallium: minor texture-related clean-ups, comments, etc
Brian [Tue, 2 Dec 2008 01:32:47 +0000 (18:32 -0700)]
mesa: fix conditional in save_Lightfv(), bug 18838
José Fonseca [Mon, 1 Dec 2008 19:53:26 +0000 (11:53 -0800)]
scons: Target Windows XP on userspace.
Pekka Paalanen [Sun, 30 Nov 2008 18:54:02 +0000 (20:54 +0200)]
Nouveau: minor winsys API fix
Signed-off-by: Pekka Paalanen <pq@iki.fi>
Pekka Paalanen [Sun, 30 Nov 2008 18:40:55 +0000 (20:40 +0200)]
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>
Pekka Paalanen [Sun, 30 Nov 2008 18:35:29 +0000 (20:35 +0200)]
Nouveau: nv20 build fix: forgotten include
Signed-off-by: Pekka Paalanen <pq@iki.fi>
Pekka Paalanen [Sun, 30 Nov 2008 18:32:14 +0000 (20:32 +0200)]
Nouveau: fix minor API change in surface_copy
Signed-off-by: Pekka Paalanen <pq@iki.fi>
Pekka Paalanen [Sun, 30 Nov 2008 18:04:28 +0000 (20:04 +0200)]
Nouveau: update nouveau_class.h
Fresh from renouveau.
Signed-off-by: Pekka Paalanen <pq@iki.fi>
Pekka Paalanen [Sat, 29 Nov 2008 19:21:12 +0000 (21:21 +0200)]
Nouveau: nv20 (nv10) immediate vertex submission
This is nv10 commands, but is in nv20 source files.
Signed-off-by: Pekka Paalanen <pq@iki.fi>
Pekka Paalanen [Sat, 29 Nov 2008 21:02:06 +0000 (23:02 +0200)]
Nouveau: properly redo nv20_vertex_layout.
This is still for NV10 hardware.
Signed-off-by: Pekka Paalanen <pq@iki.fi>
Eric Anholt [Fri, 28 Nov 2008 20:43:10 +0000 (12:43 -0800)]
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.
Eric Anholt [Fri, 28 Nov 2008 20:16:51 +0000 (12:16 -0800)]
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.
Eric Anholt [Fri, 28 Nov 2008 19:58:00 +0000 (11:58 -0800)]
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.
Eric Anholt [Thu, 27 Nov 2008 20:26:00 +0000 (12:26 -0800)]
i965: Add debug code for dumping how frequently different dirty bits are set.
Eric Anholt [Thu, 27 Nov 2008 04:42:59 +0000 (20:42 -0800)]
i915: Remove dead early z enable bit which was always on.
Eric Anholt [Thu, 27 Nov 2008 03:22:37 +0000 (19:22 -0800)]
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.
Brian Paul [Fri, 28 Nov 2008 23:17:38 +0000 (16:17 -0700)]
mesa: add missing break statements
Brian Paul [Fri, 28 Nov 2008 21:08:04 +0000 (14:08 -0700)]
mesa: enable texture compression extensions for software drivers when possible
Phillip Klaus Krause [Fri, 28 Nov 2008 20:54:08 +0000 (13:54 -0700)]
mesa: remove unneeded compressed texure size checks
Brian Paul [Fri, 28 Nov 2008 20:50:41 +0000 (13:50 -0700)]
mesa: fix default switch case in append_token(), see bug 18734
Alan Hourihane [Fri, 28 Nov 2008 16:19:10 +0000 (16:19 +0000)]
Merge commit 'origin/master' into gallium-0.2
Alan Hourihane [Fri, 28 Nov 2008 16:18:36 +0000 (16:18 +0000)]
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
src/gallium/auxiliary/tgsi/tgsi_sse2.c
Brian Paul [Thu, 27 Nov 2008 18:01:30 +0000 (11:01 -0700)]
mesa: remove an assertion (see bug 18734)
RALOVICH, Kristóf [Thu, 27 Nov 2008 11:53:43 +0000 (12:53 +0100)]
Revert "glx: xcbified visual and FBConfig choosing"
This reverts commit
62688f11355cfa865d420755aa159875b425cc9b.
RALOVICH, Kristóf [Thu, 27 Nov 2008 11:53:19 +0000 (12:53 +0100)]
Revert "glx: revert using nonexsisten XCB version of glXGetFBConfigsSGIX"
This reverts commit
53698765019e50172be25a4ff48c83d54f0e7981.
Michal Krol [Wed, 26 Nov 2008 21:29:49 +0000 (22:29 +0100)]
tgsi: Reenable OPCODE_ARR.
RALOVICH, Kristóf [Sat, 8 Nov 2008 17:18:26 +0000 (18:18 +0100)]
glx: revert using nonexsisten XCB version of glXGetFBConfigsSGIX
This uses a GLX VendorPrivate request. VendorPrivates are real GLX API
calls but use the same protocol request. XCB does not currently
support specific VendorPrivetes directly. See eg.:
http://lists.freedesktop.org/archives/xcb/2008-November/004036.html
for more information.
RALOVICH, Kristóf [Sat, 8 Nov 2008 16:58:55 +0000 (17:58 +0100)]
glx: remove XCB debug leftover
RALOVICH, Kristóf [Tue, 4 Nov 2008 16:30:21 +0000 (17:30 +0100)]
glx: xcbified glXSwapBuffers
RALOVICH, Kristóf [Tue, 4 Nov 2008 16:17:18 +0000 (17:17 +0100)]
glx: xcbified visual and FBConfig choosing
RALOVICH, Kristóf [Tue, 4 Nov 2008 11:41:55 +0000 (12:41 +0100)]
glx: xcbified __glXClientInfo
RALOVICH, Kristóf [Tue, 4 Nov 2008 10:53:32 +0000 (11:53 +0100)]
configure.ac: advertise XCB
RALOVICH, Kristóf [Tue, 4 Nov 2008 10:31:53 +0000 (11:31 +0100)]
glx: no graphics context during initialization
RALOVICH, Kristóf [Tue, 4 Nov 2008 09:59:39 +0000 (10:59 +0100)]
glx: xcbified __glXIsDirect
RALOVICH, Kristóf [Tue, 4 Nov 2008 09:43:06 +0000 (10:43 +0100)]
glx: missing static on local function
RALOVICH, Kristóf [Mon, 3 Nov 2008 17:32:35 +0000 (18:32 +0100)]
glx: use __glXGetString
RALOVICH, Kristóf [Mon, 3 Nov 2008 17:32:20 +0000 (18:32 +0100)]
glx: use __glXQueryServerString