OSDN Git Service
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.
Brian Paul [Wed, 23 Jul 2008 21:04:25 +0000 (15:04 -0600)]
mesa: glsl: fix/simplify array element handling
Also fix bug in comparing large structs/arrays.
Brian Paul [Wed, 23 Jul 2008 18:00:48 +0000 (12:00 -0600)]
mesa: glsl: mark constructor params as const
Brian Paul [Wed, 23 Jul 2008 00:27:56 +0000 (18:27 -0600)]
mesa: glsl: rework swizzle storage handling
Build on the heirarchal approach implemented for arrays/structs.
Brian Paul [Tue, 22 Jul 2008 23:38:55 +0000 (17:38 -0600)]
mesa: fix uninitialized var
Brian Paul [Tue, 22 Jul 2008 21:17:10 +0000 (15:17 -0600)]
mesa: glsl: implement constructor functions for user-defined types
Brian Paul [Tue, 22 Jul 2008 17:54:22 +0000 (11:54 -0600)]
mesa: remove stray debug assertion
Brian [Tue, 22 Jul 2008 02:42:05 +0000 (20:42 -0600)]
mesa: fix glUniform error checking for samplers
Brian Paul [Tue, 29 Jul 2008 23:19:25 +0000 (17:19 -0600)]
mesa: refactor: move _mesa_Bind/Gen/DeleteProgram() to arbprogram.c
No API-level functions now in program.c.
Brian Paul [Mon, 21 Jul 2008 23:18:22 +0000 (17:18 -0600)]
mesa: initial support for GLSL struct/array comparisons
Brian Paul [Mon, 21 Jul 2008 22:04:56 +0000 (16:04 -0600)]
mesa: added null ptr check (error handling case)
Brian Paul [Mon, 21 Jul 2008 22:04:24 +0000 (16:04 -0600)]
mesa: fix +=, -=, etc. operators
Brian Paul [Mon, 21 Jul 2008 20:23:33 +0000 (14:23 -0600)]
mesa: remove an error check for NV_v_p that doesn't apply to ARB_v_p
Brian Paul [Mon, 21 Jul 2008 20:16:07 +0000 (14:16 -0600)]
mesa: fix some issues in _mesa_validate_program()
Brian Paul [Mon, 21 Jul 2008 19:58:50 +0000 (13:58 -0600)]
mesa: assorted glsl uniform/attribute fixes
Fix incorrect uniform/attribute size query results.
Add missing error checking for glUniform, glUniformMatrix params
Fix an array size/allocation error.
Brian Paul [Sat, 19 Jul 2008 01:46:19 +0000 (19:46 -0600)]
mesa: glsl: various writemask/swizzle improvements and clean-ups
Brian Paul [Tue, 29 Jul 2008 23:15:08 +0000 (17:15 -0600)]
mesa: rework array/struct addressing code.
The slang_ir_storage type now has a pointer to parent storage to represent
storage of an array element within an array, or a field within a struct.
This fixes some problems related to addressing of fields/elements in non-
trivial cases. More work to follow.
Brian Paul [Fri, 18 Jul 2008 18:52:24 +0000 (12:52 -0600)]
mesa: fix some GLSL /= int operators
plus add a few more special constructors to improve code quality.
Brian Paul [Fri, 18 Jul 2008 18:51:39 +0000 (12:51 -0600)]
mesa: fix set_program_uniform_matrix(): need to loop over matrix count
Brian Paul [Tue, 29 Jul 2008 23:12:19 +0000 (17:12 -0600)]
mesa: implement grammar/parsing for precision/invariant syntax
Plus, fix some issues with pre-defined preprocessor symbols and version checking.
Brian Paul [Tue, 29 Jul 2008 23:09:40 +0000 (17:09 -0600)]
mesa: Silence compiler warnings on Windows.
Brian Paul [Tue, 29 Jul 2008 23:05:54 +0000 (17:05 -0600)]
mesa: fix some function inlining bugs
Need to add local vars of original function to the new scope's variable
list (though the DECLs were already present).
In slang_operation_copy() call slang_replace_scope() for SLANG_OPER_BLOCK_NEW_SCOPE opers.
Brian Paul [Tue, 29 Jul 2008 23:04:53 +0000 (17:04 -0600)]
mesa: improved printing
Brian Paul [Tue, 29 Jul 2008 22:46:08 +0000 (16:46 -0600)]
document GLSL 1.20 status
Brian Paul [Tue, 29 Jul 2008 13:38:13 +0000 (07:38 -0600)]
disable GL_ARB_shading_language_120 until 1.20 features are complete
Florent Thoumie [Mon, 28 Jul 2008 13:44:43 +0000 (14:44 +0100)]
autoconf: disable dri drivers build if being asked
Allow --with-dri-drivers={,no} to disable DRI drivers build.
Signed-off-by: Florent Thoumie <flz@FreeBSD.org>
Signed-off-by: Robert Noland <rnoland@2hip.net>
Michel Dänzer [Mon, 28 Jul 2008 08:49:43 +0000 (10:49 +0200)]
r300: Fix off-by-one error in calculation of scissor cliprect.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=16123 .
Nicolai Haehnle [Sun, 27 Jul 2008 19:40:17 +0000 (21:40 +0200)]
r300: Fix a crash related to depth textures (triggered by Glest w/ shadowmaps)
Nicolai Haehnle [Sun, 27 Jul 2008 19:31:49 +0000 (21:31 +0200)]
r300: Implement ARB_shadow_ambient; add STATE_SHADOW_AMBIENT
Nicolai Haehnle [Sun, 27 Jul 2008 19:18:29 +0000 (21:18 +0200)]
r300: Fix point minmax size
There are 6 subpixel units per pixel, not 16.
Nicolai Haehnle [Sun, 27 Jul 2008 16:18:59 +0000 (18:18 +0200)]
r300: Implement hardware acceleration for ColorLogicOp
Nicolai Haehnle [Sun, 27 Jul 2008 14:36:05 +0000 (16:36 +0200)]
r500: Handle non-native swizzles in texture instructions
This fixes piglit's fp-kil and fp-generic/kil-swizzle tests.
Nicolai Haehnle [Sun, 27 Jul 2008 13:14:07 +0000 (15:14 +0200)]
r500: Redirect TEX writes to output registers
While R500 fragment program texture instructions appear to support writemasks,
they cannot write to the output FIFO immediately, so we need to insert a MOV
for these instructions.
This fixes piglit's fp-fragment-position and fp-incomplete-tex tests.
Eric Anholt [Sun, 27 Jul 2008 00:12:04 +0000 (17:12 -0700)]
intel: Don't return a renderbuffer with alpha when just GL_RGB is requested.
Fixes oglconform rbGetterFuncs testcase. The span code for this mode hasn't
actually been tested.
Nicolai Haehnle [Sat, 26 Jul 2008 14:16:23 +0000 (16:16 +0200)]
r200: Do not set second coordinate clamping for 1D textures
Fixes piglit's tex1d-border test.
Nicolai Haehnle [Sat, 26 Jul 2008 14:15:33 +0000 (16:15 +0200)]
r300: Always emit LOAD_VBPNTR immediately before index-based rendering
This fixes one type of lockup I've been seeing on my test system.
Ian Romanick [Sat, 26 Jul 2008 01:31:44 +0000 (18:31 -0700)]
Merge branch 'master' into drm-gem
Conflicts:
src/mesa/drivers/dri/common/dri_bufmgr.c
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
Eric Anholt [Fri, 25 Jul 2008 19:40:16 +0000 (12:40 -0700)]
mesa: Return 0 for cube map face of non-cubemap framebuffer attachments.
Fixes some oglconform fbo testcases.
Eric Anholt [Fri, 25 Jul 2008 19:17:58 +0000 (12:17 -0700)]
intel: If a tex image doesn't fit in the object's tree, make a temporary tree.
Previously, we would just store the data as malloced memory hanging off the
object, which would get memcpyed in at validate time. This broke an
oglconform render-to-texture test, since validate wasn't called but a miptree
was expected.
Dave Airlie [Fri, 25 Jul 2008 10:32:22 +0000 (20:32 +1000)]
i965: fixup format for TFP zero copy
Dave Airlie [Fri, 25 Jul 2008 09:57:35 +0000 (19:57 +1000)]
Revert "intel: disable zero-copy TFP."
This reverts commit
94979950e8991bd44899eb4067c3ae43449ce51e.
I've fixed it instead
Dave Airlie [Fri, 25 Jul 2008 09:56:56 +0000 (19:56 +1000)]
i965: make tex offset override work..
should fix fd.o 14441
Dave Airlie [Fri, 25 Jul 2008 06:31:38 +0000 (16:31 +1000)]
intel: disable zero-copy TFP.
patch from Fedora. maybe someone can fix this later but for now
lets try and release Mesa so ajax can live his life and get Xorg 7.4 out.
Brian Paul [Thu, 24 Jul 2008 20:47:28 +0000 (14:47 -0600)]
mesa: move extensions->version code into separate function
Brian Paul [Thu, 24 Jul 2008 20:28:43 +0000 (14:28 -0600)]
mesa: don't include Mesa version in GL_SHADING_LANGUAGE_VERSION string
Brian Paul [Thu, 24 Jul 2008 20:27:11 +0000 (14:27 -0600)]
query/print GLSL version string
Jesse Barnes [Thu, 24 Jul 2008 16:11:37 +0000 (09:11 -0700)]
intel: remove buffer swap debug output
Accidentally pushed as part of the last commit.
Ian Romanick [Thu, 24 Jul 2008 15:39:51 +0000 (08:39 -0700)]
Revert "965: Fix color clamping issues"
This reverts commit
b993d539a76e7f1446890a85e4b61deec4d4162d. The
patch was applied incorrectly. Actual fix coming soon. Sorry for the
noise.
Thomas Hellstrom [Thu, 24 Jul 2008 11:35:35 +0000 (13:35 +0200)]
Fix a typo.