OSDN Git Service
Keith Whitwell [Fri, 12 Sep 2008 14:03:19 +0000 (15:03 +0100)]
mesa: remove dead file
Keith Whitwell [Fri, 12 Sep 2008 14:02:50 +0000 (15:02 +0100)]
mesa: add explict float casts
Keith Whitwell [Sat, 20 Sep 2008 15:26:11 +0000 (08:26 -0700)]
mesa: move fixed function vertex program builder from tnl to core mesa
Also unify caching of fragment and vertex programs in shader/prog_cache.c`
Brought across from gallium-0.2
Brian Paul [Tue, 17 Jun 2008 17:29:59 +0000 (11:29 -0600)]
mesa: add parenthesis
(cherry picked from commit
c366fd83b617db6c8c064802ff4bf120d654507d)
Keith Whitwell [Sat, 20 Sep 2008 14:32:30 +0000 (07:32 -0700)]
mesa: standardize on C99's uint*_t instead of u_int*_t
José Fonseca [Wed, 4 Jun 2008 14:55:55 +0000 (23:55 +0900)]
mesa: Remove assyntax.h include from generated matypes.h.
matypes.h doesn't really depend on assyntax.h; assyntax.h is only present
on x86; and this way we remove the need of grep being available (which is
relevant for scons and non-unix platforms).
(cherry picked from commit
fc286ff3ba089af5f1aca2d35b93b53a9383b1cf)
Keith Whitwell [Sat, 20 Sep 2008 13:43:24 +0000 (06:43 -0700)]
mesa: move rastpos helper to tnl
Keith Whitwell [Sat, 20 Sep 2008 13:34:23 +0000 (06:34 -0700)]
mesa: improved driver query interface
Brought over from gallium-0.2 branch.
Adam Jackson [Fri, 19 Sep 2008 21:16:53 +0000 (17:16 -0400)]
Update to SGI FreeB 2.0.
Under the terms of version 1.1, "once Covered Code has been published
under a particular version of the License, Recipient may, for the
duration of the License, continue to use it under the terms of that
version, or choose to use such Covered Code under the terms of any
subsequent version published by SGI."
FreeB 2.0 license refers to "dates of first publication". They are here
taken to be 1991-2000, as noted in the original license text:
** Original Code. The Original Code is: OpenGL Sample Implementation,
** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
** Copyright in any portions created by third parties is as indicated
** elsewhere herein. All Rights Reserved.
Official FreeB 2.0 text:
http://oss.sgi.com/projects/FreeB/SGIFreeSWLicB.2.0.pdf
As always, this code has not been tested for conformance with the OpenGL
specification. OpenGL conformance testing is available from
http://khronos.org/ and is required for use of the OpenGL logo in
product advertising and promotion.
Brian [Fri, 19 Sep 2008 03:22:08 +0000 (21:22 -0600)]
glx: re-add glapi/ path
Brian [Fri, 19 Sep 2008 02:31:05 +0000 (20:31 -0600)]
mesa: remove unneeded s_drawpix.h header
Brian [Fri, 19 Sep 2008 02:27:16 +0000 (20:27 -0600)]
glx: added "glapi/" prefix to include
Chris Rankin [Thu, 18 Sep 2008 22:48:11 +0000 (16:48 -0600)]
mesa: fix asst path/include mistakes in prev commits
Brian Paul [Thu, 18 Sep 2008 21:29:57 +0000 (15:29 -0600)]
mesa: fix null ptr deref bug in _tnl_InvalidateState(), bug 15834
Brian Paul [Thu, 18 Sep 2008 21:17:05 +0000 (15:17 -0600)]
mesa: added "main/" prefix to includes, remove some -I paths from Makefile.template
Brian Paul [Thu, 18 Sep 2008 19:46:47 +0000 (13:46 -0600)]
mesa: prefix more #includes with "main/"
Brian Paul [Thu, 18 Sep 2008 19:34:57 +0000 (13:34 -0600)]
mesa: remove a bunch of -I paths from INCLUDE_DIRS
Brian Paul [Thu, 18 Sep 2008 19:26:30 +0000 (13:26 -0600)]
glx: remove #include "glheader.h" lines
Was only used to get the PUBLIC/USED macros.
Also, replace "GL_FALSE" with "False" in a couple places.
Brian Paul [Thu, 18 Sep 2008 19:23:06 +0000 (13:23 -0600)]
glx: remove depency on glheader.h and GLboolean type in XF86DRI code
Return Bool instead of GLboolean to match other functions.
Define PUBLIC/USED macros locally.
Brian Paul [Thu, 18 Sep 2008 18:26:54 +0000 (12:26 -0600)]
mesa: prefix a bunch of #include lines with "main/".
This is another step toward removing a whole bunch of -I flags from
the cc commands. Still need to address driver code...
Brian Paul [Wed, 17 Sep 2008 15:05:04 +0000 (09:05 -0600)]
mesa: fix bug in previous changes to _slang_resolve_attributes()
Eric Anholt [Wed, 17 Sep 2008 00:01:06 +0000 (17:01 -0700)]
intel: Destroy bufmgr in screen destroy, not context.
Caused server crashes on second context creation since
7e0bbdcf033981282978554c2e68ce48b55aa291.
Bug #17600.
Brian Paul [Tue, 16 Sep 2008 22:28:36 +0000 (16:28 -0600)]
mesa: rework GLSL vertex attribute binding
Calls to glBindAttribLocation() should not take effect until the next time
that glLinkProgram() is called.
gl_shader_program::Attributes now just contains user-defined bindings.
gl_shader_program::VertexProgram->Attributes contains the actual/final bindings.
Brian Paul [Tue, 16 Sep 2008 19:23:01 +0000 (13:23 -0600)]
mesa: fix display list regression (check if save->prim_count > 0 in vbo_save_EndList())
Brian Paul [Mon, 15 Sep 2008 23:10:04 +0000 (17:10 -0600)]
mesa: fix MSAA enable state in update_multisample()
Brian Paul [Mon, 15 Sep 2008 15:07:32 +0000 (09:07 -0600)]
mesa: remove some assertions that are invalid during context tear-down
Keith Whitwell [Mon, 15 Sep 2008 12:47:25 +0000 (13:47 +0100)]
mesa: get another class of degenerate dlists working
Primitive begin in one dlist, end in another.
Keith Whitwell [Mon, 15 Sep 2008 12:47:12 +0000 (13:47 +0100)]
add dlist-degenerate test case
Shane Blackett [Sun, 14 Sep 2008 23:51:01 +0000 (17:51 -0600)]
glut: s/glut_fbc.c/glut_fcb.c/
Jakub Bogusz [Sat, 13 Sep 2008 20:35:02 +0000 (14:35 -0600)]
tdfx: fix crash and lack of visuals bug
Guillaume Melquiond [Sat, 13 Sep 2008 20:25:02 +0000 (14:25 -0600)]
i915: fix himask constant init for 64-bit build
Guillaume Melquiond [Sat, 13 Sep 2008 20:24:31 +0000 (14:24 -0600)]
glx: fix 64-bit datatype issue
Guillaume Melquiond [Sat, 13 Sep 2008 20:23:39 +0000 (14:23 -0600)]
mesa: return after _mesa_problem() calls
Guillaume Melquiond [Sat, 13 Sep 2008 20:23:14 +0000 (14:23 -0600)]
mesa: #include <stdio.h>
Guillaume Melquiond [Sat, 13 Sep 2008 20:22:15 +0000 (14:22 -0600)]
remove invalid XDestroyWindow() call
Guillaume Melquiond [Sat, 13 Sep 2008 20:21:50 +0000 (14:21 -0600)]
silence warning
Guillaume Melquiond [Sat, 13 Sep 2008 20:20:14 +0000 (14:20 -0600)]
GLU: fix asst warnings
Eric Anholt [Fri, 12 Sep 2008 22:48:13 +0000 (15:48 -0700)]
intel: Add a width field to regions, and use it for making miptrees in TFP.
Otherwise, we would use the pitch as width of the texture, and compiz would
render the pitch padding on the right hand side.
Eric Anholt [Fri, 12 Sep 2008 21:18:14 +0000 (14:18 -0700)]
Finish off the previous fix for TFP.
A couple of those lines of debug printfs I deleted weren't actually debug
printfs.
Eric Anholt [Fri, 12 Sep 2008 20:47:37 +0000 (13:47 -0700)]
intel: Don't segfault on TFP from a bad drawable.
Eric Anholt [Thu, 11 Sep 2008 16:50:47 +0000 (09:50 -0700)]
intel: Remove dead allow_batchbuffer param.
George Sapountzis [Fri, 12 Sep 2008 09:43:10 +0000 (12:43 +0300)]
dri/swrast: fix swapBuffers after dri2
Xiang, Haihao [Fri, 12 Sep 2008 01:25:34 +0000 (09:25 +0800)]
i965: Add support for G41 chipset which is another 4 series.
Shane Blackett [Thu, 11 Sep 2008 14:35:27 +0000 (08:35 -0600)]
added 24bpp support
Shane Blackett [Wed, 10 Sep 2008 14:22:45 +0000 (08:22 -0600)]
Fixes for Mingw
Eric Anholt [Mon, 8 Sep 2008 15:52:48 +0000 (08:52 -0700)]
intel: track move of bo_exec from drivers to bufmgr.
Eric Anholt [Sat, 6 Sep 2008 02:09:43 +0000 (03:09 +0100)]
intel: track bufmgr move to libdrm_intel and bufmgr_fake irq emit/wait change.
Eric Anholt [Thu, 4 Sep 2008 21:16:31 +0000 (22:16 +0100)]
intel: Move the bufmgr back to the screen.
Mesa requires that we be able to share objects between contexts, which means
that the objects need to be created by the same bufmgr, and the bufmgr
internally requires pthread protection for thread safety.
Rely on the bufmgr having appropriate locking.
Brian Paul [Fri, 5 Sep 2008 14:06:59 +0000 (08:06 -0600)]
mesa: replace MALLOC w/ CALLOC to fix memory error in glPushClientAttrib()
Brian Paul [Thu, 4 Sep 2008 21:25:32 +0000 (15:25 -0600)]
mesa: replace MALLOC w/ CALLOC to fix valgrind warning
Dave Airlie [Fri, 5 Sep 2008 03:48:51 +0000 (13:48 +1000)]
intel: only enable occlusion query if the drm has defines.
This interface has to be re-written to not be dumb and to work
for multiple apps.
Brian Paul [Thu, 4 Sep 2008 20:58:02 +0000 (14:58 -0600)]
mesa: improved gl_buffer_object reference counting
Use new _mesa_reference_buffer_object() function wherever possible.
Fixes buffer object/display list crash reported in ParaView.
Kristian Høgsberg [Thu, 4 Sep 2008 10:23:14 +0000 (06:23 -0400)]
configure.ac: bump dri2proto requirement, drop TTM_API define.
Xiang, Haihao [Thu, 4 Sep 2008 03:35:15 +0000 (11:35 +0800)]
intel: Fix depth_stencil texture.
Xiang, Haihao [Thu, 4 Sep 2008 03:32:52 +0000 (11:32 +0800)]
mesa: merge stencil values into depth values for MESA_FORMAT_S8_Z24
Jakob Bornecrantz [Thu, 4 Sep 2008 02:35:01 +0000 (10:35 +0800)]
mesa: Support for MESA_FORMAT_S8_Z24 texture
cherry-picked from gallium-0.1
Eric Anholt [Wed, 3 Sep 2008 15:13:18 +0000 (16:13 +0100)]
intel: Fix prototype warning.
Eric Anholt [Wed, 3 Sep 2008 11:36:43 +0000 (12:36 +0100)]
intel: Fix refcounting on depth buffer initialization in DRI2.
(Reverts a change to work around the problem on 965).
Xiang, Haihao [Wed, 3 Sep 2008 06:47:36 +0000 (14:47 +0800)]
intel: Fix a crash if dri2 is disabled.
Brian Paul [Wed, 3 Sep 2008 00:10:34 +0000 (18:10 -0600)]
fix BUFFER_DEPTH/BUFFER_ACCUM mix-up
Roland Scheidegger [Tue, 2 Sep 2008 13:48:50 +0000 (15:48 +0200)]
fix no error generated when calling glLight{if}[v] inside begin/end (bug 17408)
Michel Dänzer [Mon, 1 Sep 2008 09:43:29 +0000 (11:43 +0200)]
Fix build by removing #include of removed dri_sarea.h.
Thanks to JohnFlux on IRC for pointing out the problem.
Kristian Høgsberg [Wed, 13 Aug 2008 15:46:25 +0000 (11:46 -0400)]
DRI2: Drop sarea, implement swap buffers in the X server.
Xiang, Haihao [Fri, 29 Aug 2008 01:49:16 +0000 (09:49 +0800)]
i965: force thread switch after IF/ELSE/ENDIF. partial fix for #16882.
A thread switch is implicitly invoked after the issuance of an IF/ELSE/ENDIF
instruction if necessary. Unfortunately it seems sometimes a forced thread
switch is needed.
Xiang, Haihao [Fri, 29 Aug 2008 01:27:28 +0000 (09:27 +0800)]
i965: mask control for BREAK/CONT/DO/WHILE. partial fix fox #16882
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.