OSDN Git Service
Xiang, Haihao [Fri, 29 Aug 2008 01:22:41 +0000 (09:22 +0800)]
i965: Push/pop instruction state. partial fix for #16882
Brian Paul [Thu, 28 Aug 2008 21:15:00 +0000 (15:15 -0600)]
mesa: bump MAX_INSN to 350
Brian Paul [Tue, 26 Aug 2008 22:13:39 +0000 (16:13 -0600)]
mesa: don't check for GLSL 1.2 to advertise GL 2.1
The GLSL 1.2 features are minor...
Brian Paul [Tue, 26 Aug 2008 22:12:29 +0000 (16:12 -0600)]
added 7.1 MD5 sums
Brian Paul [Tue, 26 Aug 2008 21:59:06 +0000 (15:59 -0600)]
change MESA_MINOR to 3
Brian Paul [Tue, 26 Aug 2008 21:58:42 +0000 (15:58 -0600)]
7.1 updates from 7.2 branch
Timo Jyrinki [Tue, 26 Aug 2008 18:36:39 +0000 (12:36 -0600)]
asst. html doc updates
Brian Paul [Mon, 25 Aug 2008 15:20:26 +0000 (09:20 -0600)]
mesa: glsl: regenerated file
Brian Paul [Mon, 25 Aug 2008 15:20:00 +0000 (09:20 -0600)]
mesa: glsl: grab latest fixes from gallium-0.1 branch
Includes:
1. Fixes failed asserting about bad swizzles in src reg emit.
2. Tracks uniform var usage.
3. Emit exp() in terms of EXP2 instruction.
Brian Paul [Mon, 25 Aug 2008 15:18:33 +0000 (09:18 -0600)]
mesa: set version string to 7.3-devel
Dave Airlie [Sun, 24 Aug 2008 07:59:10 +0000 (17:59 +1000)]
Revert "Revert "Merge branch 'drm-gem'""
This reverts commit
7c81124d7c4a4d1da9f48cbf7e82ab1a3a970a7a.
Dave Airlie [Sun, 24 Aug 2008 07:52:40 +0000 (17:52 +1000)]
Revert "Merge branch 'drm-gem'"
This reverts commit
53675e5c05c0598b7ea206d5c27dbcae786a2c03.
Conflicts:
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
Krzysztof Czurylo [Thu, 21 Aug 2008 22:01:36 +0000 (15:01 -0700)]
965: Fix incorrect backface culling
Fix incorrect backface culling for OGL tunnel in wireframe and
point mode.
Krzysztof Czurylo [Thu, 21 Aug 2008 22:01:20 +0000 (15:01 -0700)]
Call _ae_update_state when array enable state changes
Basically, the application enables client vertex and color arrays,
renders something, then disables color array, and renders something
else (using vertex array only). Even though the color array is
disabled (and the pointer is no longer valid), the driver still tries
to read color data from this array (which results in an exception).
This is because enabling/disabling array does not trigger
_ae_update_state() and the list of enabled arrays is not updated.
_ae_update_state() it's called on the first state validation only (as
all the "dirty" flags are set at the beginning). Any further change to
client arrays' state has no effect.
Krzysztof Czurylo [Wed, 30 Jul 2008 17:19:08 +0000 (10:19 -0700)]
965: Fix color clamping issues
Patch is correctly applied this time.
Ian Romanick [Wed, 30 Jul 2008 17:00:48 +0000 (10:00 -0700)]
Formatting changes to ease application of patches
Eric Anholt [Thu, 21 Aug 2008 19:12:18 +0000 (12:12 -0700)]
i965: use dri_bo_subdata in vertex upload to get pwrite used.
Otherwise, we would ping-pong objects to GTT and back as we did pwrite on
indices (flushed and mapped to GTT) and mapped for vertices (moved back to
CPU domain).
Fixes bug #17180.
Eric Anholt [Thu, 21 Aug 2008 18:20:20 +0000 (11:20 -0700)]
Flush vertices when updating texObj->GenerateMipmap state.
Caught by texturing/gen-teximage test in piglit.
Peter Hutterer [Thu, 21 Aug 2008 09:22:40 +0000 (11:22 +0200)]
Report damage before modifying the area, not after.
If we copy the area before reporting the damage in this area, the server may
restore buffered data over the new data, leading to artefacts on the screen.
Reproducable with two cursors (second of which is SW rendered) and moving
windows around in compiz.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=16384 .
Eric Anholt [Thu, 21 Aug 2008 05:55:47 +0000 (22:55 -0700)]
intel: Fix SGIS_generate_mipmap after a miptree had been validated.
Previously, the updated images would be ignored because the miptree in the
image matched the miptree in the object, even though Mesa core had just attached
updated contents in ->Data. Additionally, Mesa core could have tried to
free inside our miptree if it had already been validated.
Fixes bug #17077.
Brian Paul [Wed, 20 Aug 2008 21:32:33 +0000 (15:32 -0600)]
use ftransform()
Kristof Ralovich [Wed, 20 Aug 2008 21:30:12 +0000 (15:30 -0600)]
glx: free driScreen in FreeScreenConfigs()
Kristof Ralovich [Wed, 20 Aug 2008 21:24:04 +0000 (15:24 -0600)]
glx: free context in driDestroyContext()
Kristof Ralovich [Wed, 20 Aug 2008 21:18:38 +0000 (15:18 -0600)]
glx: free vertex array state when context is destroyed
Kristof Ralovich [Wed, 20 Aug 2008 21:06:09 +0000 (15:06 -0600)]
fix mem leak (free psc->visuals)
Mark Anderson [Tue, 19 Aug 2008 14:31:08 +0000 (08:31 -0600)]
mesa: fix float blend bug
Brian Paul [Mon, 18 Aug 2008 22:49:33 +0000 (16:49 -0600)]
mesa: move old/obsolete MESA extensions specs to OLD/ directory
Dave Airlie [Fri, 25 Jul 2008 10:32:22 +0000 (20:32 +1000)]
i965: fixup format for TFP zero copy
(cherry picked from commit
9bc9e0ecb0fb2069b2c123e665eb2118e358098f which
was lost in a merge)
Dave Airlie [Fri, 25 Jul 2008 09:56:56 +0000 (19:56 +1000)]
i965: make tex offset override work..
should fix fd.o 14441
(cherry-picked from commit
d4244683a61f66cfb78408a37cf2587587847f96 which was
lost in a merge)
Xiang, Haihao [Wed, 20 Aug 2008 07:54:41 +0000 (15:54 +0800)]
i965: Enable GL_ARB_fragment_program_shadow and fix key->shadowtex_mask. (bug #16852, #16853)
Corbin Simpson [Tue, 19 Aug 2008 16:24:27 +0000 (09:24 -0700)]
r5xx: Final fog option fix.
Is there some kind of git hook we could use to keep me from committing
after like 10PM or so?
Corbin Simpson [Tue, 19 Aug 2008 10:40:27 +0000 (03:40 -0700)]
r5xx: Don't squish GL context when using FogOption
Corbin Simpson [Mon, 18 Aug 2008 23:38:21 +0000 (16:38 -0700)]
r5xx: Enable fog options.
This uses fog HW instead of fragment programs.
If it breaks you, let me know!
Henri Verbeet [Mon, 18 Aug 2008 15:30:52 +0000 (09:30 -0600)]
fix byte vs. pixel offset bug for 3D textures (see bug 17170)
Brian Paul [Mon, 18 Aug 2008 14:49:41 +0000 (08:49 -0600)]
mesa: rearrange some code in _mesa_BindTexture() to fix error detection bug 17173
Also, move GL_TEXTURE_RECTANGLE init code into separate function.
Corbin Simpson [Sun, 17 Aug 2008 21:06:47 +0000 (14:06 -0700)]
r5xx: Add DDX and DDY instructions.
Signed-off-by: Corbin Simpson <MostAwesomeDude@gmail.com>
Brian Paul [Sat, 16 Aug 2008 17:09:49 +0000 (11:09 -0600)]
bring in docs from 7.0.4 release/branch
Corbin Simpson [Sat, 16 Aug 2008 17:07:51 +0000 (11:07 -0600)]
added test for ARB GLSL extensions
Brian Paul [Sat, 16 Aug 2008 16:09:38 +0000 (10:09 -0600)]
added glu.exports files to tarballs list
Brian Paul [Sat, 16 Aug 2008 15:54:07 +0000 (09:54 -0600)]
fix convolutions test to consistanty use the ARB shader extension functions
Was using a mix of the ARB functions and the OpenGL 2.0 shader functions.
Brian Paul [Sat, 16 Aug 2008 15:39:10 +0000 (09:39 -0600)]
prep for 7.1 rc4
Brian Paul [Sat, 16 Aug 2008 15:36:46 +0000 (09:36 -0600)]
remove .txt suffix from shader source files
Brian Paul [Sat, 16 Aug 2008 15:34:12 +0000 (09:34 -0600)]
mesa: added glsl/convolutions test from gallium branch
Brian Paul [Sat, 16 Aug 2008 15:31:27 +0000 (09:31 -0600)]
mesa: turn off 'x' bit misset on a few .h and .syn files
Brian Paul [Sat, 16 Aug 2008 15:30:14 +0000 (09:30 -0600)]
mesa: import latest GLSL code from gallium-0.1 branch
Brian Paul [Fri, 15 Aug 2008 23:01:35 +0000 (17:01 -0600)]
draw a tristrip ring instead of a single quad
Brian Paul [Fri, 15 Aug 2008 17:49:05 +0000 (11:49 -0600)]
don't need to use LOD version of texture2D() funcs
Dave Airlie [Thu, 14 Aug 2008 11:43:34 +0000 (21:43 +1000)]
intel: remove unneeded mem type and args
Michel Dänzer [Thu, 14 Aug 2008 08:40:03 +0000 (10:40 +0200)]
r300: Fix 3D texture support.
Brian Paul [Wed, 13 Aug 2008 16:28:38 +0000 (10:28 -0600)]
mesa: fix a swrast state validation bug
Fixes progs/glsl/points.c
Brian Paul [Wed, 13 Aug 2008 14:49:39 +0000 (08:49 -0600)]
mesa: added new glsl/pointcoord.c test
Brian Paul [Wed, 13 Aug 2008 14:46:35 +0000 (08:46 -0600)]
mesa: clear the unused upper-left region to black instead of leaving it undefined
Jeremy Huddleston [Tue, 12 Aug 2008 18:04:19 +0000 (11:04 -0700)]
Removed broken/unsupported darwin-static configs
Fixed typo in darwin config
Jeremy Huddleston [Tue, 12 Aug 2008 17:59:40 +0000 (10:59 -0700)]
Fixed 'make install' for darwin
Jeremy Huddleston [Tue, 12 Aug 2008 16:45:04 +0000 (09:45 -0700)]
Apple: More cleanup of the darwin config in 7.1
Brian Paul [Mon, 11 Aug 2008 21:09:47 +0000 (15:09 -0600)]
mesa: glsl: add missing sampler types in sizeof_glsl_type(), bug 17079
Brian Paul [Mon, 11 Aug 2008 21:06:55 +0000 (15:06 -0600)]
version 41 of glext.h
Brian Paul [Mon, 11 Aug 2008 21:06:37 +0000 (15:06 -0600)]
version 20 of glxext.h
Brian Paul [Mon, 11 Aug 2008 21:05:57 +0000 (15:05 -0600)]
mesa: added comment about gl_PointCoord
Jeremy Huddleston [Mon, 11 Aug 2008 16:17:06 +0000 (09:17 -0700)]
Apple: Cleaned up some linking and dylib ids issues
Dave Miller [Sat, 9 Aug 2008 06:44:10 +0000 (16:44 +1000)]
dri: fix crash in driGetConfigAttribIndex
Accessing a GLboolean via an int pointer on big-endian == bad.
Eric Anholt [Fri, 8 Aug 2008 22:32:24 +0000 (15:32 -0700)]
Merge branch 'drm-gem'
Conflicts:
src/mesa/drivers/dri/intel/intel_span.c
src/mesa/main/fbobject.c
This converts the i915 driver to use the GEM interfaces for object management.
Eric Anholt [Fri, 8 Aug 2008 20:58:48 +0000 (13:58 -0700)]
intel-gem: Update to new check_aperture API for classic mode.
To do this, I had to clean up some of 965 state upload stuff. We may end
up over-emitting state in the aperture overflow case, but that should be rare,
and I'd rather have the simplification of state management.
Eric Anholt [Fri, 8 Aug 2008 17:53:25 +0000 (10:53 -0700)]
965: cleanups to state emission from aperture checking and state ordering.
Brian Paul [Fri, 8 Aug 2008 15:04:57 +0000 (09:04 -0600)]
mesa: fix out-of-bounds memory reads in swizzle_copy()
Jeremy Huddleston [Fri, 8 Aug 2008 09:52:10 +0000 (02:52 -0700)]
glx/x11: Added some #ifdef GLX_DIRECT_RENDERING protection
Jeremy Huddleston [Fri, 8 Aug 2008 09:37:14 +0000 (02:37 -0700)]
glx/x11: Fix missing __GL_EXT_BYTES declaration
Jeremy Huddleston [Fri, 8 Aug 2008 09:19:52 +0000 (02:19 -0700)]
Apple: Some changes to fix compilation problems on OSX
Brian Paul [Thu, 7 Aug 2008 13:54:53 +0000 (07:54 -0600)]
mesa: fix glBindTexture error string (bug 17005)
Brian Paul [Wed, 6 Aug 2008 15:02:39 +0000 (09:02 -0600)]
disable debug code accidentally enabled by prev commit
Haihao Xiang [Wed, 6 Aug 2008 15:01:34 +0000 (09:01 -0600)]
mesa: glsl: count number of temp regs used
Brian Paul [Wed, 6 Aug 2008 14:52:56 +0000 (08:52 -0600)]
mesa: fix comment about texture targets (bug 17005)
Brian Paul [Wed, 6 Aug 2008 14:39:54 +0000 (08:39 -0600)]
fix some FBO/texture queries (bug 15296)
Xiang, Haihao [Wed, 6 Aug 2008 06:15:31 +0000 (14:15 +0800)]
i965: update TexSrcUnit for OPCODE_TXB
Xiang, Haihao [Tue, 5 Aug 2008 03:28:54 +0000 (11:28 +0800)]
dri: Fix write/read depth buffer issue under 16bpp mode. See bug #16646
Xiang, Haihao [Tue, 5 Aug 2008 02:18:56 +0000 (10:18 +0800)]
i965: Use program->SamplerUnits[] to get the appropriate texture unit.
inst->TexSrcUnit is used as an index into program->SamplerUnits[] since
the commit
ade508312c701ce89d3c2cd717994dbbabb4f207, and program->SamplerUnits
is a sampler-to-texture-unit mapping.
Adam Jackson [Tue, 8 Jul 2008 15:07:32 +0000 (11:07 -0400)]
Drop unused 'entries' field from __glxHashTable.
Brian Paul [Sun, 3 Aug 2008 17:13:12 +0000 (11:13 -0600)]
added null ptr check (fix bug 16959)
Eric Anholt [Thu, 31 Jul 2008 21:13:30 +0000 (14:13 -0700)]
intel-gem: Always build GEM execbuffer code.
Jesse Barnes [Thu, 31 Jul 2008 18:50:37 +0000 (11:50 -0700)]
intel: sync to vblank by default
Effectively default to vblank_mode=3 on Intel to avoid tearing by default.
Users wanting to go "as fast as possible" (despite not being able to see frames
faster than their refresh rate allows) can still set the vblank_mode manually.
Eric Anholt [Wed, 30 Jul 2008 21:14:44 +0000 (14:14 -0700)]
intel-gem: Use new getparam to detect kernel GEM support.
Guillaume Melquiond [Wed, 30 Jul 2008 14:56:42 +0000 (07:56 -0700)]
Always pass CFLAGS when compiling or linking demos
To ensure that the correct architecture flags are used, always pass the
user's CFLAGS when compiling or linking the demos. Fixes #16860.
Brian Paul [Tue, 29 Jul 2008 23:50:43 +0000 (17:50 -0600)]
updated GLSL bug fixes
Brian Paul [Tue, 29 Jul 2008 23:49:38 +0000 (17:49 -0600)]
mesa: glsl: remove old assertion (fixes glsl/bitmap.c)
Brian Paul [Tue, 29 Jul 2008 23:47:52 +0000 (17:47 -0600)]
mesa: disable debug code
Brian Paul [Tue, 29 Jul 2008 23:45:46 +0000 (17:45 -0600)]
mesa: regenerated files
Brian Paul [Tue, 29 Jul 2008 23:43:35 +0000 (17:43 -0600)]
mesa: Silence compiler warnings on Windows.
Brian Paul [Tue, 29 Jul 2008 23:37:55 +0000 (17:37 -0600)]
mesa: cast to fix warning
Brian Paul [Tue, 29 Jul 2008 23:37:13 +0000 (17:37 -0600)]
mesa: fix bug/failure in recursive function inlining
Fixes a failure for cases such as y = f(a, f(a, b))
All the usual tests still pass but regressions are possible...
Brian Paul [Tue, 29 Jul 2008 23:33:52 +0000 (17:33 -0600)]
mesa: glsl: silence warning (s/int/GLuint)
Brian Paul [Tue, 29 Jul 2008 23:32:35 +0000 (17:32 -0600)]
mesa: remove stray debug code
Brian Paul [Tue, 29 Jul 2008 23:29:30 +0000 (17:29 -0600)]
mesa: glsl: assorted fixes for resolving polymorphic functions
Plus,
- fix some issues in casting function arguments to format param types.
- fix some vec/mat constructor bugs
- find/report more syntax/semantic errors
Brian Paul [Fri, 25 Jul 2008 20:48:36 +0000 (14:48 -0600)]
mesa: glsl: re-order some constructors
Brian Paul [Fri, 25 Jul 2008 20:48:14 +0000 (14:48 -0600)]
mesa: glsl: remove unneeded operators
Brian Paul [Tue, 29 Jul 2008 23:27:44 +0000 (17:27 -0600)]
mesa: glsl: added null ptr check
Brian Paul [Tue, 29 Jul 2008 23:27:22 +0000 (17:27 -0600)]
mesa: fix issues causing warnings on Windows
Brian Paul [Thu, 24 Jul 2008 23:49:33 +0000 (17:49 -0600)]
mesa: glsl: additional error detection
Plus begin some fixes for vec/matrix constructors.
Brian Paul [Thu, 24 Jul 2008 21:49:09 +0000 (15:49 -0600)]
mesa: gls: fix broken else clause of conditional break/continue
In the following case:
for () {
if (cond)
break; // or continue;
else
something;
}
The "something" block didn't get emitted.
Brian Paul [Thu, 24 Jul 2008 20:56:54 +0000 (14:56 -0600)]
mesa: glsl: only try to link shaders defining main()
Michal Krol [Thu, 24 Jul 2008 09:03:05 +0000 (11:03 +0200)]
mesa: Silence compiler warning on windows.