OSDN Git Service
Brian Paul [Wed, 7 Oct 2009 20:42:14 +0000 (14:42 -0600)]
mesa/xlib: call XQueryExtension() in glXQueryExtension()
See bug 24321.
Brian Paul [Wed, 7 Oct 2009 20:07:49 +0000 (14:07 -0600)]
mesa: don't need to free textures, VBOs, etc. in _mesa_meta_free()
They're freed by the normal context deallocation code.
Fixes Blender crash, bug 24185.
Nicolai Hähnle [Sat, 3 Oct 2009 14:30:16 +0000 (16:30 +0200)]
shader_api: Fix bounds checking of glUniform and glUniformMatrix
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Nicolai Hähnle [Sat, 3 Oct 2009 14:18:57 +0000 (16:18 +0200)]
prog_parameter: Document the fact that Size may be > 4
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
Brian Paul [Wed, 7 Oct 2009 15:41:00 +0000 (09:41 -0600)]
docs: fix glXQueryDrawable() bugs
Brian Paul [Wed, 7 Oct 2009 15:40:22 +0000 (09:40 -0600)]
mesa/xlib: fix glXQueryDrawable() bugs, see bug 24320
Brian Paul [Wed, 7 Oct 2009 15:40:04 +0000 (09:40 -0600)]
gallium/xlib: fix glXQueryDrawable() bugs, see bug 24320
Brian Paul [Wed, 7 Oct 2009 15:11:23 +0000 (09:11 -0600)]
progs/xdemos: test glXQueryDrawable()
Brian Paul [Wed, 7 Oct 2009 15:10:48 +0000 (09:10 -0600)]
progs/xdemos: fix swapped parameters to CreatePbuffer()
Brian Paul [Wed, 7 Oct 2009 14:07:53 +0000 (08:07 -0600)]
swrast: s/GLfloat/GLuint/ in bzero()
Brian Paul [Wed, 7 Oct 2009 01:05:23 +0000 (19:05 -0600)]
swrast: add missing returns
Vinson Lee [Wed, 7 Oct 2009 13:54:31 +0000 (07:54 -0600)]
progs/test: Fix MSVC build.
Brian Paul [Wed, 7 Oct 2009 13:45:15 +0000 (07:45 -0600)]
mesa/xlib: return 0 for errorBase, eventBase in glXQueryExtension()
A little better than leaving the values undefined, I think.
See bug 24321.
Brian Paul [Wed, 7 Oct 2009 13:43:12 +0000 (07:43 -0600)]
gallium/xlib: return 0 for errorBase, eventBase in glXQueryExtension()
A little better than leaving the values undefined, I think.
See bug 24321.
Brian Paul [Mon, 5 Oct 2009 20:26:16 +0000 (14:26 -0600)]
intel: use driReadDrawable in do_copy_texsubimage()
Brian Paul [Mon, 5 Oct 2009 20:25:36 +0000 (14:25 -0600)]
intel: use driReadDrawable, not driDrawable in do_blit_readpixels()
Brian Paul [Mon, 5 Oct 2009 20:07:29 +0000 (14:07 -0600)]
intel: remove a buffer equality test in _mesa_make_current()
Before, if we called glXMakeCurrent() to change a context's window binding
while an FBO was bound, we weren't updating the intel->driDrawable and
intel->driReadDrawable fields. This could cause us to dereference a null
pointer elsewhere.
Brian Paul [Mon, 5 Oct 2009 17:10:31 +0000 (11:10 -0600)]
mesa: fix return value when clipping {Read,Draw}Pixels height <= 0
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
(cherry picked from master, commit
7aeaca33c331f70d507fc83583b13b8d9fc3e847)
Jon TURNEY [Fri, 24 Jul 2009 19:33:25 +0000 (20:33 +0100)]
Fix building of GLSL demos which use M_PI
Some <math.h> files do not define M_PI, in which case, provide our own definition
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Michel Dänzer [Mon, 5 Oct 2009 10:31:51 +0000 (12:31 +0200)]
Use _mesa_select_tex_image() rather than hardcoding face 0.
Fixes crash loading a map in sauerbraten with
hwmipmap 1
in ~/.sauerbraten/config.cfg.
Frederic Crozat [Sun, 4 Oct 2009 21:46:40 +0000 (17:46 -0400)]
r200: remove subpixel offset from viewport
Fixes bug fdo 20340 for r200.
Nicolai Hähnle [Fri, 2 Oct 2009 23:26:38 +0000 (01:26 +0200)]
r300: Workaround problem on R500 with very large fragment programs
The non-KMS interface is to blame here. In theory, a proper fix
could be produced that works for the KMS interface only, but it
require cleaning a lot of mess. Easier to just do it right in r300g.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
Brian Paul [Fri, 2 Oct 2009 15:58:16 +0000 (09:58 -0600)]
docs: document default texture binding fix
Brian Paul [Fri, 2 Oct 2009 15:55:07 +0000 (09:55 -0600)]
mesa: fix incorrect default texture binding in unbind_texobj_from_texunits()
If we deleted a currently bound texture, we were always reverting the texture
binding to the default 1D texture rather than the proper default texture.
Brian Paul [Fri, 2 Oct 2009 13:52:27 +0000 (07:52 -0600)]
gallium/xlib: use bitwise-and to test GLX_RGBA_BIT in choose_visual()
The parameter is a bitmask.
Brian Paul [Fri, 2 Oct 2009 13:51:15 +0000 (07:51 -0600)]
xlib: use bitwise-and to test GLX_RGBA_BIT in choose_visual()
The parameter is a bitmask.
Brian Paul [Fri, 2 Oct 2009 13:47:49 +0000 (07:47 -0600)]
gallium/xlib: return GLX_RGBA_BIT or GLX_COLOR_INDEX_BIT in get_config()
This reverts part of commit
a6b84aef4ad3a7bac40704146a98977c62bfb6e8
Brian Paul [Fri, 2 Oct 2009 13:31:42 +0000 (07:31 -0600)]
gallium: replace // comments with /* */
Brian Paul [Fri, 2 Oct 2009 13:26:28 +0000 (07:26 -0600)]
gallium: remove // comment and extra whitespace
Brian Paul [Thu, 1 Oct 2009 20:55:13 +0000 (14:55 -0600)]
mesa: fix memory leak when generating mipmaps for compressed textures
Brian Paul [Thu, 1 Oct 2009 20:52:28 +0000 (14:52 -0600)]
mesa: fix mem leaks
Brian Paul [Thu, 1 Oct 2009 20:52:10 +0000 (14:52 -0600)]
gallium/util: silence uninitialized var warning
Brian Paul [Thu, 1 Oct 2009 20:51:43 +0000 (14:51 -0600)]
mesa: add missing return when out of memory
Brian Paul [Thu, 1 Oct 2009 20:51:26 +0000 (14:51 -0600)]
mesa: fix potential uninitialized memory reads
Brian Paul [Thu, 1 Oct 2009 20:50:45 +0000 (14:50 -0600)]
glsl: fix mem leak
Brian Paul [Thu, 1 Oct 2009 20:49:34 +0000 (14:49 -0600)]
st/mesa: check for null before asserts, fix possible mem leak
Brian Paul [Thu, 1 Oct 2009 20:49:04 +0000 (14:49 -0600)]
st/mesa: silence hidden parameter warning
Brian Paul [Thu, 1 Oct 2009 19:34:49 +0000 (13:34 -0600)]
st/mesa: fix non-mipmap lastLevel calculation.
reviewed by Brian Paul.
(cherry picked from master, commit
ae2daacbac7242938cffe0e2409071e030e00863)
Vinson Lee [Thu, 1 Oct 2009 19:33:20 +0000 (13:33 -0600)]
mesa: Return -FLT_MAX instead of 0 for LG2(0).
lim x->0 log(x) = -inf so -FLT_MAX is a better approximation than 0
for LG2(0).
Brian Paul [Tue, 29 Sep 2009 16:24:27 +0000 (10:24 -0600)]
glx: fix glXQueryContext(GLX_RENDER_TYPE)
The renderType parameter to CreateContext() was never used. Also, it
was often passed as zero. Now when it's zero we check if the context
is RGBA or CI mode and set it accordingly.
Fixes bug 24211.
Eric Anholt [Thu, 12 Feb 2009 11:54:58 +0000 (03:54 -0800)]
i965: Fix massive memory allocation for streaming texture usage.
Once we've freed a miptree, we won't see any more state cache requests
that would hit the things that pointed at it until we've let the miptree
get released back into the BO cache to be reused. By leaving those
surface state and binding table pointers that pointed at it around, we
would end up with up to (500 * texture size) in memory uselessly consumed
by the state cache.
Bug #20057
Bug #23530
Brian Paul [Wed, 30 Sep 2009 01:05:04 +0000 (19:05 -0600)]
docs: document GLSL sqrt(0) fix
Brian Paul [Wed, 30 Sep 2009 00:59:37 +0000 (18:59 -0600)]
glsl: regenerated file
Brian Paul [Wed, 30 Sep 2009 00:57:13 +0000 (18:57 -0600)]
glsl: rewrite sqrt(x) intrinsic to handle x=0
Since sqrt() is basically implemented in terms of RSQ/RCP we'll do a
divide by zero if x=0 and wind up with unpredictable results.
Now use CMP instruction to test for x<=0 and return zero in that case.
Brian Paul [Wed, 30 Sep 2009 00:51:49 +0000 (18:51 -0600)]
glsl: add support for CMP instruction
Brian Paul [Tue, 29 Sep 2009 18:18:41 +0000 (12:18 -0600)]
docs: fixed glXQueryContext(GLX_RENDER_TYPE)
Brian Paul [Tue, 29 Sep 2009 18:17:11 +0000 (12:17 -0600)]
gallium/xlib: fix GLX_RENDER_TYPE query
Return GLX_RGBA_TYPE or GLX_COLOR_INDEX_TYPE.
Brian Paul [Tue, 29 Sep 2009 18:16:12 +0000 (12:16 -0600)]
mesa/xlib: fix GLX_RENDER_TYPE query
Return GLX_RGBA_TYPE or GLX_COLOR_INDEX_TYPE.
Brian Paul [Tue, 29 Sep 2009 15:58:47 +0000 (09:58 -0600)]
glx: indentation fixes
Brian Paul [Tue, 29 Sep 2009 15:36:06 +0000 (09:36 -0600)]
mesa: bump version to 7.6.1
Brian Paul [Tue, 29 Sep 2009 15:34:47 +0000 (09:34 -0600)]
docs: initial 7.6.1 release notes
Brian Paul [Tue, 29 Sep 2009 15:32:37 +0000 (09:32 -0600)]
mesa: work-around glXCopyContext() bug in _mesa_copy_texture_state()
See bug 24217.
Brian Paul [Tue, 29 Sep 2009 14:50:56 +0000 (08:50 -0600)]
softpipe: initialize the clear_flags bitvector in sp_create_tile_cache()
This silences tons of valgrind warnings in programs that don't call
glClear(), such as progs/demos/gamma.
Brian Paul [Tue, 29 Sep 2009 14:21:54 +0000 (08:21 -0600)]
softpipe: Grab a ref when the fb is set.
Nasty bug when the surface is freed and another is allocated right on
top of it. The next time we set the fb state SP thinks it's the same
surface and doesn't flush, and when the flush eventually happens the
surface belongs to a completely different texture.
(cherry picked from commit
a77226071f6814a53358a5d6caff685889d0e4ec)
Conflicts:
src/gallium/drivers/softpipe/sp_context.c
Brian Paul [Mon, 28 Sep 2009 19:19:57 +0000 (13:19 -0600)]
docs: update news.html file with 7.5.2 and 7.6 release
Ian Romanick [Mon, 28 Sep 2009 19:02:39 +0000 (12:02 -0700)]
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
Conflicts:
src/mesa/main/version.h
Ian Romanick [Mon, 28 Sep 2009 18:41:23 +0000 (11:41 -0700)]
docs: 7.5.2 md5 sums
Ian Romanick [Mon, 28 Sep 2009 18:33:52 +0000 (11:33 -0700)]
Prep for 7.5.2 release
Ian Romanick [Mon, 28 Sep 2009 18:29:25 +0000 (11:29 -0700)]
docs: 7.6 md5 sums
Ian Romanick [Mon, 28 Sep 2009 18:22:54 +0000 (11:22 -0700)]
Prep for 7.6 release
Brian Paul [Mon, 28 Sep 2009 15:59:59 +0000 (09:59 -0600)]
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
Robert Noland [Tue, 22 Sep 2009 18:49:57 +0000 (11:49 -0700)]
Fix build on non GLIBC platforms (FreeBSD at least)
Build was broken by commit
9666529b5a5be1fcde82caadc2fe2efa5ea81e49
I'm not certain that this is entirely the correct fix since the demo
from bug #23774 seemed to work before the commit that broke the build.
Signed-off-by: Robert Noland <rnoland@2hip.net>
Signed-off-by: Brian Paul <brianp@vmware.com>
Brian Paul [Mon, 28 Sep 2009 15:43:42 +0000 (09:43 -0600)]
docs: list additional 7.5.2 bug fixes
Brian Paul [Mon, 28 Sep 2009 15:38:50 +0000 (09:38 -0600)]
docs: document gallium mipmap generation fix
Brian Paul [Fri, 25 Sep 2009 23:24:27 +0000 (17:24 -0600)]
st/mesa: fix st_generate_mipmap() issues
The main issue is we didn't always have a gallium texture object with
enough space to store the to-be-generated mipmap levels. When that's
the case, allocate a new gallium texture and use st_texure_finalize()
to copy images from the old texture to the new one.
We also had the baseLevel parameter to st_render_mipmap() wrong.
Brian Paul [Mon, 28 Sep 2009 15:28:50 +0000 (09:28 -0600)]
st/mesa: fix/simplify st_texture_object::lastLevel calculation
Don't compute the st_texture_object::lastLevel field based on the texture
filters. Use the _MaxLevel value that core Mesa computes for us.
When called from the GenerateMipmap path, we'll use the lastLevel field
as-is.
Brian Paul [Fri, 25 Sep 2009 23:19:25 +0000 (17:19 -0600)]
gallium/util: add sanity check assertions
Michel Dänzer [Fri, 25 Sep 2009 18:59:44 +0000 (20:59 +0200)]
intel: Handle GL_RGB8 for glCopyTex(Sub)Image.
Avoids an unnecessary fallback.
Vinson Lee [Fri, 25 Sep 2009 14:51:57 +0000 (08:51 -0600)]
mesa: move declaration before code
Eric Anholt [Fri, 25 Sep 2009 03:03:21 +0000 (20:03 -0700)]
i915: Fix GetBufferSubData in the case of a system-memory BO.
Bug #23760 (crashes in wine)
Eric Anholt [Thu, 24 Sep 2009 23:15:52 +0000 (16:15 -0700)]
intel: Flush the batch when we're about to subdata into a VBO.
This fixes the clears in openarena with the new metaops clear code, and
the new piglit vbo-subdata-sync test.
Bug #23857.
Eric Anholt [Thu, 24 Sep 2009 21:53:49 +0000 (14:53 -0700)]
i965: Clean up some mess with the batch cache.
Its flagging of extra state that's already flagged by the vtbl new_batch
when appropriate was confusing my tracking down of the OA clear bug.
Brian Paul [Thu, 24 Sep 2009 22:01:26 +0000 (16:01 -0600)]
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
Vinson Lee [Thu, 24 Sep 2009 21:59:57 +0000 (15:59 -0600)]
softpipe: Increase GL_MAX_3D_TEXTURE_SIZE to 256.
Eric Anholt [Thu, 24 Sep 2009 18:58:33 +0000 (11:58 -0700)]
i965: Emit zero initialization for NV VP temporaries as required.
This is similar to what r300 does inside the driver, but I've added it as
a generic option since it seems most hardware will want it.
Fixes piglit nv-init-zero-reg.vpfp and nv-init-zero-addr.vpfp.
Eric Anholt [Wed, 23 Sep 2009 23:50:59 +0000 (16:50 -0700)]
i965: Remove assert about NV_vp now that it somewhat works.
Eric Anholt [Thu, 24 Sep 2009 17:40:32 +0000 (10:40 -0700)]
i965: Load NV program matrices when required.
Eric Anholt [Wed, 23 Sep 2009 23:49:52 +0000 (16:49 -0700)]
mesa: Initialize NV_vertex_program fields for the parameter lists and such.
This helps let drivers treat NV_vp like ARB_vp.
Brian Paul [Thu, 24 Sep 2009 20:24:14 +0000 (14:24 -0600)]
mesa: remove glEnable(GL_DEPTH_BOUNDS_TEST_EXT) check/warning
At the time of the enable there may not be a Z buffer, but one
may be attached to the FBO later.
Brian Paul [Thu, 24 Sep 2009 20:19:06 +0000 (14:19 -0600)]
mesa: remove rgbMode check in enable_texture()
If the currently bound FBO isn't yet validated it's possible for
rgbMode to be zero so we'll lose the texture enable.
This could fix some FBO rendering glitches, but I don't know of
any specific instances.
Brian Paul [Thu, 24 Sep 2009 18:41:14 +0000 (12:41 -0600)]
intel: use default array/element buffers in intel_generate_mipmap()
If there happened to be a bound VBO when intel_generate_mipmap() was
called we blew up because of a bad vertex array pointer.
Fixes regnumonline, bug 23859.
Brian Paul [Thu, 24 Sep 2009 18:37:34 +0000 (12:37 -0600)]
mesa: replace assertion with no-op function assignment
Brian Paul [Thu, 24 Sep 2009 18:37:06 +0000 (12:37 -0600)]
mesa: added comment
Brian Paul [Thu, 24 Sep 2009 18:35:51 +0000 (12:35 -0600)]
vbo: limit number of warnings to 10
Otherwise some apps will emit tons of warnings.
Pauli Nieminen [Thu, 24 Sep 2009 16:58:09 +0000 (19:58 +0300)]
radeon: Fix scissors for r600 KMS.
Radeon generic scissors code had problem that some of code was using exclusive
and some inclusive bottom right corner. Only r600 driver is using exclusive
coordinate so changed generic code to pass inclusive coordinate and r600 driver
changes BR coordinate to be exclusive.
Brian Paul [Thu, 24 Sep 2009 16:52:15 +0000 (10:52 -0600)]
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
Brian Paul [Thu, 24 Sep 2009 16:26:56 +0000 (10:26 -0600)]
tgsi/sse: Pass the lodbias, not zero. More comments.
This fixes the glean/glsl1 "texture2D(), with bias" test when using SSE.
Brian Paul [Wed, 23 Sep 2009 21:44:37 +0000 (15:44 -0600)]
mesa: added default case return to silence warning
Brian Paul [Wed, 23 Sep 2009 21:44:18 +0000 (15:44 -0600)]
glsl: init var to silence warning
Brian Paul [Wed, 23 Sep 2009 21:44:02 +0000 (15:44 -0600)]
glsl: fix missing initializers warning
Andre Maasikas [Wed, 23 Sep 2009 11:20:59 +0000 (14:20 +0300)]
r600: add support for CUBE textures, also TXP
seems to work here ...
Alex Deucher [Mon, 21 Sep 2009 20:48:55 +0000 (16:48 -0400)]
r600: fix typo in the last commit
128 gprs, 256 reg-based consts
Alex Deucher [Mon, 21 Sep 2009 20:30:14 +0000 (16:30 -0400)]
r600: various cleanups
- max texture size is 8k, but mesa doesn't support
that at the moment.
- attempt to set shader limits to what the hw actually
supports
- clean up some old r300 cruft
- no need to explicitly disable irqs. This is fixed
in the drm now.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Andre Maasikas [Mon, 21 Sep 2009 14:14:25 +0000 (10:14 -0400)]
r600: fix some issues with LIT instruction
- MUL_LIT is ALU.Trans instruction
- some Trans instructions can take 3 arguments
- don't clobber dst.x, use dst.z as temp, it'll get written correct
value in last insn
- respect source swizzles
Alex Deucher [Sat, 19 Sep 2009 19:18:42 +0000 (15:18 -0400)]
r600: fix point sizes
registers takes radius
Alex Deucher [Sat, 19 Sep 2009 18:46:06 +0000 (14:46 -0400)]
r600: fix polygon offset
Alex Deucher [Tue, 15 Sep 2009 21:12:03 +0000 (17:12 -0400)]
radeon: don't build non-r600 span code on r600
Alex Deucher [Tue, 15 Sep 2009 20:58:37 +0000 (16:58 -0400)]
r600: minor span cleanups
Andre Maasikas [Tue, 15 Sep 2009 15:27:51 +0000 (11:27 -0400)]
r600: support position_invariant programs
Alex Deucher [Mon, 14 Sep 2009 22:05:15 +0000 (18:05 -0400)]
r600: add span support for 1D tiles
1D tile span support for depth/stencil/color/textures
Z and stencil buffers are always tiled, so this fixes
sw access to Z and stencil buffers. color and textures
are currently linear, but this adds span support when we
implement 1D tiling.
This fixes the text in progs/demos/engine and progs/tests/z*