Julien Cristau
369cda3752
Prepare changelog for upload.
2007-08-28 12:11:47 +02:00
Julien Cristau
846078d06f
Delete generated files.
2007-08-28 12:07:45 +02:00
Julien Cristau
b18500d56e
* Update to latest git (from mesa_7_0_branch)
...
+ adds support for some new intel chipsets (i915 and i915_tex dri drivers)
(closes : #437333 )
+ broken inline asm in dri drivers fixed (closes : #423739 )
2007-08-28 12:07:25 +02:00
Julien Cristau
7d92c50490
Merge branch 'mesa_7_0_branch' of git.freedesktop.org:/git/mesa/mesa into debian-unstable
2007-08-28 11:06:22 +02:00
Brian
d69a596193
Fixed bugs 6748, 12141
2007-08-27 10:48:31 -06:00
Colin McDonald
8aa4ae638e
fixed problem with big glDrawArrays (see bug 12141)
2007-08-27 10:47:49 -06:00
Brian
3069f34841
new __gluInvertMatrix() function (Mesa bug 6748)
2007-08-27 10:36:25 -06:00
Adam Jackson
b3788a0e4f
Unbreak Linux builds with -fvisibility=hidden.
2007-08-24 08:49:59 +01:00
Brian
582bc029ab
remove CallDepth++/-- accidentally removed in prev commit
2007-08-24 08:45:27 +01:00
Brian
e9e3099433
remove unneeded CallStack array
2007-08-23 08:17:35 +01:00
Brian
4fc561cc7b
refactor bounds checking code
2007-08-20 13:12:10 +01:00
Brian
ad3e3a0b99
don't map buffer in _mesa_validate_DrawElements() unless needed
2007-08-20 12:55:26 +01:00
Brian
bfb8c849cb
Remove recent texobj refcount debug/logging code.
2007-08-16 09:11:11 +01:00
Michel Dänzer
09dd25b5d1
i915tex: Unreference texture buffers on context destruction.
...
Not doing this could cause the buffers to leak under some circumstances.
2007-08-16 08:45:16 +02:00
Roland Scheidegger
c48efb1dbe
suppress warning about ncon visuals (bug #6689 )
2007-08-16 02:43:45 +02:00
Brian
5408acb6b7
log deleting/binding of FBOs
2007-08-15 15:47:28 +01:00
Brian
15481160f9
more debug output (context destroy, fb destroy)
2007-08-15 12:52:00 +01:00
Brian
00ccff03a5
Rewrite quite a bit of the code for glPush/PopAttrib() for texture state.
...
Remove the Saved1D/2D/etc fields from gl_texture_attrib in mtypes.h
Use a new texture_state struct in attrib.c that has the extra information
for restoring texture object state and saving references to the texture
objects (so they can't accidentally get deleted while referenced by the
attribute stack). All the texobj refcounting is mutex-protected now.
2007-08-15 11:21:06 +01:00
Brian
21594921b1
copy Target in _mesa_copy_texture_object()
2007-08-15 11:18:38 +01:00
Brian
42c91eebc9
Added _mesa_free_attrib_data() to free anything left in the attribute stack upon context destruction.
...
Also, a bit more refcount debug info.
2007-08-15 10:10:02 +01:00
Brian
88273e08b4
more tex obj ref count debugging (temporary)
2007-08-15 08:55:03 +01:00
Brian
08f7fb45ef
added some temporary texobj ref counting debug output
2007-08-14 19:45:02 +01:00
Brian
75ebda3ce6
Fix a few more problems with freeing FBOs/textures during context destruction.
...
Free FBOs before textures since the later may be referenced by the former.
Need to bind the context we're destroying if there isn't a current context
so that ctx->DeleteTexture() etc can be used.
2007-08-14 11:57:16 +01:00
Brian
53ff15fcbf
fix blending/banding bug
2007-08-13 21:17:04 +01:00
Dan Torop
72adb70ee2
fix spantmp2 READ_RGBA inline asm ( #11931 )
2007-08-13 21:14:51 +01:00
Brian
960d41fcfe
added more i915/945 chipsets
2007-08-13 21:11:17 +01:00
Brian
0c4e35b070
Add PCI IDs for the G33, Q33, and Q35 chipsets.
...
Conflicts:
src/mesa/drivers/dri/i915/i915_texstate.c
src/mesa/drivers/dri/i915/intel_context.c
src/mesa/drivers/dri/i915/intel_context.h
src/mesa/drivers/dri/i915/intel_screen.c
src/mesa/drivers/dri/i915/intel_tex.c
2007-08-13 21:06:33 +01:00
Wang Zhenyu
c53f1cb813
i915tex: Add support for 945GME
2007-08-13 21:00:28 +01:00
Brian
f6696cc15e
free any render/framebuffers left in hash tables when freeing shared state
2007-08-13 17:39:05 +01:00
Michel Dänzer
fef9a41fe4
i915tex: Make sure pitch is aligned properly for render-to-texture.
...
Just always align texture pitch to multiples of 64 bytes for now, pending a
more sophisticated scheme to do it only when really necessary.
2007-08-13 13:22:43 +02:00
Brian
e279a0a076
Implement mutex/locking around texture object reference counting.
...
Use new _mesa_reference_texobj() function for referencing/unreferencing
textures. Add new assertions/tests to try to detect invalid usage of
deleted textures.
2007-08-13 11:28:52 +01:00
Brian
88c8aaed96
fix link to 7.0.1 relnotes
2007-08-09 15:59:38 +01:00
Julien Cristau
34beaefe1c
Prepare changelog for upload.
2007-08-09 16:00:58 +02:00
Julien Cristau
10b828f193
New upstream release.
2007-08-09 11:56:00 +02:00
Julien Cristau
43e6260ed0
Merge tag 'mesa_7_0_1' into debian-experimental
2007-08-09 11:25:42 +02:00
Brian
62cbbd7226
fix byte swap bug for GLuint stencil indexes (bug 11909)
2007-08-09 08:45:01 +01:00
Brian
f7cbe7fcee
move free() after dereference (bug 11878)
2007-08-07 22:06:48 +01:00
Brian
d8e4ff9079
fix potential NULL dereference (bug 11879)
2007-08-07 21:56:39 +01:00
Brian
510ff27eda
remove SHELL line, replace -e test with new logic (Daniel Stone)
2007-08-07 21:52:22 +01:00
Brian
5abf055100
fix potential NULL dereference (bug 11880)
2007-08-07 21:46:42 +01:00
Brian
4bb5721f6b
fix swizzle error test (bug 11881)
2007-08-07 21:43:46 +01:00
Brian
c41ab70d3a
initial 7.0.2 notes
2007-08-07 08:44:35 +01:00
Brian
a05e403bf2
fix bug 9962 (vbo splitting) as in trunk
2007-08-07 08:43:31 +01:00
Brian
2f57e0f71d
Merge branch 'mesa_7_0_branch' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into mesa_7_0_branch
2007-08-07 08:21:50 +01:00
Brian
95a2eb9767
fix even-sized point positioning (bug 11874)
2007-08-07 08:20:18 +01:00
Brian
55175daed7
added md5 sums
2007-08-03 13:54:55 -06:00
Brian
ae16a51e95
added GLU bug fixes
2007-08-03 13:39:09 -06:00
Brian
4398d67546
update 7.0.1 release info/date
2007-08-03 13:32:47 -06:00
Brian
c93738687c
remove -rc2
2007-08-03 13:32:28 -06:00
Brian
799492e606
add OSMESA_LIB_NAME
2007-08-03 10:08:16 -06:00
Brian
f33ff071bb
added -lm
2007-08-03 07:24:33 -06:00
Brian
99e854743c
added bluegene-osmesa
2007-08-02 14:24:05 -06:00
Brian
6f79062d91
OSmesa on BlueGene (Alexander Neundorf)
2007-08-02 14:22:52 -06:00
Brian
2f682c3995
fix stencil value masking bug 11805, and fix sizeof() bug
2007-08-02 09:08:53 -06:00
Brian
067370e68f
fix invalid pointer usage in bezierPatchDeleteList(), bug 11807
2007-08-02 08:40:58 -06:00
Brian
2aa439a6a4
fix double free()s (bug 11808)
2007-08-02 08:38:10 -06:00
Brian
b477182dc3
s/MAX_TEXTURE_LEVELS/SIS_MAX_TEXTURE_LEVELS/ and add assertion (bug 11806)
2007-08-02 08:35:27 -06:00
Michel Dänzer
a8964ca89e
i915tex: Better attempt to release miptree when overriding texture image.
...
The previous approach could lead to crashes in FBO code that dereferences the
miptree struct pointer unconditionally.
2007-08-02 12:14:03 +02:00
Brian
4f0e92d07c
Merge branch 'mesa_7_0_branch' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into mesa_7_0_branch
2007-08-01 17:03:09 -06:00
Brian
577f4e8a5f
Obsolete
2007-08-01 11:45:47 -06:00
Brian
0586d9fe56
fix error code test limit (bug 11795)
2007-08-01 11:27:47 -06:00
Michel Dänzer
1f0d9bf05e
i915tex: Missing piece of SetTexOffset hook implementation for I830 generation.
2007-08-01 17:46:32 +02:00
Michel Dänzer
8bcae2a527
i915tex: Implement SetTexOffset hook.
...
Only build tested for I830 generation.
2007-08-01 17:46:31 +02:00
Michel Dänzer
35ca9aae91
r300: Implement SetTexOffset hook.
2007-08-01 17:46:30 +02:00
Michel Dänzer
6cdd2bf8d7
Add interfaces for overriding texture images with driver specific 'offsets'.
...
To be used by AIGLX for GLX_EXT_texture_from_pixmap without several
additional data copies.
2007-08-01 17:46:29 +02:00
Brian
ce7d175adb
fix mem leak (bug 11793)
2007-08-01 08:42:13 -06:00
Brian
1904fd095f
fix mem leak (bug 11791)
2007-08-01 08:42:09 -06:00
Brian
897d0ac5cc
fix some FreeBSD issues
2007-07-31 14:57:54 -06:00
Brian
e262d0182f
fix failure caused by undeclared variable (bug 11783)
2007-07-31 09:43:40 -06:00
Brian
aa5b748c10
glGetAttribLocation always returned 1 (bug 11774)
2007-07-31 09:29:31 -06:00
Julien Cristau
c6728df4a3
Merge tag 'mesa_7_0_1_rc2' into debian-experimental
2007-07-31 04:00:13 +02:00
Brian
3c182c5bc8
Added sunos5-v9-cc-g++ config (Roland Egger)
2007-07-30 09:00:09 -06:00
Brian
1b5677847b
_mesa_pack_bitmap() fix from trunk
2007-07-30 08:13:05 -06:00
Brian
1be59a9dbe
dlist polygon stipple fix from trunk
2007-07-30 08:12:29 -06:00
Brian
55c2178ad4
fix bug 11754
2007-07-29 18:28:09 -06:00
Jan Dvorak
3e3d392e1c
fix glPointParameteriv bug 11754
2007-07-29 18:26:55 -06:00
Julien Cristau
593de57fa2
Prepare changelog for upload.
2007-07-27 20:18:21 +02:00
Julien Cristau
04b0e43ea6
New upstream release candidate.
2007-07-27 19:59:38 +02:00
Julien Cristau
04eee290c8
Merge branch 'mesa_7_0_branch' of git://anongit.freedesktop.org/git/mesa/mesa into debian-experimental
2007-07-27 19:58:30 +02:00
Brian
756a7a4e4b
minor tweaks
2007-07-27 11:44:55 -06:00
Brian
121b4ac220
More Mingw32 fixes from Zhang (zxpmyth@yahoo.com.cn)
2007-07-27 11:12:21 -06:00
Brian
cdbd5db3af
release candidate 2
2007-07-27 11:10:00 -06:00
Brian
b2240f6ad4
fix bug 11731
2007-07-26 15:33:39 -06:00
Brian
33814a55f8
Fix function call bug 11731. Also, fix up IR_CALL/IR_FUNC confusion.
2007-07-26 15:32:34 -06:00
Brian
a57c5a417b
generate error upon writing to varying var in fragment program (bug 11733)
2007-07-26 11:39:37 -06:00
Brian
ff1a28de17
clamp float colors
2007-07-26 08:19:40 -06:00
Brian
772f57f99b
call ctx->Driver.NewProgram() instead of _mesa_new_program()
2007-07-24 09:56:54 -06:00
Brian
dacee32b8b
fix logic error, typos
2007-07-24 09:19:44 -06:00
Brian
fa1a3eb06d
fix GLX_STEREO bug
2007-07-23 16:54:35 -06:00
Brian
bd4817ca54
fix GLX_STEREO handling (bug 11705)
2007-07-23 16:51:03 -06:00
Julien Cristau
d3a160e217
New upstream release candidate.
2007-07-23 16:39:48 +02:00
Julien Cristau
c5837f2791
Merge branch 'mesa_7_0_branch' of git://anongit.freedesktop.org/git/mesa/mesa into debian-experimental
2007-07-23 16:28:56 +02:00
Julien Cristau
490bd43f18
Merge branch 'debian-unstable' of git+ssh://git.debian.org/git/pkg-xorg/lib/mesa into debian-experimental
...
Conflicts:
debian/changelog
2007-07-23 16:28:10 +02:00
Brian
005eea249c
Fix a number of MINGW32 issues (Zhang <zxpmyth@yahoo.com.cn>)
2007-07-21 11:27:22 -06:00
Brian
9747de8ec6
drop VC6 and VC7 project files until updated
2007-07-21 10:03:30 -06:00
Brian
849a9799d0
fix bug 11588
2007-07-13 16:37:18 -06:00
Jan Dvorak
e32ae4fe33
fix shader/info string length queries (bug 11588)
2007-07-13 16:35:19 -06:00
Brian
4595389c4c
fix width/depth mix-up (bug 11577)
2007-07-12 21:43:39 -06:00
Brian
e8ccc7cc49
Merge branch 'mesa_7_0_branch' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into mesa_7_0_branch
2007-07-12 14:49:56 -06:00
Brian
673d21047a
fix swizzle-related bug 11534
2007-07-12 14:49:24 -06:00
Julien Cristau
6186261589
Prepare changelog for upload.
2007-07-11 05:51:34 +02:00
Julien Cristau
45310e219c
Relax libgl1-mesa-dev dependency on libgl1-mesa-glx.
...
Change the >= ${source:Version} dependency to >= ${source:Upstream-Version}.
This way libgl1-mesa-dev stays installable after a minor revision bump on
architectures where mesa isn't built yet.
2007-07-11 05:45:30 +02:00
Julien Cristau
250f6b2c88
Replace ${Source-Version} with ${source:Version} in one remaining spot.
2007-07-11 05:34:30 +02:00
Michel Dänzer
fdefc2bbda
i915tex: Better procedure for dropping batchbuffer on virtual resolution change.
...
The previous procedure would often result in a GPU lockup.
2007-07-10 11:02:18 +02:00
Michel Dänzer
2079df8527
i915tex: Only wait for vblank when really necessary.
...
This avoids superfluous waits for vblank timing out under some circumstances.
2007-07-10 10:54:51 +02:00
Michel Dänzer
b53659452c
Clear pointers to freed cliprects.
...
Not doing this could lead to double frees under rare circumstances.
2007-07-10 10:49:28 +02:00
Michel Dänzer
46f1d6653e
Remove dubious compile-time test for pre-2.4 Linux kernels.
...
LINUX_VERSION_CODE shouldn't be used by userspace code, it can be defined empty
these days.
If anybody still cares about 2.2 kernels, they should reinstate this as a
proper runtime test.
2007-07-10 10:34:10 +02:00
Brian
c1938a60f7
Fix zero-size texture checking in _mesa_test_proxy_teximage(), bug 11309
2007-07-08 10:04:14 -06:00
Brian
d65110f352
Check if 'indices' is NULL, bug 11314
2007-07-08 09:21:21 -06:00
Brian
9fa3bbcb5a
check depthScale value for optimized ushort->uint case (fixes bug 11474)
2007-07-08 08:53:09 -06:00
Brice Goglin
19e51ecbe6
libgl1-mesa-dev does not need to depend on libgl1-mesa-dri, libgl1-mesa-glx is enough.
...
libgl1-mesa-glx was included in libgl1-mesa-dri before 6.4.1-0.1,
so libgl1-mesa-dev had to depend on libgl1-mesa-dri at this point.
Since libgl1-mesa-dri only contains the DRI modules now, it is not
required anymore for libgl1-mesa-dev.
2007-07-07 22:17:35 +02:00
Brian
99d62f2922
fix i915 polygon stipple bug
2007-07-06 16:53:28 -06:00
Brian
284743cafe
add GL_QUADS to i915_reduced_primitive_state() to fix redbook/polys demo
2007-07-06 16:52:34 -06:00
Xavier Bachelot
08d7307b2a
call glutInit(), bug 11486
2007-07-06 12:54:40 -06:00
Brian
ef6a64abe6
fix a syntax error (missing right-paren)
2007-07-05 16:04:10 -06:00
Brian
18bfa52ef7
fix bug 11475
2007-07-05 09:42:07 -06:00
Brian
d62be2652c
Copy from Mesa master. Includes fixes for bugs 11475 and 11448.
2007-07-05 09:40:37 -06:00
Julien Cristau
31f3433635
Prepare changelog for upload.
2007-07-05 00:56:56 +02:00
Samuel Thibault
639eaceee7
Fix build on hurd-i386.
...
Build libgl1-mesa-glx without direct rendering support on that arch, and
don't build any dri driver.
2007-07-05 00:48:30 +02:00
Eric Anholt
ea53ff80af
fix LogicOp/bitmap problem, bug 11133
2007-07-04 07:37:28 -06:00
Brian
feeca1bcbc
add fbdev/ to DEMO_FILES
2007-07-03 15:46:48 -06:00
Brian
12e7278c08
document GLSL fixes
2007-07-03 12:21:11 -06:00
Brian
45b5c44eb9
bring over Roland's DOT3_RGBA fix from master
2007-07-03 12:20:52 -06:00
Brian
e3456c1028
added vec2(vec4) constructor, bug 11404
2007-07-03 11:42:03 -06:00
Brian
327fb38573
add code for stpq, rgba writemasks in make_writemask(), bug 11404
2007-07-03 11:41:07 -06:00
Brian
1d25d9e15f
Bump version to 7.0.1
2007-07-03 10:04:41 -06:00
Brian
cc7cee3f48
Revert the version of libOSMesa.so to 6.5.3 to avoid linking issues that were caused by bumping to 7.0
2007-07-03 10:03:01 -06:00
Brian
d7062710cd
use _mesa_unpack_stencil_span() in draw_stencil_pixels(), bug 11457
2007-07-03 08:58:03 -06:00
Julien Cristau
3e21f52796
Make libgl1-mesa-swx11 depend on libosmesa6
...
libgl1-mesa-swx11 used to contain libOSMesa.so.6, so programs linked against
it don't necessarily depend on libosmesa6; their dependencies were broken
since mesa 6.5.2-1.
2007-07-03 05:34:07 +02:00
Brian
9bfba734d8
add const to wglSetPixelFormat() to match .h declaration
2007-07-02 10:15:39 -06:00
Julien Cristau
0511d9a9d2
Fix merge and delete symlinks which aren't in the tarball.
2007-07-01 02:55:59 +02:00
Brian
aaebf2f47e
regenerated
2007-06-29 07:51:49 -06:00
Brian
23f8d77b38
Add a few missing GL 2.0 entrypoints, regenerate related files.
...
Specifically:
glVertexAttrib4bv
glVertexAttrib4iv
glVertexAttrib4ubv
glVertexAttrib4uiv
glVertexAttrib4usv
2007-06-28 16:38:48 -06:00
Samuel Thibault
498b4dbba4
Fix build on hurd-i386.
...
Build libgl1-mesa-glx without direct rendering support on that arch, and
don't build any dri driver.
2007-06-28 22:33:05 +01:00
Julien Cristau
ecc42e79ae
Merge unreleased changelog entries
2007-06-28 22:01:05 +01:00
Julien Cristau
0bf8ed523d
* Add a shlibs file for libgl1-mesa-swx11-i686.
2007-06-28 21:58:42 +01:00
Brian
87d22ee0fe
initial 7.0.1 relnotes
2007-06-28 08:11:36 -06:00
zhang
52e25f63d4
a variety of fixes for MingW
2007-06-28 08:10:09 -06:00
Brian
f3fb67972b
remove obsolete t_save_api.c
2007-06-28 07:43:32 -06:00
Brian
6400756364
remove obsolete sources
2007-06-28 07:21:59 -06:00
David Nusinow
d71d04bf6f
Bite the bullet and add myself to uploaders
2007-06-27 22:54:52 -04:00
David Nusinow
af90259e09
Merge remote branch 'origin/debian-experimental' into debian-experimental
...
Conflicts:
debian/changelog
src/mesa/drivers/dri/r300/radeon_lock.c
2007-06-27 22:53:04 -04:00
David Nusinow
7c9762f698
Changelog bump
2007-06-27 21:32:51 -04:00
David Nusinow
b2e67fdb7c
Merge branch 'upstream-experimental' into debian-experimental
...
Conflicts:
.gitignore
progs/miniglx/miniglxtest.c
src/glx/mini/Makefile
src/glx/mini/miniglx.c
src/mesa/drivers/dri/r300/.gitignore
2007-06-27 21:29:16 -04:00
Brian
d59f0314bd
md5 sums for 7.0
2007-06-22 16:50:24 -06:00
Brian
131baefac3
fix date for 7.0 release
2007-06-22 16:41:36 -06:00
Brian
a450078b67
update version
2007-06-22 16:40:17 -06:00
Brian
f6b041bf6c
bring in Eric's FreeBSD fixes for -pthread
2007-06-22 15:40:46 -06:00
Brian
4f340d181a
set tentative 7.0 release date
2007-06-20 19:59:15 -06:00
Julien Cristau
74a11701f3
Shorten the one-line synopsis of various packages.
...
They're cut off in .changes files if they're too long.
Thanks, Marc 'HE' Brockschmidt!
2007-06-13 19:36:49 +02:00
Brian
b58e38e936
fix TEXTREL problem (bug 7459)
2007-06-12 09:52:05 -06:00
Brian
8713cb48a8
Fix TEXREL issues when using GLX_USE_TLS (see bug 7459).
2007-06-12 09:46:12 -06:00
Brian
277c5e57ed
fix GLX_USE_TLS breakage
2007-06-12 08:57:39 -06:00
Brian
b3d62d5af5
disable depthBits check in check_compatible(), see bug 11161
2007-06-08 12:36:00 -06:00
Brian
9c0f0c8d81
remove old comment about DEFAULT_SOFTWARE_DEPTH_BITS
2007-06-08 12:35:37 -06:00
Brian
18a0a2a7ac
document bug 11049 fix
2007-05-23 16:50:22 -06:00
Brian
8b99d9e33c
restore GL_TEXTURE_LOD_BIAS in _mesa_PopAttrib(), bug 11049
2007-05-23 16:49:19 -06:00
Brian
01e7e153e3
document point attentuation fix
2007-05-23 08:59:02 -06:00
Brian
0ad4ca24d2
Fix point attentuation problem (bug 11042)
...
ctx->Point._Attentuation was computed in wrong place and the VB->Eye coord Z
array wasn't indexed correctly in run_point_stage().
2007-05-23 08:56:45 -06:00
Brian
724a155552
if light position is local, treat it as a homogeneous coord and divide by W (see bug 11009)
2007-05-21 10:55:15 -06:00
Julien Cristau
e1b0715dd6
Prepare changelog for upload.
2007-05-21 11:35:28 +02:00
Julien Cristau
a5c6598966
Merge remote branch 'origin/debian-unstable' into debian-experimental
...
Conflicts:
debian/changelog
2007-05-21 11:33:42 +02:00
Roland Scheidegger
d38b74a316
fix miptree layout (i915) for small compressed mipmaps
...
This seems to work now. Also fix i945 set_level_info, need to match i915
behaviour for storing mip height, as it's assumed to be the mip width
(in texels) elsewhere and the division by 4 is done later (untested).
2007-05-19 04:43:50 +02:00
Roland Scheidegger
54cab4b47b
fix copy & paste bug of previous commit, breaking dxt5 formats
2007-05-19 03:56:06 +02:00
Roland Scheidegger
c093666bc5
fix miptree comparison with compressed textures
...
TexelBytes is always 0 with compressed textures, thus would never match
mt->cpp. This caused constant blitting around of textures, and it fixes at
least the horrible performance of Q3 if compressed textures are enabled.
2007-05-19 01:39:54 +02:00
Roland Scheidegger
04972f6761
fix small s3tc mipmaps ( #10968 )
...
make sure that always whole blocks are uploaded.
(May still not work correctly if the top mip map is not at least a full block,
that is 4 pixels wide - not sure, but probably doesn't happen in real world)
2007-05-19 01:39:16 +02:00
Brian
67f8234622
set version to 7.0
2007-05-18 09:41:34 -06:00
Brian
201d6dbd9c
fix STATE_HALF_VECTOR value (bug 10987)
2007-05-18 09:35:18 -06:00
Julien Cristau
1865ef6fd4
Prepare changelog for upload.
2007-05-18 13:36:42 +02:00
Ian Romanick
fbcac5aa83
Refactor determining whether a texture target can use compressed format
2007-05-17 14:45:25 -07:00
Brian
2b72ab8f8f
document glXDestroyPbuffer fix
2007-05-17 15:30:39 -06:00
Brian
0ea97b9408
In DestroyPbuffer(), use GetReq() intead of GetReqExtra(). See bug 10983.
2007-05-17 15:26:39 -06:00
Brian
28683ac7c0
version 7.0, not 7.1
2007-05-17 09:07:25 -06:00
Brian
c72e3e210f
version should be 7.0
2007-05-17 09:04:19 -06:00
Ian Romanick
b0fe0d8a55
Bring framebuffer_texture's error checking more in-line with the spec.
2007-05-15 13:42:25 -07:00
Brian
c128c3ce8c
master/trunk is now for Mesa 7.1 devel: bump versions
2007-05-14 14:30:36 -06:00
Bruce Merry
6efdf648f5
in __glXGetArrayType() return type, not enabled (bug 10938)
2007-05-14 09:38:23 -06:00
Brian
6a587c0124
comment about fixing uniform structs
2007-05-14 09:38:23 -06:00
Oliver McFadden
524c3336c4
r300: Enable the non-user-buffers code to compile.
2007-05-13 13:38:38 +00:00
Oliver McFadden
0e7e211055
r300: Use e32(0x0) rather than e32(0); makes greping for hex values easier.
2007-05-13 12:59:41 +00:00
Oliver McFadden
4e641bf3e9
r300: Use the defined values when writing to R300_RS_ROUTE_0.
2007-05-13 12:56:59 +00:00
Oliver McFadden
2189ff5e51
r300: Use the defined values when writing to R300_SE_VTE_CNTL.
...
You can verify this is correct with the following code.
assert (0x043f ==
(R300_VTX_W0_FMT | R300_VPORT_X_SCALE_ENA | R300_VPORT_X_OFFSET_ENA
| R300_VPORT_Y_SCALE_ENA | R300_VPORT_Y_OFFSET_ENA |
R300_VPORT_Z_SCALE_ENA | R300_VPORT_Z_OFFSET_ENA));
2007-05-13 12:43:40 +00:00
Oliver McFadden
33a73466ae
r300: Added a TODO comment for the R300_VAP_INPUT_ROUTE_[01]_0 values.
2007-05-13 12:36:27 +00:00
Oliver McFadden
13c0abd8a7
r300: Changed some more functions to static functions.
...
This required reordering some of the functions which is why the diff is a little
larger.
2007-05-13 09:09:30 +00:00
Oliver McFadden
82de92c0fb
r300: Changed a couple of functions in r300_state.c to static functions.
2007-05-13 08:59:54 +00:00
Oliver McFadden
e4b8481f39
r300: Removed the unused r300_aos_rec (replaced by r300_dma_region) structure.
2007-05-13 08:43:30 +00:00
Oliver McFadden
b5990cec90
r300: Use #if 0 for disabled code, rather than commenting it out.
2007-05-13 08:28:51 +00:00
Oliver McFadden
d93642251e
r300: Removed a couple of obsolete/commented out includes.
2007-05-13 08:21:50 +00:00
Oliver McFadden
c66fd808ac
r300: A few very minor indenting corrections.
2007-05-13 07:51:41 +00:00
Oliver McFadden
73449270bb
r300: Use the defined values for the interpolater (interp_magic) magic values.
2007-05-13 07:44:20 +00:00
Oliver McFadden
6f56e68ee3
r300: Use the defined values when writing to R300_VAP_INPUT_CNTL_[01].
...
You can verify this is correct with the following code.
assert (0x00000001 == R300_INPUT_CNTL_0_COLOR);
assert (0x00000405 ==
(R300_INPUT_CNTL_POS | R300_INPUT_CNTL_COLOR |
R300_INPUT_CNTL_TC0));
2007-05-13 06:39:24 +00:00
Oliver McFadden
65fae19383
Revert "r300: Perform the locking closer to the DRM texture upload call."
...
This reverts commit 93881edb46
.
2007-05-12 17:18:57 +00:00
Roland Scheidegger
b78aec5767
bring over recent radeonMakeCurrent fixes for r300 to radeon/r200
2007-05-12 11:20:24 +02:00
Oliver McFadden
6bae7d40f7
r300: Removed the name argument to ALLOC_STATE; do the name via the macro.
2007-05-12 01:53:56 +00:00
Oliver McFadden
5f1f1f5704
r300: Renamed r300DoEmitState to r300EmitAtoms.
2007-05-12 01:13:54 +00:00
Oliver McFadden
93881edb46
r300: Perform the locking closer to the DRM texture upload call.
...
This might help if with attaching GDB if the driver gets into a -EAGAIN loop.
2007-05-12 00:14:33 +00:00
Oliver McFadden
56b99ace19
r300: Removed unused FORCE_32BITS_ELTS define.
2007-05-11 23:35:37 +00:00
Oliver McFadden
3aad47679e
r300: Removed the unused CPT macro.
2007-05-11 23:33:47 +00:00
Oliver McFadden
dac5303692
r300: Moved r300PackFloat24 near r300PackFloat32.
2007-05-11 23:32:03 +00:00
Oliver McFadden
64b03f33ee
r300: Added insert_at_tail to the ALLOC_STATE macro.
2007-05-11 23:13:08 +00:00
Oliver McFadden
b8b0dd1e20
Revert "r300: Merged radeon_span.c."
...
This reverts commit 0aa998b2ab
.
2007-05-11 23:03:40 +00:00
Oliver McFadden
93f9e61f43
r300: Corrected another error; regexp replaced something it shouldn't have.
2007-05-11 22:26:47 +00:00
Oliver McFadden
f405fbb36d
r300: Corrected some macro errors from the previous commit.
2007-05-11 22:23:31 +00:00
Oliver McFadden
5a09ea01e0
r300: Reduced the diff on radeon_lock.[ch].
2007-05-11 22:21:19 +00:00
Oliver McFadden
98d25a5a28
r300: Initial work on merging radeon_lock.[ch].
2007-05-11 22:02:52 +00:00
Oliver McFadden
0aa998b2ab
r300: Merged radeon_span.c.
2007-05-11 21:56:10 +00:00
Oliver McFadden
b6087270a0
r300: Cleaned up function names in r300_texstate.c.
2007-05-11 21:45:14 +00:00
Oliver McFadden
3f709f16ef
r300: Enable hardware 3D texture support. Fixes the stex3d demo.
2007-05-11 21:41:16 +00:00
Oliver McFadden
67363327e5
r300: Corrected a small error from 37cbf38c344012f9d6e938937dac3697b73721a8.
2007-05-11 21:41:16 +00:00
Oliver McFadden
bcaf8fc7b1
r300: Cleaned up the blend factor function.
2007-05-11 21:41:16 +00:00
Oliver McFadden
ef29d6af6c
r300: Removed the r300BindProgram function; mesa default does better checking.
2007-05-11 21:41:16 +00:00
Oliver McFadden
6a69bb5864
r300: Removed deprecated/disabled VBO code from r300_mem.c
...
Also removed a couple of unused fields from the r300_memory_manager structure.
2007-05-11 21:41:16 +00:00
Oliver McFadden
cbd29adbc8
r300: Indented r300_mem.c; I forgot this because it used to be radeon_mm.c.
2007-05-11 21:41:16 +00:00
Oliver McFadden
c729e67321
r300: Use __FUNCTION__ not __func__.
...
Just for consistency; most of the code already uses __FUNCTION__.
2007-05-11 21:41:16 +00:00
Oliver McFadden
5b23d36613
r300: Assert if the primitive type is unknown; this can't really happen.
2007-05-11 21:41:16 +00:00
Oliver McFadden
a87390504f
r300: Moved some code around in r300_render.c and general clean up.
2007-05-11 21:41:16 +00:00
Brian
cc358d861d
user-declared uniform structs not supported yet (see bug 10908)
2007-05-11 15:35:12 -06:00
Brian
749e093e33
don't ignore return value of _slang_codegen_global_variable()
2007-05-11 15:34:29 -06:00
Brian
eab6e16522
remove some unneeded code in init_machine()
2007-05-11 15:12:40 -06:00
Oliver McFadden
1b39be3790
r300: Removed some checking in r300NumVerts that is not needed.
...
According to Aapo Tahkola the OpenGL specification defines the behaviour when
there are not enough vertices for the primitive type, thus DRI drivers do not
need to perform verification on the number of vertices per primitive.
2007-05-11 19:45:28 +00:00
Oliver McFadden
69ff5a3dbc
r300: Function naming correction in r300_texmem.c.
2007-05-11 19:45:28 +00:00
Oliver McFadden
01ec508c7f
r300: Cleaned up function names in r300_state.c.
2007-05-11 19:45:28 +00:00
Oliver McFadden
d4e3b0b2c2
r300: Cleaned up function naming in r300_emit.c.
2007-05-11 19:45:28 +00:00
Oliver McFadden
b63c70666f
r300: Renamed r300_maos.c to r300_emit.c; it contains mostly emit code now.
2007-05-11 19:45:28 +00:00
Brian
c33c00764c
Remove unused FB_* tokens, re-indent code.
2007-05-11 08:41:34 -06:00
Brian
6c342ad859
When feeding back texcoords, don't divide by W. See bug 10913.
2007-05-11 08:39:18 -06:00
Patrick Baggett
86e4f52f3c
Fix some bugs related to loop counters and conditional branching.
2007-05-11 08:19:33 -06:00
Brian
f0707c789a
more indentation fixes, remove 'register' keywords
2007-05-10 17:33:14 -06:00
Brian
aed53ba525
re-indent some code
2007-05-10 17:30:44 -06:00
Brian
3dec7c57b0
document exp(), mod() fixes
2007-05-10 16:14:16 -06:00
Brian
544e441f53
regenerated
2007-05-10 16:14:16 -06:00
Brian
fa546c367d
Implement exp() in terms of __asm float_power. Fix typo in mod(vec4) function.
...
exp() was using __asm float_exp (OPCODE_EXP) but that computes base two, not e.
See bug 10907.
2007-05-10 16:14:15 -06:00
Ian Romanick
64a6a50155
Fix reversed enable logic in enable_texture
...
Fix bug inserted in commit c9e723e501
.
Discovered by Oliver McFadden (z3ro).
2007-05-10 15:01:52 -07:00
Oliver McFadden
c103453d4f
r300: Added TODO comment regarding texture tiling; I'm not sure about this.
2007-05-10 22:01:41 +00:00
Oliver McFadden
d7e3d1dc42
r300: Corrected a compile error introduced by one of the previous commits.
2007-05-10 21:40:20 +00:00
Oliver McFadden
02e44e41c8
r300: Removed obsolete start_index16_packet/start_index32_packet.
...
It's all in r300_render.c now.
2007-05-10 21:28:04 +00:00
Oliver McFadden
eed67a6e3e
r300: Moved some more emit code into r300_render.c.
2007-05-10 19:24:16 +00:00
Oliver McFadden
e856edb279
r300: Moved some more of the emit code into r300_render.c.
2007-05-10 19:24:16 +00:00
Brian
58239d2ae3
document tex sampler bug fix, code changes
2007-05-10 10:52:19 -06:00
Brian
2f6a0840c4
Replace pkg-config --cflags libdrm
with LIBDRM_CFLAGS, remove disabled lines, remove obsolete comments.
2007-05-10 10:51:54 -06:00
Ian Romanick
c9e723e501
Convert "bit" parameters to GLbitfield. Fix cut-and-paste bug in _mesa_IsEnabled
...
These changes are based on patch review comments from Brian Paul, Alan
Hourihane, and vehemens.
2007-05-10 08:20:42 -07:00
Ian Romanick
87a980a795
Refactor the loop in unbind_texobj_from_texunits.
...
Common code was pulled out of the per-target if-statment and put at the end
of the for-loop. The common code is guarded by a new variable, curr, that
is set to point to the unit's current target in each if-statement.
2007-05-10 08:20:41 -07:00
Ian Romanick
e282f89a38
Refactor queries of GL_(SOURCE|OPERAND)[012]_(ALPHA|RGB).
...
Most switch-statements that have cases for these enums already use code like:
const GLuint idx = pname - GL_SOURCE0_RGB;
... texUnit->Combine.SourceRGB[idx] ...
This patch just brings the remaining bits up to speed.
2007-05-10 08:20:41 -07:00
Ian Romanick
e2e4b60c7d
Refactor the way TestProxyTexImage is called in texture_error_check.
2007-05-10 08:20:41 -07:00
Ian Romanick
58dacc8df1
Refactor Enable / Disable and IsEnabled bits related to texture targets.
2007-05-10 08:20:41 -07:00
Oliver McFadden
b470189378
r300: Name the render functions in r300_render.c consistently.
2007-05-09 22:43:01 +00:00
Oliver McFadden
574bf4d346
r300: Return -1 for error.
2007-05-09 22:43:01 +00:00
Oliver McFadden
795ebb1a3b
r300: Probably a good idea to always check the vertices; it's a WARN_ONCE so the
...
performance impact is extremely minimal.
2007-05-09 22:43:01 +00:00
Oliver McFadden
d0be8b959a
r300: Added some more Doxygen documentation and made some functions static.
2007-05-09 22:43:01 +00:00
Oliver McFadden
672ecba175
r300: Removed the "texmicrotile" variable; the tiling code is disabled via a
...
compiler conditional anyway; probably broken?
2007-05-09 22:43:01 +00:00
Oliver McFadden
0dcea4bf8e
r300: Converted a few "if (0)" into "if (RADEON_DEBUG & DEBUG_TEXTURE)".
2007-05-09 22:43:01 +00:00
Brian
16c503f39a
Tweak the shell scripting for descending into and building subdirs.
...
In general, use this:
@for dir in $(SUBDIRS) ; do \
if [ -d $$dir ] ; then \
(cd $$dir && $(MAKE)) || exit 1; \
fi \
done
Basically, silently skip missing subdirs but generate an error and stop if
there's a compilation or install problem.
This was done inconsistantly before. In once case, a missing subdir was
causing us to go into an infinte loop!
2007-05-09 16:23:11 -06:00
Oliver McFadden
4d5d4e1f97
r300: Cleaned up radeon_context.h slightly; mostly Indent.
2007-05-09 21:06:28 +00:00
Oliver McFadden
a9ab36b8f2
r300: radeon_span.h is now common code; radeon_span.c still needs some work.
2007-05-09 20:52:09 +00:00
Oliver McFadden
88288b614e
r300: Renamed the R300 memory manager from "radeon" to "r300"; it's R300
...
specific.
2007-05-09 20:49:49 +00:00
Oliver McFadden
a154706061
r300: Indented radeon_span.h
2007-05-09 20:41:27 +00:00
Oliver McFadden
6fe41a4c01
r300: Further reduced the radeon_span.c diff.
2007-05-09 20:36:48 +00:00
Oliver McFadden
f4a2b9f83d
r300: I have no idea why this was forced on, but it seems to work fine when
...
restored to the previous behaviour.
2007-05-09 19:30:59 +00:00
Oliver McFadden
56c2f7bb42
r300: Removed the dangerous R300_SPAN_DISABLE_LOCKING flag.
...
Enabling R300_SPAN_DISABLE_LOCKING would probably cause more lockups; I think
there are a couple of other little bugs in this code, too. It's best to remove
it.
2007-05-09 19:24:59 +00:00
Oliver McFadden
df747eb354
r300: Removed a bit of disabled code.
2007-05-09 18:44:56 +00:00
Oliver McFadden
ff7a41a159
r300: Don't need to include the deprecated r300_program.h in some files.
...
The only file that still requires r300_program.h is r300_ioctl.c; and it should
use the new defines in r300_reg.h!
2007-05-09 18:37:46 +00:00
Oliver McFadden
01fdb34b39
r300; Indent would destroy r300_reg.h, so add *INDENT-OFF*.
2007-05-09 18:31:04 +00:00
Christoph Bill
3c9e5cb0bd
r300: Added a few more Doxygen comments.
2007-05-09 18:25:12 +00:00
Christoph Bill
a6aa1f8016
r300: Added some Doxygen comments.
2007-05-09 18:24:06 +00:00
Oliver McFadden
967c2d220d
r300: Converted "rp" variables (r300_fragment_program) to "fp".
2007-05-09 18:14:42 +00:00
Oliver McFadden
0e6b7eb9c0
r300: Don't need to sleep here; might cause performance problems the first time.
2007-05-09 18:11:38 +00:00
Oliver McFadden
ed42bd6e20
r300: Removed the obsolete GLX_DIRECT_RENDERING define.
2007-05-09 18:07:16 +00:00
Oliver McFadden
2db667290a
r300: Further reduced the diff between radeon_span.[ch].
2007-05-09 18:06:10 +00:00
Oliver McFadden
cea0c2b144
r300: Indented both copies of radeon_span.[ch] in preparation for merging.
2007-05-09 18:01:43 +00:00
Oliver McFadden
2b5ef29a7b
r300: Removed the deprecated VTXFMT code.
...
This was okayed by Jerome Glisse and Keith Whitwell on the dri-devel IRC channel
and list, respectively.
2007-05-09 16:10:08 +00:00
Oliver McFadden
4ed59c6012
r300: The empty check_space doesn't and never has done anything; removed it.
2007-05-09 15:57:30 +00:00
Oliver McFadden
7e7b1f7c4d
r300: Fix a couple of static errors.
2007-05-09 15:38:18 +00:00
Oliver McFadden
c48e4c6f09
r300: Fixed indenting from previous commit
...
d28f6d9176
.
2007-05-09 15:28:38 +00:00
Oliver McFadden
4f20fe8a93
r300: Added R300_PRIM_NUM_VERTICES_MASK suggested by Jerome Glisse.
2007-05-09 15:21:13 +00:00
Oliver McFadden
d28f6d9176
r300: Fixed some more function names.
...
Note there might be some calls to the old function names in conditionally
disabled code, but I think I've got them all.
2007-05-09 15:19:05 +00:00
Oliver McFadden
fe6a2c4295
r300: Changed r300_run_vb_render calls to r300RunRender in some conditionally
...
disabled code.
2007-05-09 15:07:34 +00:00
Oliver McFadden
faf47d9f84
r300: Added a "not implemented yet" comment back.
2007-05-09 14:45:42 +00:00
Oliver McFadden
f9828f5c4f
Merge branch 'master' of git://anongit.freedesktop.org/git/mesa/mesa
2007-05-09 14:23:22 +00:00
Oliver McFadden
7b165de5f8
r300: Last of the indent changes. :)
2007-05-09 14:19:45 +00:00
Brian
62ef001de7
add pointers to git repo for drm/libpciaccess, replace & with &
2007-05-09 08:17:57 -06:00
Oliver McFadden
76d7b62cd2
r300: Indented r300_cmdbuf.[ch].
2007-05-09 14:17:16 +00:00
Oliver McFadden
901fc0de18
r300: Indented r300_state.[ch].
2007-05-09 14:12:34 +00:00
Oliver McFadden
c970811dab
r300: Indented r300_texmem.[ch].
2007-05-09 14:11:17 +00:00
Oliver McFadden
bb97694fad
r300: Indented r300_texstate.[ch]
2007-05-09 14:09:35 +00:00
Brian
516259d609
Clean-up in I830AllocVidMem(), s/int/unsigned long/ for ret variable.
2007-05-09 08:07:15 -06:00
Brian
3e4302fe3b
Check that texture units/samplers specified with glUniform1i() are legal.
2007-05-09 08:07:15 -06:00
Oliver McFadden
dcc8e5f4c1
r300: Indented r300_tex.[ch].
2007-05-09 13:59:28 +00:00
Oliver McFadden
32c8d002d0
r300: Indented r300_context.[ch].
2007-05-09 13:55:14 +00:00
Julien Cristau
a8c856d43c
Cherry-pick commmit 65faf023
by Michel Dänzer to fix r300 crash.
...
r300: Don't crash in radeonUpdatePageFlipping when !radeon->glCtx->DrawBuffer.
This feels like a kludge, maybe there's a better solution.
2007-05-09 15:09:12 +02:00
Oliver McFadden
c9b87b8ad8
r300: Removed the unused immediate vertices mode macro.
...
Immediate vertices mode hasn't been supported since early CVS versions of the
R300 driver.
2007-05-09 04:30:16 +00:00
Oliver McFadden
5d61cfd1fd
r300: Removed a disabled/obsolete e32 in the AOS function.
2007-05-09 04:27:31 +00:00
Oliver McFadden
93e957cc65
r300: Removed some disabled R200 code from the R300 driver.
2007-05-09 04:25:27 +00:00
Oliver McFadden
3eae496deb
r300: Don't indent the tables in r300_texstate.c.
2007-05-09 04:20:35 +00:00
Oliver McFadden
81c6516af1
r300: Indented r300_vertprog.[ch].
2007-05-09 04:12:04 +00:00
Oliver McFadden
9e91351826
r300: Indented r300_fragprog.[ch].
2007-05-09 04:08:27 +00:00
Oliver McFadden
328b307e2f
r300: Cleaned up the R300 Makefile.
2007-05-09 03:44:40 +00:00
Oliver McFadden
d316b4dc22
r300: Corrected a couple of "control reaches end of non-void function" warnings.
2007-05-09 03:40:06 +00:00
Oliver McFadden
f0126a76ac
r300: Corrected an error in r300_vertprog.c.
...
Cannot use _mesa_warning here because we don't have a context pointer; perhaps
R300 specific warning and error functions are needed.
2007-05-09 03:38:45 +00:00
Oliver McFadden
b8640db021
r300: Corrected the exit codes for consistency; they are all -1 for error now.
...
The one exception is 300FlushCmdBuf.
2007-05-09 03:36:28 +00:00
Oliver McFadden
28b47110b6
r300: Converted exit calls to _mesa_exit calls.
...
Note that the exit codes are inconsistent and should be fixed.
2007-05-09 03:32:15 +00:00
Oliver McFadden
fe2c58d2d5
r300: Converted a few fprintf calls to _mesa_warning calls.
2007-05-09 03:25:33 +00:00
Oliver McFadden
4917955205
r300: Added a warning when texture state update fails.
2007-05-09 03:22:37 +00:00
Oliver McFadden
eca50a27e1
r300: Removed some obsolete code from r300_tex.c.
2007-05-09 03:18:14 +00:00
Oliver McFadden
0950e9727e
mesa: Added Vim swap files to .gitignore.
2007-05-09 03:14:08 +00:00
Oliver McFadden
504fafe389
r300: Updated .gitignore.
2007-05-09 03:12:51 +00:00
Oliver McFadden
72608aedc3
r300: Added the Linux Kernel indent script.
2007-05-09 03:12:22 +00:00
Oliver McFadden
be56660ba0
r300: Indented r300_state.[ch].
2007-05-09 02:59:11 +00:00
Oliver McFadden
36c8bc6141
r300: Indented r300_emit.h.
2007-05-09 02:52:37 +00:00
Oliver McFadden
5c8296a6ab
r300: Indented r300_cmdbuf.[ch].
2007-05-09 02:51:13 +00:00
Oliver McFadden
6665658a56
r300: Indented r300_shader.[ch].
2007-05-09 02:50:13 +00:00
Oliver McFadden
204bc4e441
r300: Indented r300_maos.[ch].
2007-05-09 02:49:14 +00:00
Oliver McFadden
e90ad3dbbb
r300: Indented r300_ioctl.[ch].
2007-05-09 02:46:57 +00:00
Oliver McFadden
8d62afdb6a
r300: Removed the obsolete pfs_reg_t type from r300_fragprog.h.
2007-05-09 02:41:38 +00:00
Oliver McFadden
59494bafb4
r300: Use an array for the vertex program sources and corrected an error from
...
4960af08ad
.
2007-05-09 02:35:07 +00:00
Oliver McFadden
33939fd29b
r300: Removed the ugly CARD32 type.
2007-05-09 02:27:08 +00:00
Oliver McFadden
4960af08ad
r300: Renamed vertex_shader.h to r300_vertprog.h
2007-05-09 02:24:59 +00:00
Oliver McFadden
f5b0cafbb1
r300: Removed obsolete pixel_shader.h header file.
2007-05-09 02:18:29 +00:00
Oliver McFadden
c578354642
r300: Renamed the VBO functions to the R300 name format.
2007-05-08 21:04:57 +00:00
Brian
da37ac5ee7
remove some debug code
2007-05-08 14:08:45 -06:00
Brian
ed2fddc98e
special case for -pthread (bug 10876)
2007-05-08 14:03:04 -06:00
Brian
58eaf0acca
a somewhat nicer demo w/ command line options
2007-05-08 13:48:52 -06:00
Oliver McFadden
d132f7245d
r300: Removed some deprecated code from r300_context.c and corrected an unused
...
variable warning in r300_render.c.
2007-05-08 19:46:25 +00:00
Oliver McFadden
73bc8b63ac
r300: Last few r300_render.c clean up.
2007-05-08 19:38:44 +00:00
Oliver McFadden
377ce9e074
r300: Merged some comments into the Doxygen documentation.
2007-05-08 19:35:36 +00:00
Oliver McFadden
f1d785188b
r300: Cleaned up r300_render.c using Indent with appropriate options.
...
This corrects the mess of space and tab indenting that existed in this file, and
probably others. The diff is actually very small if you use an external diff
program and ignore whitespace.
2007-05-08 19:31:30 +00:00
Oliver McFadden
313c4c2643
r300: General render clean up; added some Doxygen documentation, too.
2007-05-08 19:22:15 +00:00
Oliver McFadden
fbeae4f70c
r300: Moved the pipeline stages together for readability.
2007-05-08 18:47:26 +00:00
Oliver McFadden
9301a6a325
r300: Print the OpenGL define instead of a 2-digit char code in the warning.
2007-05-08 18:43:56 +00:00
Oliver McFadden
6c036812be
r300: Clean up the vertex buffer emission code and reduced code duplication.
...
I tested both the unoptimized and optimized versions with Quake 3 Arena; there
are no problems.
2007-05-08 18:28:04 +00:00
Oliver McFadden
c6abbbfd02
r300: Cleaned up a lot of cruft in r300_render.c.
2007-05-08 18:05:10 +00:00
Dave Airlie
8a7f474c69
i915/miniglx: remove unused code
2007-05-08 10:53:43 +10:00
Dave Airlie
47e33a27df
miniglx: fixup use of create windows x and y coordinates
...
This makes miniglx take not of the x and y from XCreateWindow
2007-05-08 10:51:44 +10:00
Dave Airlie
401629c721
miniglx/glut: should use the x/y pos to create window
...
This allows moving miniglx glut windows around the framebuffer
2007-05-08 10:49:31 +10:00
Brian
f1770c3210
better comments for _mesa_debug(), _mesa_warning(), etc
2007-05-07 14:13:23 -06:00
Dave Airlie
8130a4fe98
radeon: enable xpress chipsets
...
glxgears and googleearth now run so that seems like a good start
Thanks to Aapo Tahkola for doing the 3D work on this so far, I got lost
after the GART changes.
2007-05-07 07:06:08 +10:00
Aapo Tahkola
8f1c63b263
rs480: fix secondary color for real this time
2007-05-06 19:25:45 +03:00
Aapo Tahkola
857ebc6d47
Merge branch 'master' of git+ssh://aapot@git.freedesktop.org/git/mesa/mesa
2007-05-06 19:19:16 +03:00
Aapo Tahkola
660bdc616b
rs480: fix textures and secondary color(?). clipping is still busted. tested on r480
2007-05-06 19:18:10 +03:00
Aapo Tahkola
88ae491bd2
r300: fix broken vbos
2007-05-06 19:10:39 +03:00
Oliver McFadden
8445960d9f
r300: Added R300_AA_DISABLE for R300_GB_AA_CONFIG.
2007-05-06 12:09:42 +00:00
Oliver McFadden
74cae00c0e
r300: Removed more deprecated state code that is now set in separate functions.
2007-05-06 11:56:36 +00:00
Oliver McFadden
56d9663574
r300: R300_ZS_... is now set in separate functions; removed the deprecated code.
2007-05-06 11:54:00 +00:00
Oliver McFadden
81d1a04e04
r300: Point size is now set in a separate function; removed the deprecated code.
2007-05-06 11:52:03 +00:00
Oliver McFadden
62cbe6c3f3
r300: Use the defined values for R300_VAP_CNTL_STATUS.
2007-05-06 11:36:24 +00:00
Aapo Tahkola
16cec9f767
r300: fix primary color on rs480
2007-05-06 14:28:23 +03:00
Aapo Tahkola
5e2a66466d
don't use hw to perform vertex transform etc. when using swtcl. This for compatibility with vertex programs and the fact that swtcl very rarely gets hit with tcl capable hw.
2007-05-05 17:07:46 +03:00
Dave Airlie
b3378f6cc5
nouveau: disable nouveau build by default
...
Until this is API/ABI stable building it by default isn't a good idea.
2007-05-05 15:43:01 +10:00
Brian
91948f99dd
add </ol> tag
2007-05-04 18:32:02 -06:00
Brian
ae5f67575d
Makefile clean-ups for miniglx.
2007-05-04 18:27:12 -06:00
Brian
e75fbd3f91
Assorted miniglx updates.
2007-05-04 18:26:41 -06:00
Brian
a6dad578b5
document R300 bug fix 10848
2007-05-03 13:52:33 -06:00
Brian
c6443eb1a3
fix some matrix/state token indexing bugs (see bug 10848)
2007-05-03 12:33:25 -06:00
Brian
121533defb
add some #includes to silence warnings
2007-05-03 09:50:08 -06:00
Brian
3cddba688d
get rid of normal vector
2007-05-02 18:55:45 -06:00
Brian
dc881e1909
get rid of OSMESA stuff
2007-05-02 18:54:57 -06:00
Brian
2dfb03beb2
New test of the dFdx(), dFdy() functions.
2007-05-02 18:48:51 -06:00
Brian
18cfe0c801
document recent GLSL, R300 fixes
2007-05-02 18:46:45 -06:00
Brian
60d136f63c
changes to get DDX/DDY working again
2007-05-02 18:45:44 -06:00
Brian
62da6a1b3e
Resuscitate some of the DDX,DDY code.
...
Only works for program input registers at this time.
Good enough for the common case of texcoords, though.
2007-05-02 18:44:34 -06:00
Brian
77e7535c0f
fix some DDX,DDY mix-ups
2007-05-02 18:42:57 -06:00
Brian
5c1b53d58d
Document a deficiency in the _swrast_Translate() function with regard to point size.
2007-05-02 12:06:43 -06:00
Brian
b2f1d6422b
fix some renderbuffer/wrapper bugs
2007-05-02 08:48:43 -06:00
Brian
99f24c8d17
fix some StepX/StepY mix-ups in alpha interpolation
2007-05-02 08:48:20 -06:00
Brian
04c401c91e
add *gc, *syn files to tarballs
2007-05-02 08:29:14 -06:00
Brian
03f201d935
regenerated
2007-05-01 14:03:16 -06:00
Brian
594b5ad87d
implement acos(), asin(), atan()
2007-05-01 14:02:49 -06:00
Brian
bfd5cf72c4
fog, mix() bug fixes
2007-05-01 10:23:15 -06:00
Brian
7559364027
Rewrite of slang_inline_asm_function() to do full parameter/argument substitution.
...
We had been taking a short-cut w/ asm inlines by just using parameters in order
rather than doing full formal parameter -> actual argument substitution like
ordinary inlined function calls. This worked in all cases but one: mix() in
which the parameters were used in a different order.
This fixes bug 10821.
2007-05-01 10:22:08 -06:00
Michel Dänzer
65faf02367
r300: Don't crash in radeonUpdatePageFlipping when !radeon->glCtx->DrawBuffer.
...
This feels like a kludge, maybe there's a better solution.
2007-04-30 18:28:24 +02:00
David Nusinow
1953cfc954
Update changelog
2007-04-30 00:08:11 -04:00
David Nusinow
8e7bac950e
Merge branch 'upstream-experimental' into debian-experimental
2007-04-29 23:23:00 -04:00
Michel Dänzer
c409dbcae3
r300: Page flipping fixes.
...
Mostly making sure the page flipping state is respected when necessary.
2007-04-29 13:52:48 +02:00
Michel Dänzer
cbf280dc26
r300: radeonMakeCurrent cleanups.
...
r300UpdateWindow is superfluous or even possibly wrong here; _mesa_make_current
will set the viewport when necessary. So the conditional _mesa_set_viewport call
can go as well.
2007-04-29 13:52:11 +02:00
Brian
af0ae93863
only load front/back face attrib if using a shader (bug 10788)
2007-04-28 08:51:23 -06:00
Brian
bcc3baadba
use EMIT_1F or EMIT_4F for fog depending on fragment program (bug 10788)
2007-04-28 08:50:07 -06:00
Brian
4ca7c804db
fix GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB bug (10787)
2007-04-28 08:01:18 -06:00
Keith Packard
bfaf6156fb
additional checks that attr is a texcoord
2007-04-28 07:50:06 -06:00
Brian
d741b10be6
7.0 blurb
2007-04-27 17:05:29 -06:00
Brian
e371a5f084
Version bumps for 7.0
2007-04-27 17:01:23 -06:00
Brian
af846712fd
updates for 7.0
2007-04-27 17:00:13 -06:00
Brian
c4615abb11
added 7.0 relnotes link
2007-04-27 16:54:05 -06:00
Brian
430e036413
added 6.5.3 MD5 sums
2007-04-27 16:53:42 -06:00
Brian
502ebe90e8
7.0 release notes (template)
2007-04-27 16:53:26 -06:00
Brian
02e958a1e4
added glGetActiveAttrib
2007-04-27 16:27:36 -06:00
Brian
cce5084941
"Fix" for bug 9170. May need more attention.
2007-04-27 15:41:07 -06:00
Brian
4b1d1b7b18
document perspective correction issues
2007-04-27 15:25:00 -06:00
Brian
7ff72a7659
document broken inverse trig functions
2007-04-27 15:23:19 -06:00
Brian
c4b3b8dece
asin(), acos(), atan() just return 0.5 for now to avoid crashing. Fix someday.
2007-04-27 15:22:58 -06:00
Brian
65bab0dad8
remove rc4 suffix
2007-04-27 08:00:51 -06:00
Brian
74edc663a6
set 6.5.3 release date
2007-04-27 08:00:37 -06:00
Brian
54d59cfb70
Added error check that all varying vars needed by the fragment shader are produced by vertex shader.
2007-04-26 12:20:53 -06:00
Brian
b7f5b8af65
Unconditionally update _TriangleCaps bits. Fixes software fallback bugs, such as #10687 .
2007-04-26 10:45:44 -06:00
Brian
4099531a0a
bump Windows to OpenGL 2.1, set release date
2007-04-26 07:50:26 -06:00
Brian
1606f2c123
enable 2.1 extensions
2007-04-26 07:49:33 -06:00
Brian
1dd7c00214
Windows updates
2007-04-26 07:48:35 -06:00
Brian
f42d4ab41e
move #include <GL/glut.h> after other #includes for Windows
2007-04-26 07:46:59 -06:00
Brian
4a28548cbf
use sqrt(), not sqrtf() for Windows
2007-04-26 07:46:38 -06:00
Karl Schultz
5814922d25
updates for 6.5.3 w/ VC8
2007-04-25 10:28:37 -06:00
Brian
3de20aead2
RC4
2007-04-25 10:01:30 -06:00
Brian
6d27194dff
fix attribsMask (re-fixes depth peeling algorithm)
2007-04-25 09:58:15 -06:00
Julien Cristau
03cdacfb6a
Prepare changelog for upload.
2007-04-25 10:37:10 +02:00
Julien Cristau
30f3c3dfad
Update changelog.
2007-04-25 08:42:02 +02:00
Julien Cristau
dee1b0d5bb
Merge remote branch 'upstream/master' into debian-experimental
2007-04-25 08:40:39 +02:00
Brian
c233aa2768
s/fog/attrib[FRAG_ATTRIB_FOGC][0]/
2007-04-24 22:32:41 -06:00
Brian
c93b2a1cb7
s/fog/attrib[FRAG_ATTRIB_FOGC][0]/
2007-04-24 22:22:14 -06:00
Julien Cristau
6f2b0fe463
New upstream release candidate.
...
Refresh a couple patches.
2007-04-25 01:48:33 +02:00
Julien Cristau
0c69176498
Merge tag 'mesa_6_5_3_rc3' into debian-experimental
2007-04-25 01:41:05 +02:00
Julien Cristau
4e7a0385b5
Merge tag 'mesa_6_5_3_rc2' into debian-experimental
2007-04-25 01:40:50 +02:00
Brian
eca456b63d
s/DO_TEXVAR/DO_ATTRIBS/
2007-04-24 16:57:38 -06:00
Brian
4003bde6ff
get rid of an extra textured triangle function
2007-04-24 16:47:33 -06:00
Brian
ddcf819906
s/TEXTURE/ATTRIBS/
2007-04-24 16:47:07 -06:00
Brian
9ede048127
trim down the number of line drawing functions, special cases
2007-04-24 16:40:54 -06:00
Brian
97693436a5
only need one CI-mode triangle function
2007-04-24 16:20:50 -06:00
Brian
8a8a5bd104
s/INTERP_TEX/INTERP_ATTRIBS/
2007-04-24 16:16:25 -06:00
Brian
3e5eda9ee9
fix typo
2007-04-24 10:21:10 -06:00
Brian
f38dcc8a6a
added missing VC8 .sln files
2007-04-24 10:19:19 -06:00
Brian
b1b154c498
added new VC* files, bump version to rc3
2007-04-24 08:58:12 -06:00
Karl Schultz
286faac68e
assorted fixes for Windows/VC8
2007-04-24 08:53:28 -06:00
Brian
3b0bd0ce17
new VC8 project files
2007-04-24 08:52:34 -06:00
Karl Schultze
208ea84524
fix double const, move an assertion
2007-04-24 08:19:07 -06:00
Matthias Hopf
7868ab6617
add missing semicolon
2007-04-24 07:48:35 -06:00
Sean D'Epagnier
47ad443c55
Added proper cleanup code
2007-04-23 21:17:30 -07:00
Brian
3db3dc58bc
disable some errant code
2007-04-23 22:04:03 -06:00
Brian
c27adc52ce
remove SWvertex->fog field, use attrib field
2007-04-23 22:03:11 -06:00
Brian
afc132e7a9
remove SWvertex->fog field, use attrib field
2007-04-23 22:01:34 -06:00
Brian
335769a875
some re-org, clean-up
2007-04-23 21:27:13 -06:00
Brian
0bdf216dd0
Improve the code for interpolating fragment attributes a little. More to come...
2007-04-23 21:21:52 -06:00
Julien Cristau
4adbd94b10
Only install stuff in mesa-swx11-source if we're building arch:all packages.
2007-04-23 11:00:09 +02:00
Brian
d59e6f233b
import glxext.h version 19
2007-04-22 15:32:10 -06:00
Julien Cristau
4a2905b645
Delete obsolete file.
2007-04-22 18:08:58 +02:00
Julien Cristau
0638c6b530
Add generated files from the tarball so they're included in mesa-swx11-source.
2007-04-22 18:08:35 +02:00
Julien Cristau
7dd35ce013
Delete .gitignore files which do more harm than good in a debian package tree.
2007-04-22 18:07:52 +02:00
Sean D'Epagnier
ad02042db2
Fixed fallout, glfbdev driver was calling a nop function that was removed.
2007-04-21 20:18:42 -07:00
Julien Cristau
c8629c3178
Resync debian/scripts/install-source.sh.
2007-04-22 00:51:10 +02:00
Julien Cristau
77ccf51cb3
New upstream release candidate.
2007-04-22 00:50:40 +02:00
Julien Cristau
01197f0c77
Merge branch 'upstream-experimental' into debian-experimental
2007-04-22 00:34:30 +02:00
Julien Cristau
69c86ff4fd
Remove leftover file.
2007-04-22 00:33:38 +02:00
Brian
f793e90e82
Fix color sum bug 10688.
2007-04-21 15:58:37 -06:00
Brian
112e1f2b5a
specularColor.alpha should default to 1, not 0
2007-04-21 15:56:10 -06:00
Brian
e5cf37c178
fix SkipPixels bugs in _mesa_pack_bitmap(), bug 10690
2007-04-21 14:12:57 -06:00
Julien Cristau
9a42ffad81
Add build-dependencies on libxdamage-dev and libxfixes-dev.
2007-04-21 21:23:21 +02:00
Julien Cristau
0d8633bf8c
Delete autogenerated files, and files not included in the tarball.
2007-04-21 21:20:37 +02:00
Brian
b5e9b0e562
Remove the !rb->Data check that was added a few months ago.
...
Was changed while debugging #7205 . Broke the shadowtext demo. Revisit this
if the problem w/ bug 7205 returns...
2007-04-21 13:18:06 -06:00
Brian
b1502588c4
s/occlude.h/queryobj.h/
2007-04-21 12:54:23 -06:00
Julien Cristau
d79e80a3d0
New upstream release candidate.
...
Drop patches included upstream.
2007-04-21 20:47:01 +02:00
Brian
74afcabd85
Rename occlude.[ch] to queryobj.[ch]
2007-04-21 12:42:54 -06:00
Brian
b3ab925e91
Rename occlude.[ch] to queryobj.[ch] to better reflect contents.
2007-04-21 12:36:39 -06:00
Brian
2d2c6a622d
prep for 6.5.3 rc2
2007-04-21 12:31:51 -06:00
Brian
fc3d6bd351
memory leaks fixed
2007-04-21 12:30:58 -06:00
Brian
e261d66d81
Remove all the USE_MEMPOOL debug code.
2007-04-21 12:30:58 -06:00
Brian
cd3e39340f
Use new memory pool allocator. Lots of debug code still in place...
2007-04-21 12:30:58 -06:00
Julien Cristau
d890ebdd25
Merge branch 'upstream-experimental' into debian-experimental
...
Conflicts:
doxygen/Makefile
doxygen/common.doxy
doxygen/doxy.bat
doxygen/glapi.doxy
doxygen/header.html
doxygen/main.doxy
doxygen/math.doxy
doxygen/shader.doxy
doxygen/swrast.doxy
doxygen/swrast_setup.doxy
doxygen/tnl.doxy
doxygen/tnl_dd.doxy
progs/tests/Makefile
progs/tests/fbotest1.c
progs/tests/fbotest2.c
progs/tests/fbotexture.c
progs/tests/mipmap_limits.c
progs/tests/sharedtex.c
progs/tools/trace/gltrace_support.cc
progs/trivial/Makefile
src/egl/docs/EGL_MESA_screen_surface
src/egl/main/egllog.c
src/glx/mini/Makefile
src/glx/mini/driver.h
src/mesa/drivers/allegro/amesa.c
src/mesa/drivers/windows/gldirect/dx7/gld_driver_dx7.c
src/mesa/drivers/windows/gldirect/dx7/gld_ext_dx7.c
src/mesa/drivers/windows/gldirect/dx7/gld_primitive_dx7.c
src/mesa/drivers/windows/gldirect/dx8/gld_driver_dx8.c
src/mesa/drivers/windows/gldirect/dx8/gld_ext_dx8.c
src/mesa/drivers/windows/gldirect/dx8/gld_primitive_dx8.c
src/mesa/drivers/windows/gldirect/dx9/gld_driver_dx9.c
src/mesa/drivers/windows/gldirect/dx9/gld_ext_dx9.c
src/mesa/drivers/windows/gldirect/dx9/gld_primitive_dx9.c
src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c
2007-04-21 20:27:55 +02:00
Brice Goglin
5ee9b3ce72
Fix conflicts for libGLw packages.
...
libglw1-mesa does not have to conflict with earlier libgl1-mesa-swx11
(libGLw was only shipped as development libs/headers within swx11-dev).
libglw1-mesa-dev needs to conflicts with libglw-dev.
2007-04-21 20:20:03 +02:00
Brice Goglin
031b539a09
Split out libGLw libs and headers from libgl1-mesa-swx11.
...
Ship both static and shared libraries for libGLw, creating libglw1-mesa and
libglw1-mesa-dev (closes : #374904 ).
2007-04-21 20:19:38 +02:00
Ian Romanick
ad3cc95485
Fix FBO completeness bug in shadowtex.
2007-04-21 10:48:24 -07:00
Brian
4e0a64675c
added MemPool field
2007-04-21 10:18:49 -06:00
Brian
d5e7234ba8
call grammar_alloc_free() to fix memleaks
2007-04-21 10:05:05 -06:00
Brian
bc74cb4c0a
destroy window upon exit
2007-04-21 10:05:05 -06:00
Brian
257f799849
remove more unused vars, assertions
2007-04-21 10:05:05 -06:00
Brian
81c4fee160
remove unused vars, assertions
2007-04-21 10:05:05 -06:00
Brian
1fbdd9d794
added slang_mem.c
2007-04-21 10:05:05 -06:00
Brian
82839e8430
Memory pool manager.
...
Instead of doing intricate malloc/free tracking during compiling, allocate
everything (which would be discarded after compiling) from a pool that can
be freed en masse when done.
2007-04-21 10:05:05 -06:00
Brian
ced6f76404
undo a test/debug change
2007-04-21 10:05:05 -06:00
Brian
4cc2674aee
fix instruction comment code
2007-04-21 10:05:05 -06:00
Brian
a7f7366d38
another bit of debug code
2007-04-21 10:05:05 -06:00
Brian
11e3f733ba
free subroutine array (fix mem leak)
2007-04-21 10:05:05 -06:00
Brian
98ef18909a
new varnames in slang_operation_insert()
2007-04-21 10:05:05 -06:00
Brian
f2346498aa
fix memleak in slang_operation_insert()
2007-04-21 10:05:05 -06:00
Brian
4b7c6fc5a6
free shProg->Attributes in _mesa_free_shader_program_data()
2007-04-21 10:05:05 -06:00
Brian
fe16b9f663
move allocation of shProg->Attributes earlier in function
2007-04-21 10:05:05 -06:00
Brice Goglin
47c3c706e8
Add 09_i915_always_enable_pixel_fog.patch
2007-04-21 18:00:12 +02:00
Brian
c9855a60f4
Call _mesa_warning() instead of _mesa_problem() when external s3tc lib not found.
...
The later incorrectly encourages filing a bug (10703, for example).
2007-04-21 09:47:36 -06:00
Jeremy Kolb
838a2a2633
Make xcb backend compile.
...
Add nouveau to match linux-dri config.
2007-04-20 21:53:38 -04:00
Brian
e7e5279fc0
Remove unused Imakefiles.
2007-04-20 19:18:13 -06:00
Brian
7fd3a6c521
Long obsolete.
2007-04-20 19:01:21 -06:00
Brian
720cf3aa13
added new xm_glide.c file
2007-04-20 18:55:13 -06:00
George Sapountzis
5491c8194c
xmesa: call _glapi_set_dispatch() for all xserver DDXes.
...
This is to unify the xmesa code across xserver DDX'es. The call is intented for
XGL, but it does not hurt to call for other DDX'es. In fact it was not guarded
against XGL when it was first added in xserver.
2007-04-20 21:09:00 +03:00
George Sapountzis
e4e2068ac9
xmesa: minor cosmetic
...
mainly drop 'client' argument from initialize_visual_and_buffer().
2007-04-20 21:08:58 +03:00
George Sapountzis
6346a753c6
xmesa: split FX functions to separate file, part 2.
2007-04-20 21:08:57 +03:00
George Sapountzis
4d944b502f
xmesa: split FX functions to separate file, part 1.
2007-04-20 21:08:56 +03:00
George Sapountzis
6aa5668871
xmesa: spilt FX code to separate functions.
2007-04-20 21:08:55 +03:00
George Sapountzis
d60009bd6d
Revert "xmesa: drop glide (FX) backend."
...
This reverts commit 2a2f8d806f
.
2007-04-20 21:08:53 +03:00
Brice Goglin
0d830a616c
Add 08_r300_update_window_state_when_bound_but_stamp_changed.patch
2007-04-20 18:53:47 +02:00
Brice Goglin
e219bf8338
Add 07_call_radeonSetCliprects_from_radeonMakeCurrent.patch
2007-04-20 18:44:59 +02:00
Julien Cristau
6c0fba2480
Prepare changelog for upload.
2007-04-20 05:58:00 +02:00
Julien Cristau
f4cc159f53
Revert " * Split out libGLw libs and headers from libgl1-mesa-swx11 and ship both"
...
This reverts commit 856ae782c7
.
Conflicts:
debian/changelog
2007-04-20 05:55:04 +02:00
Julien Cristau
04c002abc2
Revert "Fix conflicts for libGLw packages."
...
This reverts commit 048144074b
.
2007-04-20 05:53:59 +02:00
Julien Cristau
78fd17907e
Merge branch 'debian-experimental' into debian-unstable
2007-04-20 05:52:20 +02:00
Julien Cristau
47edc83080
Merge branch 'debian-experimental' into debian-unstable
...
Conflicts:
configs/debian-osmesa16
configs/debian-osmesa16-static
configs/debian-osmesa32
configs/debian-osmesa32-static
debian/changelog
debian/compat
debian/control
debian/copyright
debian/libgl1-mesa-dev.install
debian/libgl1-mesa-swx11-dev.install
debian/libgl1-mesa-swx11.shlibs
debian/libglu1-mesa-dev.install
debian/mesa-common-dev.docs
debian/mesa-common-dev.install
debian/rules
src/mesa/x86-64/matypes.h
src/mesa/x86/matypes.h
2007-04-20 05:44:24 +02:00
Julien Cristau
33e34f5bf4
Merge tag 'mesa_6_5_1' into debian-unstable
...
Conflicts:
progs/util/README
progs/util/glstate.c
progs/util/glstate.h
progs/util/sampleMakefile
src/glu/sgi/libnurbs/interface/bezierEval.h
src/glu/sgi/libnurbs/interface/bezierPatch.cc
src/glu/sgi/libnurbs/interface/bezierPatch.h
src/glu/sgi/libnurbs/interface/bezierPatchMesh.cc
src/glu/sgi/libnurbs/interface/bezierPatchMesh.h
src/glu/sgi/libnurbs/interface/glcurveval.cc
src/glu/sgi/libnurbs/interface/glimports.h
src/glu/sgi/libnurbs/interface/glinterface.cc
src/glu/sgi/libnurbs/interface/glrenderer.h
src/glu/sgi/libnurbs/interface/incurveeval.cc
src/glu/sgi/libnurbs/interface/insurfeval.cc
src/glu/sgi/libnurbs/interface/mystdio.h
src/glu/sgi/libnurbs/interface/mystdlib.h
src/glu/sgi/libnurbs/internals/arc.h
src/glu/sgi/libnurbs/internals/arcsorter.cc
src/glu/sgi/libnurbs/internals/arcsorter.h
src/glu/sgi/libnurbs/internals/arctess.h
src/glu/sgi/libnurbs/internals/backend.cc
src/glu/sgi/libnurbs/internals/backend.h
src/glu/sgi/libnurbs/internals/basiccrveval.h
src/glu/sgi/libnurbs/internals/basicsurfeval.h
src/glu/sgi/libnurbs/internals/bezierarc.h
src/glu/sgi/libnurbs/internals/bin.cc
src/glu/sgi/libnurbs/internals/bin.h
src/glu/sgi/libnurbs/internals/bufpool.cc
src/glu/sgi/libnurbs/internals/bufpool.h
src/glu/sgi/libnurbs/internals/cachingeval.cc
src/glu/sgi/libnurbs/internals/cachingeval.h
src/glu/sgi/libnurbs/internals/ccw.cc
src/glu/sgi/libnurbs/internals/coveandtiler.h
src/glu/sgi/libnurbs/internals/curve.cc
src/glu/sgi/libnurbs/internals/curve.h
src/glu/sgi/libnurbs/internals/curvelist.cc
src/glu/sgi/libnurbs/internals/curvelist.h
src/glu/sgi/libnurbs/internals/curvesub.cc
src/glu/sgi/libnurbs/internals/dataTransform.cc
src/glu/sgi/libnurbs/internals/dataTransform.h
src/glu/sgi/libnurbs/internals/defines.h
src/glu/sgi/libnurbs/internals/displaylist.cc
src/glu/sgi/libnurbs/internals/displaylist.h
src/glu/sgi/libnurbs/internals/displaymode.h
src/glu/sgi/libnurbs/internals/flist.cc
src/glu/sgi/libnurbs/internals/flist.h
src/glu/sgi/libnurbs/internals/flistsorter.cc
src/glu/sgi/libnurbs/internals/flistsorter.h
src/glu/sgi/libnurbs/internals/gridline.h
src/glu/sgi/libnurbs/internals/gridtrimvertex.h
src/glu/sgi/libnurbs/internals/gridvertex.h
src/glu/sgi/libnurbs/internals/hull.cc
src/glu/sgi/libnurbs/internals/hull.h
src/glu/sgi/libnurbs/internals/intersect.cc
src/glu/sgi/libnurbs/internals/jarcloc.h
src/glu/sgi/libnurbs/internals/knotvector.h
src/glu/sgi/libnurbs/internals/mapdesc.cc
src/glu/sgi/libnurbs/internals/mapdesc.h
src/glu/sgi/libnurbs/internals/mapdescv.cc
src/glu/sgi/libnurbs/internals/maplist.cc
src/glu/sgi/libnurbs/internals/maplist.h
src/glu/sgi/libnurbs/internals/mesher.cc
src/glu/sgi/libnurbs/internals/mesher.h
src/glu/sgi/libnurbs/internals/monoTriangulationBackend.cc
src/glu/sgi/libnurbs/internals/monotonizer.cc
src/glu/sgi/libnurbs/internals/monotonizer.h
src/glu/sgi/libnurbs/internals/myassert.h
src/glu/sgi/libnurbs/internals/mycode.cc
src/glu/sgi/libnurbs/internals/mystring.h
src/glu/sgi/libnurbs/internals/nurbsconsts.h
src/glu/sgi/libnurbs/internals/nurbstess.cc
src/glu/sgi/libnurbs/internals/patch.cc
src/glu/sgi/libnurbs/internals/patch.h
src/glu/sgi/libnurbs/internals/patchlist.cc
src/glu/sgi/libnurbs/internals/patchlist.h
src/glu/sgi/libnurbs/internals/pwlarc.h
src/glu/sgi/libnurbs/internals/quilt.cc
src/glu/sgi/libnurbs/internals/quilt.h
src/glu/sgi/libnurbs/internals/reader.cc
src/glu/sgi/libnurbs/internals/reader.h
src/glu/sgi/libnurbs/internals/renderhints.cc
src/glu/sgi/libnurbs/internals/renderhints.h
src/glu/sgi/libnurbs/internals/simplemath.h
src/glu/sgi/libnurbs/internals/slicer.cc
src/glu/sgi/libnurbs/internals/slicer.h
src/glu/sgi/libnurbs/internals/sorter.cc
src/glu/sgi/libnurbs/internals/sorter.h
src/glu/sgi/libnurbs/internals/splitarcs.cc
src/glu/sgi/libnurbs/internals/subdivider.h
src/glu/sgi/libnurbs/internals/tobezier.cc
src/glu/sgi/libnurbs/internals/trimline.cc
src/glu/sgi/libnurbs/internals/trimline.h
src/glu/sgi/libnurbs/internals/trimregion.cc
src/glu/sgi/libnurbs/internals/trimregion.h
src/glu/sgi/libnurbs/internals/trimvertex.h
src/glu/sgi/libnurbs/internals/trimvertpool.cc
src/glu/sgi/libnurbs/internals/trimvertpool.h
src/glu/sgi/libnurbs/internals/types.h
src/glu/sgi/libnurbs/internals/uarray.cc
src/glu/sgi/libnurbs/internals/uarray.h
src/glu/sgi/libnurbs/internals/varray.cc
src/glu/sgi/libnurbs/internals/varray.h
src/glu/sgi/libnurbs/nurbtess/definitions.h
src/glu/sgi/libnurbs/nurbtess/directedLine.h
src/glu/sgi/libnurbs/nurbtess/glimports.h
src/glu/sgi/libnurbs/nurbtess/gridWrap.cc
src/glu/sgi/libnurbs/nurbtess/gridWrap.h
src/glu/sgi/libnurbs/nurbtess/monoChain.cc
src/glu/sgi/libnurbs/nurbtess/monoChain.h
src/glu/sgi/libnurbs/nurbtess/monoTriangulation.cc
src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h
src/glu/sgi/libnurbs/nurbtess/mystdio.h
src/glu/sgi/libnurbs/nurbtess/mystdlib.h
src/glu/sgi/libnurbs/nurbtess/partitionX.cc
src/glu/sgi/libnurbs/nurbtess/partitionX.h
src/glu/sgi/libnurbs/nurbtess/partitionY.cc
src/glu/sgi/libnurbs/nurbtess/partitionY.h
src/glu/sgi/libnurbs/nurbtess/polyDBG.h
src/glu/sgi/libnurbs/nurbtess/polyUtil.cc
src/glu/sgi/libnurbs/nurbtess/polyUtil.h
src/glu/sgi/libnurbs/nurbtess/primitiveStream.cc
src/glu/sgi/libnurbs/nurbtess/primitiveStream.h
src/glu/sgi/libnurbs/nurbtess/quicksort.cc
src/glu/sgi/libnurbs/nurbtess/quicksort.h
src/glu/sgi/libnurbs/nurbtess/rectBlock.cc
src/glu/sgi/libnurbs/nurbtess/rectBlock.h
src/glu/sgi/libnurbs/nurbtess/sampleComp.cc
src/glu/sgi/libnurbs/nurbtess/sampleComp.h
src/glu/sgi/libnurbs/nurbtess/sampleCompBot.cc
src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h
src/glu/sgi/libnurbs/nurbtess/sampleCompRight.cc
src/glu/sgi/libnurbs/nurbtess/sampleCompRight.h
src/glu/sgi/libnurbs/nurbtess/sampleCompTop.cc
src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h
src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.cc
src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.h
src/glu/sgi/libnurbs/nurbtess/sampledLine.cc
src/glu/sgi/libnurbs/nurbtess/sampledLine.h
src/glu/sgi/libnurbs/nurbtess/searchTree.cc
src/glu/sgi/libnurbs/nurbtess/searchTree.h
src/glu/sgi/libnurbs/nurbtess/zlassert.h
src/glu/sgi/libtess/README
src/glu/sgi/libtess/alg-outline
src/glu/sgi/libtess/dict-list.h
src/glu/sgi/libtess/dict.c
src/glu/sgi/libtess/dict.h
src/glu/sgi/libtess/geom.c
src/glu/sgi/libtess/memalloc.c
src/glu/sgi/libtess/memalloc.h
src/glu/sgi/libtess/mesh.c
src/glu/sgi/libtess/mesh.h
src/glu/sgi/libtess/normal.h
src/glu/sgi/libtess/priorityq-heap.c
src/glu/sgi/libtess/priorityq-heap.h
src/glu/sgi/libtess/priorityq-sort.h
src/glu/sgi/libtess/priorityq.c
src/glu/sgi/libtess/priorityq.h
src/glu/sgi/libtess/render.c
src/glu/sgi/libtess/render.h
src/glu/sgi/libtess/sweep.h
src/glu/sgi/libtess/tess.h
src/glu/sgi/libtess/tessmono.c
src/glu/sgi/libtess/tessmono.h
src/glu/sgi/libutil/error.c
src/glu/sgi/libutil/glue.c
src/glu/sgi/libutil/gluint.h
src/glu/sgi/libutil/project.c
src/glu/sgi/libutil/registry.c
src/glx/x11/glxext.c
src/mesa/main/imports.h
src/mesa/tnl/t_vb_cliptmp.h
2007-04-20 05:37:11 +02:00
Brian
535c37e85d
Notes about shared lib version. Document depth-peel fixes.
2007-04-19 14:24:58 -06:00
Brian
ba3d384e94
dFdx(), etc. don't work yet
2007-04-19 14:24:29 -06:00
Brian
8b5fce6bcc
Put gl_program_machine into swrast structure rather than using a local variable.
...
Basically an easy way to make sure the memory gets initialized once (to zero)
to avoid lots of valgrind warnings.
2007-04-19 14:24:10 -06:00
Brian
020cdb47cf
Fix valgrind problem caused by reading text[-1].
2007-04-19 14:15:11 -06:00
Brian
121f2212cc
remove invalid assertion (span->facing may be set because of polygonmode)
2007-04-19 14:07:16 -06:00
Brian
24a93dd6a4
remove invalid assertion
2007-04-19 14:06:43 -06:00
Brian
00da9afb84
fix crash when program has invalid structure field
2007-04-19 14:06:27 -06:00
Brian
4abcaf3949
init A.curFuncEndLabel = NULL
2007-04-19 14:04:30 -06:00
Brian
6bde08815f
In _mesa_unpack_depth_span() look for special cases of GLuint->GLushort and GLushort->GLuint conversion.
...
This improves performance and avoids int/float/int conversion problems that
can introduce errors during glCopyTexImage(). Another fix for the depth peeling
algorithm.
2007-04-19 11:23:26 -06:00
Brian
8e6207396c
Don't allow deferredTexture if using occlusion query and a frag shader.
...
Occlusion query might depend on the shader killing/discarding fragments.
Helps fix depth peeling technique.
Also, minor tweaks in interpolate_wpos().
2007-04-19 11:21:14 -06:00
Brian
5ca8d4ccf2
fix an uninitialized variable and a warning
2007-04-18 18:05:33 -06:00
Brian
6b3027e291
comments, assertions
2007-04-18 17:14:14 -06:00
Brian
8d370fb2ee
new comments
2007-04-18 17:14:14 -06:00
Brian
36a6a59972
record proper datatypes for uniforms/samplers
2007-04-18 17:14:14 -06:00
Brian
addd03da2e
added _slang_gltype_from_specifier()
2007-04-18 17:14:13 -06:00
Brian
c93e883b20
Start fixing some issues with uniform variables and their types.
2007-04-18 17:14:13 -06:00
Brian
274ac7a801
Fix some bugs related to querying active uniforms.
2007-04-18 17:14:13 -06:00
Brian
aaa57412c1
fix error strings, add a sanity check
2007-04-18 17:14:13 -06:00
George Sapountzis
2a2f8d806f
xmesa: drop glide (FX) backend.
...
glide is no longer compiled with stand-alone libGL, so this will not link.
There are still the glide config files. some code in demos and the
GLX_MESA_set_3dfx_mode code which could be removed.
2007-04-19 00:01:45 +03:00
Brian
bac15c8db8
Remove bad assertions, decrement NumShaders in _mesa_detach_shader().
...
Fixes crashes w/ Brad King's depth peeling test.
2007-04-18 14:55:18 -06:00
Brian
f3e8c32376
s/GL_SHADER_PROGRAM/GL_SHADER_PROGRAM_MESA/ (a Mesa-specific token)
2007-04-18 14:53:23 -06:00
Brian
6d3d9c1c6d
Replace _mesa_parameter_longest_name() with _mesa_longest_parameter_name().
...
The later takes a type parameter so we can match uniforms or attributes/inputs.
Used by the GL_ACTIVE_ATTRIBUTE_MAX_LENGTH and GL_ACTIVE_UNIFORM_MAX_LENGTH
queries. Fixes problem reported by Brad King in VTK.
2007-04-18 14:19:17 -06:00
Brian
e57e752eee
call ProgramStringNotify() after linking
2007-04-18 12:41:16 -06:00
Brian
884af40864
check _PreferPixelFog in _swrast_span_default_fog(), see bug 10669
2007-04-18 12:09:40 -06:00
Brian
30a79f76fc
improved fog comment
2007-04-18 12:08:18 -06:00
Brian
8598f55091
glean glsl test now does over 150 tests
2007-04-18 09:30:07 -06:00
Brian
6d01f3f1ec
added href to shading language info
2007-04-18 09:28:38 -06:00
Brian
e3caa5f891
prep for 6.5.3 release
2007-04-18 09:07:56 -06:00
Brian
d9443c2494
add progs/glsl/ to DEMO_FILES, s/pre/rc1/
2007-04-18 08:52:18 -06:00
Xiang, Haihao
565cd49b5f
fig segment fault issue in TAG(triangle), (see bug 10589)
...
Bit SS_TWOSIDE_BIT is set if gl_FrontFacing lives in
fragment input (see commit 10b5895597
).
However, VB->ColorPtr[1] isn't assigned after that.
2007-04-18 12:37:09 +08:00
Brian
a4b2b88337
omit the glide/svga sources from stand-alone libGL (anyone using them?)
2007-04-17 16:00:17 -06:00
Brian
04bda46739
Enable texture sampling for vertex programs/shaders.
...
This is a bit of a hack for now because the tnl module is using the swrast
module to fetch texels. The texture fetch/filter code should probably be
moved into the main/ module since it doesn't really depend upon other
swrast code.
2007-04-17 15:56:46 -06:00
Brian
d2d86a3f0b
In bind_inputs() set VB->EdgeFlag to NULL if it's not needed.
...
Otherwise, the clip/interp code was finding VB->EdgeFlag to be non-null and
reading/writing it when the memory may have been freed earlier in free_space().
This fixes several VTK segfaults/failures reported by Brad King @ Kitware.
2007-04-17 10:19:47 -06:00
Brian
9cbcf7c696
regenerated
2007-04-17 09:16:59 -06:00
Brian
468a33d19a
fix/simplify some texture functions
2007-04-17 09:16:30 -06:00
Brian
893b368a82
more matrix function updates
2007-04-17 09:15:57 -06:00
Brian
41fc55dd81
don't set GL_TEXTURE_MAX_LEVEL for GL_TEXTURE_RECTANGLE_ARB as that generates an error
2007-04-17 08:29:37 -06:00
Thomas Hellstrom
1a9483c954
Defer buffer pool creation to the first context creation.
...
This way we have a hw context so that we can take the hardware lock.
Also, at this point, AIGLX isn't locked with the X server context as it is
at screen creation.
2007-04-17 15:21:54 +02:00
Roland Scheidegger
36949abec7
cleanups for t_vb_program.c
...
use VertexProgram._Current instead of VertexProgram.Current in a few more places.
Only fixup fogc and psiz in case this is really a nv program (others are fine
if undefined), and fix this case up so the values actually get written.
2007-04-17 14:01:42 +02:00
Oliver McFadden
6459adf79b
r300: r300_render.c:391: warning: unused variable 'i'
2007-04-17 07:05:15 +00:00
Brian
badc346206
lots of changes, fixes, clean-ups
2007-04-16 17:56:13 -06:00
Brian
4a7c45118d
just clean-ups
2007-04-16 17:36:39 -06:00
Brian
34ca2be769
move GL_EXT_stencil_two_side into alphabetical position
2007-04-16 17:18:39 -06:00
Brian
5888010362
Fix glActiveStencilFaceEXT dispatch problem (bug 10523).
...
OK, _all_ extensions that might get enabled by the driver need to be in the
card_extensions[] list. driInitExtensions() is called at least twice: first
during screen creation, then once for each context that's created.
The first call sets up the dispatch table. The second call just sets the
extension enable/disable flags.
2007-04-16 17:16:46 -06:00
Brian
dfee7619d4
remove _tnl_arb_vertex_program_stage
2007-04-16 15:15:53 -06:00
Brian
96e05da1c9
remove _tnl_arb_vertex_program_stage
2007-04-16 15:15:23 -06:00
Brian
1560de2c3c
need to clamp MAD for linear fog
2007-04-16 15:09:39 -06:00
Brian
921b008419
removed unused t_vb_arbprogram stage
2007-04-16 11:03:14 -06:00
Brian
aa6992a296
remove t_vb_arbprogram.c
2007-04-16 10:59:00 -06:00
Brian
4b3835dadf
unhook t_vb_arbprogram.c code - it's going away
2007-04-16 10:58:30 -06:00
Brian
64e8088667
Use generic program limits instead of NV-specific ones to init program constants.
...
Previously, this limited us to 12 temp regs for vertex programs. Many vertex
shaders could exceed that. This forces us to stop using t_vb_arbprogram.c
for now because of its particular register indexing scheme. Need to increase
bits allocated for register indexing, etc.
2007-04-16 10:36:28 -06:00
Brian
3dfcd48469
Fix some assertions that could occur when an error was earlier logged.
2007-04-16 10:32:48 -06:00
Brian
e812a2a484
use b->display instead of b->xm_visual->display to fix some problems detected w/ valgrind
2007-04-16 09:11:20 -06:00
Thomas Hellstrom
da56df9d72
Make sure we are locked when creating drm buffer objects.
...
Don't place buffer objects on unfenced list when newly created.
Fix a buffer object wait-for-idle deadlock.
2007-04-16 16:04:12 +02:00
Brian
9519785e29
illegal to set GL_TEXTURE_MAX_LEVEL w/ GL_TEXTURE_RECTANGLE_ARB
2007-04-14 09:38:20 -06:00
Brian
83ad64d94a
implement shadow2DRect functions
2007-04-14 09:36:17 -06:00
Brian
fde15a2bae
Fix sample_depth_texture() to handle texture rectangle coords.
2007-04-14 09:33:20 -06:00
Brian
216eb81c53
set osmesa renderbuffer refcount=1 upon creation, free renderbuffer in OSMesaDestroyContext()
2007-04-14 08:09:12 -06:00
Brian
4fc46a6c82
more _mesa_unreference_framebuffer() calls, remove dead code
2007-04-14 08:06:54 -06:00
Brian
e19cfabb6e
fix negative zoom factor bug (10636), more comments
2007-04-14 07:49:21 -06:00
Dave Airlie
8d8a3cc398
r300: emit different clear paths for non-TCL, this gets the clear color correct
2007-04-14 17:44:33 +10:00
Dave Airlie
fb1d22d23d
r300: remove unneeded semicolon from macro
2007-04-14 17:42:59 +10:00
Dave Airlie
3d59042afd
r300: if we don't have TCL don't setup state emissions for vertex shaders
2007-04-14 04:54:49 +01:00
Brian
967c1056d5
patch for Digital/Tru64 (bug 10635) - forwarded to OpenGL ARB as well
2007-04-13 09:55:35 -06:00
George Sapountzis
9f8373d5ca
xmesa: drop unused XMesaPutImageHelper.
...
It could only be called from XMesaCopySubBuffer but this function is not used
by XFree86.
It seems that XMesaPutImageHelper would handle sub-images but never got
finished. Proper sub-image helpers should be written if need be.
2007-04-13 18:13:08 +03:00
George Sapountzis
50aaabc248
xmesa: export xmesa functions used by xfree86.
...
This uses xmesa.h as the GLcore interface and avoids adding an explicit GLcore
inteface which would not be a proper interface anyway.
It puts the declarations of the three functions specific for XMesa/XFree86 in
xmesa.h, we can push them down to xmesa_xf86.h if hiding behind XFree86Server
ifdef's is not enough.
2007-04-13 18:12:37 +03:00
Brian
30b6f11de1
s/version/vertex/
2007-04-12 16:18:27 -06:00
Brian
f11604a30d
fix bug in _playback_copy_to_current(): need to skip version position data (see bug 10587)
2007-04-12 16:17:01 -06:00
Brian
99193e4f74
disable debug printfs
2007-04-12 15:45:02 -06:00
Brian
5b74fe0889
Added sanity checking in _slang_sizeof_type_specifier() to be sure sizes are what's expected.
2007-04-12 15:23:55 -06:00
Brian
431d650f2b
use _mesa_clear_shader_program_data()
2007-04-12 15:22:53 -06:00
Brian
3c008a014f
New _mesa_reference_shader/program() function to consolidate refcounting.
...
Note that (unlike texture objects), shader handles remain valid (in the
hash table) after glDeleteShader/Program() if the refcount isn't zero.
2007-04-12 15:22:32 -06:00
Brian
bf287356cf
restore 200x200 window size, animation, version check
2007-04-11 14:09:32 -06:00
Brian
bce7043ebc
regenerated
2007-04-11 12:30:31 -06:00
Brian
70b0e123c4
checkpoint: updating non-square matrix constructors and operators
2007-04-11 12:30:03 -06:00
Brian
f98f4f6d7a
move/fix texture sampling funcs
2007-04-11 12:29:38 -06:00
Brian
afc58f5f7e
s/Shadow/SHADOW/
2007-04-11 11:13:37 -06:00
Brian
b61d74c575
as with prev commit, also fix color index mode zoomed depth copies (bug 10608)
2007-04-11 09:04:18 -06:00
Brian
9f66025f54
fix invalid error detection problem in _mesa_bind_attrib_location(), bug 10602
2007-04-11 09:00:56 -06:00
Brian
183d8e0620
fix zoomed depth copies (bug 10608)
2007-04-11 08:47:05 -06:00
Brian
b0bba03846
use _mesa_reference_renderbuffer(), fix typo
2007-04-11 08:11:52 -06:00
Brian
ba876be0c0
fix/work-around allocation bugs for non-square matrices
2007-04-10 21:51:27 -06:00
Brian
319ce38fa4
update SLANG version test
2007-04-10 21:50:53 -06:00
Dave Airlie
64700be4e1
rs480: set vap cntl to what fglrx uses for non-TCL cards
2007-04-10 11:46:58 +01:00
Michel Dänzer
159ecba4b3
i915: Bring test for vsync to pipe B in line with i915tex.
2007-04-10 11:05:17 +02:00
Michel Dänzer
e798d22556
Add missing generated file.
2007-04-10 11:04:19 +02:00
Brian
0109b47106
NULL ptr check
2007-04-09 19:07:22 -06:00
Brian
7b2626f7d8
plug in GLSL 1.20 unit
2007-04-09 19:07:22 -06:00
Brian
19121e2802
undo a debug/test change
2007-04-09 19:07:22 -06:00
Dave Airlie
e0bbf46342
r300: don't enable VAP/TCL on cards that don't support it
2007-04-10 09:32:13 +10:00
Brian
702c8f1e6c
remove unneeded initialization code (see bug 10569)
2007-04-09 11:21:51 -06:00
Brian
f9574c3f6b
allocate __GLXdisplayPrivate w/ Xcalloc instead of Xmalloc (bug 10569)
2007-04-09 08:49:26 -06:00
Michel Dänzer
e8292d28e4
i915tex: Fix some mismatches between texels or bytes for pitch/stride.
2007-04-09 14:57:08 +02:00
Michel Dänzer
c96974f78c
i915tex: Make sure texture format fetch hooks are initialized.
2007-04-09 14:53:41 +02:00
Dave Airlie
6461e91ac3
the RS400 definitely doesn't work at this point so don't let it init
2007-04-09 22:03:31 +10:00
Brian
af807a4696
enable GLSL 1.20
2007-04-08 21:48:19 -06:00
Brian
5c0c60a13c
support for GLSL 1.20 non-square matrices
2007-04-08 16:47:32 -06:00
Brian
5dba996dba
add glsl to PROGRAM_DIRS
2007-04-08 15:50:31 -06:00
Brian
9612a3011f
fix some dependencies, remove some CFLAGS
2007-04-08 15:42:26 -06:00
Brian
0d3d930912
add 2.1 functions
2007-04-08 15:41:02 -06:00
Adam Jackson
d8bfc42bb7
Make sure GLX entrypoints are marked PUBLIC.
...
Fedora bug #229808 .
2007-04-08 14:40:03 -04:00
Wei Wang
ca7885f733
fix bug 9823: GL_CLIENT_ATTRIB_STACK_DEPTH query fails for indirect rendering
2007-04-08 11:24:08 -06:00
Brice Goglin
3832ecadae
Add 06_fix_texture_data_corruption.patch ( closes : #412346 )
2007-04-08 18:52:31 +02:00
Michel Dänzer
9176752172
i915tex: Clean up resizing of renderbuffers.
2007-04-08 14:04:15 +02:00
Michel Dänzer
79bf692420
driUpdateFramebufferSize: Use ctx->Driver.ResizeBuffers.
2007-04-08 14:02:14 +02:00
Brian
f72e7fb1d6
MAX_TEXTURE_COORDS_ARB and MAX_TEXTURE_IMAGE_UNITS_ARB had wrong glGet info.
...
Fixes bug 10371.
2007-04-07 20:38:25 -06:00
Brian
4647f13c43
fix etags command to find headers
2007-04-07 19:36:58 -06:00
George Sapountzis
20ec486baf
Drop XFree86Server from execmem.c
...
This is a remnant from the libcwrapper days that can be removed now. It is the
last XFree86 glitch in Mesa core.
Reverts the following commit (thanks to Brian Paul for pointing to it):
commit 8b1dc68662
Author: Alan Hourihane <alanh@tungstengraphics.com >
Date: Tue Jan 24 21:40:53 2006 +0000
pull in fix from 6.4 branch for XFree86Server definition
commit cc7b6810e2
Author: Ian Romanick <idr@us.ibm.com >
Date: Fri Oct 21 18:09:24 2005 +0000
Make execmem.c compile in the server (libGLcore). Since xf86mmap
doesn't know about MAP_ANONYMOUS, this is the only viable fix. This
issue will likely have to be revisited at some point.
2007-04-07 18:41:14 +03:00
Richard Hughes
55000888b9
set version for tarballs to 6.5.3pre for now
2007-04-07 08:48:07 -06:00
Richard Hughes
4f9d3a07bb
fix references to non-existant sz4 field
2007-04-07 08:46:44 -06:00
Richard Hughes
84803279ca
fix some CHAN_TYPE==GL_FLOAT breakage
2007-04-07 08:46:10 -06:00
Brian
8d2d6e5194
fix comment typo
2007-04-07 08:43:40 -06:00
Richard Hughes
e9c614a1af
remove array_cache/, add vbo/
2007-04-07 08:39:24 -06:00
Brian
8f3fc5221c
added glActiveStencilFaceEXT
2007-04-07 08:38:36 -06:00
Brian
ae55d5322c
for evaluators, loop to VBO_ATTRIB_TEX7, not VBO_ATTRIB_INDEX. See bug 10543
2007-04-06 15:45:11 -06:00
George Sapountzis
92b7fa7b48
xmesa: use newly added xm_image.[hc]
...
Keep external includes to glxheader.h and xmesa includes to xmesaP.h.
Drop the following from xm_image.h:
- dix-config.h (comes from glheader.h)
- xfree86 includes (come from GL/xmesa_xf86.h)
- ifdef __CYGWIN__ (leftover ? xm_api.c has something similar)
2007-04-06 13:28:39 +03:00
George Sapountzis
eb4a8b4bb5
xmesa: add xf86glx_util.[hc] from xserver as xm_image.[hc]
2007-04-06 13:27:43 +03:00
George Sapountzis
663a3e9ba7
Drop the funky SSE exception test on linux.
...
Replace the check for IN_DRI_DRIVER with the appropriate kernel version check
and just disable SSE on older (pre 2.4) kernels.
2007-04-06 13:22:41 +03:00
Brian
51a894e6eb
fix color storage bug in convolution path
2007-04-05 21:12:44 -06:00
Brian
ac32b644ee
include points.h to fix warnings
2007-04-05 11:43:07 -06:00
George Sapountzis
487f7a73cb
Remove SI imports/exports remnants.
2007-04-05 19:01:51 +03:00
George Sapountzis
aa1c79eaea
glx: minor cosmetic in glcontextmodes.c
...
move memory macros to separate block and unwrap malloc/free for miniglx towards
cleaning Mesa core glitches in glx...
2007-04-05 19:00:47 +03:00
George Sapountzis
885111518e
Move glcontextmodes.c to glx.
...
It is no longer linked with DRI drivers, libGL passes function pointers through
the DRI interface.
2007-04-05 18:59:42 +03:00
Brian
0cae814f36
temporary add some extra renderbuffer debug code
2007-04-05 09:28:09 -06:00
Brian
33c3739628
Remove the never-used SI-style imports/exports code.
2007-04-04 22:18:53 -06:00
Brian
4d864b087e
assorted updates
2007-04-04 09:33:12 -06:00
Brian
2f207dcf1e
assorted documentation updates
2007-04-04 09:31:41 -06:00
Brian
f9c01c33d3
init span.y=0 to silence warnings
2007-04-04 09:30:28 -06:00
Brian
d4dc57bb13
Overlapping copies with zoomZ=-1 were broken. See bug 10521.
...
Need to check for overlapping src/dest regions before computing bottom-to-top
vs. top-to-bottom order.
2007-04-04 08:48:06 -06:00
Brian
a28e648690
remove debug printf
2007-04-04 08:26:41 -06:00
Xiang, Haihao
40ae3943f2
i810/i915/i915tex: reinitialize the context point state
2007-04-04 16:50:47 +08:00
Nicolai Haehnle
dba21ed913
Fix in t_vp_build: Missed necessary updates sometimes
...
_mesa_update_state doesn't always reset VertexProgram._Current to NULL.
This caused us to skip a necessary update of the fixed function vertex
program sometimes.
Change the logic such that we check for updates whenever the _Current
program is either NULL or the program generated by t_vp_build.
2007-04-02 21:01:32 +02:00
Brian
66d336808d
Call _glapi_set_context(NULL) in _glapi_check_multithread() to make sure the _glapi_Context global gets cleared properly.
2007-04-02 10:03:34 -06:00
Brian
dccd9c4f4d
use _mesa_reference_renderbuffer() in a few more places
2007-04-02 09:57:27 -06:00
Brian
3fe47d5c57
updated debug printf
2007-04-02 09:57:27 -06:00
Brian
3fd88089c0
Fix some bugs/issues related to alpha channel support. See bug 10483.
2007-04-01 18:30:28 -06:00
Brian
0683e4ce4b
If using PF_8A8B8G8R, be sure alpha is correctly handled.
2007-04-01 18:28:28 -06:00
Brian
ec42af9263
re-order tokens, fix comments
2007-04-01 18:27:23 -06:00
Brice Goglin
285ed128ab
Add a .shlibs file for libglw1-mesa.
2007-04-01 00:44:29 +02:00
Brice Goglin
048144074b
Fix conflicts for libGLw packages.
...
libglw1-mesa does not have to conflict with earlier libgl1-mesa-swx11
(libGLw was only shipped as development libs/headers within swx11-dev).
libglw1-mesa-dev needs to conflicts with libglw-dev.
2007-04-01 00:43:20 +02:00
Brian
00831b5b3b
always emit BGN/ENDSUB, for now anyway
2007-03-31 09:09:48 -06:00
Brian
ec6c8f86f3
fix scoping mistake in previous commit that checked for writable LHSs
2007-03-31 09:09:21 -06:00
Brice Goglin
856ae782c7
* Split out libGLw libs and headers from libgl1-mesa-swx11 and ship both
...
static and shared libraries, creating libglw1-mesa and libglw1-mesa-dev
(closes : #374904 ).
2007-03-31 03:28:32 +02:00
Brian
e608d92c5b
check that LHS of assignment is writable
2007-03-30 14:59:02 -06:00
Eric Anholt
57dadf71ca
Merge branch 'origin'
2007-03-30 13:18:27 -07:00
Eric Anholt
adb91c056f
Merge branch 'crestline-qa', adding support for the 965GM chipset.
2007-03-30 13:11:38 -07:00
Gustavo Pichorim Boiko
6f652c89d7
call DRI_VALIDATE_DRAWABLE_INFO(), bug 10477
2007-03-30 14:10:10 -06:00
George Sapountzis
7439a36785
Clean and update XMesa/XFree86 interface.
...
Drop XMesaSetVisualDisplay(), XMesaReset(), no longer used.
Add XMesaCopyContext() and move the GlxSetRenderTables() call for XGL within
XMesaForceCurrent(). This is to make xserver/GL/mesa/X/xf86glx.c unaware of
Mesa internals.
Also, clean some ifdef's to make it clear that USE_XSHM and XFree86Server are
mutually exclusive.
Lastly,
- move gcstruct.h from glxheader.h up to xmesa_xf86.h since it calls *gc->ops
- drop GL/glxtokens.h from xm_api|dd.c, GLX tokens come from glcore.h and are
used irrelevant of XFree86.
2007-03-30 19:19:00 +03:00
Julien Cristau
12e3f97541
Fix explanation about libglide3 in libgl1-mesa-dri's description.
...
Thanks to Michel Dänzer for his help.
2007-03-30 17:20:02 +02:00
Julien Cristau
30f6fe0710
Have libgl1-mesa-dri suggest libglide3.
...
Add explanation for this in the package description. Closes : #387339 .
2007-03-30 14:10:24 +02:00
Brian
7eba12edce
more tips, validation info
2007-03-28 17:14:35 -06:00
Brian
ba730e14ed
cond code fix
2007-03-28 17:08:17 -06:00
Brian
1ba858591b
fix cond code swizzle bug
2007-03-28 15:45:24 -06:00
Brian
f2f5d06853
Handle logical NOT and XOR without library functions. Results in much tighter code.
2007-03-28 15:16:33 -06:00
Brian
b2ac30ac36
optimization for the emit_not() function
2007-03-28 14:49:33 -06:00
Brian
3b7f2f53a2
remove IR_BREAK_IF_FALSE
2007-03-28 14:38:36 -06:00
Brian
8128f7143d
don't generate IR_BREAK_IF_FALSE
2007-03-28 14:33:25 -06:00
Brian
393a93ea32
Get rid of IR_CONT_IF_FALSE
2007-03-28 14:25:30 -06:00
Brian
3e7d43cd48
Get rid of BRK0, BRK1, CONT0, CONT1 instructions.
2007-03-28 14:23:33 -06:00
Brian
1bbd69251b
Don't emit OPCODE_CONT0/1, BRK0/1 instructions, clean-ups elsewhere.
2007-03-28 14:21:26 -06:00
Brian
f841b04601
simplify, clean-up break/cont code
2007-03-28 14:14:00 -06:00
Brian
b463d52143
added some null ptr checks to handle error recovery
2007-03-28 13:29:57 -06:00
Brian
7e4a7fdddd
Use constant_to_src_reg() to simplify some code
2007-03-28 13:23:44 -06:00
Brian
ee2f31e281
added missing returns after slang_info_log_error() calls
2007-03-28 12:48:27 -06:00
Brian
dad97b4688
Fix, clean-up code related to comparisons, condition codes, etc.
2007-03-28 11:06:34 -06:00
Brian
a01616eed5
print condcodes if DEBUG_PROG
2007-03-28 11:01:28 -06:00
Brian
d750861dc2
expose _mesa_condcode_string(), fix some printing
2007-03-28 11:01:09 -06:00
Brian
59f7f6dbe9
check that if/while/do-while condition is boolean or scalar
2007-03-28 10:44:38 -06:00
Brian
20d85c609a
bump version to 6.5.3 to match version.h
2007-03-28 09:07:41 -06:00
Alan Hourihane
ad766b5785
Add missing OSMesaColorClamp function
2007-03-28 15:58:08 +01:00
Brian
0420d8505a
disable MakeTexture()
2007-03-27 16:06:48 -06:00
Brian
05e6fd8398
added ftransform() comment
2007-03-27 16:06:48 -06:00
Brian
e5d00e8cf4
Implement true CAL/RET subroutines. Some optimizations, clean-ups coming...
2007-03-27 16:06:48 -06:00
Brian
31dc7a3c89
fix another pc off-by one
2007-03-27 16:06:47 -06:00
Brian
17238f1ee5
added _slang_label_new_unique()
2007-03-27 16:06:47 -06:00
Brian
f407cada8a
fix some printing issues related to subroutines
2007-03-27 16:06:47 -06:00
Brian
e713ef66ef
fix a fragment fog regression
2007-03-27 16:06:47 -06:00
Brian
a0275b0d2c
fix off by one error in OPCODE_RET
2007-03-27 16:06:47 -06:00
Brian
d6d6d20b13
init machine->StackDepth=0
2007-03-27 16:06:47 -06:00
Brian
1f1f582304
more parenthesis
2007-03-27 16:06:47 -06:00
Roland Scheidegger
811c2e9a91
i915tex compile fix (account for moved _UseTexEnvProgram var)
2007-03-27 22:57:22 +02:00
Roland Scheidegger
cda3236092
fix incorrect _MaxElement calculation
...
The calculation of _MaxElement was wrong if the stride was larger than
elementSize, which lead to rejection of every DrawElements call which accessed
the maximum element if CheckArrayBounds was enabled.
2007-03-27 21:03:32 +02:00
Roland Scheidegger
9b9e056615
recommit e731d8aafa
.
...
This got lost with glsl-compiler-1 merge, it fixes segfaults when using
ATI_fragment_shader, which uses the ProgramStringNotify mechanism but doesn't
have a valid program pointer.
2007-03-27 19:33:34 +02:00
Brian
ff65fa39e8
add parenthesis around a bit-wise AND term in _tnl_InvalidateState()
2007-03-27 09:52:53 -06:00
Brian
3e45db6729
Restore the UseTexEnvProgram logic.
...
Was removed during glsl-compiler work. Still need to go back and revisit this
because of the interaction with fragment shaders...
2007-03-27 09:51:52 -06:00
Roland Scheidegger
3b8ab88131
r300: Fix radeonUpdatePageFlipping() function.
...
Always call driFlipRenderbuffers() with pfCurrentPage value, in case it's
initially 1 instead of 0. May fix some issues with pageflip, the same fix was
applied to r128, radeon and r200 (6e0e6eff05
).
2007-03-27 16:27:34 +02:00
Roland Scheidegger
32225d06b9
r128, radeon, r200: Check ctx->WinSysDrawBuffer before calling function that dereferences it.
...
Same fix as for r300 (which fixed https://bugs.freedesktop.org/show_bug.cgi?id=10417 ),
since it's likely an issue with those drivers too.
2007-03-27 16:22:00 +02:00
Bernardo Innocenti
a835939222
always print error messages, unless LIBGL_DEBUG=quiet
2007-03-27 08:05:33 -06:00
Brian
98abd1bbc8
simplify .a suffixing
2007-03-27 07:58:47 -06:00
Bernardo Innocenti
a9455bb9a7
remove static lib before building to make more bulletproof
2007-03-27 07:56:34 -06:00
Michel Dänzer
63c57a14d3
r300: Check ctx->WinSysDrawBuffer before calling function that dereferences it.
...
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=10417 .
2007-03-27 09:44:32 +02:00
Miroslav Šustek
25f21b5331
fix r128 rendering, lockups
...
mis-count in offset led to mis-rendering and lockups;
units are 4 bytes rather than 1. Noticed by Chris Salch.
fixes bug 7994, possibly others.
2007-03-26 23:40:04 -04:00
Zou Nan hai
da82d86ea0
Merge branch 'master' of git+ssh://znh@git.freedesktop.org/git/mesa/mesa
2007-03-27 09:41:31 +08:00
Zou Nan hai
075d3d892f
Fix compile error
2007-03-27 09:41:01 +08:00
Brian
ae36cfc65e
s/SUB/BGNSUB/
2007-03-26 18:47:19 -06:00
Brian
9878e8ff51
Checkpoint: implementing true CAL/RET instructions for subroutine calls.
...
Also, found/fixed a code generation regression: the emit_swizzle() function
was always returning NULL. This caused emit_move() to miss its chance at peephole
optimization.
2007-03-26 18:46:07 -06:00
Brian
6583429f89
Get rid of IR_JUMP and related code.
2007-03-26 17:16:26 -06:00
Brian
037c068460
special case RET
2007-03-26 16:58:50 -06:00
Brian
c042a91b8b
Get rid of SLANG_OPER_GOTO, start rewrite of 'return' handling.
2007-03-26 16:56:45 -06:00
Brian
813a0e11f1
remove debug abort() calls
2007-03-26 16:01:58 -06:00
Brian
52cc32378c
Additional error checking for 'return' statements.
2007-03-26 15:46:35 -06:00
Brian
c3da0bd7dd
undo some debugging hacks
2007-03-26 15:09:59 -06:00
Brian
e508155d16
dead code elimination for constant-valued if/then/else
2007-03-26 15:02:21 -06:00
Nicolai Haehnle
0426d3c0c8
r300: Remove a warning when vertex programs produce an unused output
...
As far as we know, the hardware prefers outputs packed tightly together
with no holes caused by outputs that are not even read by the fragment
program. Therefore, we slightly rewrite vertex programs in this case.
It would be interesting to test this interaction between vertex programs
and fragment programs further, because some of that rewrite may be
unnecessary. However, play it safe for now and don't change the current
behaviour.
2007-03-26 22:25:06 +02:00
Nicolai Haehnle
b53745ce91
r300: Whitespace cleanup (remove trailing spaces)
2007-03-26 22:25:06 +02:00
Brian
768f7231ea
Fix a few issues with computing storage sizes with respect to swizzles.
2007-03-26 13:46:46 -06:00
Brian
680abf8a02
In _mesa_lookup_parameter_constant() make sure we return a full, 4-component swizzle.
2007-03-26 13:46:46 -06:00
Nicolai Haehnle
1170268088
r300: Fix warnings that were introduced by the glsl merge
2007-03-26 21:41:57 +02:00
Brian
38a1c2b495
Add _swrast_span_default_secondary_color() for use with glBitmap, glDrawPixels, etc.
...
Secondary color wasn't getting added to post-texture color when drawing
bitmaps, images. See bug 10409.
2007-03-26 11:30:05 -06:00
Brian
b5d988dd19
remove incorrect assertions
2007-03-26 10:39:56 -06:00
Brian
b67d93111d
minor status updates
2007-03-26 10:23:50 -06:00
Nian Wu
ee9bc897f8
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-03-26 17:00:29 +08:00
Nian Wu
1b354bb5e4
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-03-25 17:00:24 +08:00
Nian Wu
44fb5156bb
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-03-24 17:00:29 +08:00
Nian Wu
ad76128204
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-03-23 17:00:28 +08:00
Nian Wu
2eb656ef4f
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-03-22 17:00:33 +08:00
Nian Wu
8ba06464ac
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-03-21 17:00:32 +08:00
Nian Wu
76444d042c
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-03-20 13:10:46 +08:00
Nian Wu
e01ee3da57
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-03-19 17:00:19 +08:00
Nian Wu
fd1b1fce3f
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-03-18 17:00:18 +08:00
Nian Wu
38889f5221
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-03-17 17:00:25 +08:00
Nian Wu
a02870f4f6
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-03-16 17:00:24 +08:00
Nian Wu
d63eef4b86
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-03-15 17:00:22 +08:00
Nian Wu
805b1cf482
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-03-14 17:00:15 +08:00
Nian Wu
4110fac389
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-03-13 17:00:18 +08:00
Nian Wu
5a5b55943d
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-03-12 09:03:27 +08:00
Nian Wu
1e055089a3
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-03-07 16:01:36 -05:00
Nian Wu
87c9ad6fd5
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-03-06 16:01:23 -05:00
Nian Wu
c05b6f800a
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-03-06 07:43:03 -05:00
Nian Wu
540e1c70cc
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-03-05 09:01:31 -05:00
Nian Wu
180c0d70c4
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-03-02 09:01:27 -05:00
Nian Wu
6a47e35065
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-03-01 09:01:58 -05:00
Nian Wu
381b4b0c91
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-02-27 14:42:16 -05:00
Nian Wu
675f7f627b
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-02-25 09:40:28 -08:00
Cyril Brulebois
0aa8f1df3c
* Non-maintainer upload.
...
* Backport a fix from mesa 6.5.2 to mesa 6.5.1 which:
- fixes braces around the ASSERT macro;
- fixes a clipping problem, which leads to systematic segfaults of the
X server (Closes : #405803 ).
2007-02-23 00:48:40 +01:00
Julien Cristau
d39147a8a1
Fix FTBFS on amd64.
...
Set LIB_DIR and EXTRA_LIB_PATH in configs/debian-default to override
settings in configs/linux-x86-64. This fixes a FTBFS on amd64, thanks to
Marc 'HE' Brockschmidt for the report (closes : #410118 ).
2007-02-07 23:13:59 +01:00
Julien Cristau
7991f7e936
* Add myself to Uploaders.
2007-02-04 21:17:18 +01:00
Julien Cristau
10011efcd7
Add bug closer for #409638 .
2007-02-04 17:21:57 +01:00
Julien Cristau
0058815c8f
Re-add src/glut/mini/ which was deleted by mistake.
2007-02-04 15:21:46 +01:00
Julien Cristau
02048984b7
Delete directories not included in the mesa tarballs.
2007-02-04 15:15:43 +01:00
Julien Cristau
544601e9f4
Fix FTBFS on non-i386 archs.
...
Build architecture-independant debs in binary-indep, and use the debhelper -s
option for commands in binary-arch, because architectures other than i386
don't have to build libgl1-mesa-swx11-i686.
2007-02-04 14:05:23 +01:00
Wang Zhenyu
51bfb8fc8c
Add Intel 965GM chipset info
2007-02-02 10:04:48 +08:00
Wang Zhenyu
6b6760d6bc
Revert origin crestline pci id patch
2007-02-02 10:01:42 +08:00
Julien Cristau
2634f06c20
Merge branch 'upstream-experimental' into debian-experimental
...
Conflicts:
progs/util/README
progs/util/glstate.c
progs/util/glstate.h
progs/util/sampleMakefile
src/glu/sgi/libnurbs/interface/bezierEval.h
src/glu/sgi/libnurbs/interface/bezierPatch.cc
src/glu/sgi/libnurbs/interface/bezierPatch.h
src/glu/sgi/libnurbs/interface/bezierPatchMesh.cc
src/glu/sgi/libnurbs/interface/bezierPatchMesh.h
src/glu/sgi/libnurbs/interface/glcurveval.cc
src/glu/sgi/libnurbs/interface/glimports.h
src/glu/sgi/libnurbs/interface/glinterface.cc
src/glu/sgi/libnurbs/interface/glrenderer.h
src/glu/sgi/libnurbs/interface/incurveeval.cc
src/glu/sgi/libnurbs/interface/insurfeval.cc
src/glu/sgi/libnurbs/interface/mystdio.h
src/glu/sgi/libnurbs/interface/mystdlib.h
src/glu/sgi/libnurbs/internals/arc.h
src/glu/sgi/libnurbs/internals/arcsorter.cc
src/glu/sgi/libnurbs/internals/arcsorter.h
src/glu/sgi/libnurbs/internals/arctess.h
src/glu/sgi/libnurbs/internals/backend.cc
src/glu/sgi/libnurbs/internals/backend.h
src/glu/sgi/libnurbs/internals/basiccrveval.h
src/glu/sgi/libnurbs/internals/basicsurfeval.h
src/glu/sgi/libnurbs/internals/bezierarc.h
src/glu/sgi/libnurbs/internals/bin.cc
src/glu/sgi/libnurbs/internals/bin.h
src/glu/sgi/libnurbs/internals/bufpool.cc
src/glu/sgi/libnurbs/internals/bufpool.h
src/glu/sgi/libnurbs/internals/cachingeval.cc
src/glu/sgi/libnurbs/internals/cachingeval.h
src/glu/sgi/libnurbs/internals/ccw.cc
src/glu/sgi/libnurbs/internals/coveandtiler.h
src/glu/sgi/libnurbs/internals/curve.cc
src/glu/sgi/libnurbs/internals/curve.h
src/glu/sgi/libnurbs/internals/curvelist.cc
src/glu/sgi/libnurbs/internals/curvelist.h
src/glu/sgi/libnurbs/internals/curvesub.cc
src/glu/sgi/libnurbs/internals/dataTransform.cc
src/glu/sgi/libnurbs/internals/dataTransform.h
src/glu/sgi/libnurbs/internals/defines.h
src/glu/sgi/libnurbs/internals/displaylist.cc
src/glu/sgi/libnurbs/internals/displaylist.h
src/glu/sgi/libnurbs/internals/displaymode.h
src/glu/sgi/libnurbs/internals/flist.cc
src/glu/sgi/libnurbs/internals/flist.h
src/glu/sgi/libnurbs/internals/flistsorter.cc
src/glu/sgi/libnurbs/internals/flistsorter.h
src/glu/sgi/libnurbs/internals/gridline.h
src/glu/sgi/libnurbs/internals/gridtrimvertex.h
src/glu/sgi/libnurbs/internals/gridvertex.h
src/glu/sgi/libnurbs/internals/hull.cc
src/glu/sgi/libnurbs/internals/hull.h
src/glu/sgi/libnurbs/internals/intersect.cc
src/glu/sgi/libnurbs/internals/jarcloc.h
src/glu/sgi/libnurbs/internals/knotvector.h
src/glu/sgi/libnurbs/internals/mapdesc.cc
src/glu/sgi/libnurbs/internals/mapdesc.h
src/glu/sgi/libnurbs/internals/mapdescv.cc
src/glu/sgi/libnurbs/internals/maplist.cc
src/glu/sgi/libnurbs/internals/maplist.h
src/glu/sgi/libnurbs/internals/mesher.cc
src/glu/sgi/libnurbs/internals/mesher.h
src/glu/sgi/libnurbs/internals/monoTriangulationBackend.cc
src/glu/sgi/libnurbs/internals/monotonizer.cc
src/glu/sgi/libnurbs/internals/monotonizer.h
src/glu/sgi/libnurbs/internals/myassert.h
src/glu/sgi/libnurbs/internals/mycode.cc
src/glu/sgi/libnurbs/internals/mystring.h
src/glu/sgi/libnurbs/internals/nurbsconsts.h
src/glu/sgi/libnurbs/internals/nurbstess.cc
src/glu/sgi/libnurbs/internals/patch.cc
src/glu/sgi/libnurbs/internals/patch.h
src/glu/sgi/libnurbs/internals/patchlist.cc
src/glu/sgi/libnurbs/internals/patchlist.h
src/glu/sgi/libnurbs/internals/pwlarc.h
src/glu/sgi/libnurbs/internals/quilt.cc
src/glu/sgi/libnurbs/internals/quilt.h
src/glu/sgi/libnurbs/internals/reader.cc
src/glu/sgi/libnurbs/internals/reader.h
src/glu/sgi/libnurbs/internals/renderhints.cc
src/glu/sgi/libnurbs/internals/renderhints.h
src/glu/sgi/libnurbs/internals/simplemath.h
src/glu/sgi/libnurbs/internals/slicer.cc
src/glu/sgi/libnurbs/internals/slicer.h
src/glu/sgi/libnurbs/internals/sorter.cc
src/glu/sgi/libnurbs/internals/sorter.h
src/glu/sgi/libnurbs/internals/splitarcs.cc
src/glu/sgi/libnurbs/internals/subdivider.h
src/glu/sgi/libnurbs/internals/tobezier.cc
src/glu/sgi/libnurbs/internals/trimline.cc
src/glu/sgi/libnurbs/internals/trimline.h
src/glu/sgi/libnurbs/internals/trimregion.cc
src/glu/sgi/libnurbs/internals/trimregion.h
src/glu/sgi/libnurbs/internals/trimvertex.h
src/glu/sgi/libnurbs/internals/trimvertpool.cc
src/glu/sgi/libnurbs/internals/trimvertpool.h
src/glu/sgi/libnurbs/internals/types.h
src/glu/sgi/libnurbs/internals/uarray.cc
src/glu/sgi/libnurbs/internals/uarray.h
src/glu/sgi/libnurbs/internals/varray.cc
src/glu/sgi/libnurbs/internals/varray.h
src/glu/sgi/libnurbs/nurbtess/definitions.h
src/glu/sgi/libnurbs/nurbtess/directedLine.h
src/glu/sgi/libnurbs/nurbtess/glimports.h
src/glu/sgi/libnurbs/nurbtess/gridWrap.cc
src/glu/sgi/libnurbs/nurbtess/gridWrap.h
src/glu/sgi/libnurbs/nurbtess/monoChain.cc
src/glu/sgi/libnurbs/nurbtess/monoChain.h
src/glu/sgi/libnurbs/nurbtess/monoTriangulation.cc
src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h
src/glu/sgi/libnurbs/nurbtess/mystdio.h
src/glu/sgi/libnurbs/nurbtess/mystdlib.h
src/glu/sgi/libnurbs/nurbtess/partitionX.cc
src/glu/sgi/libnurbs/nurbtess/partitionX.h
src/glu/sgi/libnurbs/nurbtess/partitionY.cc
src/glu/sgi/libnurbs/nurbtess/partitionY.h
src/glu/sgi/libnurbs/nurbtess/polyDBG.h
src/glu/sgi/libnurbs/nurbtess/polyUtil.cc
src/glu/sgi/libnurbs/nurbtess/polyUtil.h
src/glu/sgi/libnurbs/nurbtess/primitiveStream.cc
src/glu/sgi/libnurbs/nurbtess/primitiveStream.h
src/glu/sgi/libnurbs/nurbtess/quicksort.cc
src/glu/sgi/libnurbs/nurbtess/quicksort.h
src/glu/sgi/libnurbs/nurbtess/rectBlock.cc
src/glu/sgi/libnurbs/nurbtess/rectBlock.h
src/glu/sgi/libnurbs/nurbtess/sampleComp.cc
src/glu/sgi/libnurbs/nurbtess/sampleComp.h
src/glu/sgi/libnurbs/nurbtess/sampleCompBot.cc
src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h
src/glu/sgi/libnurbs/nurbtess/sampleCompRight.cc
src/glu/sgi/libnurbs/nurbtess/sampleCompRight.h
src/glu/sgi/libnurbs/nurbtess/sampleCompTop.cc
src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h
src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.cc
src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.h
src/glu/sgi/libnurbs/nurbtess/sampledLine.cc
src/glu/sgi/libnurbs/nurbtess/sampledLine.h
src/glu/sgi/libnurbs/nurbtess/searchTree.cc
src/glu/sgi/libnurbs/nurbtess/searchTree.h
src/glu/sgi/libnurbs/nurbtess/zlassert.h
src/glu/sgi/libtess/README
src/glu/sgi/libtess/alg-outline
src/glu/sgi/libtess/dict-list.h
src/glu/sgi/libtess/dict.c
src/glu/sgi/libtess/dict.h
src/glu/sgi/libtess/geom.c
src/glu/sgi/libtess/memalloc.c
src/glu/sgi/libtess/memalloc.h
src/glu/sgi/libtess/mesh.c
src/glu/sgi/libtess/mesh.h
src/glu/sgi/libtess/normal.h
src/glu/sgi/libtess/priorityq-heap.c
src/glu/sgi/libtess/priorityq-heap.h
src/glu/sgi/libtess/priorityq-sort.h
src/glu/sgi/libtess/priorityq.c
src/glu/sgi/libtess/priorityq.h
src/glu/sgi/libtess/render.c
src/glu/sgi/libtess/render.h
src/glu/sgi/libtess/sweep.h
src/glu/sgi/libtess/tess.h
src/glu/sgi/libtess/tessmono.c
src/glu/sgi/libtess/tessmono.h
src/glu/sgi/libutil/error.c
src/glu/sgi/libutil/glue.c
src/glu/sgi/libutil/gluint.h
src/glu/sgi/libutil/project.c
src/glu/sgi/libutil/registry.c
2007-02-01 11:50:36 +01:00
Julien Cristau
7549426a16
Sync Section and Priority for all packages with the override.
2007-01-28 18:18:38 +01:00
Zou Nan hai
c171166987
1. Fix bug #155
...
2. I notice multiple ARB_occlusion_query should be able to overlap according to spec.
3. Declaring extern variables in a .c file is evil, fix it.
2007-01-18 14:41:38 +08:00
Thierry Reding
6dcb9a3434
Give credit where credit is due.
2007-01-11 15:09:23 +01:00
Thierry Reding
e5a31c00ec
libosmesa6{,-dev} replace libgl1-mesa-swx11{,-dev} and mesa-common-dev.
...
libosmesa6 and libosmesa6-dev are now the only packages to contain OSMesa
libraries and header files so they can be installed independent of which libGL
is installed. They statically link in the software rasterization code.
2007-01-11 15:06:42 +01:00
Thierry Reding
00295242fd
mesa-common-dev needs to replace libgl1-mesa-swx11-dev and libgl1-mesa-dev.
...
The GLX headers were previously shipped in both packages and have been moved
to mesa-common-dev.
2007-01-11 14:56:48 +01:00
Thierry Reding
21b6ed7c29
Build the DRI modules with the default optimization flags.
2007-01-11 14:40:10 +01:00
Thierry Reding
01894cbf10
Revert the previous changes to the libgl1-mesa-{glx,swx11} shlibs.
2007-01-10 15:23:29 +01:00
Thierry Reding
28cad2b9d9
Bump libgl1-mesa-glx, libgl1-mesa-swx11 and libosmesa6 shlibs files.
2007-01-10 13:55:19 +01:00
Thierry Reding
71d7b7dbe7
Drop noop line.
2007-01-08 13:36:25 +01:00
Thierry Reding
4563723db1
Make sure all files in the mesa-swx11-source package have permissions 0644.
2007-01-08 13:36:16 +01:00
Thierry Reding
0bce6a1899
Compile with -O2 optimization instead of -O3 which might lead to problems.
2007-01-08 11:43:25 +01:00
Thierry Reding
e71d6dbd9c
Make debugging symbol packages depend on the corresponding binary package and
...
put them into the libdevel section.
2007-01-08 11:41:02 +01:00
Thierry Reding
132ecd19f3
Do not build any linux*-static configuration with -fPIC.
2007-01-08 10:07:08 +01:00
Thierry Reding
a404143f4c
Add patches 04_cleanup-osmesa-configs and 05_static-nonpic.
...
04_cleanup-osmesa-configs makes the OSMesa configurations behave as expected.
That is respect the OPT_FLAGS, PIC_FLAGS, ARCH_FLAGS and DEFINES variables.
The patch also makes the files more consistent by inheriting from more general
configurations.
05_static-nonpic fixes the linux-static configuration to not use -fPIC for
compiling code because it would violate Debian policy.
2007-01-08 08:35:42 +01:00
Keith Packard
a27d3e43fe
Merge branch 'master' into crestline
2007-01-07 23:03:01 -08:00
Keith Packard
6a632de96d
Merge branch 'origin' into crestline
2007-01-07 20:57:56 -08:00
Keith Packard
92de58f001
Merge branch 'master' into crestline
2007-01-06 17:14:14 -08:00
Wang Zhenyu
caf8010652
Merge branch 'master' into crestline
...
Conflicts:
src/mesa/drivers/dri/i965/brw_tex_layout.c
Michel Dänzer replaced the copy of the 945 mipmap layout code with that from
the 945 driver directly.
2007-01-06 15:49:23 -08:00
Julien Cristau
44467ca45e
* Drop obsolete depends on xlibs.
2007-01-05 15:44:51 +01:00
Julien Cristau
f70ea0747d
Import changelog entry from the 6.5.1-0.5 NMU.
2007-01-04 21:30:49 +01:00
Thierry Reding
c619abf18a
Hijack the package (set XSF as maintainer, add myself to uploaders). \o/
2007-01-04 16:35:14 +01:00
Julien Cristau
6da1323437
* Non-maintainer upload.
...
* Build with -fno-strict-aliasing to fix misbuild of i965_dri.so
(closes : #394311 ). Thanks to Michel Dänzer for the fix, and to Ryan
Richter for the report and testing.
2007-01-03 16:59:06 +01:00
Julien Cristau
1dd29785cf
Import changes from the mesa 6.5.1-0.4 NMU.
2007-01-03 13:43:46 +01:00
Julien Cristau
5681987ee4
Import changes from the mesa 6.5.1-0.3 NMU.
2007-01-03 13:41:57 +01:00
Nian Wu
f34cad0f97
Merge branch 'crestline' into crestline-qa
2006-12-26 16:46:51 -08:00
Haihao Xiang
adccb084df
Support linear format in i965.
...
Fix bug #117 #118
2006-12-26 16:45:02 -08:00
Nian Wu
ead0f46d5f
Merge branch 'crestline' into crestline-qa
2006-12-17 10:49:43 -08:00
Nian Wu
77b862a849
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2006-12-13 13:49:00 -08:00
Zou Nan hai
ed7fbad206
Fix bug #93 , i965 driver not thread safe.
...
I am not confident of it is 100% thread safe now.
bufmgr_fake.c need a total rewrite later
(cherry picked from 606632ca27558ee1335be2f4a5906f2baa240a6a commit)
2006-12-13 13:29:37 -08:00
Zou Nan hai
4720cd0050
fix bug #99 .
...
prim_count overflow when there is more than 1 cliprect
(cherry picked from 84b958d66fe7d3fe03ed12b493e3f3197f656531 commit)
2006-12-13 13:29:20 -08:00
Michel Dänzer
c9795c6ca2
minstall: Pass correct destination file path to $RM regardless of source path.
...
(cherry picked from 26626c0052
commit)
2006-12-13 13:26:09 -08:00
Michel Dänzer
bce82efe1f
minstall: Always remove destination file before (re-)creating it.
...
This avoids issues with overwriting files that are being used.
(cherry picked from d71a5647a3
commit)
2006-12-13 13:25:42 -08:00
Zou Nan hai
aeda4c589a
ARB_occlusion_query support
2006-12-13 13:25:12 -08:00
Zou Nan hai
696fe3f52e
if (tex width < 4), mipmap calculation will be out of range
2006-12-13 13:24:35 -08:00
Zou Nan hai
c34d026eb0
Fix bug #93
2006-12-13 15:27:17 +08:00
Zou Nan hai
de90bbd0b7
fix for bug #99
2006-12-12 15:00:27 +08:00
Eric Anholt
d214138910
Merge branch 'origin' into crestline
2006-12-11 10:50:25 -08:00
Wang Zhenyu
89433fef0d
ARB_occlusion_query support
2006-12-11 00:01:56 -08:00
Wang Zhenyu
b4d9c0048f
if (tex width < 4), mipmap calculation will be out of range
2006-12-11 00:00:51 -08:00
Eric Anholt
9a94dae4c2
Avoid branch instructions while in single program flow mode.
...
There is an errata for Broadwater that threads don't have the instruction/loop
mask stacks initialized on thread spawn. In single program flow mode, those
stacks are not writable, so we can't initialize them. However, they do get
read during ELSE and ENDIF instructions. So, instead, replace branch
instructions in single program flow mode with predicated jumps (ADD to the ip
register), avoiding use of the more complicated branch instructions that may
fail. This is also a minor optimization as no ENDIF equivalent is necessary.
2006-12-10 12:24:51 -08:00
Eric Anholt
183abbcd6b
Connect INTEL_DEBUG=sync up to cmd/batch ioctls.
2006-12-10 12:24:46 -08:00
Wang Zhenyu
0536268267
adding pci id of Crestline
2006-12-10 12:24:40 -08:00
Thierry Reding
6eeb18fc68
Build the i915tex DRI module on the i386 and amd64 architectures.
2006-12-05 00:45:42 +00:00
Thierry Reding
01c90575b4
Add missing changelog entry and bug closer.
2006-12-04 07:23:14 +00:00
Thierry Reding
32e9cb0275
Update to new upstream release (6.5.2).
2006-12-02 23:46:07 +00:00
Thierry Reding
017bade93c
Update to latest upstream release candidate (6.5.2 RC3).
2006-12-01 00:16:33 +00:00
Thierry Reding
c9c79e7cae
Add manpages to the mesa-utils package.
2006-11-29 18:07:26 +00:00
Thierry Reding
777d41dd07
Mark the latest changelog entries as NMUs.
2006-11-26 02:40:01 +00:00
Thierry Reding
6238c30913
Revert maintainer and uploaders fields. Integrate latest NMUs into the
...
changelog and be a little more verbose in the debian/rules rewrite
changelog entries.
2006-11-26 02:38:31 +00:00
Thierry Reding
db164ab514
Update to latest upstream release candidate.
2006-11-22 19:50:34 +00:00
Thierry Reding
c72ef17731
Add libOSMesa16 and libOSMesa32 entries to libosmesa6.shlibs so packages
...
linking against those libraries will get the correct dependencies.
2006-11-22 19:47:56 +00:00
Thierry Reding
8dbee7867f
Use the new upstream minstall utility to install files and directories. Using
...
/usr/bin/install would result in a symlink's target being copied instead of
the symlink.
2006-11-18 21:28:07 +00:00
Thierry Reding
f403108f5f
Fix typo in changelog. libdrm2-dev is not a package.
2006-11-18 21:22:52 +00:00
Thierry Reding
223a97f92a
Bump build-dependency on libdrm-dev (>= 2.2.0).
2006-11-18 21:21:18 +00:00
Thierry Reding
bb44a8ae1f
Update to latest upstream release candidate.
...
Update patches.
2006-11-18 17:59:25 +00:00
Thierry Reding
b5a5062176
Target the mesa package at experimental until etch is released.
2006-11-18 17:50:44 +00:00
Thierry Reding
50faa32ce3
Move the code to choose which configurations to build to a separate script in
...
order to keep debian/rules cleaner.
2006-11-10 09:00:00 +00:00
Thierry Reding
b6caed527c
Also add release notes of version 6.5.1 and the release notes index.
2006-11-10 08:50:35 +00:00
Thierry Reding
d5ef77353b
Build Mesa utility programs (glxdemo, glxgears, glxheads, glxinfo) together
...
with the DRI/GLX-enabled libGL. Don't build the utilities on CPU-optimized
configurations.
2006-11-10 08:40:03 +00:00
Thierry Reding
336beba81b
Update Debian changelog.
2006-11-02 21:20:33 +00:00
Thierry Reding
5d23a7905c
Add code to provide a mesa-utils package since those utilities are shipped in
...
the MesaDemos tarball.
2006-11-02 21:05:29 +00:00
Thierry Reding
143dfcc904
Make mesa-common-dev depend on libx11-dev to provide Xlib.h and Xutil.h needed
...
by the GLX headers.
2006-11-01 07:54:40 +00:00
Thierry Reding
e076cd42f0
Bug #387706 should also be closed because we move libOSMesa to libosmesa6 and
...
statically link in the software rasterization code.
2006-10-25 00:17:42 +00:00
Thierry Reding
5bed38974e
Close 392715 because we now ship the contents of the three Mesa tarballs in
...
the original source.
2006-10-24 14:45:18 +00:00
Thierry Reding
35bc4b82ff
Since the original tarball is repackaged to include the three upstream
...
tarballs (MesaDemos, MesaGLUT and MesaLib), remove files that are not supposed
to be there.
Note that when importing initially, some files were not even added to the SVN
repository because SVN ignored them. These were configs/diffs~ and
docs/RELNOTES-6.1~. I removed those from the tarball as well.
2006-10-24 14:33:30 +00:00
Thierry Reding
4e5d870f72
Make libosmesa6-dev binNMU-safe again (mesa-common-dev is Architecture: all).
2006-10-24 14:29:11 +00:00
Thierry Reding
83def94db5
Make libgl1-mesa-dev Architecture: all, because all we ship with it is a
...
symbolic link. Make it binNMU-safe by making it depend on libgl1-mesa-glx and
libgl1-mesa-dri both >= ${Source-Version} instead of exact versions.
Add packages containing debugging symbols for libgl1-mesa-swx11,
libgl1-mesa-glx and libgl1-mesa-dri.
2006-10-24 12:16:16 +00:00
Thierry Reding
9d74c1ef2a
-fno-strict-aliasing actually *does* fix #394311 according to the submitter.
2006-10-24 10:31:28 +00:00
Thierry Reding
6023d4bdb5
Build with -fno-strict-aliasing, which should fix bug #394311 .
2006-10-24 10:29:21 +00:00
Thierry Reding
5e38f566f2
Provide libgl-dev as alternative to the mesa-common-dev dependency of the
...
libosmesa6-dev package.
2006-10-23 16:45:00 +00:00
Thierry Reding
b57341a78b
Move the glx*.h headers from libgl1-mesa(-swx11)-dev into mesa-common-dev
...
because both packages provide identical files.
2006-10-23 16:43:41 +00:00
Thierry Reding
910c32c0e9
Install the osmesa.h header in the libosmesa6-dev package where it belongs,
...
now that all OSMesa libraries have been split off into libosmesa6{,-dev}.
Don't make libosmesa6-dev depend on libgl1-mesa-swx11-dev anymore because it
no longer needs a libGL, only the gl.h header provided by mesa-common-dev.
2006-10-23 16:02:22 +00:00
Thierry Reding
e49456d8d8
Don't force -fPIC everywhere, because it seems only unused on x86 which we
...
build with assembler optimizations by default, resulting in non-PIC libraries
anyway.
2006-10-23 14:40:10 +00:00
Thierry Reding
c46becc9b3
Move the libOSMesa shlibs entry from libgl1-mesa-swx11 to libosmesa6 because
...
that's where libOSMesa is now installed.
2006-10-23 08:30:53 +00:00
Thierry Reding
b6e637106f
Add the static libGLw and the corresponding headers to the
...
libgl1-mesa-swx11-dev package again.
2006-10-23 08:23:27 +00:00
Thierry Reding
787cffe3d0
Always force -fPIC.
2006-10-23 08:22:25 +00:00
Thierry Reding
9d914e6809
Make sure the install-source.sh script is executable before trying to run it.
2006-10-20 20:56:41 +00:00
Thierry Reding
4e183c66e9
Add comments to patches and enable the previously disabled patches.
2006-10-20 19:41:00 +00:00
Thierry Reding
b1630fcbe8
Add build-dependency on lesstif2-dev needed to build the GLw libraries.
2006-10-20 19:17:34 +00:00
Thierry Reding
cd44f730cc
Enable building the GLw libraries.
2006-10-20 19:07:36 +00:00
Thierry Reding
ce5a39559e
Install several documents from the docs subdirectory into the mesa-common-dev
...
package.
2006-10-20 17:51:36 +00:00
Thierry Reding
ccffaef603
Build architecture-specific static libraries where available.
2006-10-20 12:15:29 +00:00
Thierry Reding
ae41f3a3ee
Don't make libgl1-mesa-swx11-dev depend on lesstif2-dev anymore because we
...
don't ship anything related to LessTif in that package.
2006-10-20 12:06:20 +00:00
Thierry Reding
c7e576d6bf
No longer install the default build of libOSMesa in the libgl1-mesa-swx11
...
package, but in the libosmesa6 package.
Modify the 01_fix-makefile patch to not build libOSMesa on stand-alone builds,
so that it is only created when building OSMesa explicitly.
Build libOSMesa with 8 bits per color channel (the default) in dynamic and
static versions separately from the software rasterization libGL with the
software rasterization code linked in statically so that libOSMesa can run in
parallel with any libGL. This should fix the problem Yann Dirson mentioned a
while ago.
Use the install-source.sh script to install the Mesa sources needed for the
mesa-swx11-source package instead of doing it in the debian/rules file itself.
2006-10-20 07:56:11 +00:00
Thierry Reding
f069b2812e
Add a set of files to enable an i686 optimized build of the DRI/GLX-enabled
...
libGL and the DRI drivers. Disabled for now.
2006-10-20 07:47:37 +00:00
Thierry Reding
f20ff6213e
Add a shell script to install the Mesa sources for the mesa-swx11-source
...
package.
2006-10-20 07:45:39 +00:00
Thierry Reding
24ff74bdcb
Add configurations to build static versions of the default OSMesa library.
...
In all Debian-specific configurations, include the Debian defaults
configuration after the Mesa configurations and drop the 'override' for all
variables because it is no longer needed.
2006-10-20 07:43:50 +00:00
Thierry Reding
230e79916f
Merge in the old Debian changelog entries and the old copyright file.
2006-10-17 19:35:35 +00:00
Thierry Reding
9f14b4db35
Use -march in favor of the deprecated -mcpu.
2006-10-17 19:13:27 +00:00
Thierry Reding
ec916398e7
Don't install libOSMesa development files in the libgl1-mesa-swx11 package.
2006-10-16 14:43:43 +00:00
Thierry Reding
6befad112e
Actually do rename debian-static to debian-swx11+glu-static.
2006-10-16 13:54:24 +00:00
Thierry Reding
55ce23b8db
Beautify IEEE floating point patch.
2006-10-16 13:34:57 +00:00
Thierry Reding
1292ec1ecf
Fix typo in the filename of the IEEE FP on s390 and m68k patch.
2006-10-16 13:11:51 +00:00
Thierry Reding
65a324062f
Add patches extracted from older Debian diffs but not applied yet because it's
...
not certain yet that they are needed.
2006-10-16 13:05:42 +00:00
Thierry Reding
c9db617e0b
Make the debian-static a subclass of debian-swx11+glu-default, because that's
...
what it actually is. Rename it accordingly and add it to SWX11_GLU_CONFIGS.
Install the libOSMesa.so symlink and the libOSMesa static library in the
libgl1-mesa-swx11-dev package.
Add .shlibs files for the libgl1-mesa-swx11, libgl1-mesa-glx and libglu1-mesa
packages.
2006-10-16 13:04:29 +00:00
Thierry Reding
b43137d0cc
Build libGLU by default for swx11+glu configurations but not in the
...
configurations targetting specific CPU's because it is unlikely to result in
an increase in performance.
2006-10-16 11:53:06 +00:00
Thierry Reding
eeca642778
Add versioned build-dependency on dpkg-dev (>= 1.13.19) to make sure the
...
binary:Version and source:Version substitution variables can be used.
2006-10-16 11:49:46 +00:00
Thierry Reding
5cef6ca36a
Move the detection of architecture-specific configurations to the debian/rules
...
file.
Add the configs target to debian/rules for checking whether the correct
configurations will be built.
2006-10-16 10:03:32 +00:00
Thierry Reding
be2b518f7b
Also build a static version of libGLU.
2006-10-16 09:53:30 +00:00
Thierry Reding
1b0d29afbc
Rename the CPU optimization configurations to make it clear that they only
...
build swx11 and GLU.
Build architecture-optimized swx11 and GLU where possible.
2006-10-16 09:39:59 +00:00
Thierry Reding
55cf480c0b
Drop the libgl1-mesa-swx11-dbg package until there's a decision as to whether
...
it is really needed.
Allow more than one type of optimization libraries to be built for any given
architecture. Currently optimization configurations are provided for i386
[i686], alpha [ev5], amd64, powerpc [603], ppc64 and sparc [ultrasparc].
However, only i686 and amd64 are enabled for now for safety.
Add the libgl1-mesa-swx11-i686 for i686 optimized libraries.
Drop the debian-common configuration because it is no longer used.
Don't build libGLU in all configurations, only when needed.
2006-10-16 08:58:05 +00:00
Thierry Reding
84db6912f0
Add missing build-dependencies.
2006-10-15 18:02:33 +00:00
Thierry Reding
7495cc28a0
Only build the i810, i915, i965, sis and unichrome DRI drivers on i386 and
...
amd64.
Only build the ffb DRI driver on sparc.
2006-10-15 16:17:53 +00:00
Thierry Reding
87744f786b
Use STAMP_DIR consistently throughout the debian/rules file.
...
Make the BUILD_STAMPS targets depend on patch so that when they are built
separately the patches will also be applied. Thanks to Michel Dänzer for
catching this.
Make symlinking the source tree idempotent by adding the -f option to cp.
Thanks again Michel Dänzer.
2006-10-15 14:41:12 +00:00
Thierry Reding
5bcfa4c859
Build only optimized versions of the DRI drivers, only using no optimizations
...
when not supported.
Add configuration to build the DRI drivers on amd64.
2006-10-15 13:30:22 +00:00
Thierry Reding
8ef731bcd1
Add a patch (00_create-libdir) that fixes the upstream build system to make
...
sure the LIB_DIR is created or bail out.
Update the 01_fix-makefile patch to only install libGL/libOSMesa if they
exist. Don't make installation dependent on which drivers are built.
Build optimized versions of the swx11 libraries in addition to those that
should work on the least-capable supported processor for the given
architecture.
Have most configurations include debian-default instead of debian-common so
that INSTALL_DIR is correctly defined. debian-common can probably be dropped
anyway.
2006-10-15 13:15:56 +00:00
Thierry Reding
8d02f3c68a
Add patch to fix upstream build system to correctly install libOSMesa and
...
variants. This patch also fixes the build system not to install libGL if only
the OSMesa library is built.
Update *.install files to install more files. Pretty much everything except
debugging and optimized libraries is now built and installed.
Enable building static libraries for inclusion in the -dev packages.
2006-10-15 00:49:41 +00:00
Thierry Reding
b1f8b49e8b
Add build-dependency on quilt.
...
Remove shlibs:Depends substitution variable from -dev packages, which doesn't
make sense.
2006-10-15 00:42:25 +00:00
David Nusinow
75733e4237
Commit diff of 6.5.1-0.2 so we've got a record of it here.
2006-10-14 22:42:57 +00:00
Thierry Reding
6e318e2cd1
Base the Debian OSMesa configurations on linux-osmesa* provided upstream.
...
Add a configuration for building a static version of OSMesa with 32 bits per
color channel.
2006-10-14 17:04:02 +00:00
Thierry Reding
01e6b84b14
Fix some small inconsistencies involving configuration names.
2006-10-14 16:32:25 +00:00
Thierry Reding
69705d22be
Rename the debian-dri-common configuration to debian-dri-default, to make it
...
consistent with the naming scheme of debian-default.
2006-10-14 16:29:32 +00:00
Thierry Reding
b16d1dcff5
Add a default Debian-specific configuration which overrides settings from the
...
default Mesa configuration.
2006-10-14 16:28:45 +00:00
Thierry Reding
10c5b5d5ba
Comment the Debian-specific configurations.
2006-10-14 16:25:30 +00:00
Thierry Reding
d9c5c170f6
Rename the -default configurations to -any, which is a more appropriate name.
2006-10-14 15:44:15 +00:00
Thierry Reding
32c7138d86
Move the debian/debian-dri configurations to debian-default/debian-dri-default
...
respectively, and use debian/debian-dri to choose an architecture specific
configuration.
2006-10-14 15:42:59 +00:00
Thierry Reding
d29244d872
Add OSMesa configurations and made fixed several issues here and there.
2006-10-14 15:11:31 +00:00
Thierry Reding
0fca6eda1e
Initial version of a new build system for Mesa.
2006-10-14 04:33:41 +00:00
Thierry Reding
1ddf606332
Import Mesa 6.5.1 (MesaLib, MesaDemos, MesaGLUT).
2006-10-14 03:46:41 +00:00
David Nusinow
bc8084da74
Fix goofed patch from before
2006-09-26 01:36:37 +00:00
David Nusinow
5eed400862
Prepare changelog for release
2006-09-26 01:21:59 +00:00
David Nusinow
a37a0959ac
* Add patch from Cyril Brulebois to allow package to build on HURD, which
...
lacks DRI and directfb. This includes not using lib-directfb in the
build-depends for hurd-i386. It also creates a new debian config,
debian-indirect, which is used when building for HURD. This config is
invoked in the debian-dri config on hurd-i386. Thanks to Cyril Brulebois
for the patch, Michael Banck, Michel Dänzer, and Samuel Thibault for
input on an appropriate fix. (closes : #358065 )
2006-09-26 00:46:14 +00:00
David Nusinow
53845c52e5
* Re-add s390 and m68k to the USE_IEEE test in src/mesa/main/imports.h. This
...
package seriously needs to store patches somewhere that are easy to find
and re-apply.
2006-09-26 00:32:06 +00:00
David Nusinow
d429f0b14f
* Make sure that libGl looks for the dri drivers in the proper location. Do
...
this by setting the appropriate variables in the debian config
2006-09-25 02:57:24 +00:00
David Nusinow
02339187ad
* Stuff not in the upstream tarballs
...
* Bump libdrm-dev build-dep to >= 2.0.2
* Add libdrm cflags to the debian-dri config. This allows the build system
to find drm.h
2006-09-24 22:55:41 +00:00
David Nusinow
827f778525
* Stuff not in the upstream tarballs
...
+ os2 glut stuff
+ docs/gears.png
2006-09-24 21:54:25 +00:00
David Nusinow
d3fc85eea9
Remove os2 glut stuff. It's not in the tarballs
2006-09-24 21:50:01 +00:00
David Nusinow
9a62963129
Add glut
2006-09-24 21:40:02 +00:00
David Nusinow
a0b2543ba1
Add mesa demos
2006-09-24 21:29:21 +00:00
David Nusinow
387acaac69
* New upstream version
2006-09-24 21:21:15 +00:00
David Nusinow
952b775dbe
Rename mesa dir
2006-09-24 21:18:17 +00:00
David Nusinow
eadb76b3f8
Bump to latest mesa in Debian
2006-09-24 21:11:46 +00:00
Steve Langasek
b3f7313ae4
Nuke the directory for an obsolete version of mesa -- no reason to merge
...
it anywhere, it's already superseded
2006-09-18 23:49:49 +00:00
David Nusinow
0c97d48027
* Install the glx sources with the rest in the sources package. This will
...
allow building of Xgl
2006-04-08 18:28:29 +00:00
David Nusinow
c4a678de9e
Update source package install file, change version number to match reality, and note NMU in changelog
2006-04-07 06:36:53 +00:00
David Nusinow
2c834f4d29
* Don't build now non-existant i830 driver in debian dri configs. Fixes
...
FTBFS.
2006-04-07 03:11:47 +00:00
David Nusinow
b93d290c9f
* Remove set_buffer function from idirectfbgl_mesa.c in directfb driver.
...
Also remove the line that sets SetBuffer to it. Fixes FTBFS.
2006-04-07 02:22:22 +00:00
David Nusinow
32266bb21a
* Re-Add s390 and m68k to the USE_IEEE test in src/mesa/main/imports.h.
...
I need to submit this upstream.
2006-04-07 01:50:23 +00:00
David Nusinow
cab39103b7
* Increment libdrm-dev build-dep to 2.0.1
2006-04-07 00:38:00 +00:00
David Nusinow
5c56a80ac9
Copy over Debian packaging from 6.4.1
2006-04-07 00:35:30 +00:00
David Nusinow
d0bac31721
Copy vendor drop of Mesa 6.5 over to working branch
2006-04-07 00:30:49 +00:00
David Nusinow
9258e54cfa
Move incorrect vendor drop of Mesa 6.5
2006-04-07 00:29:08 +00:00
David Nusinow
ccb68495e0
Vendor drop of Mesa 6.5
2006-04-07 00:24:21 +00:00
David Nusinow
db4236fe0b
* Add versioned conflict between libgl1-mesa-dri and xlibmesa-dri so that
...
the xlibmesa-dri transitional upgrade package works
2006-03-07 02:48:44 +00:00
David Nusinow
a4e43427f8
* Move compatibility packages to the xorg source package. The versioning on
...
these packages will be too low without an epoch and they definitely fit
with the xorg package anyway.
2006-02-24 05:43:01 +00:00
David Nusinow
829190abdd
* Provide compatibility packages for the Xorg 6.9 mesa packages. This
...
package will be the only source of mesa packages in Debian for the
present, and these packages will provide for smooth upgrades and
compatibility.
2006-02-22 03:22:26 +00:00
David Nusinow
99688cd051
Add m68k to previous fix to fix its FTBFS also
2006-02-11 23:00:27 +00:00
David Nusinow
1ba0a92702
* Add s390 to the USE_IEEE test in src/mesa/main/imports.h.
...
(closes : #349437 )
2006-02-09 01:24:52 +00:00
David Nusinow
065d5a8d17
* Remove makedepend from build-depends. Now we'll just build-dep on xutils
...
to get the app, which will translate over to our own xorg 7.0 plans.
2006-02-01 00:22:24 +00:00
David Nusinow
3b53c0ac19
* Re-add dh_installdirs call to binary-indep target so that we get
...
arch-specific dirs for the mesa-swx11-source package
2006-01-30 04:02:11 +00:00
David Nusinow
ed56fe4e82
* mesa-swrast-src.install stop looking for the swx11 dir and look for swrast
2006-01-22 19:50:19 +00:00
David Nusinow
1fbbe807ed
Make libglu1-mesa default to depending on libgl1-mesa-glx. Thanks Michel Dänzer for catching this one.
2006-01-22 00:07:07 +00:00
David Nusinow
c3dccfa05b
Use appropriate version number for an NMU. Thanks Julien for catching this one
2006-01-21 23:40:34 +00:00
David Nusinow
7703d9293f
Incorporate other NMU for xlibs-dev transition
2006-01-21 23:32:52 +00:00
David Nusinow
bcf560e4b8
* Change libgl1-mesa to be named libgl1-mesa-glx
2006-01-19 23:45:36 +00:00
David Nusinow
9d944b501a
* Change libgl1-mesa-swrast to be named libgl1-mesa-swx11
2006-01-16 22:19:03 +00:00
David Nusinow
cf013a5384
Add more closers
2006-01-11 04:10:39 +00:00
David Nusinow
2f367491c4
Add closer
2006-01-11 04:00:15 +00:00
David Nusinow
e7d93b62ec
* Change libgl1-mesa-swrast Depends on libx11-6-dev to libx11-dev.
...
(closes : #347205 )
* Add closer for packaging new upstream
2006-01-11 03:48:31 +00:00
David Nusinow
a5b309c0c9
Document that we'll be NMU'ing this for modular work
2006-01-06 03:09:12 +00:00
David Nusinow
df46b96ab0
Re-add mesa-6.4.1 which was accidentally deleted
2006-01-03 05:15:27 +00:00
David Nusinow
bda1e332ce
Update libs to 7.0 release with packaging
2005-12-30 20:12:45 +00:00
David Nusinow
53b2ad5fd0
Rename mesa lib dir to appropriate version
2005-12-16 04:04:38 +00:00
David Nusinow
b44d9c657d
Changelog version bump
2005-12-16 04:03:27 +00:00
David Nusinow
92ef7527d1
* New upstream version (6.4.1)
...
* Merge changes from Ubuntu version 6.4.1-0ubuntu1
+ Add new files required by xorg-server GL build to mesa-swrast-source.
2005-12-14 01:43:13 +00:00
David Nusinow
c37d6b4ca8
Commit Mesa 6.4 sources and packaging
2005-11-09 02:46:07 +00:00