Brian Paul [Tue, 16 Dec 2008 22:39:14 +0000 (15:39 -0700)]
tgsi: use flr(), not trunc() for ARL
Alan Hourihane [Tue, 16 Dec 2008 09:42:52 +0000 (09:42 +0000)]
gallium: fix some asserts
Ben Skeggs [Tue, 16 Dec 2008 06:34:04 +0000 (17:34 +1100)]
nv40: apply ABS modifier to RSQ source in vp
Gallium used to do this for us :)
Ben Skeggs [Tue, 16 Dec 2008 06:30:04 +0000 (17:30 +1100)]
nouveau: return a value for PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS
Michal Krol [Mon, 15 Dec 2008 11:29:34 +0000 (12:29 +0100)]
gallium: Fix PIPE_FORMAT_X8B8G8R8_SNORM definition.
Alan Hourihane [Mon, 15 Dec 2008 11:22:19 +0000 (11:22 +0000)]
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
src/gallium/winsys/gdi/SConscript
Alan Hourihane [Mon, 15 Dec 2008 11:16:03 +0000 (11:16 +0000)]
Merge commit 'origin/master' into gallium-0.2
Pierre Willenbrock [Fri, 12 Dec 2008 20:18:23 +0000 (21:18 +0100)]
intel: Don't steal renderbuffer from caller in intel_miptree_create_for_region
Fixes double-frees of some regions, once from the renderbuffer code and
once from the miptree itself.
Bug #19062
Eric Anholt [Wed, 10 Dec 2008 20:43:58 +0000 (12:43 -0800)]
i965: Add decode of index/vertex buffer and primitive emit.
Eric Anholt [Wed, 10 Dec 2008 07:02:48 +0000 (23:02 -0800)]
intel: Add batchbuffer assertions to hopefully catch future mistakes.
Ian Romanick [Mon, 15 Dec 2008 02:42:11 +0000 (18:42 -0800)]
Perform range checking on app supplied texture base level
It is possible for applications to specify any texture base level,
including trivially invalid values (i.e.,
47000000). When an app
specifies an invalide base level, we should gracefully disable the
texture instead of accessing memory outside the gl_texture_object.
This fixes an occasional segfault in one of our conformance tests.
Ian Romanick [Mon, 15 Dec 2008 02:40:39 +0000 (18:40 -0800)]
GLX: Include glapi.h before glapitable.h
A previous commit (
2dbc515a669be123a019aeb4aa5aae6b1679f6a9) change
some of the interdependencies between these two header files. Now
glapi.h must be included before glapitable.h.
Ian Romanick [Fri, 12 Dec 2008 20:59:59 +0000 (12:59 -0800)]
GLX: Change resulting from previous commit
Commit
db61cbfa2aa241da49589331d8b6875d9a77d826 made modifications to
the protocol generator data and scripts. This commit represents the
changes to the generated files resulting from the previous changes.
This is the client-side part of the fix for bugzilla #11003.
Neil Roberts [Tue, 2 Dec 2008 15:03:01 +0000 (15:03 +0000)]
Return 0 as the request size when the pixels parameter is NULL
img_null_flag was being ignored when calculating the size of a request
so a BadLength error gets thrown for glTexImage3D when the pixels
parameter is NULL.
See bug #11003
Ian Romanick [Tue, 9 Dec 2008 22:43:09 +0000 (14:43 -0800)]
GLX: Fix protocol for glTexSubImage#D
The TexSubImage commands do not have the "NULL image" flag that was
introduced with glTexImage3D. However, there is a CARD32 pad element
where that flag would be. Removing the img_null_flag causes the flag
to be removed from the protocol. This changes the protocol and breaks
everything.
In order to prevent needing to hand-code all of the TexSubImage
functions, a new attribute was added to the param element. This new
attribute, called "padding," is a boolean flag that selects whether or
not the parameter is a real parameter (default / false) or is protocol
padding (true) that does not appear in the function's parameter list.
This change resulted in a number of changes to other Python scripts.
In almost all cases parameters with the is_padding flag set should not
be emitted.
This patch only changes the the XML, the DTD, and the generator
scripts. It does NOT include the resulting changes to the generated
code. Generated code in the X server is also changed by the script /
XML changes in this patch.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Dan Nicholson [Sun, 14 Dec 2008 17:35:29 +0000 (09:35 -0800)]
Add OSMesa pkg-config file
This makes the GLU .pc file a little simpler, too.
Dan Nicholson [Mon, 24 Nov 2008 19:01:57 +0000 (11:01 -0800)]
Add more package metadata to the pkg-config files
The pkg-config files have been filled in more thoroughly to allow users
to use mesa more effectively. By adding metadata to Requires.private,
Libs.private and Cflags, we can ensure that all the libraries and
headers will be found in all situations. However, the full substitutions
are only done when using the configure script.
This also fixes the glu pkg-config file to account for using GL or
OSMesa.
Fixes bug 18161.
Gary Wong [Sun, 14 Dec 2008 03:06:21 +0000 (20:06 -0700)]
Fix silly type mismatch error in multinoise demo.
Gary Wong [Sat, 13 Dec 2008 21:15:33 +0000 (14:15 -0700)]
i965: Finish OPCODE_NOISEn instructions.
Added missing OPCODE_NOISE4, and use BRW_REGISTER_TYPE_D (instead of _UD)
in the initial RNDD instructions (which avoids saturating negative inputs
to 0).
Gary Wong [Sat, 13 Dec 2008 21:00:37 +0000 (14:00 -0700)]
Add "multinoise" demo, to test 1/2/3/4 dimensional noise.
Gary Wong [Sat, 13 Dec 2008 19:58:18 +0000 (12:58 -0700)]
Ensure p.w is initialised in noise demo.
Pekka Paalanen [Sat, 13 Dec 2008 21:24:39 +0000 (23:24 +0200)]
Nouveau: move the definition of log2i() to header
Also make the type unsigned instead of signed, since negative
values do not make sense.
Signed-off-by: Pekka Paalanen <pq@iki.fi>
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
Keith Whitwell [Fri, 12 Dec 2008 18:34:49 +0000 (18:34 +0000)]
gallium: fix refcount bug introduced in
eb20e2984
Keith Whitwell [Fri, 12 Dec 2008 17:41:49 +0000 (17:41 +0000)]
Merge branch 'no-validate' into gallium-0.1
Keith Whitwell [Fri, 12 Dec 2008 16:46:34 +0000 (16:46 +0000)]
gallium: avoid mapping same vertex buffer in subsequent frames
Quite a few util modules were maintaining a single vertex buffer over multiple
frames, and potentially reusing it in subsequent frames. Unfortunately that
would force us into syncrhonous rendering as the buffer manager would be
forced to wait for the previous rendering to complete prior to allowing the
map.
This resolves that issue, but requires the state tracker to issue a few new
flush() calls at the end of each frame.
Keith Whitwell [Wed, 10 Dec 2008 15:43:21 +0000 (15:43 +0000)]
st: reduce unnecessary calls to pipe->set_vertex_buffers()
Keith Whitwell [Wed, 10 Dec 2008 15:42:28 +0000 (15:42 +0000)]
st: move feedback draw function to new file
Keith Whitwell [Wed, 10 Dec 2008 15:41:48 +0000 (15:41 +0000)]
st: don't unilaterally ABS the argument to RSQ
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
Keith Whitwell [Fri, 12 Dec 2008 12:05:39 +0000 (12:05 +0000)]
Revert "pipebuffer: Implement proper buffer validation."
This reverts commit
a6d866f72c88d48d2bcfb3e3c882fdb639b5a8ce.
Keith Whitwell [Fri, 12 Dec 2008 12:05:30 +0000 (12:05 +0000)]
Revert "pipebuffer: Ondemand buffer manager."
This reverts commit
17849eafaacfbb2124d86f561a91b707317d3b31.
Keith Whitwell [Fri, 12 Dec 2008 12:05:21 +0000 (12:05 +0000)]
Revert "pipebuffer: Fix buffer overflow."
This reverts commit
55839ae064d64b7fcc180fcddb364bf31ab760dc.
José Fonseca [Thu, 20 Nov 2008 20:26:52 +0000 (05:26 +0900)]
glut: MinGW portability fixes.
Still, it doesn't run as well as the glut binaries...
José Fonseca [Thu, 20 Nov 2008 20:25:31 +0000 (05:25 +0900)]
gdi: Reimplement using the WGL statetracker.
José Fonseca [Thu, 20 Nov 2008 20:24:35 +0000 (05:24 +0900)]
mesa: Bring in new mesa sub-statetracker.
Some code cleanup is still in order.
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...)
José Fonseca [Fri, 12 Dec 2008 03:37:21 +0000 (12:37 +0900)]
scons: Build progs.
Just demos and trivial dirs for starters.
Conflicts:
.gitignore
Xiang, Haihao [Fri, 12 Dec 2008 02:02:05 +0000 (10:02 +0800)]
intel: check for null texture. (fix #13902)
José Fonseca [Fri, 12 Dec 2008 00:44:47 +0000 (09:44 +0900)]
scons: Allow to request the winddk toolchain.
Alan Hourihane [Thu, 11 Dec 2008 15:10:55 +0000 (15:10 +0000)]
gallium: catch vertex overflow higher up
Keith Whitwell [Wed, 10 Dec 2008 15:43:21 +0000 (15:43 +0000)]
st: reduce unnecessary calls to pipe->set_vertex_buffers()
Keith Whitwell [Wed, 10 Dec 2008 15:42:28 +0000 (15:42 +0000)]
st: move feedback draw function to new file
Keith Whitwell [Wed, 10 Dec 2008 15:41:48 +0000 (15:41 +0000)]
st: don't unilaterally ABS the argument to RSQ
Michal Krol [Thu, 11 Dec 2008 12:55:55 +0000 (13:55 +0100)]
softpipe: Add missing header include.
Michal Krol [Thu, 11 Dec 2008 12:54:05 +0000 (13:54 +0100)]
draw: Silencium compiler warnings on Windows.
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.