Brice Goglin
7f8952d242
Prepare Changelog for upload
2009-12-11 18:36:40 +01:00
Brice Goglin
adae195cc1
Drop 07_sparc64_xform_asm.patch, applied upstream
2009-12-11 18:36:25 +01:00
Brice Goglin
3fa885911b
New upstream release candidate
2009-12-11 18:33:34 +01:00
Brice Goglin
ebf57c6202
Merge branch 'mesa_7_6_branch' of git://anongit.freedesktop.org/mesa/mesa into debian-unstable
...
Conflicts:
progs/tests/Makefile
progs/tests/prog_parameter.c
2009-12-11 18:31:38 +01:00
Brian Paul
7d41b4248b
docs: updated 7.6.1 relnotes with GLSL fixes
2009-12-11 09:41:34 -07:00
Brian Paul
d8f8eca9ef
mesa: remove unnecessary loop in _mesa_remove_output_reads()
2009-12-11 09:40:33 -07:00
Brian Paul
5076a4f53a
mesa: check dst reg in _mesa_find_free_register()
...
If a register was only being used as a destination (as will happen when
generated condition-codes) we missed its use. So we'd errantly return
a register index that was really in-use, not free.
Fixes bug 25579.
2009-12-11 09:16:27 -07:00
Aurelien Jarno
f7f1211b9b
sparc: additional preprocessor test for SPARC 64-bit
2009-12-11 08:46:54 -07:00
Brice Goglin
1f47135544
Build r600_dri.so
2009-12-11 15:54:32 +01:00
Brice Goglin
ac180fa6a7
fix sparc64 FTBFS
2009-12-11 07:52:39 +01:00
Vinson Lee
94fba49be9
mesa: Initialize variable in MatchInstruction.
2009-12-10 18:51:51 -08:00
Vinson Lee
e31df54754
mesa: Assign _mesa_lookup_parameter_index return value to GLint.
2009-12-10 18:32:33 -08:00
Vinson Lee
cb1dcb55f9
i915: Add missing break statement in i915_debug_packet.
2009-12-10 18:21:59 -08:00
Vinson Lee
d38ffed523
glsl: Increase size of array in_slang_lookup_constant from 4 to 16.
...
For some cases, _mesa_GetIntegerv reads up to params[15].
2009-12-10 17:52:31 -08:00
Vinson Lee
1cf60c9810
progs/samples: Byte swap individual members of struct _rawImageRec.
2009-12-10 15:41:13 -08:00
Vinson Lee
bc0509bba8
progs/util: Byte swap individual members of struct _rawImageRec.
2009-12-10 13:24:15 -08:00
Vinson Lee
51f52edaf1
glsl: Fix array out-of-bounds access by _slang_lookup_constant.
2009-12-10 12:37:10 -08:00
Vinson Lee
dcb4a37fc8
mesa: Fix array out-of-bounds access by _mesa_TexParameteriv.
2009-12-10 12:11:09 -08:00
Vinson Lee
b827578805
mesa: Fix array out-of-bounds access by _mesa_TexGend.
...
_mesa_TexGend calls _mesa_TexGenfv, which uses the params argument
as an array.
2009-12-09 17:59:23 -08:00
Vinson Lee
444d1f3910
mesa: Fix array out-of-bounds access by _mesa_Lighti.
...
_mesa_Lighti calls _mesa_Lightiv, which uses the params argument
as an array.
2009-12-09 17:34:50 -08:00
Vinson Lee
34528a34c4
mesa: Fix array out-of-bounds access by _mesa_Lightf.
2009-12-09 17:11:30 -08:00
Vinson Lee
348883076b
mesa: Fix array out-of-bounds access by _mesa_PointParameteri.
...
_mesa_PointParameteri calls _mesa_PointParameterfv, which uses the
params argument as an array.
2009-12-09 13:15:05 -08:00
Vinson Lee
6f2d51b81f
mesa: Fix array out-of-bounds access by _mesa_PointParameterf.
...
_mesa_PointParameterf calls _mesa_PointParameterfv, which uses the
params argument as an array.
2009-12-09 13:00:22 -08:00
Vinson Lee
637970aefd
mesa: Fix array out-of-bounds access by _mesa_LightModelf.
...
_mesa_LightModelf calls _mesa_LightModelfv, which uses the
params argument as an array.
2009-12-09 12:43:28 -08:00
Vinson Lee
a082d965de
glsl: Remove unused member x from struct slang_operation.
2009-12-09 11:26:24 -08:00
Brian Paul
3de8fff45d
mesa: fix baseLevel >= MAX_TEXTURE_LEVELS test
...
This fixes invalid array indexing when baseLevel == MAX_TEXTURE_LEVELS.
See bug 25528.
2009-12-09 08:30:05 -07:00
Andre Maasikas
33a120e476
r600: fix state size prediction after dc0777d3
2009-12-09 10:51:52 +02:00
Vinson Lee
af16c822a5
mesa: Fix array out-of-bounds access by _mesa_LightModeli.
...
_mesa_LightModeli calls _mesa_LightModeliv, which uses the
params argument as an array.
2009-12-08 18:26:05 -08:00
Vinson Lee
d33bf38d63
mesa: Fix array out-of-bounds access by _mesa_Fogf.
...
_mesa_Fogf calls _mesa_Fogfv, which uses the params argument
as an array.
2009-12-08 17:51:07 -08:00
Vinson Lee
3f7c2ac279
mesa: Fix array out-of-bounds access by _mesa_TexParameteri.
...
_mesa_TexParameteri calls set_tex_parameteri, which uses the
params argument as an array.
2009-12-08 17:25:05 -08:00
Vinson Lee
7f146b3824
mesa: Fix array out-of-bounds access by _mesa_Fogi.
...
_mesa_Fogi calls _mesa_Fogfv, which uses the params argument
as an array.
2009-12-08 16:08:41 -08:00
Vinson Lee
a1d46fbea0
mesa: Fix array out-of-bounds access by _mesa_TexParameteri.
...
_mesa_TexParameteri calls set_tex_parameterf, which uses the
params argument as an array.
2009-12-08 15:42:13 -08:00
Vinson Lee
d88f3b9468
mesa: Fix array out-of-bounds access by _mesa_TexParameterfv.
...
_mesa_TexParameterfv calls set_tex_parameteri, which uses the
params argument as an array.
2009-12-08 14:33:33 -08:00
Brian Paul
54b0ed8360
vbo: fix array index out of bounds error, and fix evaluator priorities
...
Fixes bug 25525.
Plus, the GL_NV_vertex_program evaluators alias and override the
convential evaluator maps, so set their state after the conventional
maps.
2009-12-08 15:03:22 -07:00
Vinson Lee
1de1deffce
i915g: Fix memory leak when pci id is unknown.
2009-12-08 00:43:38 -08:00
Vinson Lee
7e93e06781
i915g: Add missing break statement in i915_debug_packet.
2009-12-08 00:37:35 -08:00
Vinson Lee
7f8e22aa29
rbug: Initialize variable in rbug_get_message.
...
Silences uninitialized variable warning.
2009-12-08 00:28:50 -08:00
Andre Maasikas
369669ff9a
r600: add support for TXB instruction
...
makes testing other things easier - does not hang the card
TODO: enable TEX dependency tracking in vertex programs
2009-12-08 10:02:23 +02:00
Andre Maasikas
dc0777d3e3
r600: reorder state for render_target and blend
...
First time around render targets are not enabled yet (done in
r700SendRenderTargetState) so blend state is not emitted for any targets.
Affects first glClear in some mesa tests.
As a quick fix reorder state emit so that target is set first
2009-12-08 09:41:10 +02:00
Vinson Lee
add6dfbba6
llvmpipe: Initialize variables in emit_instruction.
2009-12-07 19:04:07 -08:00
Vinson Lee
3e8b2fda21
progs/test: Initialize variable in prog_parameter.
...
Silences uninitialized variable compiler warning.
2009-12-07 18:40:37 -08:00
Ian Romanick
9dbd47fc6b
mesa: set version string to 7.6.1-rc3
2009-12-07 16:59:59 -08:00
Vinson Lee
7d84169865
progs/demos: Fix memory leak in projtex.c.
2009-12-07 12:31:08 -08:00
Vinson Lee
7005f7cd1a
st/egl: Fix memory leak in egl_tracker.c.
...
(cherry picked from commit 052b127842 )
2009-12-06 01:15:24 -08:00
Vinson Lee
c994f08eb1
dri: Fix potential null pointer dereference in driBindContext.
...
(cherry picked from commit 919898e92f )
2009-12-06 01:01:55 -08:00
Vinson Lee
f622b649fb
dri: Fix potential null pointer deference in dri_put_drawable.
...
(cherry picked from commit 364070b1f2 )
2009-12-06 01:00:20 -08:00
Vinson Lee
76b3523d75
glx: Prevent potential null pointer deference in driCreateContext.
...
(cherry picked from commit 4b0b250aae )
2009-12-06 00:56:20 -08:00
Vinson Lee
978b80c8e3
progs/tests: Add tests to Makefile.
...
(cherry picked from commit 76d2ec3a0a )
2009-12-05 21:20:54 -08:00
Brice Goglin
a7109f3ae5
Prepare Changelog for upload
2009-12-06 00:15:21 +01:00
Brice Goglin
e5e54a9a6e
Refresh patches
2009-12-06 00:15:21 +01:00
Brice Goglin
c2ad82a90b
New upstream release candidate
2009-12-06 00:15:07 +01:00
Vinson Lee
3cd745515e
draw: Initialize variable in draw_pt.c.
...
(cherry picked from commit ea98e9820d )
2009-12-05 15:11:41 -08:00
Brice Goglin
9347983556
Merge branch 'mesa_7_6_branch' of git://anongit.freedesktop.org/mesa/mesa into debian-unstable
...
Conflicts:
progs/fp/Makefile
progs/fp/fp-tri.c
progs/fp/point-position.c
progs/fp/tri-depth.c
progs/fp/tri-depth2.c
progs/fp/tri-depthwrite.c
progs/fp/tri-depthwrite2.c
progs/fp/tri-inv.c
progs/fp/tri-param.c
progs/fp/tri-tex.c
progs/tests/Makefile
progs/tests/SConscript
progs/tests/arraytexture.c
progs/tests/copypixrate.c
progs/tests/crossbar.c
progs/tests/drawbuffers.c
progs/tests/invert.c
progs/tests/minmag.c
progs/tests/mipmap_comp.c
progs/tests/prog_parameter.c
progs/tests/random.c
progs/tests/shader_api.c
progs/tests/stencil_twoside.c
progs/tests/texcmp.c
progs/tests/texdown.c
progs/tests/vao-01.c
progs/tests/vao-02.c
progs/trivial/clear-fbo-tex.c
progs/trivial/clear-fbo.c
progs/trivial/clear-random.c
progs/trivial/clear-scissor.c
progs/trivial/clear.c
progs/trivial/createwin.c
progs/trivial/dlist-begin-call-end.c
progs/trivial/dlist-dangling.c
progs/trivial/dlist-edgeflag-dangling.c
progs/trivial/dlist-edgeflag.c
progs/trivial/dlist-flat-tri.c
progs/trivial/dlist-mat-tri.c
progs/trivial/dlist-recursive-call.c
progs/trivial/dlist-tri-flat-tri.c
progs/trivial/dlist-tri-mat-tri.c
progs/trivial/line-clip.c
progs/trivial/line-cull.c
progs/trivial/line-flat.c
progs/trivial/line-stipple-wide.c
progs/trivial/line-userclip-clip.c
progs/trivial/line-userclip-nop-clip.c
progs/trivial/line-userclip-nop.c
progs/trivial/line-userclip.c
progs/trivial/line-wide.c
progs/trivial/line.c
progs/trivial/lineloop-clip.c
progs/trivial/lineloop.c
progs/trivial/linestrip-clip.c
progs/trivial/linestrip-flat-stipple.c
progs/trivial/linestrip-stipple-wide.c
progs/trivial/linestrip-stipple.c
progs/trivial/linestrip.c
progs/trivial/point-clip.c
progs/trivial/point-param.c
progs/trivial/point-sprite.c
progs/trivial/point-wide-smooth.c
progs/trivial/point-wide.c
progs/trivial/point.c
progs/trivial/poly-flat-clip.c
progs/trivial/poly-flat-unfilled-clip.c
progs/trivial/poly-flat.c
progs/trivial/poly-unfilled.c
progs/trivial/poly.c
progs/trivial/quad-clip-all-vertices.c
progs/trivial/quad-clip.c
progs/trivial/quad-degenerate.c
progs/trivial/quad-flat.c
progs/trivial/quad-offset-factor.c
progs/trivial/quad-offset-unfilled.c
progs/trivial/quad-offset-units.c
progs/trivial/quad-tex-alpha.c
progs/trivial/quad-tex-pbo.c
progs/trivial/quad-unfilled-clip.c
progs/trivial/quad-unfilled-stipple.c
progs/trivial/quad-unfilled.c
progs/trivial/quad.c
progs/trivial/quads.c
progs/trivial/quadstrip-cont.c
progs/trivial/quadstrip-flat.c
progs/trivial/quadstrip.c
progs/trivial/readpixels.c
progs/trivial/tri-alpha-tex.c
progs/trivial/tri-alpha.c
progs/trivial/tri-blend-color.c
progs/trivial/tri-clear.c
progs/trivial/tri-clip.c
progs/trivial/tri-cull-both.c
progs/trivial/tri-dlist.c
progs/trivial/tri-fbo.c
progs/trivial/tri-flat-clip.c
progs/trivial/tri-flat.c
progs/trivial/tri-fog.c
progs/trivial/tri-fp-const-imm.c
progs/trivial/tri-fp.c
progs/trivial/tri-lit-material.c
progs/trivial/tri-lit.c
progs/trivial/tri-multitex-vbo.c
progs/trivial/tri-orig.c
progs/trivial/tri-query.c
progs/trivial/tri-scissor-tri.c
progs/trivial/tri-square.c
progs/trivial/tri-stipple.c
progs/trivial/tri-tex-3d.c
progs/trivial/tri-tex.c
progs/trivial/tri-tri.c
progs/trivial/tri-unfilled-clip.c
progs/trivial/tri-unfilled-edgeflag.c
progs/trivial/tri-unfilled-point.c
progs/trivial/tri-unfilled-smooth.c
progs/trivial/tri-unfilled-tri-lit.c
progs/trivial/tri-unfilled-tri.c
progs/trivial/tri-unfilled-userclip-stip.c
progs/trivial/tri-unfilled-userclip.c
progs/trivial/tri-unfilled.c
progs/trivial/tri-userclip.c
progs/trivial/tri-z-9.c
progs/trivial/tri-z-eq.c
progs/trivial/trifan-flat-clip.c
progs/trivial/trifan-flat-unfilled-clip.c
progs/trivial/trifan-flat.c
progs/trivial/trifan-unfilled.c
progs/trivial/trifan.c
progs/trivial/tristrip-clip.c
progs/trivial/tristrip-flat.c
progs/trivial/tristrip.c
progs/trivial/vp-tri-cb-pos.c
progs/trivial/vp-tri-cb-tex.c
progs/trivial/vp-tri-invariant.c
progs/vp/vp-tris.c
progs/vpglsl/psiz-mul.glsl
progs/vpglsl/vp-tris.c
2009-12-05 23:36:06 +01:00
Vinson Lee
b2953ee1a6
mesa: Fix array out-of-bounds access by _mesa_TexGenf.
...
_mesa_TexGenf calls _mesa_TexGenfv, which uses the params argument
as an array.
(cherry picked from commit ca5a7aadb4 )
2009-12-05 13:00:35 -08:00
Vinson Lee
d74cd04e61
mesa: Fix array out-of-bounds access by _mesa_TexGeni.
...
_mesa_TexGeni calls _mesa_TexGeniv, which uses the params argument
as an array.
(cherry picked from commit d55fb7c835 )
2009-12-05 12:59:34 -08:00
Vinson Lee
ca8a2150c7
mesa: Fix array out-of-bounds access by _mesa_TexParameterf.
...
_mesa_TexParameterf calls set_tex_parameterf, which uses the params
argument as an array.
(cherry picked from commit 270d36da14 )
2009-12-05 12:50:56 -08:00
Vinson Lee
4071d065c2
mesa: Fix array out-of-bounds access by _mesa_TexParameterf.
...
_mesa_TexParameterf calls set_tex_parameteri, which uses the params
argument as an array.
(cherry picked from commit a201dfb6bf )
2009-12-05 12:47:40 -08:00
Vinson Lee
1446f30875
progs/samples: Fix memory leak if malloc fails in rgbtoppm.c.
2009-12-05 01:43:29 -08:00
Vinson Lee
412aeeed1c
progs/samples: Fix memory leak if fopen fails in rgbtoppm.c.
2009-12-05 01:38:14 -08:00
Vinson Lee
6212c8103a
progs/samples: Add rgbtoppm to Makefile.
2009-12-05 01:28:47 -08:00
Vinson Lee
2cd2341ce8
progs/tests: Removed unused variable from texdown.c.
2009-12-05 01:23:05 -08:00
Vinson Lee
d642edd2d1
progs/vpglsl: Assign glGetUniformLocationARB return value to GLint.
...
The return type of glGetUniformLocationARB is GLint, not GLuint.
2009-12-05 01:11:26 -08:00
Vinson Lee
8d2f3434c5
progs/fp: Redraw upon keypress.
2009-12-04 23:31:39 -08:00
Vinson Lee
fe8e18bcd4
mesa: Fix array out-of-bounds access in _mesa_TexEnvf.
...
_mesa_TexEnvf calls _mesa_TexEnvfv, which uses the param argument
as an array.
(cherry picked from commit a11d60d14c )
2009-12-04 17:48:30 -08:00
Vinson Lee
4fb5ae7233
progs/util: Fix memory leak if fread returns 0 in CompileShaderFile.
...
(cherry picked from commit 11905da883 )
2009-12-04 17:35:00 -08:00
Vinson Lee
5683d7d43f
progs/util: Fix memory leak if fail to load/compile shader
...
Signed-off-by: Brian Paul <brianp@vmware.com >
(cherry picked from commit c475079ef2 )
2009-12-04 17:32:48 -08:00
Vinson Lee
e5bc2a19bd
progs/fp: Add tri-inv.c to Makefile.
2009-12-04 17:29:53 -08:00
Coleman Kane
225bc70b77
r300g: use $(MAKE) variable
...
Fixes bug 24501
2009-12-04 08:45:04 -07:00
Brian Paul
ca7cd3ade0
progs/xdemos: fix some visual/fbconfig logic in glxinfo.c
...
The fbAttribSingle/Double arrays had wrong GLX_DOUBLEBUFFER values.
We only need to use the glXChooseFBConfig() code when glXChooseVisual()
fails (but I don't know when that would happen).
Other recent commits errantly removed some code in this area too.
2009-12-04 08:09:57 -07:00
Brian Paul
fb83fa26c4
docs: a few more fixes for 7.6.1
2009-12-04 08:09:07 -07:00
Alex Deucher
8d8fd9776e
radeon: fix polygon stipple
...
fixes fdo bug 25354
Signed-off-by: Alex Deucher <alexdeucher@gmail.com >
2009-12-04 09:52:37 -05:00
Vinson Lee
c74afe0c46
glu/sgi: Fix memory leak in gluBuild2DMipmapLevelsCore.
...
(cherry picked from commit 808f037660 )
2009-12-04 00:14:31 -08:00
Vinson Lee
8df551c46b
glu/sgi: Fix memory leak in gluBuild1DMipmapLevelsCore.
...
(cherry picked from commit 94bcb9f1a4 )
2009-12-04 00:14:05 -08:00
Vinson Lee
ea487c6d0b
glu/sgi: Fix memory leak in gluBuild2DMipmapLevelsCore.
...
(cherry picked from commit 0d89f3dc7f )
2009-12-04 00:13:25 -08:00
Vinson Lee
7b5eba453e
glu/sgi: Fix memory leak in gluBuild3DMipmapLevelsCore.
...
(cherry picked from commit f895abbd97 )
2009-12-04 00:12:49 -08:00
Vinson Lee
7ed749c062
glu/sgi: Fix memory leak in gluBuild3DMipmapLevelsCore.
...
(cherry picked from commit 326b66d724 )
2009-12-04 00:11:58 -08:00
Vinson Lee
80a3944a4d
glu/sgi: Fix memory leak in bitmapBuild2DMipmaps.
...
(cherry picked from commit 5b925b7daa )
2009-12-04 00:11:02 -08:00
Vinson Lee
6c1fc2b2a5
glu/sgi: Fix memory leak in gluScaleImage3D.
...
(cherry picked from commit b611f639b4 )
2009-12-04 00:10:22 -08:00
Vinson Lee
fe38c16021
glu/sgi: Fix memory leak in gluScaleImage.
...
(cherry picked from commit a9c540f5de )
2009-12-04 00:09:22 -08:00
Vinson Lee
d23bb22f62
glu: Fix memory leak in __gl_meshMakeEdge.
...
(cherry picked from commit d3b4c99c70 )
2009-12-04 00:07:51 -08:00
Vinson Lee
12a440abfb
progs/xdemos: Silence unused value warnings in sharedtex_mt.c.
...
(cherry picked from commit 8556fad751 )
2009-12-04 00:04:38 -08:00
Vinson Lee
4bf96ebdae
progs/xdemos: Fix memory leak in pbdemo.c.
...
(cherry picked from commit e0857962b9 )
2009-12-04 00:03:14 -08:00
Vinson Lee
ba3fedf246
progs/xdemos: Add missing break statement in offset.c.
...
(cherry picked from commit 4ab8dbe593 )
2009-12-04 00:01:20 -08:00
Vinson Lee
8350648401
progs/xdemos: Remove duplicate code in glxinfo.c.
...
(cherry picked from commit a4720a1a32 )
2009-12-03 23:59:47 -08:00
Vinson Lee
7324c22024
progs/xdemos: Fix memory leak in glxinfo.c.
...
(cherry picked from commit f080567f4c )
2009-12-03 23:59:11 -08:00
Vinson Lee
68d206fafa
progs/xdemos: Add assert in corender.c.
...
(cherry picked from commit 66a4ec14c3 )
2009-12-03 23:22:47 -08:00
Vinson Lee
69ed1147a8
progs/vp: Fix memory leak in vp-tris.c.
...
(cherry picked from commit 760cf71572 )
2009-12-03 23:20:18 -08:00
Vinson Lee
efb582fde7
progs/tests: Fix memory leak in texdown.c if malloc fails.
...
(cherry picked from commit e3cfd78969 )
2009-12-03 23:17:26 -08:00
Vinson Lee
b210739aad
progs/redbook: Fix memory leak in quadric.c.
...
(cherry picked from commit 47b5f584a6 )
2009-12-03 23:12:59 -08:00
Vinson Lee
b1a87a3e0b
progs/glsl: Fix memory leak in deriv.c.
...
(cherry picked from commit 0e783c7d03 )
2009-12-03 22:54:35 -08:00
Vinson Lee
25fd168f03
progs/glsl: Change tangentAttrib from GLuint to GLint in bump.c.
...
tangentAtrrib is assigned the result of glGetAttribLocation.
The assertion 'assert(tangentAtrrib >= 0)' would be a no-op if
tangentAttrib is a GLuint.
(cherry picked from commit b8dcb79c53 )
2009-12-03 22:51:43 -08:00
Vinson Lee
b803abbaad
progs/demos: Fix memory leak in ray.c.
...
(cherry picked from commit 6b480dc21d )
2009-12-03 22:49:18 -08:00
Vinson Lee
5820dae4ec
progs/demos: Fix memory leak in projtex.c.
...
(cherry picked from commit ee555e3d69 )
2009-12-03 22:44:55 -08:00
Vinson Lee
fc5f07de1a
progs/demos: Fix memory leak in ipers.c.
...
(cherry picked from commit a1afe303de )
2009-12-03 22:38:44 -08:00
Vinson Lee
d245a951f3
progs/demos: Fix memory leak in fslight.c.
...
(cherry picked from commit aef3218f0b )
2009-12-03 22:36:37 -08:00
Vinson Lee
905e12f3cc
gallium/util: Initialize variables in u_pack_color.h.
...
(cherry picked from commit 36e2074b63 )
2009-12-03 17:55:59 -08:00
Vinson Lee
56de7e222e
progs/trivial: Redraw upon keypress.
...
(cherry picked from commit 9553a42f63 )
2009-12-03 17:27:24 -08:00
Vinson Lee
34a0b22a74
progs/trivial: Redraw upon keypress.
...
(cherry picked from commit 3790c6a13b )
2009-12-03 17:25:00 -08:00
Vinson Lee
9e29242331
progs/glsl: Redraw upon keypress.
...
(cherry picked from commit 881f55236a )
2009-12-03 17:17:24 -08:00
Vinson Lee
a0ac8fc7d8
progs/util: Exit RawImageGetData early if malloc fails.
...
Prevents a null pointer deference later on.
(cherry picked from commit e26135a744 )
2009-12-03 17:14:08 -08:00
Vinson Lee
0a6acecb35
progs/util: Fix memory leak if malloc fails in RawImageOpen.
...
(cherry picked from commit d36cb2396c )
2009-12-03 17:08:48 -08:00
Vinson Lee
305d4f147e
progs/util: Fix memory leak if fopen fails in RawImageOpen.
...
(cherry picked from commit d9508e8df9 )
2009-12-03 17:03:26 -08:00
Vinson Lee
772e004781
progs/util: Fix memory leak if malloc fails in tkRGBImageLoad.
...
(cherry picked from commit 786d539511 )
2009-12-03 16:57:17 -08:00
Vinson Lee
f1172c4030
progs/util: Fix memory leak if LoadRGBImage fails.
...
(cherry picked from commit 041cd0e110 )
2009-12-03 16:24:03 -08:00
Vinson Lee
84de1672d3
progs/util: Fix memory if LoadRGBMipmaps2 fails.
...
(cherry picked from commit 28b8e4bcd7 )
2009-12-03 16:15:22 -08:00
Vinson Lee
4ca8e1680e
progs/util: Fix memory leak if LoadYUVImage fails.
...
(cherry picked from commit 0e790ac353 )
2009-12-03 16:03:22 -08:00
Vinson Lee
d6a993135f
progs/fp: Redraw upon keypress.
...
(cherry picked from commit cde6643724 )
2009-12-03 15:59:56 -08:00
Vinson Lee
005242f166
prog/tests: Fix MSVC build.
...
Signed-off-by: Brian Paul <brianp@vmware.com >
(cherry picked from commit 9c3197ef0a )
2009-12-03 15:53:13 -08:00
Vinson Lee
d3208678c2
progs/tests: fix MSVC build.
...
Signed-off-by: Brian Paul <brianp@vmware.com >
(cherry picked from commit a8ed066858 )
2009-12-03 15:50:36 -08:00
Vinson Lee
97cbf4943a
progs/tests: Fix MSVC build.
...
(cherry picked from commit 50e113e375 )
2009-12-03 15:45:18 -08:00
Vinson Lee
a99bf51bc8
progs/tests: Fix MSVC build.
...
(cherry picked from commit 952bf63e2c )
2009-12-03 15:35:10 -08:00
José Fonseca
28474e1225
progs/tests: Use rand() instead of random().
...
Forgot these on previous commit.
(cherry picked from commit 166957abeb )
2009-12-03 15:34:38 -08:00
José Fonseca
bb6e3af939
progs/tests: Use rand() instead of random().
...
More portable. Same implementation on Linux.
(cherry picked from commit 699260b195 )
2009-12-03 15:32:45 -08:00
Vinson Lee
a38776419b
progs/tests: Fix MSVC build.
...
(cherry picked from commit f7455ad7af )
2009-12-03 15:29:01 -08:00
Vinson Lee
791b754687
prog/tests: Fix MSVC build.
...
(cherry picked from commit 60b6c74583 )
2009-12-03 15:24:43 -08:00
Vinson Lee
89e747920f
prog/tests: Fix MSVC build.
...
(cherry picked from commit 96fd13c1a0 )
2009-12-03 15:15:12 -08:00
Vinson Lee
5a25adb646
progs/tests: fix MSVC build.
...
(cherry picked from commit 9c778a90ea )
2009-12-03 15:11:25 -08:00
Vinson Lee
3910e88ebf
prog/tests: Fix MSVC build.
...
(cherry picked from commit ea862ec8ff )
2009-12-03 15:05:44 -08:00
Alex Deucher
2b5618fc5b
r200: fix polygon stipple
...
fixes fdo bug 25354
Signed-off-by: Alex Deucher <alexdeucher@gmail.com >
2009-12-03 11:20:40 -05:00
Vinson Lee
c3b7f93e02
scons: Add Mac OS to target platform list.
...
(cherry picked from commit 2c307c7750 )
2009-12-02 20:33:32 -08:00
Vinson Lee
235c0c8134
progs/vpglsl: Fix psiz-mul.glsl compilation error on Mac OS.
...
(cherry picked from commit b98db7bf69 )
2009-12-02 20:28:54 -08:00
Vinson Lee
0a107d36c2
progs/glsl: Fix trirast GLSL compilation errors on Mac OS.
...
(cherry picked from commit 4b3ec2acf2 )
2009-12-02 20:20:12 -08:00
Vinson Lee
b094683e7c
progs/glsl: Fix noise GLSL compilation error on Mac OS.
...
(cherry picked from commit 0d31990b47 )
2009-12-02 20:16:51 -08:00
Vinson Lee
592c8522a2
demos/glsl: Add missing break statement to noise test.
...
(cherry picked from commit 7dfea5c072 )
2009-12-02 20:16:41 -08:00
Vinson Lee
8f4d3613da
progs/glsl: Fix multinoise GLSL compilation errors on Mac OS.
...
(cherry picked from commit d4dc2e30da )
2009-12-02 20:06:20 -08:00
Vinson Lee
9ed77d12b1
progs/glsl: Add missing break statement in multinoise.c.
...
(cherry picked from commit 43080e40aa )
2009-12-02 20:06:11 -08:00
Vinson Lee
832593772d
progs/glsl: Fix mandelbrot GLSL compilation error on Mac OS.
...
(cherry picked from commit 04442841fb )
2009-12-02 19:55:48 -08:00
Vinson Lee
2a5cd95e24
progs/glsl: Include local headers before installed headers during compilation.
...
Fixes compilation errors on platforms with insufficient older installed
GL headers.
(cherry picked from commit d17af7d1e1 )
2009-12-02 19:39:25 -08:00
Brian Paul
ccea09cd3a
progs/glsl: minor Makefile clean-ups
...
(cherry picked from commit 4df2f7af5e )
2009-12-02 19:39:11 -08:00
Vinson Lee
67a0628ab2
progs: Ignore Mac OS dSYM directories.
...
(cherry picked from commit a420056750 )
2009-12-02 15:22:34 -08:00
Brian Paul
908a3e56cc
cell: added tex_usage param to xm_surface_buffer_create()
2009-12-02 09:31:26 -07:00
Brian Paul
ba97b98842
progs/demos: remove unused glFogCoordPointer_ext var
2009-12-01 12:23:07 -07:00
Tom Fogal
b9f4a0bd2b
Simplify hackery added to fix AIX build.
...
Borrow an idiom from the GNU build system which can handle `for'
loops over empty lists.
2009-12-01 10:27:27 -08:00
Ian Romanick
d8da270a2b
intel: Remove GL_NV_point_sprite from extension list
...
i830 does not (and cannot!) support the any of the non-default
GL_POINT_SPRITE_R_MODE_NV settings. i915 and i965 could, but
currently do not. In both cases it would require mucking about with
the fragment shader.
2009-12-01 10:25:44 -08:00
Ian Romanick
910aaed4da
mesa: set version string to 7.6.1-rc2
2009-11-30 17:55:21 -08:00
Ian Romanick
587a52e95b
i915: Actually put i915PointParameterfv in the driver function table. Duh.
2009-11-30 12:43:12 -08:00
Ian Romanick
533b766007
i915: Fallback bit define missed on previous commit
2009-11-29 17:49:55 -08:00
Ian Romanick
718f31b830
i915: Round point sizes instead of truncate.
2009-11-29 17:43:38 -08:00
Ian Romanick
d8d49716cf
i915: Enable point sprite coordinate generation
...
Support still isn't completely correct, but it's better. piglit
point-sprite now passes. However, glean's pointSprite test fails. In
that test the texture on the sprite is somehow inverted as though
GL_POINT_SPRITE_COORD_ORIGIN were set to GL_LOWER_LEFT. i915 hardware
shouldn't be able to do that!
I believe there are also problems when not all texture units have
GL_COORD_REPLACE set. The hardware enable seems to be all or nothing.
Fixes bug #25313 .
2009-11-29 17:40:02 -08:00
Ian Romanick
0528f40e3b
Improve implementation of GL_POINT_SPRITE_COORD_ORIGIN errors
...
This enum is only supported for OpenGL 2.0. If a driver supports
OpenGL 1.4 and GL_ARB_point_sprite, using this enum should generate an
error. This is important because, for example, i915 and i830 can
support GL_ARB_point_sprite, but they cannot support
GL_POINT_SPRITE_COORD_ORIGIN.
This commit just removes the check for NV_point_sprite, which is
completely wrong, and add some comments describing what the code
should do. I don't see an easy way to check for version >= 2.0 from
inside Mesa. Perhaps we should add an extension
GL_MESA_point_sprite_20 (like Intel's old GL_EXT_packed_pixels_12) to
indicate that this added bit of functionality is available.
Also note that glean's pointSprite test only checks for
GL_ARB_point_sprite before trying to use
GL_POINT_SPRITE_COORD_ORIGIN. Naturally, that fails on
non-2.0 implementations (i.e., Mac OS X on GMA 950).
2009-11-25 16:31:28 -08:00
Dave Airlie
e4c5fe52c9
radeon: fix context destroy needing lock for flushing.
...
Thanks to Intel code which I've just stolen pretty much as usual.
This fixes fdo bug 22851 which is a dri1 regression since rewrite.
Tested by: fpiobaf (Fabio) on #radeon
Signed-off-by: Dave Airlie <airlied@redhat.com >
2009-11-25 20:29:56 +10:00
Ian Romanick
b12ca6b87b
i915: Initialize Length and Offset fields when mapping a buffer object
...
This fixes an assertion failure in _mesa_MapBufferARB.
Fixes bugzilla #25253 .
2009-11-23 23:14:49 -08:00
Ian Romanick
da0883114b
shaderutil: Fix detection of shaders
...
Check for versions >= 2.0 (because some drivers return 3.0), and return
GL_FALSE if shaders are not detected.
2009-11-23 18:33:50 -08:00
Jakob Bornecrantz
a11750218f
autoconf: Fix case for not having package
...
(cherry picked from commit 5c4bdbd825 )
2009-11-23 20:09:36 +01:00
Michel Dänzer
601edbef17
Fix the DRI swrast driver for big endian platforms.
...
Too bad I didn't realize earlier how easy this could be...
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=22767 .
2009-11-23 19:56:37 +01:00
Brian Paul
3128d65fd7
docs: document fixes for AIX
2009-11-19 09:35:01 -07:00
Tom Fogal
7593bcb6ec
gl: added mangled glXGetProcAddressARB define
...
Signed-off-by: Brian Paul <brianp@vmware.com >
2009-11-19 09:33:32 -07:00
Tom Fogal
8f24e863c3
progs: Fix quoting issue with empty set of PROGRAM_DIRS.
...
Quotes are important to make sure the argument to test -n really
is the empty string, but that requires stringifying PROGRAM_DIRS.
Signed-off-by: Brian Paul <brianp@vmware.com >
2009-11-19 09:26:39 -07:00
Tom Fogal
4e6e2462ea
mesa: define 32bit byteswap for AIX.
...
Fixes `xlib' driver build on AIX.
Signed-off-by: Brian Paul <brianp@vmware.com >
2009-11-19 09:18:51 -07:00
Brian Paul
5117725fd0
docs: removed VC6/7 project files
2009-11-19 09:07:34 -07:00
Brian Paul
e16b59df42
docs: update news file for 7.6.1 release
2009-11-19 09:07:17 -07:00
Brian Paul
2a1505b42e
docs: remove VC6/7 project file info
2009-11-19 09:01:48 -07:00
Brian Paul
cba614bd88
mesa: omit VC6, VC7 project files from tarballs
...
Only VC8 project file is known to work.
2009-11-19 09:00:16 -07:00
Brian Paul
3bcf2d49f3
windows: remove old VC6 project files directory
...
Very out of date, according to Karl Schultz.
2009-11-19 08:57:39 -07:00
Alex Deucher
fe5c46546e
r600: disable compressed texture support
...
It's not implemented yet. fixes fdo bug 24047
2009-11-18 11:51:20 -05:00
Alex Deucher
c5add6a468
docs: Add note about r600
2009-11-18 11:32:55 -05:00
Alex Deucher
13b5a624b1
Revert "radeon: Fix legacy bo not to reuse dma buffers before refcount is 1."
...
This reverts commit 284a7af274 .
This breaks kde desktop effects. See fdo bug 24131
2009-11-18 11:27:36 -05:00
Brian Paul
027abddf4f
mesa: set version string to 7.6.1-rc1
2009-11-18 08:08:25 -07:00
Brian Paul
d449c07b8b
xorg/st: fixup builds against later dpms headers.
...
(cherry picked from master, commit e9d6ab72be )
2009-11-18 08:07:56 -07:00
Brian Paul
2b3ea2be90
docs: i965 clipping fix
2009-11-17 15:53:27 -07:00
Eric Anholt
514544f373
i965: Fix Ironlake shadow comparisons.
...
The cube map array index arg is always present.
2009-11-12 11:41:39 -08:00
Eric Anholt
5f305b1db9
i965: Fix VBO last-valid-offset setup on Ironlake.
...
Instead of doing math based on the (broken for VBO && offset != 0)
input->count number, just use the BO size. Fixes assertion failure in ETQW.
2009-11-12 11:41:39 -08:00
Roland Scheidegger
ab12e764ba
i965: fix EXT_provoking_vertex support
...
This didn't work for quad/quadstrips at all, and for all other primitive types
it only worked when they were unclipped.
Fix up the former in gs stage (could probably do without these changes and
instead set QuadsFollowProvokingVertexConvention to false), and the rest in
clip stage.
2009-11-11 17:57:56 -08:00
Eric Anholt
1220aba99b
i965: Fix VS constant buffer value loading.
...
Previously, we'd load linearly from ParameterValues[0] for the constants,
though ParameterValues[1] may not equal ParameterValues[0] + 4. Additionally,
the STATE_VAL type paramters didn't get updated.
Fixes piglit vp-constant-array-huge.vpfp and ET:QW object locations.
Bug #23226 .
2009-11-10 14:44:40 -08:00
Eric Anholt
e5ffb9f5ea
i965: Unalias src/dst registers for SGE and friends.
...
Fixes piglit vp-sge-alias test, and the googleearth ground shader. \o/
Bug #22228
(cherry picked from commit 56ab92bad8 )
2009-11-10 14:44:39 -08:00
Eric Anholt
23a4a6727e
i965: Allow use of PROGRAM_LOCAL constants in ARB_vp.
...
Fixes piglit arl.vp.
(cherry picked from commit d52d78b4bc )
2009-11-10 14:44:39 -08:00
Alex Deucher
74ef3207d8
r600: don't emit htile regs
...
These are needed for HiZ which is not currently used and
the _BASE reg requires a reloc which is not currently supported
in the drm.
2009-11-09 12:27:27 -05:00
Ian Romanick
2cda507fa1
prog parse: Handle GL_VERTEX_PROGRAM_ARB in glLoadProgramNV
2009-11-07 15:54:33 -08:00
Ian Romanick
6d2ceda780
prog parse: Handle GL_VERTEX_PROGRAM_NV in glProgramStringARB
...
Handle both NV vertex programs and NV vertex state programs passed to
glProgramStringARB.
2009-11-07 15:54:33 -08:00
Ian Romanick
289db82b2d
prog parse: Handle GL_FRAGMENT_PROGRAM_ARB in glLoadProgramNV
2009-11-07 15:54:32 -08:00
Ian Romanick
7452877cf6
prog parse: Handle GL_FRAGMENT_PROGRAM_NV in glProgramStringARB
2009-11-07 15:54:32 -08:00
Ian Romanick
26d2ce0a09
GLX: Change GLX client vendor string to "Mesa Project and SGI"
...
This change allows a certain closed-source browser plug-in to work
with open-source drivers.
2009-11-06 14:52:49 -08:00
Ian Romanick
9348ac03ce
ARB prog parser: Regenerate parser from previous commits.
2009-11-06 10:46:23 -08:00
Ian Romanick
d8e256f923
ARB prog parser: Release old program string in _mesa_parse_arb_{fragment,vertex}_program
...
The program structure passed to _mesa_parse_arb_program is just a
place holder. The stings that actually need to be released are only
known to the functions calling _mesa_parse_arb_program, so they should
be freed there.
2009-11-06 10:46:22 -08:00
Ian Romanick
301a9b7e28
ARB prog parser: Release strings returned from the lexer that don't need to be kept
2009-11-06 10:46:22 -08:00
Ian Romanick
1c7337d46e
Revert "ARB prog parser: Fix epic memory leak in lexer / parser interface"
...
This reverts commit 93dae6761b .
This change was completely broken when the parser uses multiple
strings in a single production. It would be nice if bug fixes could
initially land somewhere other than the stable branch.
2009-11-06 10:46:22 -08:00
Brian Paul
63191bd244
xmesa: pass pixmap to clip_for_xgetimage()
...
The code was assuming ctx->DrawBuffer == ctx->ReadBuffer.
Passing the pixmap is simpler and better.
Fixes a potential segfault.
2009-11-05 16:48:52 -07:00
Brian Paul
7c623905bc
mesa: added cast to silence warning
2009-11-04 17:58:43 -07:00
Brian Paul
1c3f7ab74c
vbo: fix out-of-bounds array access
...
The exec->vtx.inputs[] array was being written past its end. This was
clobbering the following vbo_exec_context::eval state. Probably not noticed
since evaluators and immediate mode rendering don't happen at the same time.
Fixed the loop in vbo_exec_vtx_init().
Changed the size of the vbo_exec_context::vtx.arrays[] array.
Added a bunch of debug-build assertions.
Issue found by Vinson Lee.
2009-11-04 17:51:28 -07:00
Brian Paul
bc4ad7c2ae
mesa: fix broken pack_histogram() case for GLhalf
2009-11-04 17:42:30 -07:00
Brian Paul
76aa0c0fd3
mesa: silence warning from gcc 4.4.1
2009-11-04 17:42:01 -07:00
Vinson Lee
60c328db2d
progs/tests: Fix MSVC build.
...
Signed-off-by: Brian Paul <brianp@vmware.com >
2009-11-04 15:56:14 -07:00
Alan Hourihane
f1b91ccc08
Fix YTILE spantmp functions
2009-11-04 15:26:38 +00:00
Vinson Lee
51f7763c00
glslcompiler: Fix Mac OS build.
...
Signed-off-by: Brian Paul <brianp@vmware.com >
2009-11-04 07:14:55 -07:00
Brian Paul
6eb71519f7
mesa: (GLint64) casts in get.c to silence Visual Studio warnings
...
Revised version of a patch from Karl Schultz.
2009-11-03 16:13:24 -07:00
Brian Paul
c5106339d3
docs: fix 7.6 build with Visual Studio
2009-11-03 16:12:02 -07:00
Karl Schultz
804d367a47
windows: updated VC8 project file
...
Signed-off-by: Brian Paul <brianp@vmware.com >
2009-11-03 16:09:29 -07:00
Karl Schultz
077eb0d81c
windows: remove old entrypoints from mesa.def file
...
Signed-off-by: Brian Paul <brianp@vmware.com >
2009-11-03 16:08:46 -07:00
Karl Schultz
e713a95c96
mesa: added GLAPIENTRY keywords for sync object functions
...
Signed-off-by: Brian Paul <brianp@vmware.com >
2009-11-03 16:05:12 -07:00
Marek Olšák
a0cd2b7029
st/mesa: clip pixels in draw_stencil_pixels to avoid crash
...
Signed-off-by: Brian Paul <brianp@vmware.com >
2009-11-03 09:48:04 -07:00
Brian Paul
e60ebebb39
st/mesa: don't use util_blit_pixels_writemask() for depth or depth/stencil
...
util_blit_pixels_writemask() only works for color formats at this time.
Also, it might never work for depth/stencil surfaces since we can't get
handle stencil values in a fragment shader.
Fixes glCopyTexSubImage(GL_DEPTH_COMPONENT).
2009-11-03 09:48:04 -07:00
Brian Paul
0197348641
st/mesa: fix tests for depth and depth/stencil texture formats
2009-11-03 09:48:04 -07:00
Vinson Lee
e055665752
glx: Fix memory leak if XF86DRICreateDrawable() fails
...
Signed-off-by: Brian Paul <brianp@vmware.com >
2009-11-02 12:35:47 -07:00
Chow Loong Jin
35506dec67
Add --with-dri-searchpath argument
...
* Add an extra argument to configure which allows for specifying
different DRI driver search paths to libGL (FDO #24766 )
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com >
2009-10-30 06:00:13 -07:00
Brian Paul
02b9fb9c80
progs/tests: fixes for drawbuffers.c
...
Disable GL_DEPTH_TEST before glDrawPixels.
Show color buffer 0 on left, color buffer 1 on right.
2009-10-29 14:46:35 -06:00
Brian Paul
635ea87374
progs/tests: added test for GL_EXT_texture_compression_s3tc support
2009-10-28 21:50:51 -06:00
Vinson Lee
96128fdf2f
mesa: Fix memory leak if we run out of memory
...
Signed-off-by: Brian Paul <brianp@vmware.com >
2009-10-28 17:59:49 -06:00
Vinson Lee
c0a61c8442
intel: Fix memory leak in case of renderbuffer bad format
...
Signed-off-by: Brian Paul <brianp@vmware.com >
2009-10-28 13:09:44 -06:00
Brian Paul
0219cd0961
mesa: remove unneeded #includes
2009-10-28 11:13:21 -06:00
Brian Paul
5e3b2baae7
mesa: include imports.h to silence warning
2009-10-28 11:11:30 -06:00
Vinson Lee
a7d0665c00
intel: Fix memory leak in event of mip tree allocation failure
...
Signed-off-by: Brian Paul <brianp@vmware.com >
2009-10-28 11:10:14 -06:00
Ian Romanick
93dae6761b
ARB prog parser: Fix epic memory leak in lexer / parser interface
...
Anything that matched IDENTIFIER was strdup'ed and returned to the
parser. However, almost every case of IDENTIFIER in the parser just
dropped the returned string on the floor. Every swizzle string, every
option string, every use of a variable, etc. leaked memory.
Create a temporary buffer in the parser state (string_dumpster and
dumpster_size). Return strings from the lexer to the parser in the
buffer. Grow the buffer as needed. When the parser needs to keep a
string (i.e., delcaring a new variable), let it make a copy then.
The only leak that valgrind now detects is /occasionally/ the copy of
the program string in gl_program::String is leaked. I'm not seeing
how. :(
2009-10-27 17:06:18 -07:00
Ian Romanick
8df9587d68
ARB prog parser: Don't leak program string
...
The program string is kept in the program object. On the second call
into glProgramStringARB the previous kept string would be leaked.
2009-10-27 17:06:18 -07:00
Ian Romanick
0f255d1956
ARB prog parser: Don't leak symbol table header structures
2009-10-27 17:06:18 -07:00
Eric Anholt
2643a7ba29
intel: Fix flipped condition in ARB_sync GetSYnciv(GL_SYNC_STATUS).
...
Bug #24435
(cherry picked from commit d56125a298 )
2009-10-27 16:59:03 -07:00
Brian Paul
b7eea8c616
intel: added region draw_x/y offsets in x/y_tile_swizzle() funcs
...
This fixes the second part of bug 23552.
2009-10-27 17:35:30 -06:00
Brian Paul
498fcfd315
progs/tests: added new blitfb.c test
...
Tests glBlitFramebuffer() between two texture/renderbuffer surfaces.
In particular, blit from level[1] of a cube map face to a 2D texture.
Used to find/fix bug in intel do_copy_texsubimage().
See commit aef1ab1073f3e30d699b99dae17518ed48b57c72
2009-10-27 16:46:20 -06:00
Brian Paul
22575abdec
intel: fix src offset bug in do_copy_texsubimage()
...
Use src->draw_offset intead of zero. Zero usually worked, except when
the src renderbuffer is actually a texture mipmap level higher than zero.
Fixes progs/test/blitfb.c test.
2009-10-27 16:46:20 -06:00
Brian Paul
517ae7a3b6
glsl: fix memory leak
...
A slightly modified version of a patch from Vinson Lee.
2009-10-27 16:29:15 -06:00
Eric Anholt
70b17db918
i915: Fix driver for the miptree x/y offset changes.
...
Bug #24734 .
2009-10-27 10:27:15 -07:00
Brian Paul
43dc91f8bb
i965: be clear that the Fallback field is a boolean, not a bitfield
2009-10-27 09:31:53 -06:00
Brian Paul
f9e334cb32
Revert "i965: fix hacked Fallback usage in brw_prepare_vertices()"
...
This reverts commit 8810b8f671 .
It turns out the i965 driver uses the intel->Fallback field as a boolean,
not as a bitmask. The intelFallback() function is a no-op in the i965
driver. It would have been nice if there were some comments about this.
I'll fix that next...
2009-10-27 09:31:53 -06:00
Vinson Lee
42732611d3
draw: Fix memory leak.
...
This would only be hit if we got and invalid index_size.
2009-10-27 09:14:29 -06:00
Brian Paul
0a47631849
docs: document Intel glBitmap fixes
2009-10-26 10:58:47 -06:00
Brian Paul
48dad9c93f
intel: fix GL state bugs in intel_texture_bitmap()
...
Need to push texture state and polygon state too.
Fixes rendering glitches seen in progs/demos/engine when changing
the rendering mode (wireframe, texture modes).
This makes bitmap rendering a little slower, unfortunately.
2009-10-26 10:44:22 -06:00
Brian Paul
dc8b139aa2
mesa: remove FBO texture depth/stencil test
...
The texture format should not be checked until validation time since
the format might be changed by a subsequent glTexImage() call.
2009-10-23 18:22:41 -06:00
Brian Paul
0acb057ad1
mesa: fix broken _mesa_str_checksum()
2009-10-23 16:36:15 -06:00
Eric Anholt
2d17dbfb53
intel: Keep track of x,y offsets in miptrees and use them for blitting.
...
By just using offsets, we confused the hardware's tiling calculations,
resulting in failures in miptree validation and blit clears.
Fixes piglit fbo-clearmipmap.
Bug #23552 . (automatic mipmap generation)
2009-10-23 14:12:24 -07:00
Brian Paul
b01937a3c9
progs/tests: print requested/internal format info
2009-10-23 14:52:10 -06:00
Brian Paul
96d7d66dff
docs: document updated GL extension header files
2009-10-23 14:49:47 -06:00
Brian Paul
5c0dc902e7
gl: updated wglext.h to version 17
2009-10-23 14:49:26 -06:00
Brian Paul
559da98c2b
gl: updated glxext.h to version 25
2009-10-23 14:49:26 -06:00
Brian Paul
9df9696f6d
gl: updated glext.h to version 56
2009-10-23 14:49:20 -06:00
Brian Paul
ff3f09a7fe
docs: document cell, glGetTexLevelParameter() fixes
2009-10-23 14:45:44 -06:00
Brian Paul
cd62b4f00a
mesa: fix GL_TEXTURE_INTERNAL_FORMAT query for compressed formats
...
Need to return the actual compressed format when the user originally
requested a generic compressed format.
2009-10-23 14:45:44 -06:00
Brian Paul
9528dc6ed8
mesa: added _mesa_compressed_format_to_glenum()
...
Maps a compressed MESA_FORMAT_x to correspding GLenum. Needed for
querying a texture's actual format when a generic format was originally
requested.
2009-10-23 14:45:44 -06:00
Brian Paul
5e4f5e41a4
mesa: change s3tc vs. fxt1 priority when choosing compressed formats
2009-10-23 14:45:44 -06:00
Ian Romanick
dd24501665
ARB prog parser: Fix parameter array size comparison
...
Array indexes are invalid when >= the maximum, but array sizes are
only in valid when > the maximum. This prevented programs from
declaring a single maximum size array.
See the piglit vp-max-array test.
2009-10-22 19:20:15 -07:00
Brian Paul
55058652b8
intel: flush old context before binding new context
...
Per the GLX spec, when changing rendering contexts, the old context
should first be flushed.
2009-10-22 18:33:26 -06:00
Brian Paul
5e6a6a2719
glx: don't destroy context immediately if it's currently bound
...
According to the GLXDestroyContext() man page, the context should not
immediately be destroyed if it's bound to some thread. Wait until it's
unbound to really delete it. The code for doing the later part is
already present in MakeContextCurrent() so no change was needed there.
2009-10-22 18:20:28 -06:00
Brian Paul
4837e01bcd
mesa: code refactoring- new _mesa_finish(), _mesa_flush()
2009-10-22 18:16:10 -06:00
Brian Paul
61a96a2ac7
progs/xdemos: fix command line flag typo
2009-10-22 17:11:59 -06:00
Brian Paul
8810b8f671
i965: fix hacked Fallback usage in brw_prepare_vertices()
...
Setting intel->Fallback = 1 clobbered any fallback state that was already
set. Not sure where this hack originated (the git history is a little
convoluted). Define and use a new BRW_FALLBACK_DRAW bit instead. This
shouldn't break anything and could potentially fix some bugs (but no
specific ones are known).
2009-10-22 16:52:59 -06:00
Brian Paul
c24466c34e
intel: define INTEL_FALLBACK_DRIVER for drivers
2009-10-22 16:52:59 -06:00
Brian Paul
ea659f8917
intel: Fallback field is a bitmask, use GLbitfield
2009-10-22 16:52:59 -06:00
Brian Paul
f9bbbe5803
i965: remove unused brw_context::tmp_fallback field
2009-10-22 16:52:59 -06:00
Brian Paul
2f7abf5c04
i965: remove unused BRW_FALLBACK_TEXTURE bit
...
The value was probably wrong too.
It was the same as INTEL_FALLBACK_DRAW_BUFFER.
2009-10-22 16:52:59 -06:00
Andre Maasikas
869e20bcb7
r600: set barrier for tex inst if dst is used earlier, might overwrite it otherwise
2009-10-22 09:45:11 +03:00
Andre Maasikas
a88c9296cb
r600: need to export something from PS
...
Also avoids empty shader for "END" - seems to be somewhat valid fp
Maybe this can be done differently in the future (fake FRAG_RESULT_COLOR
already in Map_Fragment_Program() or is there a way to program the chip
to not hang in case of no exports.
2009-10-22 09:44:03 +03:00
Andre Maasikas
b86302283b
r600: add beginnings of ARL instruction
2009-10-22 09:42:42 +03:00
Brian Paul
5283a3fb25
progs/trivial: check if GL_ARB_occlusion_query is supported
2009-10-20 16:22:03 -06:00
Marc Dietrich
4b2cf92ad9
cell: fix compilation on cell
...
s/LERP/LRP/
2009-10-20 11:17:12 -06:00
Vinson Lee
ca940a73a7
mesa: Fix Mac OS build.
...
strtod_l needs the xlocale.h header on Mac OS. It's possible other
non-Linux OSes would need this header too.
2009-10-20 10:43:49 -06:00
Mathias Fröhlich
16e21191e2
r300: fix texture size handling with size > 2048
...
The in kernel texture check fails because of both
bit11 flags being set on 16x16 textures. It tuns out
that these bits are still set and not cleared in the
pp_txpitch field of the texture. The attached patch
at least helps for this case on my machine. It clears
the bit 11 from the pitch field if the texture is smaller
and masks out that hight bits on the conventional width
and height field.
Fixes bug 24584
2009-10-19 11:47:21 -04:00
Robert Noland
8123180ea6
r600: Fix size calculation for 24 bit depth
...
size was being calculated based on 3 bytes per pixel with 24 bit depth
instead of 4 bytes. This caused corruption in the bottom 25% of objects.
This finishes fixing the menu/text corruption in compiz/kde4.
Signed-off-by: Robert Noland <rnoland@2hip.net >
2009-10-19 11:09:10 -04:00
Maciej Cencora
3594b53c01
r300: fix vertex program parameters limits
2009-10-16 20:21:17 +02:00
Brian Paul
946bc9aa42
docs: document GLSL float parsing bug fix
2009-10-16 07:38:39 -06:00
Brian Paul
89b31c9619
mesa: use C locale for _mesa_strtod()
...
_mesa_strtod() is used for shader/program parsing where the decimal
point character is always '.' Use strtod_l() with a "C" locale to
ensure correct string->double conversion when the actual locale uses
another character such as ',' for the decimal point.
Fixes bug 24531.
2009-10-16 07:36:50 -06:00
Owen Taylor
3f30b0709b
Use the right pitch when rendering to a texture
...
We need to get the pitch from the texture level we are rendering to,
rather than just using the base texel width.
2009-10-15 11:33:08 -04:00
Robert Noland
16c6a3b71e
r600: FRAG_ATTRIB_WPOS and FRAG_ATTRIB_FOGC appear to be supported.
...
Report unsupported attributes while I'm here.
Signed-off-by: Robert Noland <rnoland@2hip.net >
2009-10-15 11:29:52 -04:00
Robert Noland
a176b1c5d8
r600: cleanup in r600_cs_process_relocs().
...
Signed-off-by: Robert Noland <rnoland@2hip.net >
2009-10-15 11:29:45 -04:00
Robert Noland
e5d6450c2c
radeon: return EINVAL for 0 length buffers.
...
Signed-off-by: Robert Noland <rnoland@2hip.net >
2009-10-15 11:29:35 -04:00
Andre Maasikas
22a0029a68
r600: fix tfp1 bo size
...
Setting the wrong bo size resulting in an incomplete
read cache flush when reading the texture. This fixes the
compiz text corruption.
[agd5f: take hw pitch alignment into account]
2009-10-15 11:24:49 -04:00
Andre Maasikas
a3fec14101
r600: implement ProgramStringNotify
...
need this to properly test with piglit/glean vert/fragprog tests
copied mostly from r300, many thanks to osiris, nha, airlied, others...
2009-10-15 11:22:18 -04:00
Andre Maasikas
606becc7f3
r600: LIT dst.y gets value from src.x
...
seems I overlooked this when removing hardcoded swizzles for this
one previously
2009-10-15 11:21:15 -04:00
Andre Maasikas
74c31e5d05
r600: DPH adds w comp of second operand, so set first one to 1 instead
2009-10-15 11:20:04 -04:00
Andre Maasikas
95851d8cb2
r600: fixup KIL instruction a bit
...
- KILLGT takes 2 arguments
- arb KIL has no dst register
- add TODO about clause ending but currently piglit fp-kil passes and
does not hang the card
2009-10-15 11:18:53 -04:00
Andre Maasikas
bf68e54a4d
r600: use CB_TARGET_MASK instead of CB_SHADER_MASK for setting color mask
...
makes blend functions work better
Signed-off-by: Dave Airlie <airlied@linux.ie >
2009-10-15 11:17:09 -04:00
Andre Maasikas
5101215a64
r600: user correct alpha blend factor
...
Signed-off-by: Dave Airlie <airlied@linux.ie >
2009-10-15 11:16:53 -04:00
Andre Maasikas
f7285bdffc
r600: clear position enable bit when when wpos is not used by FP
...
Makes doom3 alot nicer..
2009-10-15 11:16:41 -04:00
Brian Paul
6f8b4d9e36
mesa: regenerated lex.yy.c w/ _mesa_strtod()
2009-10-15 08:59:13 -06:00
Neil Roberts
269f16cd96
mesa: Use _mesa_strtod in the lexer for assembly shaders
...
See bug 24531.
2009-10-15 08:57:07 -06:00
Brian Paul
31f7e8efb2
progs/Makefile: remove extra quoting
...
This reverts part of commit 115edf24a9 and
fixes the error: "/bin/sh: line 0: test: too many arguments".
2009-10-14 09:37:53 -06:00
Tom Fogal
115edf24a9
Fix build when PROGRAM_DIRS is empty.
...
SUBDIRS just takes PROGRAM_DIRS value. If PROGRAM_DIRS gets set
to the empty string (as can happen when building only OSMesa), a
'for' loop will lack anything to iterate over, causing a parse
error.
This fixes the issue by making sure SUBDIRS is the null string
when PROGRAM_DIRS is, and wrapping the for loops in if's, causing
them only to execute if there are directories to iterate over.
2009-10-13 16:22:09 -06:00
Tom Fogal
9282edfaa0
ac: Fix AIX shared library builds.
...
AIX uses ".a" for both static and shared library extensions.
2009-10-13 16:22:06 -06:00
Eric Anholt
f3be27c0cf
i965: Fix the last valid address setting for the index buffer.
...
Again, last valid address, not first invalid address. Fixes regression
in 255e5be265 that the kernel now catches
and caused piglit draw_elements_base_vertex to fail.
2009-10-11 11:21:03 -07:00
Eric Anholt
a82da7fa26
i965: Fix the bounds emitted in the vertex buffer packets.
...
It's the address of the last valid byte, not the address of the first
invalid byte.
This should also fix problems with rendering with the new sanity checks in
the kernel.
2009-10-11 11:21:03 -07:00
Brian Paul
768481ed40
softpipe: revert 564df9dc5f
...
This change silenced valgrind warnings but broke progs/tests/drawbuffers.
The problem is we don't know the surface's state when we start caching it
(it may or may not be initialized/cleared/etc). So "clearing" it here was
presumptuous. Leaving the code in place (but disabled) for reference and
when using valgrind.
Fixes bug 24401
2009-10-10 09:18:14 -06:00
Alex Deucher
194ede4bf9
radeon: fix scissor regression
...
fixes fdo bug 24248
2009-10-09 15:44:32 -04:00
Brian Paul
2738681e84
docs: fix aux buffer bug 24426
2009-10-09 13:23:07 -06:00
Brian Paul
6164f1fe79
st/mesa: create aux buffers according to visual
...
Fixes bug 24426 for gallium.
2009-10-09 13:22:15 -06:00
Brian Paul
ce64e063a8
mesa: fix incorrect assertion in _mesa_add_aux_renderbuffers()
...
Fixes bug 24426.
2009-10-09 13:22:00 -06:00
Brian Paul
f7fb30f03b
mesa: regenerated gl_mangle.h file
2009-10-08 09:19:42 -06:00
Brian Paul
ee3fbe7067
gallium/xlib: call XQueryExtension() in glXQueryExtension()
...
See bug 24321.
2009-10-07 14:43:27 -06:00
Brian Paul
9f002e4aaa
mesa/xlib: call XQueryExtension() in glXQueryExtension()
...
See bug 24321.
2009-10-07 14:42:16 -06:00
Brian Paul
7dd2c0afd6
mesa: don't need to free textures, VBOs, etc. in _mesa_meta_free()
...
They're freed by the normal context deallocation code.
Fixes Blender crash, bug 24185.
2009-10-07 14:07:49 -06:00
Nicolai Hähnle
9fde81bb20
shader_api: Fix bounds checking of glUniform and glUniformMatrix
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com >
2009-10-07 20:36:23 +02:00
Nicolai Hähnle
ae351599f1
prog_parameter: Document the fact that Size may be > 4
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-10-07 20:33:55 +02:00
Brian Paul
cdcd9da480
docs: fix glXQueryDrawable() bugs
2009-10-07 09:41:38 -06:00
Brian Paul
c3eef6021a
mesa/xlib: fix glXQueryDrawable() bugs, see bug 24320
2009-10-07 09:41:38 -06:00
Brian Paul
0526100a5c
gallium/xlib: fix glXQueryDrawable() bugs, see bug 24320
2009-10-07 09:41:38 -06:00
Brian Paul
f36425b569
progs/xdemos: test glXQueryDrawable()
2009-10-07 09:41:38 -06:00
Brian Paul
846a6b0695
progs/xdemos: fix swapped parameters to CreatePbuffer()
2009-10-07 09:41:38 -06:00
Brian Paul
edbaa717b4
swrast: s/GLfloat/GLuint/ in bzero()
2009-10-07 08:07:53 -06:00
Brian Paul
14f21c7850
swrast: add missing returns
2009-10-07 08:05:28 -06:00
Vinson Lee
4b3cbecb3a
progs/test: Fix MSVC build.
2009-10-07 07:54:31 -06:00
Brian Paul
e3fff3daf0
mesa/xlib: return 0 for errorBase, eventBase in glXQueryExtension()
...
A little better than leaving the values undefined, I think.
See bug 24321.
2009-10-07 07:45:59 -06:00
Brian Paul
f9904edf53
gallium/xlib: return 0 for errorBase, eventBase in glXQueryExtension()
...
A little better than leaving the values undefined, I think.
See bug 24321.
2009-10-07 07:45:59 -06:00
Brian Paul
79892e7976
intel: use driReadDrawable in do_copy_texsubimage()
2009-10-05 14:26:16 -06:00
Brian Paul
3b7ec94c0d
intel: use driReadDrawable, not driDrawable in do_blit_readpixels()
2009-10-05 14:25:36 -06:00
Brian Paul
3b29dcbb5e
intel: remove a buffer equality test in _mesa_make_current()
...
Before, if we called glXMakeCurrent() to change a context's window binding
while an FBO was bound, we weren't updating the intel->driDrawable and
intel->driReadDrawable fields. This could cause us to dereference a null
pointer elsewhere.
2009-10-05 14:07:29 -06:00
Brian Paul
a8768bbc9d
mesa: fix return value when clipping {Read,Draw}Pixels height <= 0
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com >
(cherry picked from master, commit 7aeaca33c3 )
2009-10-05 11:10:31 -06:00
Jon TURNEY
a15d9ca9cc
Fix building of GLSL demos which use M_PI
...
Some <math.h> files do not define M_PI, in which case, provide our own definition
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk >
2009-10-05 11:07:23 -06:00
Michel Dänzer
43750f1575
Use _mesa_select_tex_image() rather than hardcoding face 0.
...
Fixes crash loading a map in sauerbraten with
hwmipmap 1
in ~/.sauerbraten/config.cfg.
2009-10-05 12:31:51 +02:00
Frederic Crozat
3856c3cc46
r200: remove subpixel offset from viewport
...
Fixes bug fdo 20340 for r200.
2009-10-04 17:50:16 -04:00
Nicolai Hähnle
bbe384c86a
r300: Workaround problem on R500 with very large fragment programs
...
The non-KMS interface is to blame here. In theory, a proper fix
could be produced that works for the KMS interface only, but it
require cleaning a lot of mess. Easier to just do it right in r300g.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-10-03 01:39:13 +02:00
Brian Paul
c01a77d304
docs: document default texture binding fix
2009-10-02 09:58:16 -06:00
Brian Paul
e1bddd159f
mesa: fix incorrect default texture binding in unbind_texobj_from_texunits()
...
If we deleted a currently bound texture, we were always reverting the texture
binding to the default 1D texture rather than the proper default texture.
2009-10-02 09:57:00 -06:00
Brian Paul
85ee0ef9a7
gallium/xlib: use bitwise-and to test GLX_RGBA_BIT in choose_visual()
...
The parameter is a bitmask.
2009-10-02 07:52:29 -06:00
Brian Paul
584b0879ac
xlib: use bitwise-and to test GLX_RGBA_BIT in choose_visual()
...
The parameter is a bitmask.
2009-10-02 07:51:19 -06:00
Brian Paul
abc12d0636
gallium/xlib: return GLX_RGBA_BIT or GLX_COLOR_INDEX_BIT in get_config()
...
This reverts part of commit a6b84aef4a
2009-10-02 07:47:49 -06:00
Brian Paul
389021220d
gallium: replace // comments with /* */
2009-10-02 07:31:42 -06:00
Brian Paul
337480e1f8
gallium: remove // comment and extra whitespace
2009-10-02 07:26:28 -06:00
Brian Paul
167ffa9e03
mesa: fix memory leak when generating mipmaps for compressed textures
2009-10-01 14:55:13 -06:00
Brian Paul
0574954238
mesa: fix mem leaks
2009-10-01 14:52:28 -06:00
Brian Paul
0f291f2efe
gallium/util: silence uninitialized var warning
2009-10-01 14:52:10 -06:00
Brian Paul
63064cf7c3
mesa: add missing return when out of memory
2009-10-01 14:51:43 -06:00
Brian Paul
7b568614a2
mesa: fix potential uninitialized memory reads
2009-10-01 14:51:26 -06:00
Brian Paul
9b27a0d063
glsl: fix mem leak
2009-10-01 14:50:45 -06:00
Brian Paul
b3e41e0d5e
st/mesa: check for null before asserts, fix possible mem leak
2009-10-01 14:49:39 -06:00
Brian Paul
b154497bef
st/mesa: silence hidden parameter warning
2009-10-01 14:49:04 -06:00
Brian Paul
495628bc5c
st/mesa: fix non-mipmap lastLevel calculation.
...
reviewed by Brian Paul.
(cherry picked from master, commit ae2daacbac )
2009-10-01 13:34:49 -06:00
Vinson Lee
18883cdf23
mesa: Return -FLT_MAX instead of 0 for LG2(0).
...
lim x->0 log(x) = -inf so -FLT_MAX is a better approximation than 0
for LG2(0).
2009-10-01 13:33:20 -06:00
Brian Paul
521e4b9b7e
glx: fix glXQueryContext(GLX_RENDER_TYPE)
...
The renderType parameter to CreateContext() was never used. Also, it
was often passed as zero. Now when it's zero we check if the context
is RGBA or CI mode and set it accordingly.
Fixes bug 24211.
2009-09-30 15:15:10 -06:00
Eric Anholt
49fbdd18ed
i965: Fix massive memory allocation for streaming texture usage.
...
Once we've freed a miptree, we won't see any more state cache requests
that would hit the things that pointed at it until we've let the miptree
get released back into the BO cache to be reused. By leaving those
surface state and binding table pointers that pointed at it around, we
would end up with up to (500 * texture size) in memory uselessly consumed
by the state cache.
Bug #20057
Bug #23530
2009-09-30 11:27:27 -07:00
Brian Paul
b77469871a
docs: document GLSL sqrt(0) fix
2009-09-29 19:05:04 -06:00
Brian Paul
322bc403bc
glsl: regenerated file
2009-09-29 18:59:37 -06:00
Brian Paul
65765c9f2c
glsl: rewrite sqrt(x) intrinsic to handle x=0
...
Since sqrt() is basically implemented in terms of RSQ/RCP we'll do a
divide by zero if x=0 and wind up with unpredictable results.
Now use CMP instruction to test for x<=0 and return zero in that case.
2009-09-29 18:57:13 -06:00
Brian Paul
3c794e45b0
glsl: add support for CMP instruction
2009-09-29 18:51:49 -06:00
Brian Paul
5f1faf4a21
docs: fixed glXQueryContext(GLX_RENDER_TYPE)
2009-09-29 12:18:41 -06:00
Brian Paul
a6b84aef4a
gallium/xlib: fix GLX_RENDER_TYPE query
...
Return GLX_RGBA_TYPE or GLX_COLOR_INDEX_TYPE.
2009-09-29 12:17:20 -06:00
Brian Paul
86ee448047
mesa/xlib: fix GLX_RENDER_TYPE query
...
Return GLX_RGBA_TYPE or GLX_COLOR_INDEX_TYPE.
2009-09-29 12:16:20 -06:00
Brian Paul
ef9cd84521
glx: indentation fixes
2009-09-29 09:58:47 -06:00
Brian Paul
69a3043f41
mesa: bump version to 7.6.1
2009-09-29 09:36:06 -06:00
Brian Paul
2d400d43bf
docs: initial 7.6.1 release notes
2009-09-29 09:34:47 -06:00
Brian Paul
9b5541617f
mesa: work-around glXCopyContext() bug in _mesa_copy_texture_state()
...
See bug 24217.
2009-09-29 09:32:40 -06:00
Brian Paul
564df9dc5f
softpipe: initialize the clear_flags bitvector in sp_create_tile_cache()
...
This silences tons of valgrind warnings in programs that don't call
glClear(), such as progs/demos/gamma.
2009-09-29 08:51:00 -06:00
Brian Paul
fbddc75aa2
softpipe: Grab a ref when the fb is set.
...
Nasty bug when the surface is freed and another is allocated right on
top of it. The next time we set the fb state SP thinks it's the same
surface and doesn't flush, and when the flush eventually happens the
surface belongs to a completely different texture.
(cherry picked from commit a77226071f )
Conflicts:
src/gallium/drivers/softpipe/sp_context.c
2009-09-29 08:21:54 -06:00
Brice Goglin
ee9811de78
Prepare changelog for upload
2009-09-29 11:52:04 +02:00
Brice Goglin
adaeac03dd
Add bug closers
2009-09-29 11:51:51 +02:00
Brice Goglin
e47955de4e
Refresh patches
2009-09-29 11:45:58 +02:00
Brice Goglin
58c42a5b1d
New upstream release
2009-09-29 11:43:15 +02:00
Brice Goglin
753604e607
Merge tag 'mesa_7_6' into debian-unstable
...
Conflicts:
progs/egl/Makefile
progs/egl/demo3.c
progs/slang/vstest.c
progs/tests/Makefile
progs/tests/SConscript
progs/tests/bufferobj.c
progs/tests/floattex.c
progs/tests/getprocaddress.c
progs/tests/getprocaddress.py
progs/tests/mapbufrange.c
progs/tests/mapvbo.c
progs/tests/texcmp.c
progs/tests/texcompsub.c
progs/tests/zreaddraw.c
progs/trivial/.gitignore
progs/vp/arl-static.txt
progs/vp/arl-unused.txt
progs/vp/vp-tris.c
scons/gallium.py
2009-09-29 11:39:19 +02:00
Brian Paul
6829ef7460
docs: update news.html file with 7.5.2 and 7.6 release
2009-09-28 13:20:15 -06:00
Ian Romanick
d39fd9f641
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
...
Conflicts:
src/mesa/main/version.h
2009-09-28 12:02:39 -07:00
Ian Romanick
18f3afbe88
docs: 7.5.2 md5 sums
2009-09-28 11:41:23 -07:00
Ian Romanick
b807d49f18
Prep for 7.5.2 release
2009-09-28 11:33:52 -07:00
Ian Romanick
86cd188f94
docs: 7.6 md5 sums
2009-09-28 11:29:25 -07:00
Ian Romanick
f0dc378705
Prep for 7.6 release
2009-09-28 11:22:54 -07:00
Brian Paul
eeb7e04da6
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
2009-09-28 09:59:59 -06:00
Robert Noland
d09941c8cc
Fix build on non GLIBC platforms (FreeBSD at least)
...
Build was broken by commit 9666529b5a
I'm not certain that this is entirely the correct fix since the demo
from bug #23774 seemed to work before the commit that broke the build.
Signed-off-by: Robert Noland <rnoland@2hip.net >
Signed-off-by: Brian Paul <brianp@vmware.com >
2009-09-28 09:48:45 -06:00
Brian Paul
fc613848e6
docs: list additional 7.5.2 bug fixes
2009-09-28 09:43:42 -06:00
Brian Paul
c7d0f0b46c
docs: document gallium mipmap generation fix
2009-09-28 09:38:50 -06:00
Brian Paul
c7fddaf612
st/mesa: fix st_generate_mipmap() issues
...
The main issue is we didn't always have a gallium texture object with
enough space to store the to-be-generated mipmap levels. When that's
the case, allocate a new gallium texture and use st_texure_finalize()
to copy images from the old texture to the new one.
We also had the baseLevel parameter to st_render_mipmap() wrong.
2009-09-28 09:37:16 -06:00
Brian Paul
e3a6f57ad6
st/mesa: fix/simplify st_texture_object::lastLevel calculation
...
Don't compute the st_texture_object::lastLevel field based on the texture
filters. Use the _MaxLevel value that core Mesa computes for us.
When called from the GenerateMipmap path, we'll use the lastLevel field
as-is.
2009-09-28 09:35:08 -06:00
Brian Paul
41d0606b7f
gallium/util: add sanity check assertions
2009-09-28 09:35:04 -06:00
Michel Dänzer
151e0c0aea
intel: Handle GL_RGB8 for glCopyTex(Sub)Image.
...
Avoids an unnecessary fallback.
2009-09-25 21:00:28 +02:00
Vinson Lee
46da1f2c9b
mesa: move declaration before code
2009-09-25 08:51:57 -06:00
Eric Anholt
126d62edd1
i915: Fix GetBufferSubData in the case of a system-memory BO.
...
Bug #23760 (crashes in wine)
2009-09-24 20:04:42 -07:00
Eric Anholt
cc8084932c
intel: Flush the batch when we're about to subdata into a VBO.
...
This fixes the clears in openarena with the new metaops clear code, and
the new piglit vbo-subdata-sync test.
Bug #23857 .
2009-09-24 16:24:46 -07:00
Eric Anholt
54107a0979
i965: Clean up some mess with the batch cache.
...
Its flagging of extra state that's already flagged by the vtbl new_batch
when appropriate was confusing my tracking down of the OA clear bug.
2009-09-24 16:24:46 -07:00
Brian Paul
940ca2e837
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
2009-09-24 16:01:26 -06:00
Vinson Lee
1730b8db12
softpipe: Increase GL_MAX_3D_TEXTURE_SIZE to 256.
2009-09-24 15:59:57 -06:00
Eric Anholt
726a04a2cd
i965: Emit zero initialization for NV VP temporaries as required.
...
This is similar to what r300 does inside the driver, but I've added it as
a generic option since it seems most hardware will want it.
Fixes piglit nv-init-zero-reg.vpfp and nv-init-zero-addr.vpfp.
2009-09-24 13:34:06 -07:00
Eric Anholt
a9a47afe7e
i965: Remove assert about NV_vp now that it somewhat works.
2009-09-24 13:34:06 -07:00
Eric Anholt
9018a7dd17
i965: Load NV program matrices when required.
2009-09-24 13:34:06 -07:00
Eric Anholt
601769a2c0
mesa: Initialize NV_vertex_program fields for the parameter lists and such.
...
This helps let drivers treat NV_vp like ARB_vp.
2009-09-24 13:34:06 -07:00
Brian Paul
60b152a1b3
mesa: remove glEnable(GL_DEPTH_BOUNDS_TEST_EXT) check/warning
...
At the time of the enable there may not be a Z buffer, but one
may be attached to the FBO later.
2009-09-24 14:24:14 -06:00
Brian Paul
adfa778c8e
mesa: remove rgbMode check in enable_texture()
...
If the currently bound FBO isn't yet validated it's possible for
rgbMode to be zero so we'll lose the texture enable.
This could fix some FBO rendering glitches, but I don't know of
any specific instances.
2009-09-24 14:19:06 -06:00
Brian Paul
b849c6f1b3
intel: use default array/element buffers in intel_generate_mipmap()
...
If there happened to be a bound VBO when intel_generate_mipmap() was
called we blew up because of a bad vertex array pointer.
Fixes regnumonline, bug 23859.
2009-09-24 12:41:14 -06:00
Brian Paul
f0339f502c
mesa: replace assertion with no-op function assignment
2009-09-24 12:37:34 -06:00
Brian Paul
964792b025
mesa: added comment
2009-09-24 12:37:06 -06:00
Brian Paul
1a81611725
vbo: limit number of warnings to 10
...
Otherwise some apps will emit tons of warnings.
2009-09-24 12:36:05 -06:00
Pauli Nieminen
1d2dca194c
radeon: Fix scissors for r600 KMS.
...
Radeon generic scissors code had problem that some of code was using exclusive
and some inclusive bottom right corner. Only r600 driver is using exclusive
coordinate so changed generic code to pass inclusive coordinate and r600 driver
changes BR coordinate to be exclusive.
2009-09-24 20:37:55 +03:00
Brian Paul
7549a8397b
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
2009-09-24 10:52:15 -06:00
Brian Paul
a64d4516a0
tgsi/sse: Pass the lodbias, not zero. More comments.
...
This fixes the glean/glsl1 "texture2D(), with bias" test when using SSE.
2009-09-24 10:28:09 -06:00
Brian Paul
a491e25b1f
mesa: added default case return to silence warning
2009-09-24 10:28:09 -06:00
Brian Paul
00ddd4f9e9
glsl: init var to silence warning
2009-09-24 10:28:09 -06:00
Brian Paul
e44c084be5
glsl: fix missing initializers warning
2009-09-24 10:28:09 -06:00
Andre Maasikas
2058dfaa47
r600: add support for CUBE textures, also TXP
...
seems to work here ...
2009-09-24 10:03:37 -04:00
Alex Deucher
639fb1472d
r600: fix typo in the last commit
...
128 gprs, 256 reg-based consts
2009-09-24 10:03:22 -04:00
Alex Deucher
28308c9260
r600: various cleanups
...
- max texture size is 8k, but mesa doesn't support
that at the moment.
- attempt to set shader limits to what the hw actually
supports
- clean up some old r300 cruft
- no need to explicitly disable irqs. This is fixed
in the drm now.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com >
2009-09-24 10:03:08 -04:00
Andre Maasikas
ed91d10347
r600: fix some issues with LIT instruction
...
- MUL_LIT is ALU.Trans instruction
- some Trans instructions can take 3 arguments
- don't clobber dst.x, use dst.z as temp, it'll get written correct
value in last insn
- respect source swizzles
2009-09-24 10:02:37 -04:00
Alex Deucher
48559c7605
r600: fix point sizes
...
registers takes radius
2009-09-24 10:02:22 -04:00
Alex Deucher
095db818c6
r600: fix polygon offset
2009-09-24 10:02:08 -04:00
Alex Deucher
ec14d59afa
radeon: don't build non-r600 span code on r600
2009-09-24 10:01:56 -04:00
Alex Deucher
dbec27be85
r600: minor span cleanups
2009-09-24 10:01:41 -04:00
Andre Maasikas
2cd2dc34ac
r600: support position_invariant programs
2009-09-24 10:00:58 -04:00
Alex Deucher
9437ac9bcc
r600: add span support for 1D tiles
...
1D tile span support for depth/stencil/color/textures
Z and stencil buffers are always tiled, so this fixes
sw access to Z and stencil buffers. color and textures
are currently linear, but this adds span support when we
implement 1D tiling.
This fixes the text in progs/demos/engine and progs/tests/z*
2009-09-24 09:59:45 -04:00
Alex Deucher
93a7ea6ba0
r600: fix warning
...
Noticed by rnoland on IRC.
2009-09-24 09:59:32 -04:00
Andre Maasikas
7f5a958c80
r600: fix texcoords from constants
...
with some minor updates from Richard.
2009-09-24 09:59:15 -04:00
Andre Maasikas
9edd1a441c
r600: enable caching of vertex programs
2009-09-24 09:59:00 -04:00
Alex Deucher
6552a103f9
r600: check if textures are actually enabled before submission
...
noticed by taiu on IRC.
2009-09-24 09:58:36 -04:00
Alex Deucher
65b01d449c
r600: fix ftp for dri1
...
We use t->bo for dri1 since r600 uses CS for dri1.
2009-09-24 09:58:17 -04:00
Dave Airlie
b1e417413f
r600: don't setup hardware state if TFP
...
if we have a BO here it means TFP and we should have set it
up already.
tested by b0le on #radeon
2009-09-24 09:57:45 -04:00
Alex Deucher
cbab3d7f2a
r600: fix dri2 clipping
2009-09-24 09:56:18 -04:00
Maciej Cencora
84c7afd9e0
r300: fallback to software rendering if we are out of free texcoords
...
Fixes #22741
2009-09-23 23:22:33 +02:00
Brian Paul
2acd5de226
swrast: add lod bias when texture sampling
...
Mostly fixes progs/demos/lodbias when MESA_TEX_PROG=1. But the LOD still
seems off by -1 or so.
May be an issue with the params passed to _swrast_compute_lambda()
2009-09-23 13:36:44 -06:00
Brian Paul
890f37d4d9
mesa: don't bias LOD in shader interpreter; do it in swrast
2009-09-23 13:36:44 -06:00
Brian Paul
ad935c3f47
swrast: fix typo in partial derivatives parameter passing
2009-09-23 13:36:43 -06:00
Keith Whitwell
be66ff51ec
st/mesa: trim calculated userbuffer size
...
In get_array_bounds we were previously defining a user buffer sized as
(nr_vertices * stride). The trouble is that if the vertex data
occupies less than stride bytes, the extra tailing (stride - size)
bytes may extend outside the memory actually allocated by the app and
caused a segfault.
To fix this, define a the buffer bounds to be:
ptr .. ptr + (nr-1)*stride + element_size
2009-09-23 18:55:46 +01:00
Brian Paul
e41707beca
softpipe: added max texture/surface size sanity check
2009-09-23 10:50:38 -06:00
Brian Paul
84b956c29b
softpipe: increase MAX_WIDTH/HEIGTH 4096 to match max texture size
2009-09-23 10:46:27 -06:00
Brian Paul
926b965ed5
mesa: don't re-use the meta glDrawPixels VBO; create a new one each time
...
This should help to work around bugs 24083 and 23670.
2009-09-22 15:58:49 -06:00
Brian Paul
f338de4018
mesa: fix more buffer object error messages
2009-09-22 13:47:49 -06:00
Brian Paul
ba002eb196
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
...
Conflicts:
src/mesa/main/bufferobj.c
2009-09-22 13:44:43 -06:00
Brian Paul
bc75464760
glx: include string.h to silence missing memset() prototype warning
2009-09-22 13:19:15 -06:00
Brian Paul
52cadf7592
mesa: fix error message text
2009-09-22 13:19:11 -06:00
Nicolai Hähnle
8cc12ffb34
r300: Fix crash reported in bug #24066
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-09-22 21:00:01 +02:00
Tormod Volden
e857303305
GLX: Warn only once about applications calling GLX 1.3 functions
...
The warnings introduced in 1f309c40b8
would pour out generously from some applications. This patch adds a
"warn once" wrapper macro, heavily inspired by
src/mesa/drivers/dri/r600/radeon_debug.h
Signed-off-by: Tormod Volden <debian.tormod@gmail.com >
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com >
2009-09-21 15:29:52 -07:00
Brian Paul
6559eaef59
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
2009-09-21 14:49:46 -06:00
Brian Paul
2655d43756
mesa: refine the error checking vbo_exec_DrawRangeElements()
...
If the 'end' index is out of bounds issue a warning as before. But instead
of just no-op'ing the draw call, examine the actual array indices to see
if they're OK. If the max array index is out of bounds, issue another
warning and no-op the draw call. Otherwise, draw normally. This is a
debug build-only feature since it could impact performance.
This "fixes" the missing torus in the OGL Distilled / Picking demo.
2009-09-21 14:25:39 -06:00
Brian Paul
44d260329e
mesa: make max_buffer_index() a non-static function
2009-09-21 14:25:39 -06:00
Maciej Cencora
ff5535c521
radeon: update buffer map/unmap code for changes introduced in 92033a9516 and 822c796481
2009-09-21 21:13:01 +02:00
Maciej Cencora
db928a5e91
mesa: add some debug info to teximage.c
2009-09-21 21:12:55 +02:00
Maciej Cencora
ab4ec85f6c
r300: fix a typo
2009-09-21 21:12:31 +02:00
Eric Anholt
2b83483fb4
intel: Mark the FBO as incomplete if there's no intel_renderbuffer for it.
...
This happens to rendering with textures with a border, which had resulted
in a segfault on dereferencing the irb.
(cherry-picked from commit 8bba183b9e )
2009-09-21 10:02:38 -06:00
Brian Paul
5a0b29050f
softpipe: Fix cube face selection.
...
If arx and ary are equal, we still want to choose from one of them,
and not arz.
(cherry picked from commit de685b37a9 )
2009-09-21 08:36:05 -06:00
Brian Paul
077e3de989
swrast: fix cube face selection
...
If arx and ary are equal, we still want to choose from one of them,
and not arz.
This is the same as Michal's softpipe fix.
2009-09-21 08:36:05 -06:00
Nicolai Hähnle
526430ade1
r300: Zero-initialize register for NV_vertex_program
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-09-21 12:56:16 +02:00
Nicolai Hähnle
736e1ae42f
r300: Fix handling of NV_vertex_program parameters
...
The handling is a bit inefficient, unfortunately, but I don't want to make
any intrusive changes for Mesa 7.6.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-09-21 12:56:16 +02:00
Michel Dänzer
1d4dbd8d9b
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
2009-09-21 10:39:20 +02:00
Michel Dänzer
999592745f
intel: Fix crash in intel_flush().
...
Since commit 2921a2555d ('intel: Deassociated
drawables from private context struct in intelUnbindContext'),
intel->driDrawable may be NULL in intel_flush().
2009-09-21 10:28:37 +02:00
Pauli Nieminen
284a7af274
radeon: Fix legacy bo not to reuse dma buffers before refcount is 1.
...
This should help detecting possible memory leaks with dma buffers and prevent
possible visual corruption if data would be overwriten too early.
2009-09-20 22:28:52 +03:00
Nicolai Hähnle
7e3b8b0d8f
r300/compiler: Fix trig instructions in R300 fp
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-09-20 20:43:32 +02:00
Pauli Nieminen
3640e4acde
radeon: Fix typo in variable name.
2009-09-20 21:08:42 +03:00
Pauli Nieminen
5fa9a7a9a9
radeon: Improve WARN_ONCE macro to appear as single statement.
...
Do-while makes macro safe to be used with if and for constructions.
Also remove __LINE__ macro from variable name because scope is local to macro anyway.
2009-09-20 20:15:52 +03:00
Nicolai Hähnle
94a3c5979f
radeon: Fix "verts" debugging enable
...
Copy'n'paste apparently prevented the RADEON_VERTS flag from being enabled.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-09-20 18:45:32 +02:00
Nicolai Hähnle
82c2f7756a
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
2009-09-20 16:59:03 +02:00
Nicolai Hähnle
e617dd14ab
mesa/st: Create front renderbuffer on the fly when supplied with a surface
...
Normally, the mesa/st would create a fake front buffer out of a
client-allocated surface.
In the DRI setting, however, st/dri provides a front buffer surface which is
created and maintained by the X server. Prefer to use this surface instead,
so that front buffer rendering and reading works correctly.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-09-20 16:58:53 +02:00
Nicolai Hähnle
c4ce6f6a7c
mesa/st: Initialize format bits of framebuffer renderbuffers
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-09-20 16:54:40 +02:00
Nicolai Hähnle
c8c5de9e9a
docs: Document new features in radeon/r200/r300 drivers
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-09-20 16:47:40 +02:00
Nicolai Hähnle
6c323a2473
r300/compiler: Fix R300 fragment program regression introduced by 0723cd1...
...
We obviously need to move the code addr register backwards because their may
be overlap.
This bug affected in particular the Compiz water plugin.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-09-20 16:34:47 +02:00
Zou Nan hai
1e4c353511
[i965] add a missing header file
2009-09-18 16:04:41 +08:00
Zou Nan hai
a66bab0e37
[i965] use intel_batchbuffer_flush to flush the clear
2009-09-18 13:29:28 +08:00
Brian Paul
fac38e8c8f
mesa: fix clip plane, fog issues
2009-09-16 21:22:02 -06:00
Ian Romanick
9666529b5a
glx: Use initstate_r / random_r instead of corrupting global random number state
...
Previously srandom and random were used. This cause the global random
number generator state to be modified. This caused problems for
applications that called srandom before calling into GLX. By using
local state the global state is left unmodified.
This should fix bug #23774 .
2009-09-16 16:43:50 -07:00
Brian Paul
08d39251a7
st/mesa: fix some incorrect branching/clean-up code in TexImage functions
...
We need to be sure to call the _mesa_unmap_teximage_pbo() function if we
called _mesa_validate_pbo_teximage().
2009-09-16 13:07:15 -06:00
Brian Paul
cfa1a0a609
st/mesa: fix texture memory allocation bug
...
The following example caused an incorrect GL_OUT_OF_MEMORY error to be
raised in glTexSubImage2D:
glTexImage2D(level=0, width=32, height=32, pixels=NULL);
glTexImage2D(level=0, width=64, height=64, pixels=NULL);
glTexSubImage2D(level=0, pixels!=NULL);
The second glTexImage2D() call needs to cause the first image to be
deallocated then reallocated at the new size. This was not happening
because we were testing for pixels==NULL too early.
2009-09-16 12:57:26 -06:00
Ian Romanick
88e3a57605
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
...
Conflicts:
src/mesa/main/dlist.c
2009-09-16 07:57:19 -07:00
Ian Romanick
2921a2555d
intel: Deassociated drawables from private context struct in intelUnbindContext
...
The generic DRI infrastructure makes sure that __DRIcontextRec::driDrawablePriv
and __DRIcontextRec::driReadablePriv are set to NULL after unbinding a
context. However, the intel_context structure keeps cached copies of
these pointers. If these cached pointers are not NULLed and the
drawable is actually destroyed after unbinding the context (typically
by way of glXDestroyWindow), freed memory will be dereferenced in
intelDestroyContext.
This should fix bug #23418 .
2009-09-16 07:39:58 -07:00
Zou Nan hai
76e836a41a
i965: do a flush in clear, fix openarena render issue,
...
fd.o bug# 23857
2009-09-16 13:25:46 +08:00
Brian Paul
d9ddbc3f47
docs: glUniform functions are now compiled into display lists
2009-09-15 15:12:29 -06:00
Brian Paul
41fff1b9a1
mesa: compile glUniformMatrix() functions into display lists
...
I believe this is the last of the shader-related functions that needed
display list treatment.
2009-09-15 15:10:29 -06:00
Brian Paul
6681981fe1
mesa: implement more glUniform display list functions
2009-09-15 14:56:55 -06:00
Brian Paul
3ad108b77f
docs: document glUseProgram display list fix
2009-09-15 14:38:52 -06:00
Brian Paul
f42c66c138
mesa: compile glUniform4f() into display lists
...
Note: there are more glUniform functions to compile...
2009-09-15 14:37:45 -06:00
Brian Paul
81de9d68f7
mesa: compile glUseProgram/glUseProgramObjectARB into display lists
...
Fixes bug 23746
2009-09-15 14:37:45 -06:00
Ian Romanick
6c6fe0a704
Merge commit 'origin/mesa_7_5_branch' into mesa_7_6_branch
2009-09-15 13:13:35 -07:00
Ian Romanick
1f309c40b8
GLX: Complain when buggy applications call GLX 1.3 functions.
2009-09-15 13:12:22 -07:00
Brian Paul
5d526ed21a
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
2009-09-15 09:45:18 -06:00
Brian Paul
2b992dc327
gl: restore some PFNGL typedefs
...
Commit d33c315d9e removed a few too many
typedefs. We need the typedefs in glext.h which are protected by #ifdef
GL_VERSION_1_2 but we can exclude the ones protected by
GL_VERSION_1_2_DEPRECATED.
2009-09-15 09:36:31 -06:00
Brian Paul
799631acb1
progs/vp: print program and error info when program does not compile
2009-09-14 17:48:17 -06:00
Brian Paul
ac3c8e3b53
glsl: added some link debug code (disabled)
2009-09-14 17:32:03 -06:00
Brian Paul
3129b2403e
docs: document linker/preprocessor bug fix
2009-09-14 17:27:47 -06:00
Brian Paul
b8b774c775
glsl: remove extra #version directives from concatenated shader sources
...
When we concatenate shaders to do our form of poor-man linking, if there's
multiple #version directives, preprocessing fails. This change disables
the extra #version directives by changing the first two chars to //.
This should help with some Wine issues such as bug 23946.
2009-09-14 17:24:25 -06:00
Vinson Lee
2729db8976
gallium: Add Mac OS to pipe/p_thread.h.
...
Mac OS also has POSIX threads.
2009-09-14 11:50:48 -06:00
Thierry Vignaud
1402ea8f39
configure: fix comment
2009-09-14 11:48:51 -06:00
Dan Nicholson
9c8b69302c
Use CFLAGS as HOST_CFLAGS by default
...
Unless we're cross compiling, the HOST_CFLAGS should be the same as the
normal CFLAGS. This allows the x86 and x86_64 asm to be built correctly
with a native compiler using -m32/-m64.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com >
2009-09-12 09:35:43 -07:00
Brian Paul
280933f793
docs: mention the new Gallium llvmpipe driver
2009-09-11 13:43:51 -06:00
Brian Paul
d81086a86b
llvmpipe: asst fixes for 'make linux-llvmpipe'
2009-09-11 13:39:14 -06:00
Vinson Lee
0fa1692f14
mesa: raise GL_INVALID_ENUM not GL_INVALID_VALUE for glTexParamter errors
...
Signed-off-by: Brian Paul <brianp@vmware.com >
2009-09-11 08:04:37 -06:00
Pauli Nieminen
796c96de80
radeon: Remove structure allocation from iterator variable.
...
dma_bo varaible is only used for iterating so allocating memory for it only
causes memory leaks.
2009-09-11 01:29:07 +03:00
Brian Paul
4b1cbfcbe6
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
2009-09-10 15:40:26 -06:00
Brian Paul
9e6ae75cc8
intel: disable intel_stencil_drawpixels() for now
...
It doesn't work reliably even when all the prerequisite checks are made.
2009-09-10 15:34:34 -06:00
Brian Paul
4d9bbabb83
docs: document Gallium glDrawPixels(GL_STENCIL_INDEX) fix
2009-09-10 14:15:07 -06:00
Brian Paul
3f4d776199
softpipe: minor indentation fix
2009-09-10 14:14:18 -06:00
Brian Paul
988db64119
softpipe: set dirty_render_cache in softpipe_clear()
...
This fixes a bug seen when doing a glDrawPixels(GL_STENCIL_INDEX) right
after a glClear(). The check-for-flush test was failing because we
didn't set the dirty_render_cache flag in softpipe_clear(). So we saw
stale data when we mapped the stencil buffer.
2009-09-10 14:11:41 -06:00
Brian Paul
79a3e298c5
docs: initial 7.5.2 release notes page
2009-09-10 12:50:08 -06:00
Ian Romanick
8fd4e4dfc3
Fix merge fail
...
One of the conflicst from this merge was missed:
commit 0c309bb494
Merge: c6c44bf d27d659
Author: Brian Paul <brianp@vmware.com >
Date: Wed Sep 9 08:33:39 2009 -0600
2009-09-10 11:47:24 -07:00
Brian Paul
d78a196121
tgsi: use new tgsi_call_record to handle execution mask stacks
...
This fixes some issues when "return"ing from nested loops/conditionals.
2009-09-10 12:45:27 -06:00
Brian Paul
c5f8594aeb
mesa: need to set all stencil bits to 0 before setting the 1 bits
...
Plus, check for pixel transfer stencil index/offset.
2009-09-10 12:45:27 -06:00
Ian Romanick
8398535331
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
...
Conflicts:
src/mesa/drivers/dri/intel/intel_context.c
2009-09-10 11:24:56 -07:00
Eric Anholt
acfea5c705
i965: Fix relocation delta for WM surfaces.
...
This was a regression in 0f328c90db .
Bug #23688
Bug #23254
(cherry picked from commit 5604b27b93 )
2009-09-10 11:22:56 -07:00
Zhenyu Wang
2dd3da3a4a
intel: add B43 chipset support
...
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com >
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com >
Hopefully this will be one of the last cherry-picks.
(cherry picked from commit ca246dd186 )
2009-09-10 11:18:41 -07:00
Brian Paul
e9ba9ffc9a
mesa: in texenvprogram code, only do saturation when really needed.
...
For some env modes (like modulate or replace) we don't have to clamp
because we know the results will be in [0,1].
2009-09-10 08:41:12 -06:00
Vinson Lee
23fefa031f
gallium: Add PIPE_OS_APPLE back to auxiliary/util/u_time.h.
...
Fixes typo from commit c6c44bf481 .
2009-09-10 08:40:16 -06:00
Pauli Nieminen
3d1324a66a
radeon: Change debugging code to use macros instead of inline functions.
...
Variadic functions can't be inlined which makes debugging to have quite large
function overead. Only aleternative method is to use variadic macros which are
inlined so compiler can optimize debugging to minimize overhead.
2009-09-10 16:53:08 +03:00
Brian Paul
2b692cd6d6
mesa: include new u_format.csv file in tarballs
2009-09-09 12:01:39 -06:00
Pauli Nieminen
e0f99b8268
radeon: Add more verbose error message for failed command buffer.
2009-09-09 18:31:52 +03:00
Brian Paul
0c309bb494
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
...
Conflicts:
Makefile
configs/default
progs/glsl/Makefile
src/gallium/auxiliary/util/u_simple_shaders.c
src/gallium/state_trackers/glx/xlib/xm_api.c
src/mesa/drivers/dri/i965/brw_draw_upload.c
src/mesa/drivers/dri/i965/brw_vs_emit.c
src/mesa/drivers/dri/intel/intel_context.h
src/mesa/drivers/dri/intel/intel_pixel.c
src/mesa/drivers/dri/intel/intel_pixel_read.c
src/mesa/main/texenvprogram.c
src/mesa/main/version.h
2009-09-09 08:33:39 -06:00
aljen
c6c44bf481
gallium: Added HaikuOS platform
2009-09-09 08:24:18 -06:00
Brian Paul
89a765e92b
mesa: disable GL_LUMINANCE case in _mesa_meta_draw_pixels()
...
Works around a bug found on i965. See bug 23670.
2009-09-09 08:23:14 -06:00
Vinson Lee
d27d659043
scons: Set default_dri to no for Mac OS.
...
Mac OS does not have libdrm.
2009-09-09 08:21:07 -06:00
Brian Paul
42943a4cf9
mesa: bump version to 7.5.2
...
I'm not 100% sure there'll be a 7.5.2 release, but just in case.
2009-09-08 14:45:27 -06:00
Brian Paul
8de625c7cf
i965: fix incorrect test for vertex position attribute
2009-09-08 12:21:42 -06:00
Brian Paul
18bdb6e712
egl: also use X types for building on Apple/MacOS X
...
See bug 20413.
2009-09-08 09:20:43 -06:00
Peter Hutterer
bf19638a00
prog/glsl: fix Makefile for samplers_array.
...
The rule added in 488b3c4d1b does not use the
right INCDIR, breaking the build when GL isn't installed in the default include
paths.
7.5 branch only fix, already fixed in master by rewriting the Makefile
(ceb9459ed5 )
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net >
2009-09-07 12:37:54 +10:00
Eric Anholt
b2cba25f9e
i965: Fix warnings in intel_pixel_read.c.
...
(cherry picked from commit c80ce5ac90 )
2009-09-04 14:41:33 -07:00
Eric Anholt
cf820a045f
intel: Also get the DRI2 front buffer when doing front buffer reading.
...
(cherry picked from commit df70d3049a )
2009-09-04 14:40:21 -07:00
Eric Anholt
2855ee82c6
intel: Update Mesa state before span setup in glReadPixels.
...
We could have mapped the wrong set of draw buffers. Noticed while looking
into a DRI2 glean ReadPixels issue.
(cherry picked from commit afc981ee46 )
2009-09-04 14:40:15 -07:00
Eric Anholt
04081a164c
intel: Move intel_pixel_read.c to shared for use with i965.
...
(cherry picked from commit dcfe0d66bf )
2009-09-04 14:40:12 -07:00
Eric Anholt
1d1dfc96c4
i965: Add missing state dependency of sf_unit on _NEW_BUFFERS.
...
(cherry picked from commit 99174e7630 )
2009-09-04 14:12:37 -07:00
Eric Anholt
a9504edee3
intel: Align cubemap texture height to its padding requirements.
...
(cherry picked from commit a70e131584 )
(cherry picked from commit 29e51c3872 )
2009-09-04 14:12:37 -07:00
Eric Anholt
945d34e88a
intel: Align untiled region height to 2 according to 965 docs.
...
This may or may not be required pre-965, but it doesn't seem unlikely, and
I'd rather be safe.
(cherry picked from commit b053474378 )
2009-09-04 14:12:36 -07:00
Eric Anholt
94d3b832cc
i965: Fix source depth reg setting for FSes reading and writing to depth.
...
For some IZ setups, we'd forget to account for the source depth register
being present, so we'd both read the wrong reg, and write output depth to
the wrong reg.
Bug #22603 .
(cherry picked from commit f44916414e )
2009-09-04 14:12:36 -07:00
Eric Anholt
8c764d5c34
i965: Respect CondSwizzle in OPCODE_IF.
...
Fixes piglit glsl-vs-if-bool and progs/glsl/twoside, and will likely be
useful for the looping code.
Bug #18992
(cherry picked from commit 78c022acd0 )
(cherry picked from commit 63d7a2f53f )
2009-09-04 14:12:36 -07:00
Brian Paul
a0b7850f1d
i965: asst clean-ups, etc in brw_vs_emit()
...
(cherry picked from commit fd7d764514 )
2009-09-04 14:12:36 -07:00
Eric Anholt
3d6c73513c
i965: Emit conditional code updates as required for GLSL VS if statements.
...
Previously, we'd be branching based on whatever condition code happened to be
laying around.
(cherry picked from commit 7007f8b352 )
2009-09-04 14:12:36 -07:00
Eric Anholt
83e6c67363
i965: Spell "conditional" correctly.
2009-09-04 14:12:36 -07:00
Eric Anholt
f396263651
i965: Fix RECT shadow sampling by not losing the other texcoords.
...
Bug #20821
(cherry picked from commit 191e028de2 )
2009-09-04 14:12:36 -07:00
Eric Anholt
63b3fa2bce
i965: Assert that the offset in the VBO is below the VBO size.
...
This avoids sending a bad buffer address to the GPU due to programmer error,
and is permitted by the ARB_vbo spec. Note that we still have the opportunity
to dereference past the end of the GPU, because we aren't clipping to a
correct _MaxElement, but that appears to be harder than it should be. This
gets us the 90% solution.
Bug #19911 .
(cherry picked from commit d7430d942f )
2009-09-04 14:12:36 -07:00
Eric Anholt
217af32c2d
i965: Even if no VS inputs are set, still load some amount of URB as required.
...
See comment on Vertex URB Entry Read Length for VS_STATE.
This, combined with the previous three commits, fixes #22945 .
(cherry picked from commit e340d4f986 )
2009-09-04 14:12:35 -07:00
Eric Anholt
456a16491b
i965: Make sure the VS URB size is big enough to fit a VF VUE.
...
This fix is just from code and docs inspection, but it may fix hangs on
some applications.
(cherry picked from commit e93848e595 )
2009-09-04 14:12:35 -07:00
Eric Anholt
9eca0e5350
i965: Don't emit bad packets when no VBs are referenced.
...
It appears that sometimes Mesa (and I suppose a VS could as well) emits
a program which references no vertex data, and thus we end up with
nr_enabled == 0 even though some VBs are enabled. We'd end up emitting
VB/VE packet headers of 0xffffffff in that case, leading to GPU hangs.
Bug #22945 (wine with an uncompiled VS)
(cherry picked from commit d1fbfd0f96 )
2009-09-04 14:12:35 -07:00
Eric Anholt
7e26bdb849
i965: Calculate enabled[] and nr_enabled once and re-use the values.
...
The code duplication bothered me.
(cherry picked from commit 9b9cb30d12 )
2009-09-04 14:12:35 -07:00
Eric Anholt
213ac4bb5d
i965: Set the max index buffer address correctly according to the docs.
...
It's the last addressable byte, not the byte after the end of the buffer.
(cherry picked from commit b72dea5441 )
2009-09-04 14:12:35 -07:00
Brian Paul
cab307ce6b
i965: rename var: s/tmp/vs_inputs/
...
(cherry picked from commit 840c09fc71 )
2009-09-04 14:12:35 -07:00
José Fonseca
9216b4e7be
scons: Used wrong exception class.
2009-09-04 19:38:35 +01:00
José Fonseca
b9f56078cd
scons: Don't use scons internal functions.
2009-09-04 19:34:11 +01:00
Alex Deucher
b13a553dd4
r600: fix Elts handling
...
Patch from taiu on IRC. fixes bug 23585
2009-09-04 14:07:53 -04:00
Julien Cristau
f8f07cb999
Remove unused INSTALL_TARGETS variable
...
The install targets were removed in the previous commit.
2009-09-04 17:29:21 +02:00
Julien Cristau
c14446ab00
Don't run install from the various configs in parallel
...
Hopefully this fixes a bug in the previous debian/rules that could lead
to FTBFS. Thanks to Bernhard R. Link for the suggestions.
2009-09-04 17:22:31 +02:00
Brian Paul
592a6642fc
ARB prog: replace 'unsigned' with 'gl_state_index'
...
Fixes compilation warnings with MSVC.
2009-09-04 09:17:59 -06:00
Brian Paul
3fedd08779
ARB prog: rename POINT, SIZE to POINT_TOK, SIZE_TOK
...
Fixes symbol collisions with typedefs in Microsoft headers.
Perhaps we should prefix/suffix all the lexer tokens to avoid this.
2009-09-04 09:17:59 -06:00
Brian Paul
40636fe6f2
gallium/xlib: minor clean-ups
2009-09-04 09:17:59 -06:00
Jakob Bornecrantz
65c79c9cbd
i915g: Fix warnings in scons build by using byte pointers
...
scons build complained about void pointer math
2009-09-04 10:55:53 +01:00
Brice Goglin
70fd9421ac
Prepare changelog for upload
2009-09-04 11:39:18 +02:00
Brice Goglin
1810757c29
Bump Standards-Version to 3.8.3 to 3.8.3 now that we have README.source
2009-09-04 11:35:10 +02:00
Brice Goglin
4c79e26a9d
Add a Mesa-specific README.source inspired from the one in xsfbs
2009-09-04 11:33:17 +02:00
Brice Goglin
1783d52ace
Prepare changelog for upload
2009-09-04 10:58:58 +02:00
Brice Goglin
c5bf7f94c0
New upstream release
2009-09-04 10:55:25 +02:00
Brice Goglin
8222bfc1d1
Merge tag 'mesa_7_5_1' into debian-unstable
...
Conflicts:
progs/tests/fbotest1.c
progs/tests/texwrap.c
progs/trivial/.gitignore
progs/trivial/Makefile
2009-09-04 10:53:45 +02:00
Michal Krol
ce39cd6696
tgsi: Document differencies between vs_1_1 and vs_2_0 for EXPP and LOGP.
2009-09-04 09:31:22 +02:00
Brian Paul
f6dff92c9b
docs: 7.5.1 md5 sums
2009-09-03 16:07:46 -06:00
Brian Paul
5d56e31e1d
docs: point to fd.o for downloads instead of SourceForge
2009-09-03 16:07:46 -06:00
Brian Paul
7ec865202e
gallium/xlib: silence unitialized var warning
2009-09-03 16:07:46 -06:00
Brian Paul
9e711b6865
gallium/xlib: silence uninitialized var warning
2009-09-03 16:07:46 -06:00
Brian Paul
5a8e1ddf19
st/mesa: silence uninitialized var warnings
2009-09-03 16:07:46 -06:00
Brian Paul
f1ae72e9f2
docs: prep for 7.5.1 release
2009-09-03 16:07:46 -06:00
Brian Paul
a04e83ba15
docs: added news entry for 7.5.1
2009-09-03 16:07:46 -06:00
Brian Paul
4aee0dbf81
docs: update precompiled libs info
2009-09-03 16:07:46 -06:00
Brian Paul
7e2f01e0f1
docs: move SGI GLU link
2009-09-03 16:07:46 -06:00
Brian Paul
beb05393c8
st/mesa: fix glCopyPixels(GL_STENCIL_INDEX) inverted position
...
If the renderbuffer orientation is Y=0=TOP we need to invert the dstY
position.
2009-09-03 16:07:46 -06:00
Keith Whitwell
8fc945cd84
st/mesa: Do GL_RGBA->GL_RGB texsubimage on hardware
...
State tracker currently backs GL_RGB textures with RGBA almost always.
This means we need to maintain A==1 in these textures to give correct GL_RGB
sampling results.
This change offloads the RGBA->RGB copy to hardware using the new writemask
version of u_blit_pixels.
More src/dstLogical/dstActual triples could be shifted to hardware by
this technique in future patches.
2009-09-03 16:07:45 -06:00
Keith Whitwell
862724d3c2
util: add version of u_blit_pixels which takes a writemask
...
Values outside the writemask are set in the destination to {0,0,0,1}
2009-09-03 16:07:45 -06:00
Brian Paul
375a6b4c4a
progs/tests: re-enable exit() call
...
See bug 21267.
2009-09-03 16:07:45 -06:00
Brian Paul
3b96db337d
docs/: document cross-compile fix
2009-09-03 16:07:45 -06:00
Alex Deucher
6a97cca081
r600: rework cb/db setup
...
Setup the regs when we emit rather than during state setup.
In certain cases a proper CB target was never emitted.
This fixes bug 23658.
2009-09-03 18:04:47 -04:00
Brian Paul
1960da2e09
docs: 7.5.1 md5 sums
2009-09-03 15:49:10 -06:00
Brian Paul
7d3af894d6
docs: point to fd.o for downloads instead of SourceForge
2009-09-03 15:44:49 -06:00
Brian Paul
32156f3a11
gallium/xlib: silence unitialized var warning
2009-09-03 15:44:22 -06:00
Brian Paul
1c32caf075
gallium/xlib: silence uninitialized var warning
2009-09-03 15:23:15 -06:00
Brian Paul
67c286d20e
st/mesa: silence uninitialized var warnings
2009-09-03 15:04:49 -06:00
Brian Paul
0b4e835b13
docs: prep for 7.5.1 release
2009-09-03 14:57:30 -06:00
Brian Paul
08575509e4
docs: added news entry for 7.5.1
2009-09-03 14:57:16 -06:00
Brian Paul
ccb081414b
docs: update precompiled libs info
2009-09-03 14:57:04 -06:00
Brian Paul
47df7900fd
docs: move SGI GLU link
2009-09-03 14:56:50 -06:00
Zack Rusin
323440b3e2
st/xorg: add linear and radial gradient acceleration
2009-09-03 16:52:04 -04:00
Zack Rusin
007a843991
st/xorg: radial gradient shader
2009-09-03 16:52:04 -04:00
Zack Rusin
5571c4fe36
st/xorg: linear gradient shader
2009-09-03 16:52:04 -04:00
Brian Paul
c3a0624ef0
st/mesa: fix glCopyPixels(GL_STENCIL_INDEX) inverted position
...
If the renderbuffer orientation is Y=0=TOP we need to invert the dstY
position.
2009-09-03 14:39:53 -06:00
Alex Deucher
8c1d85cebe
r600: make sure the active vertex shader bo is re-added to persistent list.
2009-09-03 15:23:18 -04:00
Brian Paul
dc60d0db52
glapi: fix incorrect/missing return types for glFenceSync(), glClientWaitSync()
2009-09-03 13:02:41 -06:00
Brian Paul
e059885ce3
mesa: rename gl_sync_object::Status to StatusFlag
...
There's a symbol collision with X11/Xlib.h #define Status int
in the Mesa xlib code. This seems the simpliest way to work around this.
2009-09-03 12:47:25 -06:00
Ian Romanick
446a71d1f8
docs: Document new extension support for 7.6 release.
2009-09-03 11:22:47 -07:00
Eric Anholt
5e448a8d4d
Add ARB_sync to the xorg sw dri driver.
2009-09-03 11:22:47 -07:00
Eric Anholt
d5ea2dce93
savage: Fix driver build post-ARB_sync.
...
Like s3v, clean up absurd use of Xlib in the driver, avoiding namespace
pollution.
2009-09-03 11:22:47 -07:00
Eric Anholt
19420f02d4
s3v: Fix driver build for ARB_sync.
...
This driver was including Xlibint.h to get the CARD32 typedef to use for
32-bit unsigned integers, which #defined Status to something. CARD32 isn't
actually a 32-bit unsigned integer, so replacing with uint32_t usage should
fix bugs on 64-bit along with the build.
2009-09-03 11:22:47 -07:00
Eric Anholt
afd6141934
intel: Add support for ARB_sync.
...
We currently weasel out of supporting the timeout parameter, but otherwise
this extension looks ready, and should make the common case happy.
2009-09-03 11:22:47 -07:00
Ian Romanick
aee282faa7
ARB sync / swrast: Use GL_ARB_sync_functions instead of GL_ARB_sync. Oops.
2009-09-03 11:22:47 -07:00
Ian Romanick
0342dce226
Don't dereference function pointers in calls.
...
I'm apparently alone in prefering this calling convention, so I'll be
a team player. :p Based on review comments by Brian Paul and Eric
Anholt.
2009-09-03 11:22:47 -07:00
Ian Romanick
18d3409571
Add syncobj.c to SConscript
2009-09-03 11:22:47 -07:00
Ian Romanick
6af24b6b03
Whitespace and include file clean-up.
...
Based on review comments by Brian Paul.
2009-09-03 11:22:47 -07:00
Ian Romanick
0f8fdd8198
Use MIN2 instead of open-coded version
...
Based on review comments by Brian Paul.
2009-09-03 11:22:47 -07:00
Ian Romanick
16b393d059
ARB sync: Fix delete behavior and context destruction behavior
...
I believe this resolves the outstanding issues WRT sync object
deletetion. I have also added a large comment at the top of syncobj.c
describing the expected memory management behavior. I'm still a
little uncertain about the locking on ctx->Shared.
2009-09-03 11:22:46 -07:00
Ian Romanick
f5a22721c5
Add dummy list node type 'struct simple_node'
2009-09-03 11:22:46 -07:00
Ian Romanick
f37070bab6
ARB sync: Add support for GL_ARB_sync to swrast
...
This isn't quite right yet. The delete behavior and the context
clean-up needs some work.
2009-09-03 11:22:46 -07:00
Ian Romanick
96bdd993ec
Eliminate trailing whitespace in extension_helper.c
2009-09-03 11:22:46 -07:00
Ian Romanick
064913430d
ARB sync: Regenerate files from previous commit
2009-09-03 11:22:46 -07:00
Ian Romanick
10a09e49fc
ARB sync: Add base infrastructure for GL_ARB_sync
2009-09-03 11:22:45 -07:00
Ian Romanick
10067e4641
ARB sync: Add infrastructure for glGetInteger64v
2009-09-03 11:22:45 -07:00
Brian Paul
d75a99edd6
mesa: fix typos in separable filter functions
2009-09-03 12:10:53 -06:00
Brian Paul
7a7d5879e2
mesa: compute tex env program key size based on nr_enabled_units
...
When no textures are enabled, the key size is 4 bytes. If unit[0] is
enabled, the key size is 16 bytes.
Inspired by a patch from Chris Wilson.
2009-09-03 11:48:19 -06:00
Brian Paul
5cd7042088
swrast: wrap comment to 80 columns, remove dead code
2009-09-03 11:46:28 -06:00
Brian Paul
2db37ef659
mesa: use new combined PBO validate/map helpers in convolution/filter funcs
2009-09-03 11:45:18 -06:00
Brian Paul
95027a0087
mesa: use new combined PBO validate/map helpers
2009-09-03 11:45:17 -06:00
Brian Paul
dc947c8f92
mesa: combined PBO validate/map helpers
2009-09-03 11:45:17 -06:00
Brian Paul
203f395aaf
mesa: use new _mesa_map_pbo_source/dest() functions in more places
...
This trims down the code a bit. The next step would be to combine
the validate and map operations into one helper...
2009-09-03 11:45:17 -06:00
Brian Paul
1b448c7a5c
mesa: consolidate PBO map/unmap helpers
...
Instead of _mesa_map_readpix_pbo() use _mesa_map_pbo_source().
Instead of _mesa_map_drawpix_pbo() and _mesa_map_bitmap_pbo() use
_mesa_map_pbo_dest().
2009-09-03 11:45:17 -06:00
Brian Paul
e0ec405a9f
intel: helper to debug bufmgr (disabled)
2009-09-03 11:45:17 -06:00
Jakob Bornecrantz
3070b13f4c
i915g: Up the number of relocs
2009-09-03 19:33:07 +01:00
Jakob Bornecrantz
8303c722cb
i915g: Don't run in sync with HW
2009-09-03 19:33:07 +01:00
Jakob Bornecrantz
87a4fa56ae
i915g: Don't send flush flags to HW
2009-09-03 19:33:07 +01:00
Zack Rusin
5643942517
st/xorg: cleanup and adjust to the changes in the ureg code
2009-09-03 12:44:15 -04:00
Zack Rusin
07f9ad5c32
st/xorg: adjust enums in preperation for gradients
2009-09-03 12:41:39 -04:00
Brian Paul
2f6d2a9e27
mesa: change ctx->Driver.BufferData() to return GLboolean for success/failure
...
Return GL_FALSE if we failed to allocate the buffer. Then raise
GL_OUT_OF_MEMORY in core Mesa.
2009-09-03 09:42:38 -06:00
Keith Whitwell
848ab8be8c
aux/tgsi: pull back ureg work from 0.1 branch
...
Manual merge of ureg changes on the branch. Too much unrelated stuff
for a proper merge.
2009-09-03 15:16:25 +01:00
Christoph Bumiller
8b1ef3fa35
nv50: move centroid, flat bits when making interp long
...
Before this, just the perspective divide bit was moved in
convert_to_long of the load interpolant instruction.
2009-09-03 12:54:41 +02:00
Christoph Bumiller
ffee352726
nv50: fix vbo_static_attrib method size error
...
The VTX_ATTR_3/2/1F methods also had size 4 ...
a stupid copy/paste error.
2009-09-03 12:42:42 +02:00
Christoph Bumiller
c8258b95d6
nv50: fix draw_elements_inline_u08/16
...
We've been emitting the same two indices over and over
without incrementing map.
2009-09-03 12:42:42 +02:00
Cooper Yuan
e938d4a053
r300g: specify point/line/triangle have stuffed texture coord
2009-09-03 17:06:18 +08:00
Dave Airlie
c19b52f10f
r600: visual depth has no meaning here.
...
fbos get angry when this happens.
2009-09-03 14:14:47 +10:00
Dave Airlie
a25d0dc9ec
r600: make sure the active shader bo is re-added to persistent list.
2009-09-03 14:14:31 +10:00
Dave Airlie
5f7c532b1e
radeon: pass internal format into the miptree.
...
We need to figure out if the compression format changes.
without this texcmp segfaults if you change format
enough times.
2009-09-03 12:02:54 +10:00
Dave Airlie
e5b93e1161
radeon/dri2: add gl20 bits for r300/r600 just like dri1 does
2009-09-03 12:01:27 +10:00
Dave Airlie
ea26f28c8f
tests/texcmp: glewInit in wrong place
2009-09-03 11:33:53 +10:00
Zack Rusin
206eb50493
st/xorg: fix warnings
2009-09-02 18:39:21 -04:00
Zack Rusin
d6b58a97c2
st/xorg: handle xrender repeat modes
2009-09-02 18:38:23 -04:00
Zack Rusin
dc9de8064f
st/xorg: flip the coordinate system
2009-09-02 17:21:28 -04:00
Zack Rusin
d918896a75
st/xorg: handle solid fills in the fragment shader
2009-09-02 17:16:03 -04:00
Eric Anholt
cbde276580
Revert "i965: Use VBOs in the VBO module on 965, now that we have ARB_map_buffer_range."
...
This reverts commit 00413d8742 . Even with
fixes, using ARB_map_buffer_range in the VBO module isn't showing up as a
significant win, and some cases apparently regressed.
Bug #23624 .
2009-09-02 12:20:01 -07:00
Eric Anholt
ec32ef12b3
intel: Add support for FlushMappedBufferRange for ARB_map_buffer_range.
...
This should help for the usage by the VBO module, where we would upload
the whole remaining chunk of the buffer for a series of range maps that should
cover just a segment of it.
2009-09-02 12:20:00 -07:00
Eric Anholt
82313eed01
intel: Sync a synchronized READ_BIT map buffer range with GL drawing to it.
...
It's probably uncommon, but would obviously have gone wrong.
2009-09-02 12:20:00 -07:00
Eric Anholt
aecba6b1c8
intel: Move MapBufferRange mesa state setting up to cover the 915 case.
2009-09-02 12:20:00 -07:00
Jakob Bornecrantz
7d8f33590f
st/xorg: Guard against realy old versions of Xorg
2009-09-02 19:48:49 +02:00
Keith Whitwell
e79054cc40
st/mesa: Do GL_RGBA->GL_RGB texsubimage on hardware
...
State tracker currently backs GL_RGB textures with RGBA almost always.
This means we need to maintain A==1 in these textures to give correct GL_RGB
sampling results.
This change offloads the RGBA->RGB copy to hardware using the new writemask
version of u_blit_pixels.
More src/dstLogical/dstActual triples could be shifted to hardware by
this technique in future patches.
2009-09-02 18:31:48 +01:00
Keith Whitwell
de343680a3
util: add version of u_blit_pixels which takes a writemask
...
Values outside the writemask are set in the destination to {0,0,0,1}
2009-09-02 18:31:48 +01:00
Keith Whitwell
1d7a989b10
draw: remove unused variable
2009-09-02 18:31:47 +01:00
Brian Paul
5e809216a8
Revert "mesa: fix the non-GNU C bit-field case"
...
This reverts commit 4b08e74982 .
Don't know what I was thinking there.
2009-09-02 10:38:46 -06:00
Brian Paul
4b08e74982
mesa: fix the non-GNU C bit-field case
2009-09-02 10:12:15 -06:00
Gary Wong
d98b9f4edb
mesa: silence gcc bit-field warning
2009-09-02 10:11:15 -06:00
Brian Paul
a7a3d3c271
mesa: replace 8 with NUM_UNITS
2009-09-02 09:43:10 -06:00
Brian Paul
8cb651578d
mesa: remove accidentally committed printf
2009-09-02 09:25:28 -06:00
Brian Paul
83e4470d9a
mesa: added #ifdef __GNUC__ around GLubyte bitfield usage
...
It would be nice if there were a #pragma or something to disable the warnings:
main/texenvprogram.c:87: warning: type of bit-field ‘Source’ is a GCC extension
main/texenvprogram.c:88: warning: type of bit-field ‘Operand’ is a GCC extension
but there doesn't appear to be a way to do that.
2009-09-02 08:47:47 -06:00
Chris Wilson
a46e32787d
mesa: Compact state key for TexEnv program cache
...
By rearranging the bitfields within the key we can reduce the size
of the key from 644 to 196 bytes, reducing the cost of both the
hashing and equality tests.
2009-09-02 08:47:47 -06:00
Michel Dänzer
c0cf0fd163
st/xorg: Remove code no longer support by xserver Git master.
...
Shouldn't be necessary with older versions either.
2009-09-02 16:01:21 +02:00
Michel Dänzer
ea55f8ed8f
st/xorg: Add support for xserver Git master DRI2 interface.
...
Reorganize to handle both interfaces with common code.
2009-09-02 16:00:30 +02:00
Michel Dänzer
0b26d97f4d
st/dri: Slight consolidation of DRI2 buffer handling.
...
Always use / assume a combined depth/stencil buffer.
Also update drawable formats from surfaces returned by the driver.
2009-09-02 15:41:41 +02:00
Michel Dänzer
385620e5eb
st/xorg: Add EXA UploadToScreen and DownloadFromScreen hooks.
2009-09-02 15:41:40 +02:00
Xiang, Haihao
98a8744e02
i965: CS FENCE in URB_FENCE is 11-bits wide
2009-09-02 13:28:32 +08:00
Xiang, Haihao
f5539b6991
i965: validate sf state
2009-09-02 13:28:23 +08:00
Eric Anholt
60b08eb1fd
mesa: Make MultiDrawElements submit multiple primitives at once.
...
Previously, MultiDrawElements just called DrawElements a bunch of times.
By sending several primitives down the pipeline at once, we avoid a bunch
of validation. On my GL demo, this improves fps by 2.5% (+/- .41%) and
reduces CPU usage by 70.5% (+/- 2.9%) (n=3).
Reviewed by: Ian Romanick <ian.d.romanick@intel.com >
2009-09-01 20:35:19 -07:00
Ben Skeggs
a82cd55a5c
nv50: SWZ is the same as MOV from our perspective
2009-09-02 12:05:34 +10:00
Brian Paul
282f578dbd
mesa: skip bitmap drawing code if width==0 or height==0
2009-09-01 17:40:07 -06:00
Brian Paul
29e22059a9
intel: use _mesa_expand_bitmap() to skip an intermediate buffer
2009-09-01 17:39:32 -06:00
Brian Paul
d5b6dd0001
st/mesa: use new _mesa_expand_bitmap() function
2009-09-01 17:39:32 -06:00
Brian Paul
278e76832f
mesa: new _mesa_expand_bitmap() function
2009-09-01 17:39:32 -06:00
Brian Paul
921bbfc942
mesa: remove redundant assignments
2009-09-01 17:39:32 -06:00
Brian Paul
457e427e32
mesa: more clean-ups
2009-09-01 17:39:32 -06:00
Brian Paul
84d6bed4d6
mesa: change conditional to match the previous one
2009-09-01 17:39:32 -06:00
Brian Paul
25e5a6f279
mesa: updated #includes
2009-09-01 17:39:32 -06:00
Brian Paul
95136694ab
mesa: remove unused texenv_fragment_program::ctx field
2009-09-01 17:39:32 -06:00
Brian Paul
1480bcacfe
mesa: remove unused ureg::abs field
2009-09-01 17:39:32 -06:00
Brian Paul
c7ba2b8622
mesa: remove unused ureg:negateabs field
2009-09-01 17:39:32 -06:00
Brian Paul
9ed0315271
mesa: more comments, clean-ups
2009-09-01 17:39:31 -06:00
Brian Paul
b5ec0a6858
mesa: simplify translate_tex_src_bit()
2009-09-01 17:39:31 -06:00
Brian Paul
f337e2c495
mesa: minor code clean-ups, comments
2009-09-01 17:39:31 -06:00
Brian Paul
d55a28e3dc
mesa: replace 8 with MAX_TEXTURE_UNITS
2009-09-01 17:39:31 -06:00
Brian Paul
51334d8401
dri: remove unused meta_clear_tris()
2009-09-01 17:39:31 -06:00
Brian Paul
c2542cdaff
intel: use BUFFER_BITS_COLOR
2009-09-01 17:39:31 -06:00
Brian Paul
5353961344
intel: fix incorrect parameter type for intel_bufferobj_map_range()
2009-09-01 17:39:31 -06:00
Brian Paul
85d3562385
radeon: trim down #includes
2009-09-01 17:39:31 -06:00
Brian Paul
18916986b4
radeon: use _mesa_meta_clear()
2009-09-01 17:39:30 -06:00
Brian Paul
92d63931e2
mesa: obey stencil write mask in _mesa_meta_draw_pixels()
2009-09-01 17:39:30 -06:00
Brian Paul
a1e869b417
intel: set Length/Offset fields in intel_bufferobj_map()
2009-09-01 17:39:30 -06:00
Brian Paul
15e6d08670
intel: use _mesa_meta_copy_pixels() when do_blit_copypixels() fails
...
Also, trim down #includes.
2009-09-01 17:39:30 -06:00
Brian Paul
be229d24c4
intel: trim down #includes
2009-09-01 17:39:30 -06:00
Brian Paul
886a0a7150
intel: use _mesa_meta_draw_pixels()
...
The textured quad path is slightly faster and will work with POT textures
on i945.
2009-09-01 17:39:30 -06:00
Brian Paul
90cba4a839
intel: trim down #includes
2009-09-01 17:39:30 -06:00
Brian Paul
50d8b295f6
intel: use _mesa_meta_clear(), it's a bit faster
2009-09-01 17:39:30 -06:00
Pauli Nieminen
06bf6628aa
radeon: Fix OQ to set ful lstate as dirty too.
2009-09-02 02:04:10 +03:00
Pauli Nieminen
9f650e19dd
radeon: Fix debug output to filter out less critical messages instead of more critical.
2009-09-02 02:04:10 +03:00
Zack Rusin
7e4487ad5c
st/xorg: getting indexes right tends to be helpful
2009-09-01 19:01:05 -04:00
Zack Rusin
5c746d9214
st/xorg: redo the vertex shader
2009-09-01 18:59:01 -04:00
Zack Rusin
a8cbb15632
st/xorg: setup solid fills
2009-09-01 17:49:32 -04:00
Zack Rusin
811aa02c7a
st/xorg: fold back the helper function into core
2009-09-01 14:44:55 -04:00
Zack Rusin
91c366359c
st/xorg: start rendering and compositing pictures
2009-09-01 14:44:55 -04:00
Ian Romanick
847bc5c852
ARB prog parser: Fix handling of stateOptModMatNum
...
The optional array index should clearly be enclosed in square
brackets. This helps the oglconform test vp_binding.c get a bit
farther, but it still fails.
2009-09-01 11:11:31 -07:00
Keith Whitwell
b3f4b56a3b
tgsi: remove redundant CND0 opcode
...
Can be implemented with CMP src2, src1, src0
2009-09-01 17:30:01 +01:00
Brian Paul
d9b7d7875b
progs/tests: re-enable exit() call
...
See bug 21267.
2009-09-01 08:53:34 -06:00
José Fonseca
836a9f0ae6
scons: Tool for LLVM. Gracefully disable llvmpipe if LLVM not found.
2009-09-01 12:26:00 +01:00
Jakob Bornecrantz
8c3f622a34
trace: Don't set surface_[fill|copy] if not set on pipe
2009-09-01 11:56:14 +02:00
Cooper Yuan
165e87c491
r300g: Fix clear issue on r300
2009-09-01 17:59:03 +08:00
Dave Airlie
7d36153766
radeon: fix r100/r200 polygon stipple under kms
...
There really need to use state emits under kms, otherwise
we end up with some dwords in the command buffer before we've
ever emitted any useful state.
Signed-off-by: Dave Airlie <airlied@redhat.com >
2009-09-01 16:06:02 +10:00
Dave Airlie
a2bd13fec9
r100: fixup cubemap domains
2009-09-01 15:18:17 +10:00
Brian Paul
ae5d78198f
xlib: plug in more meta functions, if TEST_META_FUNCS is set
2009-08-31 21:15:39 -06:00
Brian Paul
056612241a
mesa: implement GL_DEPTH_BUFFER_BIT for _mesa_meta_blit_framebuffer()
2009-08-31 21:15:39 -06:00
Brian Paul
7a78e6e8af
mesa: disable another debug test
2009-08-31 21:15:38 -06:00
Brian Paul
5b0f7c6c3b
mesa: make verts[] arrays local vars
2009-08-31 21:15:38 -06:00
Dave Airlie
97aa3d553f
r200: emit cube for kms correctly + fix tex emit reset
...
CS checker found some issues.
2009-09-01 12:54:48 +10:00
Brian Paul
8126dfa9c2
xlib: option to enable/test meta functions (disabled)
2009-08-31 19:34:47 -06:00
Brian Paul
1fc713a1e7
mesa: implement depth/stencil formats for meta glDrawPixels
2009-08-31 19:34:47 -06:00
Brian Paul
9c41931c0f
mesa: remove accidentally commited debug/disabled code
2009-08-31 19:34:47 -06:00
Brian Paul
10d81f4667
mesa: added _mesa_is_stencil_format()
2009-08-31 19:34:47 -06:00
Brian Paul
d762b5459b
progs/samples: added test/debug code for culling
2009-08-31 19:34:47 -06:00
Brian Paul
a1d3855fb0
swrast: fix selection/feedback regression
...
This fixes a conform selection/feedback regression introduced by commit
8f4d66c5f8
2009-08-31 19:34:47 -06:00
Brian Paul
c0633ddabb
mesa: debug printf for KIL
2009-08-31 19:34:47 -06:00
Brian Paul
b3232e9280
progs/tests: disable depth test for second glDrawPixels
...
We don't want to z-test that glDrawPixels. Also, set the raster color to
red when drawing GL_DEPTH_COMPONENT image to aid in debugging.
2009-08-31 19:34:47 -06:00
Brian Paul
18656201ef
swrast: can't use deferred texture/shading if using KIL instruction
...
If the fragment program uses KIL, we have to execute it before z/stencil
testing. Otherwise, deferred texture/shading lets us skip shading for
pixels that fail z/stencil testing.
2009-08-31 19:34:47 -06:00
Dave Airlie
31a5a9e9cc
r300/compiler: fix warning due to no newline
2009-09-01 10:50:40 +10:00
Dave Airlie
e3a17904dd
r200: emit max vtx info for index buffer.
...
We need this for the CS bounds checking.
2009-09-01 10:50:31 +10:00
Brian Paul
3f785080db
swrast: fix selection/feedback regression
...
This fixes a conform selection/feedback regression introduced by commit
8f4d66c5f8
2009-08-31 17:54:46 -06:00
Jakob Bornecrantz
935e4c56e5
i915g: Implement new winsys
2009-09-01 00:47:02 +01:00
Jakob Bornecrantz
d2110064c2
i915g: Switch from pipe_winsys to intel_winsys
...
Also includes moving lots of functions from i915_batch.h
into intel_batchbuffer.h
2009-09-01 00:47:02 +01:00
Jakob Bornecrantz
dd040753d7
i915g: Add header file for new winsys interface
2009-09-01 00:47:01 +01:00
Jakob Bornecrantz
105e4b093e
i915g: Add new buffer code not yet hocked up
2009-09-01 00:46:56 +01:00
Jakob Bornecrantz
7b32da0b11
st/xorg: Fix crash in MPH
2009-09-01 00:44:36 +01:00
Pauli Nieminen
c4a3e036ed
radeon: Fix null pointer reference in debug system if no context is bind.
2009-09-01 00:39:20 +03:00
Brian Paul
fcf0804c05
swrast: can't use deferred texture/shading if using KIL instruction
...
If the fragment program uses KIL, we have to execute it before z/stencil
testing. Otherwise, deferred texture/shading lets us skip shading for
pixels that fail z/stencil testing.
2009-08-31 13:28:31 -06:00
Pauli Nieminen
d028cf9313
r600: Add more trace debug output to rendering pipeline.
2009-08-31 20:44:11 +03:00
Pauli Nieminen
fde929c4fd
radeon: Add support for indenting debug output.
...
Indetion can be used to make it easier to read debug code when sections of debug output are indented.
2009-08-31 20:39:43 +03:00
Pauli Nieminen
7870edc778
radeon: Add comment warning about not choosing critical debug level.
2009-08-31 20:27:49 +03:00
Pauli Nieminen
6c963fbdd1
radeon: Change default debug level to verbose.
...
Verbose is a lot better for developement but we should considre changing it to normal in stable branch.
2009-08-31 20:27:49 +03:00
Pauli Nieminen
012e990160
r300: Convert to shared debug code.
2009-08-31 20:27:49 +03:00
Pauli Nieminen
239105c6c8
r200: Convert r200 to use new style debug code.
...
Only very few places where realy converted so there isa lot of to do.
2009-08-31 20:27:49 +03:00
Pauli Nieminen
aabb36fdd5
r600: Convert to shared debug code and add a few new debug messages.
...
There is only a few functions that have debugging enabled now.
2009-08-31 20:27:49 +03:00
Pauli Nieminen
fe62e4c3ff
radeon: Make OQ to use new style debugging.
2009-08-31 20:27:48 +03:00
Pauli Nieminen
b6ebcf8156
radeon: Add gcc attribute to enable pritnf format warnings.
2009-08-31 20:27:48 +03:00
Pauli Nieminen
4e0d99a635
r100: Use shared debug code.
...
Converted r100 to use shared debug code with sed and fast compile check. New
code has compability layer so old debugging code doesn't have to be changed
all immidiatly.
2009-08-31 20:27:48 +03:00
Pauli Nieminen
f9a4a0a971
radeon: Add common debugging functions.
...
These function are aiming to make it very simple to add and keep large amount
of debugging code without having runtime impact in relase builds. Basic idea
is to expose simple printf style debugging functions that are inlined.
Level parameter will be evalueted in compile time so compiler can optimise
some of debugging functions out if compile time request for debug level is too
tight.
2009-08-31 20:27:48 +03:00
Brian Paul
a5e7003565
mesa: added const qualifiers, move local var
2009-08-31 11:22:36 -06:00
Brian Paul
956e6c3978
mesa: fix saturation logic in emit_texenv()
...
We need to clamp/saturate after each texenv stage, not just the last one.
Fixes glean texEnv failure for softpipe (and probably other fragment program-
based drivers).
2009-08-31 11:22:36 -06:00
Brian Paul
aca8dbcaa6
docs: fixed glXCreateGLXPixmap() for direct rendering
2009-08-31 11:22:36 -06:00
Brian Paul
1d64a4ceb3
docs/: document cross-compile fix
2009-08-31 11:22:36 -06:00
Marc Dietrich
c705e72382
mesa: fix 32bit cross compilation on a 64bit machine
...
When cross compiling on a 64bit machine, gen_matypes.c is build
for the host machine (64bit) but must generates code for the target
machine (32bit). This causes wrong offsets all over the place and
crashes googleearth on my machine. Solution is to add -m32 when
cross compiling.
Attached patch is compatible with linux-x86-32 and autoconf based
builds.
2009-08-31 11:22:36 -06:00
Zack Rusin
f315c0128b
st/xorg: add code to render textured quads for composite acceleration
2009-08-31 13:26:01 -04:00
Zack Rusin
9ccbadb22d
st/xorg: setup constant buffers for vertex and fragment shaders
2009-08-31 13:26:01 -04:00
Brian Paul
9f36473a8e
mesa: added const qualifiers, move local var
2009-08-31 11:17:59 -06:00
Brian Paul
2241665dc6
mesa: fix saturation logic in emit_texenv()
...
We need to clamp/saturate after each texenv stage, not just the last one.
Fixes glean texEnv failure for softpipe (and probably other fragment program-
based drivers).
2009-08-31 11:14:16 -06:00
Michel Dänzer
3c3ad915d8
st/xorg: Re-organize the EXA ModifyPixmapHeader hook a bit.
...
This should also handle the case where the pixmap is backed by a (different)
texture before and afterwards.
2009-08-31 18:41:54 +02:00
Michel Dänzer
40e3148a81
st/xorg: Simplify EXA ModifyPixmapHeader hook for pPixmap != NULL.
...
Just let the upper layers handle it.
2009-08-31 18:41:54 +02:00
Michel Dänzer
366efd8c4b
st/xorg: Don't always fall back for solid fills.
2009-08-31 18:41:53 +02:00
Brian Paul
6bf86681f5
docs: fixed glXCreateGLXPixmap() for direct rendering
2009-08-31 10:32:56 -06:00
Brian Paul
f7654faf16
docs/: document cross-compile fix
2009-08-31 10:32:14 -06:00
Marc Dietrich
a48ee529a2
mesa: fix 32bit cross compilation on a 64bit machine
...
When cross compiling on a 64bit machine, gen_matypes.c is build
for the host machine (64bit) but must generates code for the target
machine (32bit). This causes wrong offsets all over the place and
crashes googleearth on my machine. Solution is to add -m32 when
cross compiling.
Attached patch is compatible with linux-x86-32 and autoconf based
builds.
2009-08-31 10:32:14 -06:00
Alex Deucher
1b1673fa63
r600: add missing r7xx pci id
2009-08-31 12:18:44 -04:00
Jakob Bornecrantz
5f7b46ae5f
i915g: Reorg texture layout code
2009-08-31 16:29:59 +01:00
Jakob Bornecrantz
761c8c7076
i915g: Move transfer functions into i915_texture.c
2009-08-31 16:29:58 +01:00
Jakob Bornecrantz
5374aff56f
i915g: Reorg texture code a bit
2009-08-31 16:29:58 +01:00
Jakob Bornecrantz
f260652153
i915g: Don't use winsys directly in the driver
2009-08-31 16:29:58 +01:00
Jakob Bornecrantz
bd0c51874f
i915g: Cleanup i915_prim_vbuf.c
2009-08-31 16:29:58 +01:00
Jakob Bornecrantz
1bb3a2c648
i915g: Cleanup i915_screen.[c|h]
2009-08-31 16:29:58 +01:00
Jakob Bornecrantz
1b5f46a3b8
i915g: Cleanup i915_context.c
2009-08-31 16:29:58 +01:00
Jakob Bornecrantz
7864b0e717
i915g: Cleanup i915_blit.[c|h]
2009-08-31 16:29:58 +01:00
Jakob Bornecrantz
5d929366aa
i915g: Cleanup i915_state_emit.c
2009-08-31 16:29:57 +01:00
Jakob Bornecrantz
00b0728094
i915g: Cleanup i915_texture.c
2009-08-31 16:29:57 +01:00
Jakob Bornecrantz
4224bda684
i915g: Cleanup texture init functions a bit
2009-08-31 16:29:57 +01:00
Jakob Bornecrantz
e1741dbe45
i915g: Rename pipe field on context to base
2009-08-31 16:29:57 +01:00
Jakob Bornecrantz
ad25d450ec
i915g: Rename screen field on screen to base
2009-08-31 16:29:57 +01:00
Brian Paul
2b6ab615a4
mesa: set additional fields in _mesa_buffer_map_range()
2009-08-31 09:12:04 -06:00
Brian Paul
d1da8acd82
mesa: set Length/Offset fields in _mesa_buffer_map()
2009-08-31 09:05:28 -06:00
Brian Paul
822c796481
mesa: additional assertions for ctx->Driver.UnmapBuffer()
...
The Pointer, Offset and Lenght fields should be cleared by the driver function
since ctx->Driver.Unmap() may be called from VBO code, etc.
2009-08-31 09:01:58 -06:00
Brian Paul
28c159d614
intel: clear buffer fields in intel_bufferobj_unmap()
2009-08-31 09:01:44 -06:00
Brian Paul
92033a9516
mesa: new assertions, comments about buffer mapping
...
Since ctx->Driver.MapBuffer() and ctx->Driver.MapBufferRange() may be called
from other places in Mesa (such as VBO) it's important that the driver
callbacks set all the buffer object fields properly (Pointer, Offset, Length,
etc). Add assertions to make sure that the driver does that.
2009-08-31 08:50:15 -06:00
Brian Paul
c69a4dce75
st/mesa: fix obj->Pointer offset in st_bufferobj_map_range()
...
This fixes a bunch of gallium regressions since
commit 8096aa5213
2009-08-31 08:49:24 -06:00
José Fonseca
241c3a1d80
llvmpipe: Fallback to element-wise comparisons when no comparison intrinsic is available.
...
Although selection of vector elements is valid LLVM IR, no machine target
supports it yet.
This is a last-resort option, but it allows llvmpipe to be used on any
target supported by LLVM without modifications. Obviously better
performance is attainable by emitting SIMD intrinsics where otherwise
LLVM doesn't.
2009-08-31 10:22:36 +01:00
José Fonseca
45fb66ab7b
llvmpipe: In the abcense of a min/max intrinsic, use the comparison intrinsics.
2009-08-31 10:00:38 +01:00
José Fonseca
b995af25d0
llvmpipe: Actually commit lp_buffer.[ch].
...
Thanks Michel.
2009-08-31 09:34:04 +01:00
Michel Dänzer
9f0495aa76
Gallium xlib: Add support for BGRA visuals.
2009-08-31 10:22:19 +02:00
Ben Skeggs
1ea114958b
nouveau: fix for dri state tracker changes
2009-08-31 13:39:45 +10:00
Ben Skeggs
02f3245448
nouveau: introduce nouveau_miptree common to all nouveau pipe drivers
...
The winsys once again has to know about textures it seems, so we need a
common representation between all our pipe drivers to store some
information the winsys will need.
Only the nv50 driver has been fixed so far.
2009-08-31 13:39:38 +10:00
Ben Skeggs
500b260494
nouveau: hack winsys to compile again, it's broken still however
2009-08-31 12:55:56 +10:00
Marc Dietrich
a192da37ed
cell: fix compilation
2009-08-30 09:24:27 -06:00
Brian Paul
d6b8664e3c
swrast: minor code consolidation
2009-08-30 09:21:20 -06:00
Brian Paul
04f8193aad
mesa: consolidate texture-related code in meta.c
...
Also, allow using texture rectangles, NPOT textures or regular POT textures
(preferred in that order).
2009-08-30 09:15:24 -06:00
Brian Paul
7dd6fa12e1
progs/util: minor updates to glutskel.c
2009-08-30 09:10:36 -06:00
Brian Paul
a068e098e2
intel: use more efficient loop over buffers
2009-08-30 09:10:36 -06:00
Brian Paul
0243f79eac
mesa: avoid redundant viewport changes in meta code
2009-08-30 09:10:36 -06:00
José Fonseca
c28f253ac2
llvmpipe: Texture cache in 4 ubytes instead of 4 floats.
...
This is more a short term experiment than a long term commitment, as we'll
need to support higher precision textures too, as this will all be
be replaced by runtime generated code.
With this change most Mesa demos fps increased around 10%. Not a huge
improvement, but not a negligible one either.
2009-08-30 12:37:03 +01:00
José Fonseca
62b586fce4
llvmpipe: Use util_format_read_4f to read texture tiles.
2009-08-30 12:37:03 +01:00
José Fonseca
ffe1b7bad8
llvmpipe: Texture cache is read-only. No need to flush.
2009-08-30 12:37:03 +01:00
José Fonseca
3d30524393
util: Auto generate pixel format accessor functions from
...
This has several advantages over the u_
- not hand written
- no intermediate memcpy of raw pixels
- supports 4 ubytes in addition to floats
- no need to pass a pipe_transfer
It also has (hopefully temporary) limitations:
- no support for YUV
- no support for SRGB
2009-08-30 12:37:03 +01:00
José Fonseca
379304a72c
llvmpipe: Eliminate internal pipe_buffer_map/unmap usage.
2009-08-30 12:37:03 +01:00
José Fonseca
d336ef410a
xlib: Implement lp_winsys::destroy.
2009-08-30 12:37:03 +01:00
Michel Dänzer
9053bb0d40
Merge branch 'mesa_7_5_branch'
...
Conflicts:
src/glx/x11/glxcmds.c
2009-08-30 13:06:18 +02:00
Michel Dänzer
edb1178798
glx/x11: Fix glXCreateGLXPixmap for direct rendering.
...
Fixes progs/xdemos/glxpixmap modified to use direct rendering.
2009-08-30 12:53:00 +02:00
Eric Anholt
3c1172f066
i965: Fix segfault with ARB_oq CheckQuery when results are already fetched.
2009-08-29 13:29:38 -07:00
Eric Anholt
09549704c6
i965: Support PROGRAM_ENV_PARAMs in brw_vs_emit.c
2009-08-29 13:29:38 -07:00
José Fonseca
c9adb4c9cb
llvmpipe: List lp_buffer.c in the Makefile.
2009-08-29 20:07:53 +01:00
José Fonseca
85a0a4b296
xlib: Implement llvmpipe lp_winsys interface.
2009-08-29 20:03:44 +01:00
José Fonseca
e173a9bbd6
llvmpipe: Define an winsys for LLVM. Drop pipe_winsys
...
lp_winsys will eventually be unified with softpipe's eventually, but we
are free to move quicker since we don't have the myriad of users yet.
Will provide a pipe_winsys adaptor from Keith's softpipe-private-winsys
soon.
2009-08-29 20:03:44 +01:00
Pauli Nieminen
e48dc9c5ed
r300: Disable threshold register for KMS.
...
Kernel side doesn't have required register in safe list so can't send it kernel.
2009-08-29 21:05:22 +03:00
Pauli Nieminen
9c0ab1fa85
r300: Swtcl prediction was still missing scissors.
...
All that state stuff should really be in state atoms :/
2009-08-29 21:05:19 +03:00
Pauli Nieminen
32df8922a9
r300: Add missing pre_emit_count to swtcl state size prediction.
2009-08-29 18:40:44 +03:00
Christoph Bumiller
8313801911
nv50: set provoking vertex state
2009-08-29 17:22:12 +02:00
José Fonseca
da1248bee5
xlib: Update llvmpipe integration for changes in master.
2009-08-29 09:21:42 +01:00
José Fonseca
f04ce6276b
llvmpipe: Update for changes in master.
2009-08-29 09:21:42 +01:00
José Fonseca
6818eb9b90
mesa: Update sconscript for new ARB/FP assembler.
2009-08-29 09:21:42 +01:00
José Fonseca
fdb3e75f7e
util: Add util_unsigned_logbase2.
...
Cherry picked from Keith's commit f911c3b989 .
2009-08-29 09:21:42 +01:00
José Fonseca
c40eddd294
llvmpipe: Isolate sampling from TGSI translation.
2009-08-29 09:21:42 +01:00
José Fonseca
d4806c64a2
llvmpipe: Better structure dereference naming.
2009-08-29 09:21:42 +01:00
José Fonseca
8aa62cead7
llvmpipe: Fix shader variant key construction.
...
Fixes the blank screen on non-64bit mode.
2009-08-29 09:21:42 +01:00
José Fonseca
1e6cc1cf37
llvmpipe: Fix build.
2009-08-29 09:21:42 +01:00
José Fonseca
f311bacebd
llvmpipe: Merge all pixel format related files.
2009-08-29 09:21:42 +01:00
José Fonseca
f85c5f8621
llvmpipe: Factor out and optimize the input interpolation.
...
Special attention is given to the interpolation of side by side quads.
Multiplications are made only for the first quad. Interpolation of
inputs for posterior quads are done exclusively with additions, and
perspective divide if necessary.
2009-08-29 09:21:41 +01:00
José Fonseca
03180dca7a
llvmpipe: Pre-declare fetch_texel.
2009-08-29 09:21:41 +01:00
José Fonseca
635c37e118
llvmpipe: Pass the alpha ref value and blend color in the jit context.
2009-08-29 09:21:41 +01:00
José Fonseca
c022e15d1e
llvmpipe: Pass fragment context to generated function in a single structure.
2009-08-29 09:21:41 +01:00
José Fonseca
8c7c108d71
llvmpipe: Structure manipulation helpers.
2009-08-29 09:21:41 +01:00
José Fonseca
08dd41fd68
llvmpipe: Centralize the C <-> JIT interfaces in one place.
2009-08-29 09:21:41 +01:00
José Fonseca
97b4681d7e
llvmpipe: Drop blend derived state.
...
Already included in the fragment shader.
2009-08-29 09:21:41 +01:00
Keith Whitwell
04de13b9cd
llvmpipe: keep texture stride 16byte aligned
...
Fixes crash when resizing gears window.
2009-08-29 09:21:41 +01:00
José Fonseca
4d2b0eb19e
llvmpipe: Squash the quad pipeline.
...
It had been reduced to one fixed stage.
2009-08-29 09:21:41 +01:00
José Fonseca
77b35dc179
llvmpipe: s/uni/scalar/.
...
More obvious name.
2009-08-29 09:21:40 +01:00
José Fonseca
5811ed87d7
llvmpipe: Add a bunch of comments.
...
Description/rationale/to-do items, while I still remember them...
2009-08-29 09:21:40 +01:00
José Fonseca
3f36f4b051
llvmpipe: Split off vs stuff from lp_state_fs.c.
...
lp_state_fs.c is already too big without it.
2009-08-29 09:21:40 +01:00
José Fonseca
c3b7406667
llvmpipe: Avoid duplicate clamping when converting between types.
2009-08-29 09:21:40 +01:00
José Fonseca
9897180279
llvmpipe: Generate the fragment pipeline into a single function.
...
Still hackish. Will document and optimize later.
2009-08-29 09:21:40 +01:00
José Fonseca
64cc71167f
llvmpipe: Get conversions working correctly for all integer types.
2009-08-29 09:21:39 +01:00
José Fonseca
53f9a1180e
llvmpipe: Delete the quad polygon stipple stage.
...
Not used now -- stipple done by the draw module. May code generate later.
2009-08-29 09:21:39 +01:00
José Fonseca
3d7a88674f
llvmpipe: Early depth testing.
2009-08-29 09:21:39 +01:00
José Fonseca
90b5df8d1b
llvmpipe: Disassemble beyond referred code beyond the RET instruction.
2009-08-29 09:21:39 +01:00
José Fonseca
c5531f575b
llvmpipe: Split control flow function declarations and notes.
2009-08-29 09:21:39 +01:00
José Fonseca
1e4376a68f
llvmpipe: Back port recent softpipe-opt improvements from Keith.
2009-08-29 09:21:39 +01:00
José Fonseca
f10ee9a0a1
llvmpipe: Don't limit the number of tiles in the cache.
2009-08-29 09:21:39 +01:00
José Fonseca
87c383a2e5
llvmpipe: Clean dead tile cache code.
2009-08-29 09:21:39 +01:00
José Fonseca
e3baeb3f14
llvmpipe: Simplify tile clears. Use pipe_fill_rect instead of scratch tile.
2009-08-29 09:21:38 +01:00
José Fonseca
d94fbb4a48
llvmpipe: Start hiding llvmpipe_cached_tile.
2009-08-29 09:21:38 +01:00
José Fonseca
1cb9ce0d27
llvmpipe: Drop depth/stencil support from tile cache.
2009-08-29 09:21:38 +01:00
José Fonseca
e3b38e5ec1
llvmpipe: Code generate the depth test, and include in the shader.
...
Only 32bit depth/stencil surfaces supported for now. Stencil ops not
implemented yet.
2009-08-29 09:21:38 +01:00
José Fonseca
db35ac36d9
llvmpipe: Update texture block from format.
2009-08-29 09:21:38 +01:00
José Fonseca
343ccc8dd0
llvmpipe: Depth test to LLVM IR translation.
2009-08-29 09:21:38 +01:00
José Fonseca
c0472f9c34
llvmpipe: Centralize mask update logic.
2009-08-29 09:21:37 +01:00
José Fonseca
3dbf00f9ab
llvmpipe: Clamped float to unsigned norm via mantissa manipulation.
2009-08-29 09:21:37 +01:00
José Fonseca
33ce51bc0d
llvmpipe: Several fixes of the conversion test.
2009-08-29 09:21:37 +01:00
José Fonseca
d07b038366
llvmpipe: Generate instrinsics for integer comparisons.
...
It is a little messy, given the available instrucions form SIMD
integer comparisons is rather limited.
2009-08-29 09:21:37 +01:00
José Fonseca
89146cd48d
llvmpipe: Mention the ability to get microbenchmarks from the unit tests.
...
Even better would be to have a -h/--help option to the tests...
2009-08-29 09:21:37 +01:00
José Fonseca
9ae47069b4
llvmpipe: Code generate alpha testing and append to generated fragment shader.
2009-08-29 09:21:37 +01:00
José Fonseca
b5e397c369
util: Dump PIPE_FUNC_x value names.
2009-08-29 09:21:37 +01:00
Brian Paul
d6d4f8b66e
llvmpipe: use the udis86 lib to print the x86 assembly code
2009-08-29 09:21:36 +01:00
Brian Paul
03b388e1c9
llvmpipe: frag shader comments
2009-08-29 09:21:36 +01:00
Brian Paul
0f6c621aee
llvmpipe: blend comments
2009-08-29 09:21:36 +01:00
Brian Paul
8329e59958
llvmpipe: comments about blend generator
2009-08-29 09:21:36 +01:00
Brian Paul
f586d9546b
llvmpipe: basic comments
2009-08-29 09:21:36 +01:00
José Fonseca
b9f2f01315
llvmpipe: Hack to force the line/point rasterization also fit the blend function expectations.
2009-08-29 09:21:35 +01:00
José Fonseca
7643da88a3
llvmpipe: Refer my udis86 branch which decodes more opcodes.
2009-08-29 09:21:35 +01:00
José Fonseca
7c2dc3faa8
llvmpipe: Code generate the position interpolation.
2009-08-29 09:21:35 +01:00
José Fonseca
6f5cd15f80
llvmpipe: Simpler variant of lp_build_broadcast_scalar.
2009-08-29 09:21:35 +01:00
José Fonseca
17baa01bfb
llvmpipe: Put the position coefficients together with the inputs.
...
The automatic search'n'replace leaves lp_setup.c a bit ugly, but this code
will be eventually code generated as well.
2009-08-29 09:21:35 +01:00
José Fonseca
7926b42d41
llvmpipe: Implement saturation.
2009-08-29 09:21:35 +01:00
José Fonseca
39352b3443
llvmpipe: Put color/depth directly into the quad structure.
2009-08-29 09:21:35 +01:00
Brian Paul
4c6fd574b1
llvmpipe: re-enable other gallium drivers
...
No more symbol collisions between drivers, AFAICT.
2009-08-29 09:21:35 +01:00
Brian Paul
908d8d7a1b
llvmpipe: prefix point/line/tri_setup() functions with llvmpipe_
...
Avoid symbol collisions with softpipe.
2009-08-29 09:21:35 +01:00
Brian Paul
1ea1cd8468
llvmpipe: repurpose linux-llvm config to build the llvmpipe driver
...
The gallivm module is no longer built. If/when gallivm is resuscitated we
can revisit this.
2009-08-29 09:21:35 +01:00
Brian Paul
137afe6a55
llvmpipe: updated Makefile C_SOURCES
2009-08-29 09:21:34 +01:00
Brian Paul
aa2514d12d
llvmpipe: add missing break in xlib _init()
2009-08-29 09:21:34 +01:00
José Fonseca
556eecea67
llvmpipe: Allow to build without udis86.
2009-08-29 09:21:34 +01:00
José Fonseca
2fef9b3369
llvmpipe: Drop the FETCH/STORE macros.
2009-08-29 09:21:34 +01:00
José Fonseca
5999ebfb69
llvmpipe: Debug helper function to name llvm intermediate values.
2009-08-29 09:21:34 +01:00
Keith Whitwell
a22f87c994
llvmpipe: use align_malloc for all structs containing ALIGN16 members
...
Unless the struct is allocated aligned, aligning the members isn't very
helpful.
2009-08-29 09:21:34 +01:00
José Fonseca
49d83fdc45
llvmpipe: Document that llvm 2.5 is expected.
2009-08-29 09:21:34 +01:00
José Fonseca
8df64bb2fe
llvmpipe: Briefly describe current status.
2009-08-29 09:21:34 +01:00
José Fonseca
bb867b0ae4
llvmpipe: Blend in place.
2009-08-29 09:21:34 +01:00
José Fonseca
4a414d8f87
llvmpipe: Code generate logic ops.
2009-08-29 09:21:34 +01:00
José Fonseca
3014919211
llvmpipe: Rasterize the quads according to what the blend function expects.
2009-08-29 09:21:34 +01:00
José Fonseca
efab431684
llvmpipe: Tile in SoA format identical to the blender function output.
2009-08-29 09:21:34 +01:00
José Fonseca
ee066eaf6d
llvmpipe: Allow to dump the disassembly byte code.
...
Useful as dis86 doesn't disassemble some SSE4 opcodes yet.
2009-08-29 09:21:33 +01:00
José Fonseca
c5abcac7ef
llvmpipe: Implement LIT.
2009-08-29 09:21:33 +01:00
José Fonseca
09a7b011ac
llvmpipe: Move lp_build_select to lp_bld_logic.[ch].
2009-08-29 09:21:33 +01:00
José Fonseca
1aae039ee2
llvmpipe: Implement comparison opcodes.
2009-08-29 09:21:33 +01:00
José Fonseca
aede39efd8
llvmpipe: Fix translation of KIL with repeated swizzles.
2009-08-29 09:21:33 +01:00
José Fonseca
81e7ec485d
llvmpipe: Handle floating point selection.
2009-08-29 09:21:33 +01:00
José Fonseca
4d7a8194c5
llvmpipe: Silence compiler warnings.
2009-08-29 09:21:33 +01:00
José Fonseca
7821664b15
llvmpipe: Implement KIL.
2009-08-29 09:21:33 +01:00
José Fonseca
2c90652ed9
llvmpipe: More verbose error message when failed to translate opcodes.
2009-08-29 09:21:33 +01:00
José Fonseca
58f20b2b65
llvmpipe: Detect typos in LLVM intrinsics early.
2009-08-29 09:21:33 +01:00
José Fonseca
1aede69d3a
llvmpipe: Comparisons translation.
2009-08-29 09:21:33 +01:00
José Fonseca
818d444e12
llvmpipe: Disassemble generated x86 code.
2009-08-29 09:21:32 +01:00
José Fonseca
a7f9b915ae
llvmpipe: Shader function arguments don't alias.
2009-08-29 09:21:32 +01:00
José Fonseca
539c55da16
llvmpipe: Test only present functionality to allow regression testing.
2009-08-29 09:21:32 +01:00
José Fonseca
c67570ba85
llvmpipe: Clamp into range when writing integers.
2009-08-29 09:21:32 +01:00
José Fonseca
17aec9304c
llvmpipe: Compute interpolation coeffs directly into SoA layout.
2009-08-29 09:21:32 +01:00
José Fonseca
b6f43b445b
llvmpipe: Pass the interpolation factors as scalars.
2009-08-29 09:21:32 +01:00
José Fonseca
1a004142bb
llvmpipe: Eliminate dependency on tgsi_exec_machine.
2009-08-29 09:21:32 +01:00
José Fonseca
73af91e938
llvmpipe: Eliminate non-LLVM fs execution paths.
2009-08-29 09:21:32 +01:00
José Fonseca
95f38dd67c
llvmpipe: Code generate interpolators.
2009-08-29 09:21:32 +01:00
José Fonseca
af608e56ca
llvmpipe: Factor out lp_build_select from lp_build_select_aos.
2009-08-29 09:21:31 +01:00
José Fonseca
57907e7fd9
llvmpipe: Translate approximate log2/exp2.
2009-08-29 09:21:31 +01:00
José Fonseca
ef1fddb36a
llvmpipe: Handle a few more TGSI opcodes.
2009-08-29 09:21:31 +01:00
José Fonseca
844f802a70
llvmpipe: Efficient implementations of pow/exp/log/exp2/log2
2009-08-29 09:21:31 +01:00
José Fonseca
90e9a4d4f9
llvmpipe: Migrate more SSE2 codegen to LLVM IR.
2009-08-29 09:21:31 +01:00
José Fonseca
1b3c83d699
llvmpipe: Don't assume/enforce fs values are in [0,1] range.
2009-08-29 09:21:30 +01:00
José Fonseca
1709ace359
llvmpipe: Implement more arithmetic functions.
2009-08-29 09:21:30 +01:00
José Fonseca
1929057eac
llvmpipe: Reuse coord/texel store.
2009-08-29 09:21:30 +01:00
José Fonseca
0b6a9b2dbe
llvmpipe: Replace lp_fs_llvm.c.
...
Based on lp_fs_exec.c/lp_fs_sse.c and tgsi_exec.c.
2009-08-29 09:21:30 +01:00
José Fonseca
63b07618b3
llvmpipe: TGSI -> LLVM SoA IR converstion.
...
Based on tgsi_sse2.c.
2009-08-29 09:21:30 +01:00
José Fonseca
9033c44a62
llvmpipe: Dump only the generated function.
2009-08-29 09:21:29 +01:00
José Fonseca
4393ca7956
llvmpipe: Scalar -> vector broadcasting.
2009-08-29 09:21:29 +01:00
José Fonseca
8422f293ab
llvmpipe: More arithmetic ops.
...
Mostly untested.
2009-08-29 09:21:29 +01:00
José Fonseca
36249348ed
llvmpipe: More intrinsic helpers.
2009-08-29 09:21:29 +01:00
José Fonseca
50d77141e8
llvmpipe: Fix typo.
2009-08-29 09:21:29 +01:00
José Fonseca
81644f6315
util: Fix SCons build.
2009-08-29 09:21:28 +01:00
José Fonseca
19b31d0ac8
llvmpipe: Document the typo in llvm-c/Core.h.
2009-08-29 09:21:28 +01:00
José Fonseca
fb56786f60
util: Auto-generate u_format_table.c from SConscript.
2009-08-29 09:21:28 +01:00
José Fonseca
9285f159e0
llvmpipe: Simple description/instructions.
2009-08-29 09:21:28 +01:00
José Fonseca
8edcc8abe3
llvmpipe: Add missing include.
2009-08-29 09:21:27 +01:00
José Fonseca
2101c2941c
llvmpipe: Tiles in rgba8 format.
2009-08-29 09:21:27 +01:00
José Fonseca
3ce1abf950
llvmpipe: Store tile color in SoA.
2009-08-29 09:21:27 +01:00
José Fonseca
29d94a9cbb
llvmpipe: Code generate color masking.
2009-08-29 09:21:27 +01:00
José Fonseca
2d6b39f05e
llvmpipe: Use the generated SoA blending code.
2009-08-29 09:21:27 +01:00
José Fonseca
e7fc21434d
llvmpipe: Handle disabled blending too.
2009-08-29 09:21:27 +01:00
José Fonseca
62c91998ef
xlib: Ensure one screen instance.
2009-08-29 09:21:27 +01:00
José Fonseca
0318f3e53e
llvmpipe: Split the texture cache from the color/depth/stencil cache.
2009-08-29 09:21:27 +01:00
José Fonseca
b836b2593c
xlib: Complete llvmpipe integration.
2009-08-29 09:21:27 +01:00
José Fonseca
2529ed5616
llvmpipe: SoA blending.
...
Throughput seems to be 4x higher.
2009-08-29 09:21:27 +01:00
José Fonseca
20f50b845b
util: Fix blend factor dumping.
2009-08-29 09:21:26 +01:00
José Fonseca
3130b9921c
llvmpipe: Update blending test.
2009-08-29 09:21:26 +01:00
José Fonseca
60584affcf
llvmpipe: Handle more conversions.
...
Not all successfully yet though..
2009-08-29 09:21:26 +01:00
José Fonseca
145de19548
llvmpipe: Use full set of sse4 min/max intrinsics.
2009-08-29 09:21:26 +01:00
José Fonseca
a9771d2b75
llvmpipe: Fix one const generation for some signed integers.
2009-08-29 09:21:26 +01:00
José Fonseca
8244d6e5ad
llvmpipe: Allow floating types without sign.
...
With the meaning that all values are assumed to be positive.
2009-08-29 09:21:26 +01:00
José Fonseca
9493260fdc
llvmpipe: Centralize lp_build_context initialization.
2009-08-29 09:21:25 +01:00
José Fonseca
b07d19a885
llvmpipe: Normalize the cycles with the number of channel.
...
So that we have a comparable number for different formats.
2009-08-29 09:21:25 +01:00
José Fonseca
b874a7b807
llvmpipe: Handle ubyte -> float conversion too.
2009-08-29 09:21:25 +01:00
José Fonseca
b441a0b658
llvmpipe: Make lp_const_offset visible.
2009-08-29 09:21:24 +01:00
José Fonseca
684a47f0f6
llvmpipe: Only get the preprocessor flags from llvm-config.
...
Otherwise we get -O2 optimization flag, preventing proper debugging.
2009-08-29 09:21:24 +01:00
José Fonseca
8988424ee8
llvmpipe: Bootstrap type conversions.
2009-08-29 09:21:24 +01:00
José Fonseca
b19cb0080c
llvmpipe: Use same type for reference vectors.
2009-08-29 09:21:24 +01:00
José Fonseca
d52dce0ffb
llvmpipe: Fix floating point const scale factor.
2009-08-29 09:21:24 +01:00
José Fonseca
e6ebebc485
llvmpipe: Factor out shared test code into a separate module.
2009-08-29 09:21:24 +01:00
José Fonseca
138428bade
llvmpipe: Cleanup constant helpers.
2009-08-29 09:21:23 +01:00
José Fonseca
627d6a6b04
llvmpipe: Move intrinsic helpers to a separate module.
2009-08-29 09:21:23 +01:00
José Fonseca
1165c30dc2
llvmpipe: Collect richer blend data.
2009-08-29 09:21:23 +01:00
José Fonseca
28e46458bc
llvmpipe: Some notes about PSHUF.
2009-08-29 09:21:23 +01:00
José Fonseca
1dd7bb17c7
llvmpipe: Optimize blend swizzles by using bitmasks instead of shuffles for ubytes.
2009-08-29 09:21:23 +01:00
José Fonseca
a77084ea4b
llvmpipe: Write data to a tsv file for posterior analysis.
2009-08-29 09:21:23 +01:00
José Fonseca
f081bacc25
llvmpipe: Move p_build_context to lp_bld_type.h
...
As it will be shared with more modules.
2009-08-29 09:21:23 +01:00
José Fonseca
696f7f2be5
util: New file dedicated to dump state in human/machine readable format.
2009-08-29 09:21:23 +01:00
José Fonseca
5940ba26f7
llvmpipe: Don't use llvm.readcyclecounter.
...
LLVM during optimization reorders the rdtsc instructions next to each
other, which makes it pretty useless.
2009-08-29 09:21:22 +01:00
José Fonseca
64611e086d
llvmpipe: Separate constant building.
2009-08-29 09:21:22 +01:00
José Fonseca
c87fab0008
llvmpipe: Move type support functions into a separate file.
2009-08-29 09:21:22 +01:00
José Fonseca
b94e22e4be
llvmpipe: Measure the number of cycles taken for blending.
2009-08-29 09:21:22 +01:00
José Fonseca
5778970f15
llvmpipe: Minor comments / debug mnemonics.
2009-08-29 09:21:22 +01:00
José Fonseca
02eaa32d83
llvmpipe: Optimize away min/max with equal operands.
2009-08-29 09:21:22 +01:00
José Fonseca
9e92244440
llvmpipe: Improve generated 8bit blending code.
2009-08-29 09:21:22 +01:00
José Fonseca
ede73258a7
llvmpipe: Get blending of normalized 8bit unsigned integers working.
2009-08-29 09:21:22 +01:00
José Fonseca
a6622e6c54
llvmpipe: Specialize arithmetic operations.
2009-08-29 09:21:22 +01:00
José Fonseca
272dadbe4e
llvmpipe: Introduce a custom typing system.
...
Straightforward representation of floating-point/fixed-point/integer,
normalized/scaled, signed/unsigned SIMD vector types.
2009-08-29 09:21:22 +01:00
José Fonseca
f478b6fe76
llvmpipe: Avoid C99-isms.
2009-08-29 09:21:21 +01:00
José Fonseca
fe90e46dc9
llvmpipe: Factor out intrisic calling code into a reusable function.
2009-08-29 09:21:21 +01:00
José Fonseca
7ace0b1f4a
llvmpipe: Cleanup test programs.
2009-08-29 09:21:21 +01:00
José Fonseca
7d043162c5
llvmpipe: Blending.
...
The code
2009-08-29 09:21:21 +01:00
José Fonseca
d2cf3e8dfd
llvmpipe: Arithmetic helpers.
2009-08-29 09:21:21 +01:00
Keith Whitwell
fa3514a57e
llvmpipe: fastpath for interpolated z16 less depthtesting
...
Because this is interpolated (ie. early) depth, we can build in an
assumption about the quads emitted by triangle setup, ie that they
are actually linear spans. Interpolate z over those spans in z16
format to save on math & conversion.
2009-08-29 09:21:21 +01:00
Keith Whitwell
38a1479fe1
llvmpipe: cope with nr_cbufs == 0
...
Disable blend code when no color buffer
2009-08-29 09:21:21 +01:00
José Fonseca
4639f8aad5
llvmpipe: Translate logicops.
2009-08-29 09:21:21 +01:00
José Fonseca
833323b8d0
llvmpipe: Separate pixel packing/unpacking from loading/storing.
2009-08-29 09:21:21 +01:00
José Fonseca
c4903ee27f
xlib: Integrate with llvmpipe.
...
Actually, the makefile/sconscript changes were already commit by mistake.
2009-08-29 09:21:21 +01:00
José Fonseca
b060771612
llvmpipe: Adjust for pixel layout changes.
2009-08-29 09:21:20 +01:00
José Fonseca
42b15b26fd
util: Make pixel format layout more meaningful.
...
Namelly, explicitly distinguish formats coded by arithmetic manipulation,
from formats layed out in array.
2009-08-29 09:21:20 +01:00
José Fonseca
a910c7d820
util: Don't commit u_format_table.c
...
At least not until stabilizes, to reduce noise.
2009-08-29 09:21:20 +01:00
José Fonseca
9a519ec4d1
llvmpipe: Fix typo in copyright.
2009-08-29 09:21:20 +01:00
José Fonseca
3ef44746fe
llvmpipe: Add test cases for pixels.
...
Actually some of this test cases need more testing...
2009-08-29 09:21:20 +01:00
José Fonseca
899bee2788
util: Fix r5g6b5 description.
2009-08-29 09:21:19 +01:00
José Fonseca
3ace63c00f
llvmpipe: Update SConscript.
2009-08-29 09:21:19 +01:00
José Fonseca
b023c1dc68
llvmpipe: Simple shell script to aid port softpipe changes to llvmpipe.
2009-08-29 09:21:19 +01:00
Keith Whitwell
05bfd93c3f
llvmpipe: move all depth/stencil/alpha pixel processing into one stage
2009-08-29 09:21:19 +01:00
Keith Whitwell
b8c437f20f
llvmpipe: fix error in scissor state dependencies
2009-08-29 09:21:18 +01:00
Keith Whitwell
c5375da1dc
llvmpipe: cleanup framebuffer state routine slightly
2009-08-29 09:21:18 +01:00
Keith Whitwell
90caf1a3f3
llvmpipe: move all color-combine code into lp_quad_blend.c
...
Consolidate the read-modify-write color combining code from
the blend, colormask and output stages.
2009-08-29 09:21:18 +01:00
Keith Whitwell
54c6ef144f
llvmpipe: fix typo
2009-08-29 09:21:18 +01:00
Keith Whitwell
3c71a19016
llvmpipe: example fastpaths in blending
2009-08-29 09:21:18 +01:00
Keith Whitwell
80eb276630
llvmpipe: actually pass >1 quad from triangle routine
...
First attempt
2009-08-29 09:21:18 +01:00
Keith Whitwell
bdbb4beb21
llvmpipe: expand quad pipeline to process >1 quad at a time
...
This is part one -- we still only pass a single quad down, but
the code can now cope with more. The quads must all be from the same
tile.
2009-08-29 09:21:18 +01:00
Keith Whitwell
4486012245
llvmpipe: rip out old mulithread support
2009-08-29 09:21:18 +01:00
Keith Whitwell
2a7c39a211
llvmpipe: avoid flushing depth buffer cache on swapbuffers
...
There's no need to push out depth buffer contents on swapbuffers.
Note that this change doesn't throw away depth buffer changes, it simply
holds them in the cache over calls to swapbuffers. The hope is
that swapbuffers will be followed by a clear() which means in that case
we won't have to write the changes out.
2009-08-29 09:21:17 +01:00
Keith Whitwell
3adca96114
llvmpipe: also shortcircuit non-texture tile lookups
2009-08-29 09:21:17 +01:00
Keith Whitwell
2301314e7c
llvmpipe: shortcircuit repeated lookups of the same tile
...
The lp_tile_cache is often called repeatedly to look up the same
tile. Add a cache (to the cache) of the single tile most recently
retreived and make a quick inline check to see if this matches the
subsequent request.
Add a tile_address bitfield struct to make this check easier.
2009-08-29 09:21:17 +01:00
Keith Whitwell
df1823ec5b
llvmpipe: remove unused vars in lp_setup.c
2009-08-29 09:21:17 +01:00
Keith Whitwell
08811032c2
llvmpipe: use bitwise logic to setup quad masks in lp_setup
2009-08-29 09:21:17 +01:00
Keith Whitwell
0aa24fa36f
llvmpipe: simplify flush_spans
...
No loss of performance, but simpler code.
2009-08-29 09:21:17 +01:00
Keith Whitwell
0f55a95b2f
llvmpipe: make some small steps to flush texture cache less frequently
...
No performance gain yet, but the code is a bit cleaner.
2009-08-29 09:21:16 +01:00
Keith Whitwell
3121484a8b
llvmpipe: remove backwards dependency from tilecache to llvmpipe
...
The tile cache is a utility, it shouldn't know anything about the
entity which is making use of it (ie llvmpipe).
Remove llvmpipe parameter to all the tilecache function calls, and
also remove the need to keep a llvmpipe pointer in the sampler structs.
2009-08-29 09:21:16 +01:00
José Fonseca
c9a5930fe4
llvmpipe: Rename preprocessor symbols too.
2009-08-29 09:21:16 +01:00
José Fonseca
8783732c4d
llvmpipe: Pixel packing/unpacking and loop code generators.
...
Just a small proof of concept plus a standalone test app. Not integrated
with the rest of the driver yet.
2009-08-29 09:21:16 +01:00
José Fonseca
15422b2d99
util: Pixel format database.
...
There are some inconsistencies in pipe_format, but above all, there
simply aren't enough bits in an enum to conveniently store all
information about a pixel format we need to be able to dynamically
generate pixel packing/unpacking code.
2009-08-29 09:21:15 +01:00
José Fonseca
946f432a08
llvmpipe: Fork softpipe for experimentation with llvm.
2009-08-29 09:21:15 +01:00
Ian Romanick
1814d6b49c
Put 'extern' first on the line to silence GCC warnings.
2009-08-28 20:12:36 -07:00
Eric Anholt
00413d8742
i965: Use VBOs in the VBO module on 965, now that we have ARB_map_buffer_range.
...
This looks like it's a small win on blender.
2009-08-28 15:29:35 -07:00
Eric Anholt
8096aa5213
vbo: Fix array pointer calculation for MapBufferRange-mapped vertex data.
...
We would end up with the offset from the start of the mapping rather than
the offset from the start of the buffer.
2009-08-28 15:29:35 -07:00
Eric Anholt
2d5c74fac3
intel: Add support for GL_ARB_map_buffer_range.
...
Passes glean's bufferObject test, and should provide good performance in the
cases applications are expected to use.
2009-08-28 15:29:35 -07:00
Eric Anholt
446a226f9f
i965: Implement ARB_oq CheckQuery in the intended way.
...
Previously we blocked because I hadn't added the libdrm function. Now it's
there, so update your libdrm.
2009-08-28 15:29:34 -07:00
Pauli Nieminen
0926a5f4a1
radeon: Fix swtcl emit pediction.
...
Problem was to find the correct place to run prediction. Only place that is
called for every primitive is ALLOC_VERTS so we have to do prediction there
before allocation.
2009-08-29 00:46:57 +03:00
Jakob Bornecrantz
55e7abf81f
i915g: Add cursor case for scanout layout
2009-08-28 22:41:53 +01:00
Jakob Bornecrantz
644060c025
i915g: Don't forget to init buffer ptrs
2009-08-28 22:41:52 +01:00
Zack Rusin
aaedd035ca
st/xorg: disable composite accelration for now
2009-08-28 16:19:53 -04:00
Zack Rusin
0a26811286
st/xorg: bind samplers before composition
2009-08-28 15:43:46 -04:00
Zack Rusin
f1c0a4b2f4
st/xorg: normalize coords for the src operands in the vertex shader
2009-08-28 15:36:33 -04:00
Pauli Nieminen
4f644e58d4
radeon: Fix scissors for dri1.
...
DRI1 has to set scissors in framebuffer coordinates.
2009-08-28 22:05:15 +03:00
Joakim Sindholt
dbe58d7f9f
r300g: pretty up the new drm code a bit
...
As it turns out, I made some boners. This corrects them (I hope)
2009-08-28 20:05:52 +02:00
Jakob Bornecrantz
1e9eb69f83
st/xorg: If migrating from a sw pixmap to a hw pixmap upload old contents
2009-08-28 17:10:58 +02:00
Jakob Bornecrantz
d80242c254
st/xorg: Null devPrivate.ptr when unmapping
2009-08-28 17:10:57 +02:00
Michel Dänzer
fdc8ec60eb
st/xorg: Fix scons build.
2009-08-28 17:42:07 +02:00
Joakim Sindholt
6bfec14d6d
r300g: support new drm_api
2009-08-28 17:23:11 +02:00
Jakob Bornecrantz
1e5014f7df
drm_api: Operate on textures instead of buffers
...
Most use cases just got the buffer from the texture
and then called into one of the get_handle functions.
Also with this patch it would be easier to move to a
generic function for getting handles from textures
and textures from handles, that is exposed via the screen.
2009-08-28 13:38:23 +01:00
José Fonseca
9399b9a0e2
util: Reset size to zero when failed to allocate buffer.
2009-08-28 12:52:31 +01:00
Jakob Bornecrantz
7d9af52bc5
st/xorg: Fix some warnings
2009-08-28 12:46:24 +02:00
Jakob Bornecrantz
b26aee0ffe
st/dri: Fix some warnings
2009-08-28 12:46:17 +02:00
Jakob Bornecrantz
6f0a1a8426
st/xorg: Pass dri driver name as driverName on screen
2009-08-28 12:36:42 +02:00
Jakob Bornecrantz
205d344e2a
Revert "st/xorg/dri: Pass texture formats via the DRI2 protocol flags."
...
This reverts commit a33e9ea3b9 .
As this change breaks both radeon and nouveau
2009-08-28 12:35:42 +02:00
Pauli Nieminen
4322181e6a
r100/r200: Bring back old PolygonStripple for DRI1.
...
DRI1 didn't have support for command buffer emit for stripple.
2009-08-28 05:42:41 +03:00
Pauli Nieminen
bfbad4fbb7
r100/r200: Share PolygonStripple code.
2009-08-28 04:58:50 +03:00
Pauli Nieminen
e541845959
r200: Fix piglit paths test.
...
Polygon stipple has to go to command buffer because special ioctl is disabled.
Piglit doesn't like HyperZ warning so disable it for kms.
2009-08-28 04:13:01 +03:00
Dave Airlie
a7f8b329aa
r600: fix scissor also.
...
I forgot about r600 being here.
2009-08-28 11:05:29 +10:00
Dave Airlie
d0cb1036aa
radeon: fix scissors harder.
...
this makes gnome-shell work on r300 for me
2009-08-28 11:02:32 +10:00
Eric Anholt
60b072d49f
intel: Add support for ARB_copy_buffer.
...
Passes glean's bufferObject test for this extension.
2009-08-27 17:51:29 -07:00
Pauli Nieminen
812ccacabc
r300: Fix emit prediction to account scissor emitting correctly.
2009-08-28 02:05:08 +03:00
Brian Paul
e363ec1d08
Merge branch 'mesa_7_5_branch'
2009-08-27 16:54:32 -06:00
Brian Paul
0d7bed9f89
docs: fix selection/feedback culling bug
2009-08-27 16:50:44 -06:00
Brian Paul
8f4d66c5f8
swrast: fix incorrect tri culling in selection/feedback mode.
...
See bug 16866.
2009-08-27 16:50:03 -06:00
Eric Anholt
c2ef10803d
i915: Fix undefined symbol as of eabe12df44
2009-08-27 15:33:33 -07:00
Zack Rusin
8bdce0c3a7
st/xorg: set vertex and fragment shader for the current op
2009-08-27 18:17:54 -04:00
Zack Rusin
c7e103d238
st/xorg: bind rasterizer state
2009-08-27 18:08:58 -04:00
Zack Rusin
2048182e86
st/xorg: set blend state for exa
2009-08-27 18:06:15 -04:00
Zack Rusin
f9a3fce090
st/xorg: bind framebuffer and viewport for exa
2009-08-27 17:39:45 -04:00
Zack Rusin
3f15ea866f
st/xorg: create and destroy shader cache
2009-08-27 17:39:45 -04:00
Michel Dänzer
416ee3c53e
st/xorg: Set shared usage of pixmaps for use via DRI2.
...
Also allow pixmaps to have both the shared and displayed usage flags, as is
the case for the screen pixmap now.
2009-08-27 20:29:32 +02:00
Michel Dänzer
bfbfcdd703
st/dri: Make sure the front left renderbuffer is there for texture-from-pixmap.
2009-08-27 20:27:28 +02:00
Michel Dänzer
d73d4cfcf1
st/xorg: Don't hardcode ExaPrepareCopy to fall back to software.
2009-08-27 20:27:28 +02:00
Michel Dänzer
05aa56a827
st/xorg: Flush context if necessary in ExaPrepareAccess.
2009-08-27 20:27:28 +02:00
Michel Dänzer
f3a540f6d7
st/dri: Only ask for fake front buffer for single buffer visuals by default.
2009-08-27 20:17:53 +02:00
Michel Dänzer
a33e9ea3b9
st/xorg/dri: Pass texture formats via the DRI2 protocol flags.
...
No need to guess.
2009-08-27 20:17:53 +02:00
Nicolai Hähnle
1160bf7c65
r300: Cleanup reported native program limits
...
The fragment program native limits are actually higher on R4xx
as reported by Alex Deucher, but using those requires some
bit-twiddling changes to program handling.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-08-27 18:13:48 +02:00
Nicolai Hähnle
eb6e281966
r300: Debug messages are written to stderr, so fflush that
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-08-27 18:13:48 +02:00
Pauli Nieminen
570d4e375a
radeon/r200/r300: Fix swtcl prediction to work after primitie change.
...
Swtcl calls flush everytime primitive changes so prediction has to made again
after flushing.
2009-08-27 18:57:13 +03:00
marvin24
43a064e06d
mesa: direct program debug output to stderr instead of stdout
2009-08-27 09:22:51 -06:00
Brian Paul
44e86dde6d
Merge branch 'mesa_7_5_branch'
2009-08-27 09:14:09 -06:00
Brian Paul
32f95f8c17
gallium/util: added support for SRGB formats
...
Fixes glean/texture_srgb failure, bug #23449 .
2009-08-27 09:10:38 -06:00
Brian Paul
f8ae968d28
gallium/util: added cases for SRGB formats
2009-08-27 09:09:56 -06:00
Chia-I Wu
8d0bdfa433
progs: EGL/X progs should link to libX11.
...
Since 5a459d58fc , libEGL no longer links
to libX11. Add the dependency to affected progs and cleanup
prog/egl/Makefile.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-27 08:08:30 -06:00
Vinson Lee
0dd08a9e15
mesa: move decls before code
2009-08-27 07:40:48 -06:00
Cooper Yuan
ba87cbf2be
r300g: Correct scissor setting, subtract 1 from window's width and height
2009-08-27 17:46:59 +08:00
Dave Airlie
82ff3190de
radeon: fix scissor calcs.
...
For non-FBOs we need to invert, for FBOs the scissors are non-inverted.
no matter what we need to clamp them to the buffer sizes.
2009-08-27 15:38:00 +10:00
Ian Romanick
09c73c7437
i965: Increase assmebly shader program parameter limits
...
Increase the number of native program parameters to the same values
exposed by GLSL.
2009-08-26 22:05:53 -07:00
Ian Romanick
eabe12df44
ARB prog: Change handling of program parameter limits
...
Several changes are made to program parameter limits. Several of the
non-NATIVE limits are set higher. All of the NATIVE limits are set to
zero in the core Mesa code. Each driver must set the actual value in
its context creation routine. If the NATIVE value remains zero, this
indicates that hardware shaders may not be supported.
Each of the preceeding changes matches the bahavior of Apple's shader
assembler, so it seems safe.
Finally, we limit the value of MaxEnvParams to be no greater than
MaxNativeAttribs. At least one case has been found where an
application does the wrong thing if MaxNativeAttribs < MaxEnvParams.
See also bugzilla #23490 .
2009-08-26 22:05:53 -07:00
Dave Airlie
20d9204fbd
radeon: fix max indx/vertex emission due to state checker
2009-08-27 14:50:42 +10:00
Younes Manton
cefe9c4f39
mesa: gitignore
2009-08-26 20:15:00 -04:00
Younes Manton
7d3b8231e1
nv04: Handle more Z formats.
...
Based on the patch from Luo Jinghua.
2009-08-26 20:07:51 -04:00
Nicolai Hähnle
c024f1047f
r300/compiler: Fix vertex program MAD emit
...
Only use the macro variant of MAD when absolutely necessary.
Apparently it cannot deal with relative addressing.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-08-27 01:46:50 +02:00
Nicolai Hähnle
2114acb044
r300/compiler: Fix bug in rc_find_free_temporary
...
Find used temporaries even if they are only written to in dead code.
This fixes a bug in the NQSSADCE stage.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-08-27 01:46:45 +02:00
Chia-I Wu
e1d978775f
egl: Remove Xdpy from EGLDisplay.
...
It is not used anymore.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-26 16:40:22 -06:00
Chia-I Wu
f5a06fad62
egl_glx: Make fbconfigs and visuals per display.
...
This is to allow a driver to drive multiple displays. Remove the use of
_EGL_PLATFORM_X and obsolete code along the way.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-26 16:40:22 -06:00
Chia-I Wu
c06699dd12
egl_softpipe: Make winsys and pipe screen per display.
...
This is to allow a driver to drive multiple displays. Remove the use of
_EGL_PLATFORM_X along the way.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-26 16:40:22 -06:00
Chia-I Wu
49f245ea6b
EGL_i915: Make struct drm_device per display.
...
This is to allow a driver to drive multiple displays.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-26 16:40:22 -06:00
Pauli Nieminen
74b55970dc
Merge branch 'fix_r300_swtcl' into push_master
2009-08-27 00:08:30 +03:00
Pauli Nieminen
47d4b9ff70
radeon: Fix loop en condition so debug output doesn't flood meaningless values.
2009-08-27 00:07:05 +03:00
Pauli Nieminen
e0e76edf97
radeon: Make RADEON_CMDBUF more fine grained.
2009-08-27 00:05:57 +03:00
Pauli Nieminen
97029c1860
radeon/r200/r300: Fix swtcl flushing not to invalidate dma region.
...
We were check command buffer sizes too alte so allocated dma regions
were freed before relocations so space checking failed.
2009-08-27 00:01:56 +03:00
Brian Paul
38f5641106
Merge branch 'mesa_7_5_branch'
2009-08-26 14:49:15 -06:00
Brian Paul
b2b220e622
i965: init the tex_units_used field
2009-08-26 14:47:50 -06:00
Brian Paul
a9a6399cd3
i965: fix incorrect tex unit in emit_tex() and emit_txb()
...
The instructions we're translating already went through the brw_wm_pass_fp()
function which does the sampler->texture unit mapping. We were applying
the sample->unit mapping a second time in the GLSL texture emitters.
Often, this made no difference but other times it could lead to accessing
an invalid texture and could cause a GPU lockup.
2009-08-26 14:46:58 -06:00
Brian Paul
81a101b5be
i965: clean-up tex target switches
2009-08-26 14:43:45 -06:00
Brian Paul
6df38e6f5a
glsl: asst. clean-ups in set_program_uniform()
...
Remove redunant type check for samplers (assert instead).
Move some local vars. Update comments.
2009-08-26 14:35:45 -06:00
Brian Paul
babb5ba9a9
glsl: signal that the program needs to be re-translated when samplers change
2009-08-26 14:29:50 -06:00
Brian Paul
7205221051
progs/glsl: asst. changes in shtest.c
2009-08-26 12:16:18 -06:00
Brian Paul
af7315e58b
i965: added texture unit sanity check
...
Check that all the textures needed by the current fragment program
actually exist and are valid.
2009-08-26 12:08:23 -06:00
Brian Paul
34da6024e3
i965: keep track of which texture units the fragment shader accesses
...
We'll use this for debug/sanity checking.
2009-08-26 12:07:03 -06:00
Brian Paul
d09d03aa42
docs: document sampler array bug fix
2009-08-26 12:04:35 -06:00
Brian Paul
f8b344114f
i965: clean up texture target switches
2009-08-26 12:02:24 -06:00
Brian Paul
f05344fcea
mesa: var renaming, new assertion
2009-08-26 12:02:24 -06:00
Brian Paul
dd528f0ec1
mesa: additional instruction field size assertions
2009-08-26 12:02:24 -06:00
Brian Paul
476290946e
Merge branch 'mesa_7_5_branch'
2009-08-26 12:01:23 -06:00
Brian Paul
2bcf787de1
progs/glsl: handle window resizes in texaaline.c
2009-08-26 11:56:56 -06:00
Brian Paul
488b3c4d1b
progs/glsl: add special Makefile rule for samplers_array
2009-08-26 11:55:15 -06:00
Brian Paul
f6d34c2058
progs/glsl: change samplers.c to better test sampler/texture indexing
...
Now the left half is yellow and the right half is red, with the gradients
going in opposite directions.
2009-08-26 11:53:25 -06:00
Brian Paul
04d170794a
glsl: fix bug in sampler array indexing
...
Need to add the 'offset' parameter when indexing the parameter array.
Before, if we were setting arrays of samplers, we were actually only
setting the 0th sampler's value.
Because of how progs/glsl/samplers.c is constructed, this wasn't showing
up as a failure in the samplers_array output.
2009-08-26 11:39:31 -06:00
Alex Deucher
7ffbe48706
r600: fix two sided stencil
2009-08-26 13:33:06 -04:00
Alex Deucher
f988c750a9
r600: add missing radeon_cs_space_set_flush call
...
fixes crash in etracer reported by kdekorte on IRC
2009-08-26 13:10:15 -04:00
Zack Rusin
a0966c41a9
st/xorg: create basic vertex shader
2009-08-26 12:50:47 -04:00
Zack Rusin
b324aacf13
st/xorg: create basic fragment shader
2009-08-26 12:50:47 -04:00
Alex Deucher
490f640cd5
r600: make reloc_chunk size dynamic
2009-08-26 12:17:44 -04:00
Alex Deucher
f33853e56d
r600: fix memory leak
2009-08-26 11:09:59 -04:00
Alex Deucher
18e0fea55b
r300: r4xx and rs4xx also have lte discard regs
2009-08-26 10:53:30 -04:00
Jakob Bornecrantz
53b3cdaee2
st/dri: Add some debug code
2009-08-26 14:30:54 +02:00
Jakob Bornecrantz
57230d96ed
st/xorg: Temporary fix for none stencil visuals
...
Should be replaced with something looking at the proper
glx visual for the buffers.
2009-08-26 14:27:50 +02:00
Jakob Bornecrantz
23fe960be0
st/xorg: Find out correct type for depth stencil buffers
2009-08-26 13:45:31 +02:00
Jakob Bornecrantz
aab0bedb8c
st/dri: Redo config generation
2009-08-26 12:29:28 +02:00
Michel Dänzer
b2e1b25881
st/xorg: Add support for dirty framebuffer region reporting.
...
Add a BlockHandler which flushes the context and reports the dirty region
gathered using the X server damage layer.
In the interim, with dirty region reporting only allocate textures for the
framebuffer and shared pixmaps (e.g. DRI2 buffers) and fall back to software
for other pixmaps. This will be improved in the future.
2009-08-26 13:18:37 +02:00
Cooper Yuan
dadf138ddb
r600: Update vertex fetch shader if necessary
2009-08-26 16:21:10 +08:00
Ben Skeggs
1664bc1a37
st/dri: make the GL_ARB_map_buffer_range entrypoints available
2009-08-26 16:18:39 +10:00
Dave Airlie
674835f184
radeon/r100/r200: actually init the OQ support properly
2009-08-26 14:16:54 +10:00
Dave Airlie
b6df23d8b3
radeon/r200: OQ support for r200 in theory.
...
this is an untested port of the r100 OQ code
2009-08-26 14:03:48 +10:00
Dave Airlie
5484428d72
radeon: add r100 OQ support with kms.
...
This adds OQ support for the r100 chipsets, it requires
KMS unless someone wants to make a kernel patch to add support
for OQ regs.
2009-08-26 13:56:45 +10:00
Brian Paul
42675ff0e3
progs/glsl: call ValidateShaderProgram()
2009-08-25 17:46:11 -06:00
Brian Paul
a088e5631d
mesa: validate shader before drawing (for debugging, disabled)
2009-08-25 17:46:10 -06:00
Brian Paul
d8b4f8c848
glsl: update a texture/sampler comment
2009-08-25 17:46:10 -06:00
Brian Paul
c90fca3da4
glsl: implement shader sampler validation
...
Shader validation should fail if there are two samplers of different types
which reference the same texture unit. For example, if a cubemap sampler
and a 2D sampler both reference texture unit 0, that's invalid.
2009-08-25 17:46:10 -06:00
Brian Paul
2050baba96
mesa: use gl_texture_index type for gl_program::SamplerTargets
2009-08-25 17:46:10 -06:00
Brian Paul
fa6299cb31
progs/util: added ValidateShaderProgram() to shaderutil.c
2009-08-25 17:46:10 -06:00
Brian Paul
b7d2023cf9
i965: add some texture unit/target assertions
2009-08-25 17:46:10 -06:00
Brian Paul
f9ce0a91dc
mesa: print some program fields in binary too
2009-08-25 17:46:10 -06:00
Pauli Nieminen
dbf59de6d2
r200: Add scissor to state atom list.
...
Scissors are jsut one of states that we have to emit so it should be in state list
2009-08-26 01:53:17 +03:00
Pauli Nieminen
5d10890795
radeon/r600: Fix remaining warnings when building 64 bit binary.
2009-08-25 22:16:19 +03:00
Pauli Nieminen
87f83e193a
r200: Addd missing parameter to debug output.
2009-08-25 21:39:58 +03:00
Pauli Nieminen
75df73838a
r200: Fix commit size prediction.
...
Scissor are emited for every primitive so fix that in prediction.
2009-08-25 21:36:57 +03:00
Zack Rusin
7bc4744026
xorg: insert shaders into the cache
2009-08-25 14:22:26 -04:00
Zack Rusin
23b59d3b40
exa: add basic code to cache vertex and fragment shaders
2009-08-25 14:01:58 -04:00
Zack Rusin
c7653a8333
exa: check whether the op is accelerated
2009-08-25 13:23:08 -04:00
Pauli Nieminen
c3374bf97e
radeon: Fix all compiler warnings.
2009-08-25 19:35:41 +03:00
Brian Paul
42ecb1287e
mesa: remove -I$(TOP)/src/gallium/drivers from sources.mak
...
Core Mesa and the state tracker do not depend on any gallium drivers.
2009-08-25 09:42:28 -06:00
Brian Paul
a94d66e857
Revert "glapi: Fix a possible race in getting current context/dispatch."
...
This reverts commit 17090cf3ef .
We're reverting this because it causes ABI breakage with the X server.
Maybe re-attempt with another patch.
2009-08-25 09:37:43 -06:00
Zack Rusin
65f9d10342
xorg: revert bad merge
2009-08-25 09:58:51 -04:00
Michel Dänzer
d22bd1421c
Add support for building the Xorg state tracker with scons.
...
scons ... statetrackers=xorg
2009-08-25 15:39:05 +02:00
Pauli Nieminen
418cdc66ec
Revert "glx: Make drawables persistent untill they are changed by glXMakeCurrent"
...
This commit was not mean to end in to master yet. It is still queston if this
right design to fix the problem.
This reverts commit 45e3be3c07 .
2009-08-25 05:07:08 +03:00
Pauli Nieminen
ce7ed63f0c
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into r600_state_predict
2009-08-25 02:36:13 +03:00
Maciej Cencora
1d5a06a1f7
r300: fix condition logic
...
The s3tc extensions are properly enabled now, when force_s3tc_enable option is set in driconf.
2009-08-25 01:30:24 +02:00
Maciej Cencora
ff235c8ccb
r300: set proper CS section size
2009-08-25 01:30:24 +02:00
Pauli Nieminen
4297f32c24
radeon/r200/r300/r600: Warn if we emit more than prediction was.
...
Prediction code making too small prediction may cause space check aserttion
failure later in rendering. So warning about any failure to predict correctly
should be fixed.
2009-08-25 02:23:52 +03:00
Zack Rusin
ffe8cc6cef
xorg: fix compilation
2009-08-24 18:42:16 -04:00
Zack Rusin
17076d700c
xorg: start on code accelerating render
2009-08-24 18:39:01 -04:00
Alex Deucher
3023328ea7
r300: add support for getting Z pipe info from drm
...
Needed for occulsion queries on rv530 chips
Signed-off-by: Alex Deucher <alexdeucher@gmail.com >
2009-08-24 18:08:37 -04:00
Alex Deucher
8dd151b947
r600: code cleanup
2009-08-24 17:51:00 -04:00
Dave Airlie
dea1038186
radeon: fix fbo size calculation to after pitch
2009-08-25 07:21:03 +10:00
Zack Rusin
cd5c7bfd93
Merge branch 'master' of ssh://zack@git.freedesktop.org/git/mesa/mesa
2009-08-24 16:39:25 -04:00
Zack Rusin
534c133022
openvg: fix vgTransformPath with relative coords
2009-08-24 16:38:43 -04:00
Brian Paul
bf7e4b10cb
ARB prog: Set error instead of falling through with incorrect value
...
If a fragment program only parameter was queried of a vertex program
(e.g., GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB) no error would be set and
a random value would be returned. This caused 'glxinfo -l' to show
the same values for GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB,
GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB, GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB,
GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB,
GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB,
GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB as for
GL_MAX_PROGRAM_ENV_PARAMETERS_ARB. This is confusing and incorrect.
(cherry picked from master, commit 4bccd693a7 )
2009-08-24 13:56:01 -06:00
Ian Romanick
4bccd693a7
ARB prog: Set error instead of falling through with incorrect value
...
If a fragment program only parameter was queried of a vertex program
(e.g., GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB) no error would be set and
a random value would be returned. This caused 'glxinfo -l' to show
the same values for GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB,
GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB, GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB,
GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB,
GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB,
GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB as for
GL_MAX_PROGRAM_ENV_PARAMETERS_ARB. This is confusing and incorrect.
2009-08-24 12:51:29 -07:00
Brian Paul
1e2a71c5c2
mesa: add new program parser sources to tarball
...
The end user doesn't need the .y or .l or Makefile but include them anyway
in case someone wants to patch or debug things.
2009-08-24 13:12:07 -06:00
Brian Paul
b879316d4d
docs: recent 7.5.1 bug fixes
2009-08-24 13:05:20 -06:00
Brian Paul
69170a4aae
xlib: fix single buffer window resize bug
...
When a single-buffered window was resized the new window size was never
detected. This fix that, but there's still a bug which causes window
contents corruption for certain window sizes...
2009-08-24 13:05:20 -06:00
Brian Paul
93aa0fd81c
vbo: fix divide by zero exception
...
Fixes bug 23489.
2009-08-24 13:05:20 -06:00
Vinson Lee
0a24e50111
glsl: Silence gcc uninitialized variable warning.
2009-08-24 13:04:50 -06:00
Brian Paul
4eb7256854
st/mesa: flush bitmap cache if Z value changes
...
When adding a new bitmap to the cache we have to check if the Z value is
changing and flush first if it is.
This is a modified version of a patch from Justin Dou <justin.dou@intel.com >
2009-08-24 13:04:50 -06:00
Brian Paul
96f7b42242
docs: recent 7.5.1 bug fixes
2009-08-24 13:02:33 -06:00
Ian Romanick
d8a3ada7fb
ARB prog parser: Regenerate parser from previous commit
2009-08-24 12:00:35 -07:00
Brian Paul
4cf27608bc
ARB prog parser: use correct context limits
2009-08-24 12:00:35 -07:00
Brian Paul
b5ecbbe636
xlib: fix single buffer window resize bug
...
When a single-buffered window was resized the new window size was never
detected. This fix that, but there's still a bug which causes window
contents corruption for certain window sizes...
2009-08-24 12:58:49 -06:00
Brian Paul
b9b04872d5
vbo: fix divide by zero exception
...
Fixes bug 23489.
2009-08-24 12:44:00 -06:00
Alex Deucher
29473d25a3
r600: fix state emit sizes
2009-08-24 14:40:40 -04:00
Chia-I Wu
58ac57c2b7
egl_xdri: Revive the driver.
...
egl_xdri does not compile for some time. This commit revives the
driver. It no longer depends on libGL.so for GLX related functions.
Instead, it uses code from src/glx/ directly. Both DRI and DRI2 are
supported.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-24 11:49:45 -06:00
Chia-I Wu
17090cf3ef
glapi: Fix a possible race in getting current context/dispatch.
...
There is a possbile race that _glapi_Context is reset by another thread
after it is tested in GET_CURRENT_CONTEXT but before it is returned. We
definitely do not want a lock here to solve the race. To have correct
results even under a race, no other threads should reset _glapi_Context
(or _glapi_Dispatch).
This patch adds a new global variable _glapi_SingleThreaded. Since
_glapi_Context or _glapi_Dispatch are no longer reset,
_glapi_SingleThreaded is tested instead, before accessing them.
DRI drivers compiled with this patch applied will not work with existing
libGL.so because of the missing new symbol. If this turns out to be a
real problem, this patch should be reverted.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-24 11:46:15 -06:00
Chia-I Wu
3076d1617d
glapi: Static mutex does not work on WIN32_THREADS.
...
This re-introduces the race in _glapi_check_multithread, but avoids a
crash on windows.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-24 11:46:15 -06:00
Chia-I Wu
fc2feea685
glapi: Fix a race in accessing context/dispatch TSD.
...
If multiple threads set/get a TSD at roughly same time for the first
time, glthread might (wrongly) initialize it more than once. This patch
solves the race by initializing context/dispatch TSDs early.
Acked-by: Ian Romanick <ian.d.romanick@intel.com >
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-24 11:45:57 -06:00
Chia-I Wu
99939982ec
glapi: Protect _glapi_check_multithread by a mutex.
...
Multiple threads might call _glapi_check_multithread at roughly the same
time. It is possbile that all of them are wrongly regarded as firstCall
if there is no mutex. This bug causes xeglthreads to crash sometimes.
Acked-by: Ian Romanick <ian.d.romanick@intel.com >
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-24 11:45:57 -06:00
Vinson Lee
f785b35b47
glsl: Silence gcc uninitialized variable warning.
2009-08-24 11:43:02 -06:00
Brian Paul
53db19b57d
mesa: _mesa_layout_parameters() returns a boolean value
2009-08-24 10:50:07 -06:00
Pauli Nieminen
55c0457fe9
radeon: Add debug output to radeonCountStateEmitSize.
2009-08-24 18:45:30 +03:00
Pauli Nieminen
ec61f677c3
r600: Fix indetion and add useful debug output.
2009-08-24 18:06:25 +03:00
Pauli Nieminen
75da0a6a56
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into r600_state_predict
2009-08-24 17:09:27 +03:00
Maciej Cencora
ed14a4cb7b
r300: add support for EXT_framebuffer_blit
2009-08-24 14:52:33 +02:00
Cooper Yuan
a88678d3ee
tgsi: Fix build error due to commit acc7da90
2009-08-24 19:50:38 +08:00
José Fonseca
02c523dfbb
tgsi: Only free temp uregs.
...
Shorthand.
(cherry picked from commit de911220bbbe74cff0c79b260456ff36122b7b5b)
2009-08-24 12:11:24 +01:00
José Fonseca
acc7da9035
tgsi: Pass pipe_context as a parameter to ureg_create_shader.
...
Simplifies migration to tgsi_ureg.
(cherry picked from commit f574398c07c41cb8d31249a7186fc178ef7d552a)
2009-08-24 12:11:22 +01:00
Keith Whitwell
b570a7e6b6
tgsi: add generic instruction builder
...
When translating an incoming shader (rather than building one from scratch)
it's preferable to be able to call a single, generic instruction emitter
rather than figuring out which of the opcode-specific functions to call.
2009-08-24 11:33:38 +01:00
Cooper Yuan
7ee4f32dcd
r300g: Set the vector address in the input memory for bypass_vs_clip_and_viewport case
2009-08-24 13:56:23 +08:00
Dave Airlie
2b29d21018
r600: scissor updates for dri2
...
Pulled from Dave's WIP patch.
2009-08-24 00:56:40 -04:00
Dave Airlie
f758a8bf2e
r600: switch to common cs functions
...
needed for dri2. Pulled from Dave's WIP patch.
2009-08-24 00:47:34 -04:00
Alex Deucher
436fb34369
r600: map 16 VS outputs
...
Should cover everything exported from the VS
2009-08-24 00:33:33 -04:00
Alex Deucher
d6f7ebd603
r600: fix logic copy paste error
...
Spotted by airlied.
2009-08-23 23:56:45 -04:00
Pauli Nieminen
fe42b4b757
r600: Improve emit prediction.
2009-08-24 02:44:27 +03:00
Pauli Nieminen
885906840d
r600: Predict emit size for next rendering.
2009-08-24 02:01:15 +03:00
Pauli Nieminen
ccde276838
radeon: Fix dri1 ctx emit size.
2009-08-24 01:54:01 +03:00
Pauli Nieminen
7bb0f880db
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into r600_state_predict
...
Conflicts:
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/radeon/radeon_cmdbuf.h
2009-08-24 00:57:05 +03:00
Alex Deucher
4484ce9c7b
radeon: add radeon_cs_write_table to the legacy path
2009-08-23 16:22:01 -04:00
Alex Deucher
becb50f84d
r600: bump reloc_chunk size
...
This fixes openarena reloc errors. This needs to be
made more dynamic.
2009-08-23 16:06:31 -04:00
Alex Deucher
670bd47df9
r600: fix count for CB/DB target state
2009-08-23 15:35:55 -04:00
Maciej Cencora
e1801d861a
r300: fix a typo
2009-08-23 21:30:43 +02:00
Maciej Cencora
bcbe27d0ca
radeon: use proper macro
2009-08-23 21:11:13 +02:00
Maciej Cencora
7e7f0f61bf
radeon: use bo_is_idle interface for checking if OQ result is available
2009-08-23 21:09:55 +02:00
Maciej Cencora
4aadda5f66
r300: minor optimization
...
use properly implemented OUT_BATCH_TABLE where possible
2009-08-23 20:21:48 +02:00
Ian Romanick
9b70c33e73
ARB prog lexer: Fix lexer to eat both DOS and Unix line endings
2009-08-23 11:15:32 -07:00
Alex Deucher
7a05a4c65c
r600: use persistent bos for shaders
2009-08-23 13:41:43 -04:00
Alex Deucher
41934be254
r600: always emit CB base
...
Not doing so seems to cause lock-ups or rendering problems
on some chips. I think there is an logic issue related to
CB and VGT on some chips. We ran into similar issues in
r600_demo IIRC.
2009-08-23 13:05:52 -04:00
Pauli Nieminen
b34695375e
radeon: Fix compilation with legacy memory manager.
2009-08-23 14:02:46 +03:00
Pauli Nieminen
66bbafb6f9
radeon: Check from kernel if dma buffer is idle.
...
This makes sure that objects are leaving wait list only when they are processed by gpu.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com >
2009-08-23 13:39:32 +03:00
Alex Deucher
bf6d0ae598
r600: make state emit more fine grained
...
Gives a nice speed boost in most apps since
we only emit what state we need.
2009-08-22 18:03:26 -04:00
Renato Caldas
08e91e0315
shader: fix compilation warnings
...
This patch fixes some "implicit declaration of function" compilation
errors/warnings on the new shader code.
Signed-off-by: Renato Caldas <seventhguardian@gmail.com >
2009-08-22 14:00:23 -07:00
Luo Jinghua
523cb80d0f
ARB prog parser: include imports.h to kill some compiler warnings
2009-08-22 13:59:48 -07:00
Julien Cristau
3f970a6d4e
Bump debhelper build-dep for dh_lintian
2009-08-22 21:30:15 +02:00
Alex Deucher
180c304943
r600: move full state to radeon state atoms
2009-08-22 15:03:41 -04:00
Alex Deucher
17813931db
r600: add support for RS880
2009-08-22 11:45:40 -04:00
Ian Romanick
c87ef0870a
i965: Implement frag prog DPH like DP4
...
DPH can output to any component, not just to X. This allows fpalu.c
to run without hitting the assertion in emit_dph.
2009-08-22 01:35:12 -07:00
Pauli Nieminen
effda2e2a7
r300: Fix debug output.
2009-08-22 04:37:24 +03:00
Jakob Bornecrantz
54fb71b863
st/dri: Remove some debug prints
2009-08-22 02:16:02 +01:00
Jakob Bornecrantz
a3e59b9d06
st/dri: Find out if the drawable is a pixmap
...
Part of this code is disabled since no performance gains
where detected with it enabled.
This code only detects if it is a pixmap that it is
rendering to on the st/xorg DDX since it sets the fake
front to the same handle as front.
2009-08-22 02:16:02 +01:00
Jakob Bornecrantz
6237ac2412
st/dri: Fix frontbuffer rendering with DRI2
2009-08-22 02:16:01 +01:00
Jakob Bornecrantz
29165a2fcc
st/xorg: Handle fake fronts correctly for pixmaps
2009-08-22 02:10:18 +01:00
Jakob Bornecrantz
a469b4c459
i915g: Remove bad assert on fence
2009-08-22 02:09:59 +01:00
Pauli Nieminen
6c5c46f842
r300: Fix dri1 not to emit state that is not supported in old drm.
2009-08-22 02:54:34 +03:00
Pauli Nieminen
c0f4063703
radeon/r300: Code clean up and logic fix.
2009-08-22 02:43:00 +03:00
Michel Dänzer
029e643b24
glx/dri2: Always use X drawable ID for DRI2 protocol.
...
Fixes protocol errors in cases where the GLX ID is different.
2009-08-22 01:33:37 +02:00
Michel Dänzer
6b1f144d9b
Fix r300 VBO support build on big endian.
2009-08-22 01:24:39 +02:00
Alex Deucher
bf5d6cf455
r600: better default state size.
...
Hopefully suokko's emit size impovements will
land soon.
2009-08-21 17:46:32 -04:00
Pauli Nieminen
bb43c5d1cb
r300: Remove calls to rcommonEnsureCmdBufSpace.
...
All rendering is checked in r300PredictTryDrawPrimsSize which mamde these calls useless.
2009-08-21 23:48:39 +03:00
Pauli Nieminen
90647ff558
radeon: protect against buffer overflow in state atom debug code.
2009-08-21 22:37:13 +03:00
Ian Romanick
4cfb1b880b
Merge branch 'asm-shader-rework-1'
2009-08-21 11:34:30 -07:00
Pauli Nieminen
b7ec2ebe33
radeon: Improve state emit code.
...
Trying to make understanding code easier with small refactoring and renaming.
2009-08-21 20:47:35 +03:00
Pauli Nieminen
0bf4308580
r300: Add debug output to show how much was emited in TryDrawPrims.
2009-08-21 20:26:41 +03:00
Brian Paul
ef98eed0a9
radeon: fix incorrect loop limit (warned by -O3)
2009-08-21 11:04:37 -06:00
Brian Paul
49c0825655
glx: initialize some local vars to silence warnings with -O3
2009-08-21 11:04:37 -06:00
Brian Paul
1aba1baa62
st/mesa: flush bitmap cache if Z value changes
...
When adding a new bitmap to the cache we have to check if the Z value is
changing and flush first if it is.
This is a modified version of a patch from Justin Dou <justin.dou@intel.com >
2009-08-21 10:24:50 -06:00
Pauli Nieminen
d6b5464aaa
r300: Predict emit size for next rendering operation.
...
We do flush for cmd buffer in case there isn't enough space left for whole
rendering operation. This protects dma regions from getting released in middle
of state emit.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com >
2009-08-21 19:12:31 +03:00
Pauli Nieminen
12fe319c53
r300: Handle possible fall back if space check fails.
2009-08-21 19:12:30 +03:00
Pauli Nieminen
11d3ec1f93
r300: Delay allocation of dma regions in TryDrawprims.
...
This makes it easier to predict size of next rendering operation so we
can do early flush.
2009-08-21 19:12:30 +03:00
Pauli Nieminen
66513ba884
r300: Clean emit code.
...
This fixes some state atom check functions from returing wrong emit size.
There is emit code cleanup so that emit function selection is done in init
time instead of runtime.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com >
2009-08-21 19:12:30 +03:00
Pauli Nieminen
d1a0ece907
radeon: Port flush preventation code from r200 to r100.
...
- emit prediction
- fixes to emit_sizes for data
- clean up of excesive use of radeonEnsureCmdBufferSpace
Signed-off-by: Pauli Nieminen <suokkos@gmail.com >
2009-08-21 19:12:30 +03:00
Pauli Nieminen
60d156f688
r200: Make swtcl use state size prediction for flush.
...
Signed-off-by: Pauli Nieminen <suokkos@gmail.com >
2009-08-21 19:12:30 +03:00
Pauli Nieminen
e083f53ce4
r200: Remove unnecessery Elts from r200 context.
...
Signed-off-by: Pauli Nieminen <suokkos@gmail.com >
2009-08-21 19:12:29 +03:00
Pauli Nieminen
9f7676c718
r200: Remove unnecessary calls to rcommonEnsureCmdBufSpace.
...
Calling EnsureCmdBufSpace is not required because rendering pipeline has to quarentee free space.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com >
2009-08-21 19:12:29 +03:00
Pauli Nieminen
0f41259eff
r200: Fix atom->check call to return emit size for atom.
...
This patch makes render emit size prediction count the corect maximum emit size
for state.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com >
2009-08-21 19:12:29 +03:00
Pauli Nieminen
fb1d0bfd47
r200: Prevent flush in middle of rendering.
...
Patch adds prediction functionthat tries to predict emit size to the smallest
possible values that is quarenteed to be higher than worst case scenario in
rendering pipeline.
State emit size prediction code is in place but fix for emit sizes is included
in next patch.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com >
2009-08-21 19:12:29 +03:00
Pauli Nieminen
7f8f486b36
radeon/r200: Add -Wall to default build flags like it is in r300/r600
...
Signed-off-by: Pauli Nieminen <suokkos@gmail.com >
2009-08-21 19:12:29 +03:00
Pauli Nieminen
45e3be3c07
glx: Make drawables persistent untill they are changed by glXMakeCurrent
...
This fixes bug that xdemos/manywin would segfault if it was run with command
./manywin 2. Demo is tring to call glXSwapBuffers while another context was
bind using glXMakeCurrent.
Fix is simple makes drawable and readable persistent untill they change or
context is destroyed.
I found a logic error when same dri context is used for multiple drawables
which caused readable and drawable to fall out of sync in special case. Fix
is simple just updating drawables more often than in original patch.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com >
2009-08-21 19:12:28 +03:00
Chia-I Wu
b1f156f0ec
egl: Make _eglChooseDriver return the filename of the driver.
...
The real difference is that the driver suffix is now appended. This
also fixes an annoying bug that EGL_DRIVER could not specify the path to
a driver because a suffix was always appended.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-21 08:34:34 -06:00
Chia-I Wu
5a459d58fc
egl: Remove dependency on libX11.
...
libX11 is used to determine the screen number, which is in turned used
to determine the DRI driver. However, the sysfs interface for
determining the DRI driver is gone, and no working driver depends on
this mechanism.
Display string parsing is moved to a new function,
_eglSplitDisplayString.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-21 08:34:34 -06:00
Chia-I Wu
1f871a4d15
egl_softpipe: Do not flush unlinked context.
...
An unlinked context is destroyed after _eglMakeCurrent. Flushing such
context would cause segfault.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-21 08:34:34 -06:00
Chia-I Wu
408db29792
egl: Check for null display in handle checking.
...
The display may be NULL when checking a handle.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-21 08:34:34 -06:00
Jakob Bornecrantz
9b3e5df900
st/egl: Add support for drmModeDirtyFB command if found
2009-08-21 15:04:21 +02:00
Pauli Nieminen
0c0cea250d
radeon: Add comment to explain logic for freeing dma buffers.
2009-08-21 16:40:14 +03:00
Ian Romanick
ac5551fbb9
ARB prog parser: Revert part of previous change to constant parsing
...
The commit "ARP prog parser: Implement the spec, not what makes sense"
broke the parsing of scalar constants. This commit reverts that part
of that commit. Now vp_swizzle.c passes.
2009-08-20 18:29:41 -07:00
Alex Deucher
ba48e78b1f
r600: convert to using common radeon state atoms
...
switches more state handling to common code. We need
should be more fine grained with the state atoms
eventually.
2009-08-20 18:55:41 -04:00
Alex Deucher
a47bb56d45
r600: improve state emission
...
Slowing migrating to atom based system like
the other radeon drivers.
2009-08-20 17:21:50 -04:00
Alex Deucher
ad36058e21
r600: split state emit into block specific functions
...
We probably want to go finer grained eventually, but
this is a good start.
2009-08-20 17:21:50 -04:00
Brian Paul
a215da5e9c
progs/glsl: report compile/link times in shtest.c
2009-08-20 14:43:32 -06:00
Brian Paul
f300db379e
progs/util: added GetShaderCompile/LinkTime() to get compilation/link times
2009-08-20 14:43:32 -06:00
Brian Paul
8a883d1657
progs/glsl: update multitex.shtest for new texture syntax
2009-08-20 14:43:32 -06:00
Brian Paul
0062bd68b3
progs/glsl: update shtest.c to handle 1D/3D/CUBE/RECT textures
2009-08-20 14:43:32 -06:00
Brian Paul
174054c973
progs/glsl: tweaks to shtest.c
...
1. Larger sphere to match cube size
2. Allow -geometry option to override window size
3. Cube samplers
2009-08-20 14:43:32 -06:00
Christoph Bumiller
d7c55555ac
nv50: use VTX_ATTR_nF for constant vtxelts
2009-08-20 21:41:39 +02:00
Christoph Bumiller
6d1f63f520
nv50: set vertex buffer limits
2009-08-20 21:41:39 +02:00
Christoph Bumiller
80c5ab1586
nv50: modify vbo format to hw translation, add BGRA swizzle
2009-08-20 21:41:39 +02:00
Brian Paul
ce723d8d8b
tgsi: check for SOA dependencies in SSE and PPC code generators
...
Fall back to interpreter for now. This doesn't happen very often.
2009-08-20 10:34:45 -06:00
Brian Paul
4c7c294fff
tgsi: handle SOA dependencies for MOV/SWZ
...
SOA dependencies can happen when a register is used both as a source and
destination and the source is swizzled. For example:
MOV T, T.yxwz; would expand into:
MOV t0, t1;
MOV t1, t0;
MOV t2, t3;
MOV t3, t2;
The second instruction will produce the wrong result since we wrote to t0
in the first instruction. We need to use an intermediate temporary to fix
this.
This will take more work to fix for all TGSI instructions. This seems to
happen with MOV instructions more than anything else so fix that case now
and warn on others.
Fixes piglit glsl-vs-loop test (when not using SSE). See bug 23317.
2009-08-20 10:28:22 -06:00
Brian Paul
5e6d21afa4
tgsi: added tgsi_full_instruction::Flags field
...
Users of the parser can make use of this.
2009-08-20 10:25:55 -06:00
Jakob Bornecrantz
e93d41d24f
st/egl: Open the first drm node
...
At least its better then hardcoded to i915
2009-08-20 17:50:30 +02:00
Brian Paul
94d14f6cd2
progs/glsl: more comments in shtest.c
2009-08-20 10:52:13 -06:00
Brian Paul
45cd9d80db
tgsi: when printing/dumping programs indent loops and conditionals
2009-08-20 10:52:12 -06:00
Brian Paul
1645adc551
tgsi: check for SOA dependencies in SSE and PPC code generators
...
Fall back to interpreter for now. This doesn't happen very often.
2009-08-20 10:52:12 -06:00
Brian Paul
013bd4da1a
tgsi: handle SOA dependencies for MOV/SWZ
...
SOA dependencies can happen when a register is used both as a source and
destination and the source is swizzled. For example:
MOV T, T.yxwz; would expand into:
MOV t0, t1;
MOV t1, t0;
MOV t2, t3;
MOV t3, t2;
The second instruction will produce the wrong result since we wrote to t0
in the first instruction. We need to use an intermediate temporary to fix
this.
This will take more work to fix for all TGSI instructions. This seems to
happen with MOV instructions more than anything else so fix that case now
and warn on others.
Fixes piglit glsl-vs-loop test (when not using SSE). See bug 23317.
2009-08-20 10:52:12 -06:00
Brian Paul
fffcecc4d9
tgsi: added tgsi_full_instruction::Flags field
...
Users of the parser can make use of this.
2009-08-20 10:51:55 -06:00
Alex Deucher
0f0a9e3ee7
r600: try and get everything in the draw in one IB
...
fixes corruption issues with apps like teapot and
geartrain.
2009-08-20 12:12:23 -04:00
Alex Deucher
1b1d591373
r600: move misc regs from general state
...
These regs don't use the SET_CONTEXT_REG packet,
so they weren't getting set correctly.
2009-08-20 12:12:23 -04:00
Brian Paul
39ec4a9253
mesa: add GL_DEPTH_STENCIL to glCopyPixels error check
...
Plus, add a comment about 'type' error checking.
See bug 19087.
2009-08-20 08:12:16 -06:00
Alex Deucher
525ddb1f56
r600: rework emit code
...
make sure we allocate enough space for relocs
2009-08-20 03:38:49 -04:00
Pauli Nieminen
ec1540052b
radeon: Update regulary cs processing info from kernel.
...
This fixes problem that dma buffers were leaking in dri1 mode.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com >
2009-08-20 03:38:49 -04:00
Brian Paul
8604a896a6
gallium: rename copy/fill_rect utility functions
2009-08-19 13:17:58 -06:00
Brian Paul
4522cdbfdd
gallium: fix tags target in Makefile.template
2009-08-19 13:17:58 -06:00
Alex Deucher
174aeabc0f
radeon: fix typo in last dma patch
2009-08-19 13:07:39 -04:00
Eric Anholt
29e51c3872
intel: Fix failure to commit -a --amend before last push.
2009-08-19 09:30:47 -07:00
Eric Anholt
a70e131584
intel: Align cubemap texture height to its padding requirements.
2009-08-19 09:19:06 -07:00
Eric Anholt
b053474378
intel: Align untiled region height to 2 according to 965 docs.
...
This may or may not be required pre-965, but it doesn't seem unlikely, and
I'd rather be safe.
2009-08-19 09:19:06 -07:00
Pauli Nieminen
947df2e5a8
radeon: Add debug output for dma buffer object numbers.
...
Signed-off-by: Pauli Nieminen <suokkos@gmail.com >
2009-08-19 11:59:47 -04:00
Pauli Nieminen
66e019c6c9
radeon: Fix dma buffer object pool to scale object sizes.
...
This fixes problems when application is using large vertex arrays for drawing.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com >
2009-08-19 11:59:34 -04:00
Alex Deucher
d551b3ac88
r600: minor cleanup
2009-08-19 11:59:03 -04:00
Brian Paul
0259a2ad69
progs/xdemos: add multictx to .gitignore
2009-08-19 08:58:38 -06:00
José Fonseca
c69d9296fb
tgsi: Add missing include.
...
(cherry picked from commit d2787c02c130b1fe20d0c032d468622f2fdaef79)
2009-08-19 12:03:34 +01:00
José Fonseca
b2f3f7dd12
tgsi: Fix typo in ureg constant creation.
...
(cherry picked from commit aa40c9abc7787fdf46cb661a4d0bb8bec513fc63)
2009-08-19 12:03:10 +01:00
Keith Whitwell
dd5ac3cafc
st/xlib: remove a couple more 'fake' references
2009-08-19 12:02:53 +01:00
Keith Whitwell
515a820021
st/xlib: remove dead ungrab helper
2009-08-19 12:02:53 +01:00
Keith Whitwell
65079afcde
tgsi: silence compiler warning
2009-08-19 12:00:24 +01:00
Keith Whitwell
7dc5527592
tgsi: remove unused function argument
2009-08-19 12:00:03 +01:00
Keith Whitwell
265e210edb
tgsi: add missing functionality to support instructions with labels
...
Could previously emit opcodes with label arguments, but was no way to
patch them with the actual destinations of those labels.
Adds two functions:
ureg_get_instruction_number - to get the id of the next instruction
to be emitted
ureg_fixup_label - to patch an emitted label to point to a given
instruction number.
Need some more complex examples than u_simple_shader, so far this has
only been compile-tested.
2009-08-19 11:54:26 +01:00
Corbin Simpson
e327845e2b
r300g: Force off ZTOP optimizations for now.
2009-08-18 21:25:53 -07:00
Corbin Simpson
0086a84e2d
r300g: Utilize DONTBLOCK.
...
Also ALGYRHYTHMS.
2009-08-18 21:25:53 -07:00
Corbin Simpson
c0bc070ff5
radeon-gallium: Oh, look, we *do* already support DONTBLOCK.
...
Well, okay, the kernel doesn't, but that's no excuse for us! :3
2009-08-18 21:25:53 -07:00
Corbin Simpson
a381ee8266
r300g: Massively cleanup OQ.
...
Still broken, but compiles cleaner, behaves better, etc.
2009-08-18 21:25:53 -07:00
Corbin Simpson
4092f318db
r300g: Add high_second_pipe cap for R3xx chipsets.
...
This name is totally subject to change if ever I need to separate R3xx
for some other reason.
2009-08-18 21:25:53 -07:00
Corbin Simpson
14378cbd2d
radeon-gallium: Stop using outdated ioctls.
2009-08-18 21:25:53 -07:00
Corbin Simpson
c63bd15f81
Revert "r300-gallium, radeon-gallium: Nuke gb_pipes from orbit."
...
This reverts commit 6a40d1e9d9 .
Turns out that we *do* need these for OQ after all. Go figure.
Conflicts:
src/gallium/winsys/drm/radeon/core/radeon_r300.h
2009-08-18 21:25:53 -07:00
Brian Paul
73fc09a7bf
Merge branch 'mesa_7_5_branch'
2009-08-18 17:55:27 -06:00
Brian Paul
e4aa62a6ce
egl/xlib: move call to create_configs() after we set the Xdpy field
2009-08-18 17:54:44 -06:00
Brian Paul
3097d7dbf8
tgsi/ppc: we don't implement saturation modes yet
2009-08-18 17:50:52 -06:00
Brian Paul
fab17c1216
tgsi/sse: we don't implement saturation modes yet
...
Fixes piglit fp-generic tests/shaders/generic/lrp_sat.fp, bug 23316.
2009-08-18 17:50:00 -06:00
Brian Paul
ee0984e299
mesa: when emitting vertex program fog, set yzw=0,0,1
...
Fixes piglit fp-fog failure with gallium.
2009-08-18 17:39:55 -06:00
Brian Paul
b062a119ff
mesa: call FLUSH_CURRENT() for GL_CURRENT_TEXTURE_COORDS query
2009-08-18 17:09:32 -06:00
Ian Romanick
a512985fd8
Merge branch 'master' into asm-shader-rework-1
...
Conflicts:
src/mesa/shader/arbprogparse.c
2009-08-18 12:20:36 -07:00
Ian Romanick
0b5af41c6f
ARB prog parser: Delete the old parser
2009-08-18 12:07:47 -07:00
Ian Romanick
ea8db5c332
ARB prog: Revert some changes to debug output
2009-08-18 12:07:47 -07:00
Pauli Nieminen
f9b8562f32
radeon: balance dma buffer mapping
...
In radeonRefillCurrentDmaRegion() make sure we
unmap the previous buffer.
2009-08-18 14:32:45 -04:00
Jakob Bornecrantz
657109bbc6
egl: Create the front texture the properly
2009-08-18 18:51:41 +01:00
Pauli Nieminen
caae3f1e8d
r300: Movde debug output from stdout to stderr in copiler.
...
Signed-off-by: Pauli Nieminen <suokkos@gmail.com >
2009-08-18 13:44:00 -04:00
Dave Airlie
1279cdcb1f
r200: make use of DMA buffers for Elts a lot better.
...
This allows us to return the unused portion of the dma buffer
to the allocator instead of wasting nearly 16k a pop.
Cherry picked and ported to new code by Pauli.
2009-08-18 13:19:45 -04:00
Pauli Nieminen
ae290fd93e
r200: Fix missing offset from elt buffer pointer.
...
Signed-off-by: Pauli Nieminen <suokkos@gmail.com >
2009-08-18 13:19:34 -04:00
Pauli Nieminen
bbf2b5c4ff
radeon: Optimize memory handling for dma operations.
...
We keep dma buffer objects in list untill they have been unused for many
draw operations. Current limit of having 100 flushes is just guess for
good performance/memory trade off.
Moving WARN_ONCE macro to common context because it is used in multiple drivers.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com >
2009-08-18 13:19:25 -04:00
Alex Deucher
c745c87b3e
r300: fix the build on big endian
2009-08-18 11:40:18 -04:00
Brian Paul
1c1ee1176d
gallium: improved comments, minor whitespace changes
2009-08-18 09:31:22 -06:00
Chia-I Wu
34d8c13bff
egl: Remove eglhash.c and eglhash.h.
...
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-18 08:50:12 -06:00
Chia-I Wu
e484a92928
egl: Add back handle checking.
...
Handle checking was done using hash tables. Now that they are gone, we
have to loop over the lists.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-18 08:50:06 -06:00
Chia-I Wu
e3734e4685
egl: Make lookup functions static inline.
...
progs/egl/demo3.c is also changed since it uses an internal function.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-18 08:50:00 -06:00
Chia-I Wu
38feefdc4e
egl: Remove hash table for displays.
...
The hash table was used to map a display to a handle. It is simpler to
cast directly.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-18 08:49:53 -06:00
Chia-I Wu
7a9f528009
egl: Remove hash table for surfaces.
...
The hash table was used to map a surface to a handle. It is simpler to
cast directly.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-18 08:49:34 -06:00
Chia-I Wu
ccc2b0bc65
egl: _eglCloseDriver should be no-op.
...
Move drv->API.Terminate call to eglTerminate. Remove
_eglReleaseDisplayResource as drivers are doing it.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-18 08:49:22 -06:00
Chia-I Wu
5a2c9372a0
egl: Some per-driver data should be per-display.
...
Move some fields of _EGLDriver to _EGLDisplay. It also becomes
unnecessary to pass _EGLDisplay to drivers when _eglMain is called.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-18 08:49:09 -06:00
Chia-I Wu
0eaa02c836
egl: Change the way drivers are loaded.
...
Driver is chosen and preloaded when eglGetDisplay is called. Later when
eglInitialize is called, the same driver is matched to initialize the
display. Also, add new, but unused, hooks to EGLDriver to allow a
driver to probe a display or unload itself.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-18 08:44:44 -06:00
Chia-I Wu
2f2cf461c5
egl: Overhaul driver API.
...
The motivation is so that drivers do not need to look up and check for
bad display, context, and etc. It also becomes unnecessary for drivers
to call the link functions.
This commit makes eglapi.[ch] do the lookup and check. As a result, the
driver API is overhauled, and almost all sources and drivers need
update. The updates are mainly find and replace with human brains.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-18 08:44:34 -06:00
Dave Airlie
521dea21d4
r600: fix build
2009-08-18 20:38:49 +10:00
Dave Airlie
771e19a861
r300: remove warning introduced with OQ
2009-08-18 20:30:15 +10:00
Dave Airlie
f74e00f4d1
radeon/r200: fix build after OQ commits
2009-08-18 20:29:02 +10:00
Dave Airlie
9ad76e9479
r300: OQ rework
...
Move to common code base so radeon/r200 can add support for this.
Make OQ start a state emitted like all normal state, and make no-tcl
flushing work in proper places.
Really need a generic post emit space reservation mechanism like max_state
so we can reserve some space for the emit
this code passes demos/arbocclude, piglit occlusion query and
glean occlusion query with TCL and NO-TCL on my rv530.
2009-08-18 20:10:50 +10:00
Dave Airlie
0e705c0dd3
r300: fix missing BEGIN/END batches
2009-08-18 20:10:08 +10:00
Dave Airlie
c80bc3abcd
r300: fix big endian build
2009-08-18 13:55:12 +10:00
Brian Paul
3aafd22f6a
gallium: memset() tgsi_exec_machine to all zeros in tgsi_exec_machine_create()
...
This fixes invalid values for CondStackTop, LoopStackTop, etc.
2009-08-17 17:13:17 -06:00
Brian Paul
680df529a3
demos/glsl: remove glutInitWindowPosition() calls
2009-08-17 17:13:17 -06:00
Alex Deucher
af1dc225c2
r600: fix counting error after the last commit
2009-08-17 18:16:38 -04:00
Alex Deucher
66c632b5a1
r600: make sure the number of indices is valid
...
make sure the number of indices is valid for the
requested prim type. glxgears sends invalid
quad strips with only 2 indices for example.
2009-08-17 17:47:27 -04:00
Alex Deucher
c3380ded10
radeon: remove RADEON_DEBUG_BO stuff
...
This stuff was a vestige of the r600 bring up and
now mostly serves to periodically break the build.
2009-08-17 15:42:19 -04:00
Maarten Maathuis
caf40d5d14
nv50: remove a few cases of directly casting struct pipe_context
2009-08-17 18:48:14 +02:00
Maarten Maathuis
97cc526eb7
nv50: borrow some flushing code from the ddx
...
- This fixes neverball corruption.
- I'm unsure about what we're actually flushing here.
2009-08-17 18:48:14 +02:00
Maarten Maathuis
f199dbdb76
gallium: Make PIPE_TRANSFER_{READ,WRITE,READ_WRITE} bitmask friendly.
2009-08-17 18:48:14 +02:00
Maarten Maathuis
93ce4c99d4
nv50: whitespace fixes and deobfuscation
2009-08-17 18:48:13 +02:00
Brian Paul
7c4223876b
cell: fix incorrect pipe_transfer tests
...
The value is an enum, not a bitmask.
2009-08-17 08:28:22 -06:00
Jerome Glisse
c952c1f109
r300: split vbo rendering with big drawarray case
...
Split vbo rendering when the number of elements requested
by drawarrays is bigger than 65536.
2009-08-17 12:50:27 +02:00
Christoph Bumiller
0204c7d8d7
nv50: fix stencil state
...
It's the front stencil methods that have contiguous offsets,
not the back ones.
Unfortunately the names in the header still have FRONT/BACK
reversed, so I'm using hex values until it gets updated.
2009-08-17 12:26:54 +02:00
Dave Airlie
743c4af5cd
radeon: turn off bo debugging
2009-08-17 19:09:15 +10:00
Maciej Cencora
fd97f2f8b8
r300: disable ZTOP only when occlusion queries are used
2009-08-16 02:04:29 +02:00
Maciej Cencora
30e9c753b8
Merge branch 'oq'
2009-08-16 01:56:29 +02:00
Pauli Nieminen
57f55af219
mesa: Add 2 new demos to .gitignore.
2009-08-15 13:30:15 -06:00
Maarten Maathuis
a7adb85827
nv50: avoid a NULL-ptr dereference when the pipe context changes
...
- We cannot assume all state objects are present when the pipe context changes.
2009-08-15 16:57:00 +02:00
Christoph Bumiller
a2af40b846
nv50: align registers used with TEX to 4
...
The TEX instruction is passed the first index of a contiguous
range of 4 TEMP registers that contain coordinates / LOD and,
after execution, the texel values.
It seems the first index is required to be a multiple of 4 on
some (older ?) cards.
2009-08-15 16:22:27 +02:00
Maciej Cencora
60587182d4
r300: enable ARB_occlusion_query
...
Supported only on HW with TCL block and with proper radeon drm.
Required minimum radeon drm version is 1.30 or KMS.
2009-08-15 15:14:29 +02:00
Maciej Cencora
d2b1b9e8d5
radeon: add flag for drm OQ support
2009-08-15 15:14:25 +02:00
Maciej Cencora
f3e1d7d6f8
r300: temporary occlusion query hack
2009-08-15 15:14:24 +02:00
Maciej Cencora
8d60c0b751
r300: clear not_flushed OQ list after flush
2009-08-15 15:14:24 +02:00
Maciej Cencora
c903834d4d
r300/oq: add some debugging info
2009-08-15 15:14:23 +02:00
Maciej Cencora
0d0f01e2e0
r300: add occlusion queries support
...
TODO:
- use proper interface for checking if bo is idle when it's available
- disable ZTOP only when needed
- make it work under KMS
2009-08-15 15:14:11 +02:00
Dave Airlie
f2daded812
radeon space: realign with drm space check code
2009-08-15 21:34:17 +10:00
Dave Airlie
a6cc45e135
r300: fixup space checks since VBO code
...
Hopefully this gets the ordering correct so the space checks don't fail.
2009-08-15 21:18:30 +10:00
Dave Airlie
3cc9a28b9b
r300: add just in case warn I don't think this can actually happen
2009-08-15 20:30:45 +10:00
Dave Airlie
5e4e8effec
radeon: enable vertex splitting for IBs
...
Based on Maciej's code, just fixed up the alignments for INDX_BUFFER
ut2004 runs AS-Convoy
2009-08-15 20:22:13 +10:00
Roland Scheidegger
b9789948e0
i965: disable bounds checking on arrays with stride 0
...
if stride is 0 we cannot use count as max index for bounds checking,
since the hardware will simply return 0 as data for indices failing
bounds check. If stride is 0 any index should be valid hence simply
disable bounds checking in this case.
This fixes bugs introduced with e643bc5fc7 .
2009-08-15 03:44:43 +02:00
Brian Paul
e8957f4800
progs/demos: print more info in fbotexture.c
2009-08-14 17:30:32 -06:00
Ian Romanick
e304c65a2b
i965: Add support for GL_ARB_seamless_cube_map
2009-08-14 16:28:51 -07:00
Ian Romanick
8b0b33530c
demos/cubemap: Add support for GL_ARB_seamless_cube_map
2009-08-14 16:28:51 -07:00
Ian Romanick
06ae1db4a9
Regenerate files for GL_ARB_seamless_cube_map
2009-08-14 16:28:51 -07:00
Ian Romanick
9d5bb3c6f8
Infrastructure for GL_ARB_seamless_cube_map
2009-08-14 16:28:51 -07:00
Ian Romanick
970f768666
Regenerate files for GL_APPLE_flush_buffer_range
2009-08-14 16:28:50 -07:00
Maciej Cencora
a89963cec1
Merge branch 'vbo_clean'
...
Conflicts:
src/mesa/drivers/dri/r300/r300_draw.c
2009-08-15 00:52:44 +02:00
Maciej Cencora
7fe0dd2e6e
r300: mark VBO buffer objects as persistent
2009-08-15 00:39:19 +02:00
Maciej Cencora
cd703049db
r300: unmap buffer objects after usage
2009-08-14 23:56:04 +02:00
José Fonseca
e3bc1fb6bc
gallium: Always map for READ flag when DISCARD is not set.
...
This prevents the driver from discarding a buffer when the whole buffer
is mapped for writing, but only a portion is effectively written.
This is a temporary fix, because WRITE shouldn't imply DISCARD.
The full fix implies using PIPE_BUFFER_USAGE_DISCARD, throughout
the code, and will go only into master.
2009-08-14 20:05:51 +01:00
José Fonseca
10430f47a4
trace: Remove space next to the class attribute of the trace.
2009-08-14 20:05:51 +01:00
José Fonseca
cdf56eb68d
python/retrace: Open bz2 files correctly.
2009-08-14 20:05:51 +01:00
Brian Paul
71b1610941
mesa: append uniform values to the log file the first time we use a shader
...
This info is essential to using/debugging a shader outside of its normal
application.
2009-08-14 12:58:21 -06:00
Brian Paul
12199ed96c
mesa: also pass the GPU program to _mesa_append_uniforms_to_file()
...
We want the post-link program at this points.
2009-08-14 12:57:39 -06:00
Brian Paul
e3d47515f9
vbo: call _mesa_valid_to_render()
2009-08-14 11:31:00 -06:00
Brian Paul
d09a19bf6e
Merge branch 'mesa_7_5_branch'
2009-08-14 11:27:51 -06:00
Brian Paul
db598b8998
mesa: new _mesa_append_uniforms_to_file() debug/logging function
2009-08-14 11:27:33 -06:00
Brian Paul
b6e5600bd4
mesa: call _mesa_valid_to_render()
2009-08-14 11:27:33 -06:00
Brian Paul
d03dde16eb
vbo: call _mesa_valid_to_render()
2009-08-14 11:27:33 -06:00
Brian Paul
56c4226fcc
mesa: new _mesa_valid_to_render() function
...
Tests if the current shader/program is valid and that the framebuffer is
complete. To be called by glBegin, glDrawArrays, etc.
2009-08-14 11:27:33 -06:00
Brian Paul
a48b0a5ce7
mesa: minor error string changes
2009-08-14 11:27:33 -06:00
Brian Paul
1574b05189
docs: docs: document new --with-max-width/height config options
2009-08-14 11:24:20 -06:00
Brian Paul
a7ca80ff6a
Add a FAQ about internal buffer sizes.
...
(cherry picked from master, commit 9a8781bd24 )
2009-08-14 11:23:18 -06:00
Brian Paul
467b3d9a6f
Add configure options for MAX_WIDTH/HEIGHT.
...
This adds two --with configure options for setting defines for
MAX_WIDTH and MAX_HEIGHT. It's conceivably just as easy to define
these in CFLAGS manually, but this way users don't need to know
about internal Mesa details.
Patch updated by BrianP to set DEFINES, not CFLAGS.
(cherry picked from master, commit 7085dce750 )
2009-08-14 11:23:00 -06:00
Brian Paul
e691b0e533
Allow external settings of MAX_WIDTH/HEIGHT.
...
Conditionalize MAX_WIDTH / MAX_HEIGHT defines so that users can
set them via CFLAGS.
(cherry picked from master, commit 66bc17e80e )
2009-08-14 11:22:37 -06:00
Keith Whitwell
51c47383f9
st/xlib: reduce the proliferation of GLX context types
...
Now there is just a single, struct __GLXcontextRec, which is the
GLXContext typedef has already been defined as a pointer to. I
believe this is the intended usage, that GLX implementations should
define that struct as they require.
Merge the two previous structs into one and get rid of the
no-longer-necessary type casts and sub-classing.
2009-08-14 17:56:47 +01:00
Keith Whitwell
9616e4ad1c
st/dri: remove unused dummyContext value
2009-08-14 17:42:27 +01:00
Brian Paul
3ffaa11f88
mesa: move assertions in test_attachment_completeness()
...
Put the assertions after the error checks.
2009-08-14 10:30:10 -06:00
Christoph Bumiller
442a5e4343
nv50: fix mipmap offsets and tiling
...
The hardware expects a texture's tile mode to change with
the mipmap level.
Also, only multiply by block size once to obtain size.
2009-08-14 18:23:55 +02:00
Christoph Bumiller
3506d7d3e2
nv50: make sure we don't re-emit outdated scissor state
...
Since we don't turn off scissors, we need to update the
stateobj when the framebuffer size changes.
2009-08-14 18:16:46 +02:00
Christoph Bumiller
74e8b1a30b
nv50: make use of the y-origin switch
...
Now that we know how to make the hardware have y-coordinate origin
top, we can get rid of all the inversion introduced earlier.
2009-08-14 18:06:24 +02:00
Maciej Cencora
cdaf63d0ea
r300: remove broken vertex splitting
...
Revert to previous behaviour of dropping to big render operations.
2009-08-14 17:10:21 +02:00
Maciej Cencora
9e018d8225
r300: rework index buffer setup
...
Copy elements directly to DMA bo to get rid of one memcpy, and prepare for using VBOs for index buffer.
2009-08-14 17:10:15 +02:00
Maciej Cencora
7c060bff13
r300: remove unused software TNL path
...
This doesn't remove software TCL path - so RS480 and RS690 work as before.
2009-08-14 17:06:02 +02:00
Maciej Cencora
5fb5ea97f4
r300: use VBOs for vertex attributes
2009-08-14 17:05:50 +02:00
Brian Paul
c3f9c2eb75
docs: document new --with-max-width/height config options
2009-08-14 09:00:15 -06:00
Tom Fogal
9a8781bd24
Add a FAQ about internal buffer sizes.
2009-08-14 08:58:59 -06:00
Tom Fogal
7085dce750
Add configure options for MAX_WIDTH/HEIGHT.
...
This adds two --with configure options for setting defines for
MAX_WIDTH and MAX_HEIGHT. It's conceivably just as easy to define
these in CFLAGS manually, but this way users don't need to know
about internal Mesa details.
Patch updated by BrianP to set DEFINES, not CFLAGS.
2009-08-14 08:58:37 -06:00
Tom Fogal
66bc17e80e
Allow external settings of MAX_WIDTH/HEIGHT.
...
Conditionalize MAX_WIDTH / MAX_HEIGHT defines so that users can
set them via CFLAGS.
2009-08-14 08:56:51 -06:00
Tobias Doerffel
87946d206f
intel: in intel_context struct use typedef for sarea struct
...
Using drm_i915_sarea_t instead of struct drm_i915_sarea seems to be
a common standard now, therefore fix it also in intel_context
structure. Additionally this silences a compiler warning:
intel_swapbuffers.c: In function `intelFixupVblank':
intel_swapbuffers.c:48: warning: initialization from incompatible pointer type
Signed-off-by: Tobias Doerffel <tobias.doerffel@gmail.com >
2009-08-14 08:50:52 -06:00
Thierry Vignaud
2674d1ba50
mesa: make sure r300/compiler/ sources are included in tarball
2009-08-14 08:16:54 -06:00
Chia-I Wu
67b639c7ab
st/vega: Add more symbols defined by mesa/st.
...
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-14 08:11:38 -06:00
Maciej Cencora
895f7c33d4
r300: add required symlinks
...
Reported by adamk on #radeon
2009-08-14 16:02:11 +02:00
Maciej Cencora
e029c91fd3
radeon: handle debug versions of radeon_bo_open
2009-08-14 16:02:10 +02:00
Christoph Bumiller
f1aa2a43b7
nv50: fix typo in REALLOC's 2nd argument in ctor_immd
2009-08-14 15:54:49 +02:00
Maciej Cencora
6bcbeb02d6
radeon: add VBO support (not enabled yet)
2009-08-14 15:31:11 +02:00
Maciej Cencora
2233ac61e1
radeon: export emitvec* functions
2009-08-14 15:31:06 +02:00
Maciej Cencora
d534648d90
radeon: constify some parameters
2009-08-14 15:30:55 +02:00
Alex Deucher
7069a7548f
r600: emit SURFACE_BASE_UPDATE on depth base updates on rv6xx
2009-08-14 01:37:36 -04:00
Dave Airlie
ceb9459ed5
glsl: re-write Makefile after I called it bad.
2009-08-14 10:05:10 +10:00
Brian Paul
0c717bcd5d
progs/glsl: added multitex.shtest config file
2009-08-13 17:03:57 -06:00
Brian Paul
08ecd863ee
progs/glsl: set generic vertex attribute values
2009-08-13 17:03:56 -06:00
Brian Paul
62d1132160
progs/glsl: add type field to shtest config files
...
Plus, texture loading.
2009-08-13 17:03:56 -06:00
Brian Paul
823703418e
mesa: added *.shtest files to demo tarball
2009-08-13 17:03:56 -06:00
Dave Airlie
25cd4dc1d6
glsl/tests: skinning.o
...
worst Makefile ever. not sure what is going on here, hopefully
this fixes tinderbox
2009-08-14 08:35:49 +10:00
Alex Deucher
9d96095c1e
r600: move non-surface related cb state to general state
2009-08-13 17:55:42 -04:00
Alex Deucher
083b04e809
r600: move non-surface related depth state to general state
2009-08-13 17:43:03 -04:00
RALOVICH, Kristóf
0896268b97
glx: indent -br -i3 -npcs --no-tabs
...
Some manual intervention applied since XEXT_* and other macro magic
fooled indent. Auto generated files were also skipped.
2009-08-13 15:13:21 -06:00
Brian Paul
1e0f621b50
mesa: fix some invalid memory reads
...
We were passing the address of a float to functions that would deref the
pointer as an array.
2009-08-13 14:38:27 -06:00
Brian Paul
6d55fd705d
progs/tests: hack a PBO/dlist test
2009-08-13 14:07:25 -06:00
Brian Paul
ecb177eaea
mesa: fix warnings about locals hiding function params
2009-08-13 14:05:52 -06:00
Brian Paul
36df6a6e91
mesa: add missing PBO mapping code in unpack_image()
2009-08-13 14:00:21 -06:00
Brian Paul
ad8a6937ae
main: fix some potential memory leaks
...
Allocate dlist images after error checking.
Record GL_OUT_OF_MEMORY when we can't make a copy of an image.
2009-08-13 13:48:36 -06:00
Brian Paul
f418d18ea6
mesa: fix some potential uninitialized memory references
2009-08-13 13:44:31 -06:00
Brian Paul
a531a5cf94
glsl: fix some uninitialized pointers
2009-08-13 13:44:01 -06:00
Brian Paul
741869d73a
progs/util: ignore pre-defined uniforms in SetUniformValues()
2009-08-13 12:53:20 -06:00
Brian Paul
ae99e4c67e
progs/glsl: new shtest program, a simple shader test harness app
...
This commit includes some sample config files (*.shtest)
2009-08-13 12:52:13 -06:00
Brian Paul
03ba461c19
glsl: fix incorrect attribute size
2009-08-13 12:50:57 -06:00
Brian Paul
53dfd5d870
tnl: if NAN_CHECK is enabled, also assert that pos.x != 0
2009-08-13 12:50:57 -06:00
Brian Paul
c10002361c
mesa: s/assert/ASSERT/ in _mesa_reference_texobj()
...
We want the no-op ASSERT for non-debug builds.
2009-08-13 12:50:57 -06:00
Brian Paul
8a9795e5c6
mesa: rework error check in glGetTexLevelParameter(), remove tex_image_dimensions()
2009-08-13 12:50:57 -06:00
Brian Paul
423a53f635
mesa: if maxLevels==0, target is invalid
2009-08-13 12:50:56 -06:00
Brian Paul
fe988d786c
mesa: add extension checks in _mesa_max_texture_levels()
2009-08-13 12:50:56 -06:00
Brian Paul
47a385b43b
mesa: minor clean-ups in bumpmap functions
2009-08-13 12:50:56 -06:00
Brian Paul
6aa7a03d85
mesa: use _mesa_get_current_tex_unit() in more places
2009-08-13 12:50:56 -06:00
Brian Paul
73b150c816
mesa: refactor: move _mesa_is_color/depth/stencil_format() helpers to image.c
2009-08-13 12:50:56 -06:00
Brian Paul
ba2a55ccd6
mesa: move _mesa_Get[Compressed]TexImage() to texgetimage.c
...
All the glGetTexImage code is in one file now.
2009-08-13 12:50:56 -06:00
Brian Paul
b9f67df6e7
mesa: short-circuit no-change in _mesa_DepthRange()
2009-08-13 12:25:53 -06:00
Michel Dänzer
ace98f09e6
st/dri: Add support for GLX_EXT_texture_from_pixmap with direct rendering.
2009-08-13 20:24:09 +02:00
Michel Dänzer
7c08614b32
gallium/drm: Handle circular dependencies in the auxiliary libraries with make.
2009-08-13 18:46:53 +02:00
Michel Dänzer
7ef8c79a8c
st/xorg: Fix DRI2 CopyRegion hook.
...
Use GC CopyArea op for proper translation and clipping, and throttle full
buffer swaps / frontbuffer flushes.
2009-08-13 18:46:53 +02:00
Keith Whitwell
f2fcd5822a
tgsi: add simple facility for releasing and reusing temporaries
2009-08-13 17:32:25 +01:00
Keith Whitwell
b56d2ba7b2
tgsi: rename ureg src/dest converters
...
Also fix a typo in ureg_src().
2009-08-13 17:32:25 +01:00
José Fonseca
5c5364a0f6
draw: Remove unused variable.
2009-08-13 16:33:50 +01:00
José Fonseca
7b39194e2d
scons: Handle Circular dependencies in the libraries.
2009-08-13 16:32:51 +01:00
Keith Whitwell
bf57eda0ec
Merge branch 'mesa_7_5_branch'
2009-08-13 15:57:23 +01:00
Keith Whitwell
1ce3f5a806
draw: cope with more primitives in draw_pipeline_run
...
This previously was used only for decomposed (POINT/LINE/TRI) primitives,
but for some time a full range of primitives could end up in here.
Fixes trivial/lineloop-clip on softpipe, among others.
(cherry picked from commit 87cd8a3b8a2407b30916be418ff2f95dfea5d2ad)
2009-08-13 15:56:17 +01:00
Keith Whitwell
78918c8760
tgsi: turn off debugging
2009-08-13 14:28:01 +01:00
Keith Whitwell
749e52049d
tgsi: use REALLOC for growing token pool
2009-08-13 14:27:42 +01:00
Keith Whitwell
120e76866b
util: silence warnings for third REALLOC argument
...
Our fallback realloc path requires an old_size argument, but the posix
varient doesn't need this. Add some code to avoid gcc unused variable
warnings for this extra argument.
2009-08-13 14:26:50 +01:00
Keith Whitwell
b1d82f1f19
util: remove unneeded includes
2009-08-13 13:43:25 +01:00
Keith Whitwell
002c76cfef
util: convert u_simple_shaders to use tgsi_ureg
...
Much nicer now.
2009-08-13 13:02:59 +01:00
Keith Whitwell
8a7d1e7b76
tgsi: add tgsi_ureg, a simplified tgsi shader builder
...
This is modelled on the nice & easy-to-use facilities we had
for building shaders in mesa, eg. in texenvprogram.c and friends.
Key points include pass-by-value register structs that can be manipulated
in a functional style, eg:
negate(swizzle(reg, X,X,X,X))
and per-opcode instruction functions, eg:
emit_MOV( p, writemask(dst, 0x1), negate(src));
and similar.
Additionally, the interface allows mixed emit of instructions and decls,
which are sorted out internally to obey TGSI ordering.
Immediates may be emitted at any time and are scanned against existing
immediates to try and reduce redundancy.
Not all TGSI functionality is accessible through this interface, but
most or all of what mesa uses should be.
2009-08-13 13:02:47 +01:00
Xiang, Haihao
1f40ffca63
i965: fix cube map on IGDNG
2009-08-13 18:42:52 +08:00
Brian Paul
4ce73ad92c
glsl: remove duplicate frag input entry
2009-08-12 20:37:34 -06:00
Brian Paul
f3b215cba2
Merge branch 'new-frag-attribs'
...
This branch introduces new FRAG_ATTRIB_FACE and FRAG_ATTRIB_PNTC fragment
program inputs for GLSL gl_FrontFacing and gl_PointCoord. Before, these
attributes were packed with the FOG attribute. That made things
complicated elsewhere.
2009-08-12 20:32:41 -06:00
Brian Paul
fdfb0d4b0e
progs/glsl: change uniform_info::type field to use GLSL vector types
2009-08-12 17:28:45 -06:00
Brian Paul
af3d7f6889
demos: call SetUniformValues()
2009-08-12 17:28:45 -06:00
Brian Paul
f95b82b486
mesa: const qualifiers
2009-08-12 17:28:45 -06:00
Brian Paul
bd4c6a2e50
vbo: use _mesa_is_bufferobj()
2009-08-12 17:28:45 -06:00
Brian Paul
684049d97d
demos: rename InitUniforms() to SetUniformValues()
...
And call new PrintUniforms() in demos.
2009-08-12 17:28:45 -06:00
Brian Paul
378bff0edd
progs/util: added more shader utility functions
2009-08-12 17:28:45 -06:00
Brian Paul
434ec3ada8
mesa: use _mesa_is_bufferobj()
2009-08-12 17:28:45 -06:00
Brian Paul
604031563c
mesa: use _mesa_is_bufferobj()
2009-08-12 17:28:45 -06:00
Brian Paul
abbf83551f
mesa: new _mesa_is_bufferobj() function
...
Tests if the given buffer object is a user-created, non-default buffer object.
Use this instead of testing bufferobj->Name != 0.
2009-08-12 17:28:45 -06:00
Eric Anholt
d64649a316
i965: Make the cube mapping RCP use a writemask.
...
Fixes cube mapping since the scalar changes.
2009-08-12 13:50:09 -07:00
Eric Anholt
5faa0dc591
i965: Allocate destination registers for GLSL TEX instructions contiguously.
...
This matches brw_wm_pass*.c behavior, and fixes the norsetto shadow demo.
Bug #19489
2009-08-12 13:18:47 -07:00
Eric Anholt
63fa5fd319
i965: drop dead scalar handling in GLSL.
2009-08-12 13:05:59 -07:00
Eric Anholt
08687c8b40
i965: Correct brw_wm_nr_args for WM_DELTAXY and WM_PIXELXY.
2009-08-12 12:54:43 -07:00
Eric Anholt
863ae3a527
i965: Drop GLSL ABS code, which is translated away in brw_wm_fp.
2009-08-12 12:43:43 -07:00
Eric Anholt
4de8b8902f
i965: Drop code for emitting OPCODE_SUB, since brw_wm_fp.c makes it an ADD.
2009-08-12 12:43:43 -07:00
Eric Anholt
0eb819a2d1
i965: Store the dispatch width in the WM compile struct.
...
I'll be using this in merging brw_wm_emit.c and brw_wm_glsl.c
2009-08-12 12:43:43 -07:00
Eric Anholt
536476f243
i965: Handle scalar result swizzling in shared GLSL/non-GLSL code.
...
This is preparation for merging of brw_wm_glsl.c and
brw_wm_emit.c, and glsl.c doesn't swizzle channel results around.
2009-08-12 12:43:43 -07:00
Eric Anholt
792c49968e
i965: Flag ARL-using programs as requiring brw_wm_glsl.c
...
This doesn't fix the glean testcase, but I guess it provides hope.
2009-08-12 12:43:42 -07:00
Eric Anholt
4e477aa1ba
i965: Remove some unused WM opcode args.
2009-08-12 12:43:42 -07:00
Eric Anholt
255e5be265
i965: Avoid re-uploading the index buffer when we don't need to.
...
No performance difference proven at 95% confidence with my GLSL demo (n=10).
2009-08-12 12:43:42 -07:00
Alex Deucher
a245c05dd3
r600: fix warning
2009-08-12 15:40:15 -04:00
Alex Deucher
b0c191acaf
r600: state cleanups
2009-08-12 15:40:15 -04:00
Alex Deucher
2f6675b816
r600: clean up Create/DestroyContext
2009-08-12 15:40:15 -04:00
Pauli Nieminen
b6a4f5f1d3
r200: Prevent TexGenMatrix from leaking when destroying r200 context.
...
Signed-off-by: Pauli Nieminen <suokkos@gmail.com >
2009-08-12 15:40:14 -04:00
Brian Paul
855374a76a
vbo: fix incorrect pointer
2009-08-12 13:16:41 -06:00
Brian Paul
8f9ee06925
glsl: add gl_Vertex, gl_Normal, etc to list of active attributes
...
If a vertex shader uses gl_Vertex, gl_Normal, etc, we need to include them
when the user queries the list of active attributes. Before this we were
just including the user-defined attributes.
2009-08-12 12:35:13 -06:00
Brian Paul
fd5eda1423
glsl: move predefined shader input/output info/code to slang_builtin.c
...
This is a more logical place for this code.
Also add some functions for querying vertex shader input names, types, etc.
2009-08-12 12:35:12 -06:00
Eric Anholt
2708ddfb06
vbo: Avoid extra validation of DrawElements.
...
This saves mapping the index buffer to get a bounds on the indices that
drivers just drop on the floor in the VBO case (cache win), saves a bonus
walk of the indices in the CheckArrayBounds case, and other miscellaneous
validation. On intel it's a particularly a large win (50-100% in my app)
because even though we let the indices stay in both CPU and GPU caches, we
still end up waiting for the GPU to be done with the buffer before reading
from it.
Drivers that want the min/max_index fields must now check index_bounds_valid
and use vbo_get_minmax_index before using them.
2009-08-12 11:28:34 -07:00
Eric Anholt
ef3ad412c7
radeon: Minor warnings cleanup.
2009-08-12 11:28:34 -07:00
Eric Anholt
e643bc5fc7
i965: Use _MaxElement instead of index-calculated min/max for VBO bounds.
2009-08-12 11:28:33 -07:00
Pauli Nieminen
29173d3d5c
radeon: Add protection against recursive DRM locking.
...
Reference counting protects DRM lock call from recursive locking that would
cause hang. Code also adds optional debugging output for recursive call that
is compiled only if NDEBUG is not defined.
This code is not 100% thread safe because mesa doesn't include increment and
test atomic operation. There is built-in gcc functions but they are only
available from gcc 4.2.
2009-08-12 14:14:29 -04:00
Michel Dänzer
5eeb44f398
st/xorg: Acquire/drop DRM master in order to work with multiple servers.
2009-08-12 19:11:11 +02:00
Brian Paul
f21b0e9a04
gallium/glx/xlib: main/ prefix on Mesa includes, remove -I$(TOP)/src/mesa/main/
2009-08-12 10:32:22 -06:00
Brian Paul
10eb2ca954
gallium/glx/xlib: updated comments
2009-08-12 10:32:22 -06:00
Brian Paul
80b8fbcaba
gallium/glx/xlib: delete fakeglx.h
2009-08-12 10:32:22 -06:00
Brian Paul
275d0e7e92
gallium/glx/xlib: rename fakeglx.c to glx_api.c
2009-08-12 10:32:22 -06:00
Brian Paul
622d531296
gallium/glx/xlib: delete glxapi.h
2009-08-12 10:32:22 -06:00
Brian Paul
f5dd1cff94
gallium/glx/xlib: rename fakeglx_fonts.c to glx_usefont.c
2009-08-12 10:32:22 -06:00
Brian Paul
0528d6c704
gallium/glx/xlib: rename glxapi.c to glx_getproc.c
2009-08-12 10:32:22 -06:00
Brian Paul
f546fa00aa
gallium/glx/xlib: don't include fakeglx.h
2009-08-12 10:32:22 -06:00
Brian Paul
4a4039e199
gallium/glx/xlib: overhaul and simplification of the Gallium Xlib-based GLX
...
The old GLX dispatch table stuff isn't needed (same story for the Mesa/Xlib
driver). The intention of that code was being able to switch on the fly
between the real GLX library and the fake/Xlib-based emulation. That hasn't
been used in a long time.
Next up: some file renaming.
2009-08-12 10:32:22 -06:00
Cooper Yuan
1e52b8b4e0
r600: A shader is bound that exports Z as a float into Red channel
2009-08-12 17:39:18 +08:00
Chia-I Wu
64e7bb3262
egl: Use _eglAddAtExitCall to free thread infos and displays.
...
Thread infos and displays are usually not freed by applications. This
commit add atexit calls to free them.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-11 22:14:35 -06:00
Chia-I Wu
435c7ac24d
egl: Add _eglAddAtExitCall.
...
Add a convenient wrapper to register atexit calls. Add mutex to
_eglGlobal along the way.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-11 22:14:35 -06:00
Chia-I Wu
0e3687e33d
egl: Make _eglGlobal initialize statically.
...
Now that display and surface hash tables are moved out, _eglGlobal can
be initialized statically.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-11 22:14:35 -06:00
Chia-I Wu
413969a920
egl: Implement _eglFiniDisplay.
...
_eglFiniDisplay is called at exit time to free allocated displays. It
is, however, not used right now.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-11 22:14:35 -06:00
Chia-I Wu
621801abd2
egl: Make display and surface hash tables local.
...
Move display and surface hash tables to egldisplay.c, and have them
initialized on demand.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-11 22:14:35 -06:00
Chia-I Wu
56d2119280
egl: Initialize current thread management on demand.
...
Current thread management was initialized in _eglInitGlobals, which is
called only in eglGetDisplay. Since EGL does not require eglGetDisplay
to be called first, the initialization is better to be done on demand.
_eglFiniCurrent is removed, as it is not called at all.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-11 22:14:35 -06:00
Chia-I Wu
f6c2f5e379
egl: Destroy eglThreadInfo on thread exit.
...
This is done through pthread TSD destructor. It destroys all thread
infos except for main thread's. The thread info of the main thread is
destroyed by _eglFiniCurrent.
TLS case is not supported yet.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-11 22:14:35 -06:00
Chia-I Wu
e79d21ca1f
egl: Add eglmutex.h.
...
The implementation uses pthread mutex when available. Otherwise, it is
no-op.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-11 22:14:35 -06:00
RALOVICH, Kristóf
50f8ca2344
glx: fix signedness warning
2009-08-11 22:14:35 -06:00
Brian Paul
fd90d8000c
mesa: handle glDrawPixels images which are larger than max rect texture size
2009-08-11 20:34:22 -06:00
Brian Paul
dba6d52ba0
mesa: added _mesa_meta_draw_pixels()
2009-08-11 20:34:21 -06:00
Brian Paul
f821866360
mesa: added META_FOG and optimize some meta_begin/end() code
2009-08-11 20:34:21 -06:00
Brian Paul
9ba19b892c
gallium/trace: remove stray semicolons
2009-08-11 20:34:21 -06:00
Brian Paul
b681f396e6
gallium/xlib: add missing tex_usage parameter
2009-08-11 20:34:21 -06:00
Brian Paul
6deaa6d4b1
gallium/egl: add missing tex_usage parameter
2009-08-11 20:34:21 -06:00
Brian Paul
2e8be3ab79
gallium/xlib: add missing tex_usage parameter
2009-08-11 20:34:21 -06:00
Brian Paul
26a762c2f6
gallium/identity: remove stray semicolons
2009-08-11 20:34:21 -06:00
Alex Deucher
c2b29b5df5
r600: use the drm ioctls for swap and texture upload
...
NOTE: THIS REQUIRES AN UPDATED DRM!
2009-08-11 22:21:26 -04:00
Jakob Bornecrantz
164d8e8701
i915g: Reduce max relocs
2009-08-12 03:58:38 +02:00
Jakob Bornecrantz
df9f27822e
i915g: Check relocs as well
2009-08-12 03:58:37 +02:00
Jakob Bornecrantz
7a60ed2015
i915g: Implement surface_buffer_create for softpipe
...
In order to run softpipe on st/xorg we need this function
2009-08-11 18:37:09 +01:00
Jakob Bornecrantz
a41a253ce3
gallium: Add texture usage information to surface_buffer_create
...
We need aditional meta data about the usage of the surface
in softpipe because we need to be able tell the diffrence
between PRIMARY and DISPLAY_TARGET surfaces.
2009-08-11 18:34:43 +01:00
Brian Paul
7013a4dfb8
mesa/glapi: regenerated files from gl_API.xml
2009-08-11 10:00:02 -06:00
Brian Paul
bb45e6f07b
gallium: fix debug_printf() format string
2009-08-11 09:30:12 -06:00
Brian Paul
a9d37f6837
glut: fix incorrect Vista maximisation size due to WM_GETMINMAXINFO handling
...
See bug 23182.
2009-08-11 08:54:25 -06:00
Brian Paul
20e4421fe3
mesa: remove _mesa_set_vp_override() from _mesa_Bitmap()
...
This reverts part of commit 2c9812e3d3 .
The calls to _mesa_set_vp_override() were causing extra state validation
and caused the gallium state tracker's bitmap cache to get flushed on
every call.
2009-08-11 08:38:51 -06:00
Michel Dänzer
e93be5132c
r300g: Fix up remaining VAP_CNTL_STATUS writes for big endian.
2009-08-11 09:16:48 +02:00
Michel Dänzer
bb91368003
r300g: Emit relocations for pitch registers.
...
Fixes CS failures with tiling enabled kernels.
2009-08-11 09:13:12 +02:00
Cooper Yuan
2cbd3fce8f
r300g: a typo of debug message
2009-08-11 14:39:58 +08:00
Cooper Yuan
2ccd66d8a0
r600: update num of interp if posizition is used
2009-08-11 14:36:01 +08:00
Eric Anholt
74504c48ad
demos: Fix the VBO usage in glsl/multitex.
...
The fix for 965 to be noisy when apps sent pointers instead of VBO offsets
caught this app in the act of doing exactly that.
Bug #23203
2009-08-10 15:53:47 -07:00
Brian Paul
16a1f68c39
intel: use new _mesa_meta_copy_pixels() function
...
glCopyPixels() no longer hits a software fallback when zooming, blending, etc.
2009-08-10 15:48:02 -06:00
Brian Paul
edb991b7bc
mesa: save/restore texture matrix in meta code
...
Also, save/restore viewport and texture state in _mesa_meta_copy_pixels()
2009-08-10 15:44:05 -06:00
Brian Paul
2ad10c966c
mesa: for meta blit, check max texture size, use glCopyTexSubImage2D() when possible
2009-08-10 15:09:38 -06:00
Brian Paul
c16fa388d3
mesa: initial meta implementation of glCopyPixels()
2009-08-10 15:09:38 -06:00
Brian Paul
36a222cf04
mesa: remove debug flush call
2009-08-10 14:15:56 -06:00
Brian Paul
0109e1b9f3
intel: add missing \n to fprintf()
2009-08-10 13:58:56 -06:00
Brian Paul
8cb389ce35
intel: use new _mesa_meta_blit_framebuffer() function
...
The previous version of framebuffer blit was a quick hack. The new meta
version works pretty well.
2009-08-10 13:55:32 -06:00
Brian Paul
33a838beb9
mesa: new driver meta-ops module
...
Implement glClear() in terms of quad rendering, implement glBlitFramebuffer()
in terms of glCopyTexImage2D + textured quad, etc.
There have been several places in the drivers where we've implemented
meta rendering similar to this. This is an effort to do it in a more
portable and more efficient form.
The _mesa_meta_begin/end() functions act like glPush/PopAttrib() but are
lighter-weight. Plus, _mesa_meta_begin() resets GL state back to default
values (texturing off, identity vertex transform, etc) so the meta drawing
functions don't have to worry about it.
For now only _mesa_mesa_blit_framebuffer() and _mesa_meta_clear() are
implemented. glDrawPixels() and glCopyPixels() would be the next candidates.
2009-08-10 13:55:31 -06:00
Brian Paul
e9d9dab0cd
mesa: added GLcontext::Meta field for meta rendering state
2009-08-10 13:55:31 -06:00
Dave Airlie
b4c9569715
radeon_fbo: switch short to byte for 565
2009-08-10 19:58:11 +10:00
Dave Airlie
e0c9157671
radeon: fix cut-n-paste in alphabits in fbo code
2009-08-10 10:10:13 +10:00
Pauli Nieminen
11038989c1
egl: Add depend and depend.bak to clean target
...
Signed-off-by: Pauli Nieminen <suokkos@gmail.com >
2009-08-09 08:42:50 -06:00
Dave Airlie
728da99737
r600: looks like a typo
2009-08-09 20:46:12 +10:00
Cooper Yuan
b2927a6204
r600: load per-pixel position into PS in order to use fragment.position.
...
This patch can fix /progs/fp/tri-depth, tri-depth2, tri-depthwrite,
tri-depthwrite2 and point-position.
2009-08-09 12:18:40 +08:00
Brian Paul
483a7916d1
mesa: update framebuffer status as needed in _mesa_source/dest_buffer_exists()
2009-08-08 07:30:26 -06:00
Brian Paul
101c2f907e
mesa: simplify glPushAttrib() list building code
2009-08-08 07:30:26 -06:00
Brian Paul
924ba48499
mesa: remove old, prototype code
2009-08-08 07:30:26 -06:00
Brian Paul
b153340351
swrast: replace GLenum, GLint with GLbitfield for buffer vars
2009-08-08 07:30:26 -06:00
Brian Paul
4482f96c59
mesa: use _mesa_bufferobj_mapped()
2009-08-08 07:30:26 -06:00
Corbin Simpson
10b9d9f895
r300g: Knock out another fragment of invariant state.
...
Colorbuffer setup will always happen.
2009-08-07 20:50:42 -07:00
Corbin Simpson
847fcb645c
gallium: Move minify() to u_math.
...
minify() is usually used in mipmap size calculation. Strangely enough,
we all defined it as MAX2(1, d >> 1); imagine that. :3
2009-08-07 20:50:42 -07:00
Corbin Simpson
c58133b81a
r300g: Remove r300_constant_buffer::user_count.
...
Not needed with new compiler.
2009-08-07 20:50:42 -07:00
Eric Anholt
a962c07cc3
Revert "i965: Disable texture tiling by default."
...
This reverts commit b8e638d489 .
Now that the known hangs and misrendering issues are fixed, I'm ready to
start encouraging it by default again.
2009-08-07 18:33:08 -07:00
Eric Anholt
ceb8afcca5
intel: Align region height as required for tiled regions.
...
Otherwise, we would address beyond the end of our buffers. Fixes reliable
GPU segfault with texture_tiling=true and oglconform shadow.c.
Bug #22406 .
2009-08-07 18:33:08 -07:00
Eric Anholt
12c6973c6e
i965: Add a note justifying domain choice for the SF VP.
2009-08-07 18:33:08 -07:00
Eric Anholt
b82abaabee
intel: Add some more safety asserts in the blit code.
2009-08-07 18:33:08 -07:00
Eric Anholt
9f981ec27d
i965: Replace the subroutine-skipping jump in VS with a NOP if it's a NOP.
...
This showed a 1.9% (+/-.3%, n=3) improvement in OA performance with high
geometry settings.
2009-08-07 18:33:08 -07:00
Jakob Bornecrantz
7de5e60c18
i915g: Don't forget x/y coords in transfers
...
Fixes demos/ray.
2009-08-08 03:20:24 +02:00
Jakob Bornecrantz
738e02c3c8
i915g: Don't try to free a mapped buffer at shutdown
2009-08-08 03:19:01 +02:00
Alex Deucher
f7474a577d
radeon: correct fix for tiling with the legacy build
2009-08-07 17:36:07 -04:00
Eric Anholt
a2a3d8d7f0
intel: Fix googleearth by avoiding GL_VIEWPORT_BIT in meta clear push/pop
...
I have no idea why this fixes things, but being more efficient sounds good
anyway. Fixes regression in 99d07d0f91
where most of the lit half of the world was not drawn.
2009-08-07 14:04:11 -07:00
Alex Deucher
caf4f0ede7
radeon: fix the build with older drm headers
2009-08-07 16:20:26 -04:00
Pauli Nieminen
0d7fafa0ed
dri: Fix problems with unitialized values in dri screen object.
...
This fixes crash in r200 KMS driver when pSAREA was set to 1 randomly because of memory wasn't cleared.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com >
2009-08-07 13:48:26 -06:00
Brian Paul
9de26ccbcc
util: fix incorrect assertion
...
Check that the dest surface/format is renderable.
2009-08-07 13:48:26 -06:00
Brian Paul
f36d012191
util: include u_surface.h, added comment
2009-08-07 13:48:26 -06:00
Brian Paul
513a82cb1b
util: use util_same_surface() to compare surface pointers
2009-08-07 13:48:26 -06:00
Brian Paul
abb120fe5b
util: added util_same_surface() helper function
2009-08-07 13:48:26 -06:00
Robert Ellison
2caec748ad
tests: have getprocaddress return a return code
...
These minor changes allow getprocaddress to return an error code
in the case of test failure. This allows the program to be integrated
into the piglit test suite.
2009-08-07 12:23:19 -06:00
Robert Ellison
99d5139078
mesa: improve getprocaddress test
...
- Allow the getprocaddress test to test extensions not supported by
Mesa. The original getprocaddress.py script only included OpenGL
extension functions that were in Mesa dispatch tables. Now all
known extension functions (as detailed in gl_API.xml) are included.
As the test does not link against any extension function symbols
(i.e. it uses glXGetProcAddress() for all extension functions),
it still compiles and links against Mesa; but now the same
binary can be used to test extensions not yet supported by Mesa.
- Extend the list of tested extension functions. The last revision
of this test exercised 16 extension functions; this revision adds
support for 95 more.
2009-08-07 12:06:17 -06:00
Pauli Nieminen
d80b36f64f
dri: Fix problems with unitialized values in dri screen object.
...
This fixes crash in r200 KMS driver when pSAREA was set to 1 randomly because of memory wasn't cleared.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com >
2009-08-07 11:24:47 -06:00
Brian Paul
1359d69f11
st/mesa: remove redundant calls to _mesa_set_vp_override()
...
Called from core Mesa now.
2009-08-07 10:49:38 -06:00
Brian Paul
c02b38d169
progs/xdemos: added multictx.c (multi-context rendering demo)
...
Create one window and render into it with two GLX contexts. Setup the
rendering state differently for each context to be sure there's no state
"bleeding" between contexts.
2009-08-07 09:52:18 -06:00
Brian Paul
2c9812e3d3
mesa: use _mesa_set_vp_override() in glDraw/CopyPixels and glBitmap
...
We don't use the vertex program in these functions and the driver may
install its own. This fixes the broken glCopyPixels swrast fallback in
i965 and possibly other drivers. In particular, glCopyPixels sometimes
didn't work because the fixed-function fragment program was replacing all
fragment colors with the current raster color.
2009-08-07 09:51:50 -06:00
Brian Paul
6807d96f8e
mesa: reformat code to allow setting breakpoints on the true-statement
2009-08-07 09:50:38 -06:00
Brian Paul
84e67330e1
glxgears: make functions static, update comments
2009-08-07 09:50:38 -06:00
Brian Paul
7bf6efe780
mesa: use _mesa_bufferobj_mapped()
2009-08-07 09:50:38 -06:00
Brian Paul
67153a4518
mesa: new _mesa_bufferobj_mapped() helper function
2009-08-07 09:50:38 -06:00
Brian Paul
f738b913e6
mesa: use valid_fragment_program() helper
2009-08-07 09:50:38 -06:00
Brian Paul
94504be63a
mesa: test DrawBuffer, not ReadBuffer in _mesa_dest_buffer_exists()
...
Also, update comments.
2009-08-07 09:50:38 -06:00
Brian Paul
2dec62405f
mesa: fix some incorrect error checks in _mesa_error_check_format_type()
...
Plus, simplify the code a bit.
2009-08-07 09:50:38 -06:00
Brian Paul
3335b847bf
mesa: do error checking on glCopyPixels() type parameter
...
Plus, move some other error checks before state validation and update
some comments.
2009-08-07 09:50:38 -06:00
Brian Paul
28cfd37bb3
mesa: use a more logical flag in _mesa_set_vp_override()
2009-08-07 09:50:38 -06:00
Brian Paul
b28854088b
mesa: new _mesa_copy_client_array() function
2009-08-07 09:50:38 -06:00
Brian Paul
692c50b388
i965: minor context comments
2009-08-07 09:50:38 -06:00
Brian Paul
922ef4a119
intel: minor context comments
2009-08-07 09:50:38 -06:00
Brian Paul
6e0be1cc34
intel: move blit call out of assert()
2009-08-07 09:50:38 -06:00
Brian Paul
4d24feddff
intel: fix typo: s/softare/software/
2009-08-07 09:50:37 -06:00
Brian Paul
3105fd760b
mesa: fix comment
2009-08-07 09:50:37 -06:00
Dave Airlie
239c8bfb10
radeon: enable tiling fallbacks in 3D driver.
...
Only really got good testing on r500 so far, need to enable in
DDX and play some more.
2009-08-07 19:40:59 +10:00
Dave Airlie
2dc3fb7803
radeon span: add r200 depth/stencil span read/writing
...
this should only really affect DRI2 since we mostly have a surface in DRI1.
I don't think this is perfect yet, but it is a better start than nothing.
2009-08-07 16:16:08 +10:00
Dave Airlie
eaf87e84c3
r200: fix scissor emission for r200 under kms
2009-08-07 14:13:19 +10:00
Brian Paul
9676ed27fe
util: fix incorrect assertion
...
Check that the dest surface/format is renderable.
2009-08-06 14:58:06 -06:00
Brian Paul
98f00e8eb9
util: include u_surface.h, added comment
2009-08-06 14:54:25 -06:00
Ian Romanick
3cb6f3bf21
GL_ARB_vertex_array_bgra is (basically) a synonym for the EXT version
2009-08-06 15:26:35 -05:00
Brian Paul
24fdf8aadb
util: use util_same_surface() to compare surface pointers
2009-08-06 09:47:13 -06:00
Brian Paul
ffb1f9bded
util: added util_same_surface() helper function
2009-08-06 09:47:13 -06:00
Alan Hourihane
8c223e8eb6
Ensure GL_EXT_blend_equation_separate is enabled when 2.0 is enabled.
2009-08-06 16:16:55 +01:00
Alan Hourihane
45b12edcbe
Ensure GL_EXT_blend_equation_separate is enabled when 2.0 is enabled.
2009-08-06 15:56:05 +01:00
Chia-I Wu
e179ab2815
progs/egl: Add xeglbindtex, really.
...
Missed this file in the earlier commit.
2009-08-06 08:40:03 -06:00
Jakob Bornecrantz
8fdda95162
mesa: Ignores
...
Got tired of seeing these files in git status all the time
2009-08-06 13:59:48 +01:00
Jakob Bornecrantz
8662f2c542
i915g: Compile with scons
2009-08-06 13:50:46 +01:00
Jakob Bornecrantz
c818efd0b3
identity: Use the correct texture
2009-08-06 13:20:49 +01:00
Eric Anholt
f44916414e
i965: Fix source depth reg setting for FSes reading and writing to depth.
...
For some IZ setups, we'd forget to account for the source depth register
being present, so we'd both read the wrong reg, and write output depth to
the wrong reg.
Bug #22603 .
2009-08-05 20:20:02 -07:00
Jakob Bornecrantz
b6c6551686
st/xorg: If we have DRI2 we should also have some sort of hw support
2009-08-06 00:52:13 +01:00
Jakob Bornecrantz
b6c9401f13
i915g: Always run in sync with the HW
2009-08-06 00:52:13 +01:00
Jakob Bornecrantz
901b87547e
i915g: The i915 seems more happier with sampler domain so lets use that
2009-08-06 00:52:13 +01:00
Jakob Bornecrantz
7a20f50c60
i915g: Dirty fix for VBO module double flush assert
2009-08-06 00:52:13 +01:00
Jakob Bornecrantz
66b00380a2
i915g: Switch to mapping the batch buffer instead of using subdata
2009-08-06 00:52:13 +01:00
Chia-I Wu
246f58d922
progs/egl: Add xeglbindtex.
...
This is a simple demo for eglBindTexImage. It uses a OpenGL context,
instead of the required OpenGL ES one. But it still suffices the demo
and test purpose.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-05 16:08:48 -06:00
Chia-I Wu
6f97a41964
egl_softpipe: Add support for pbuffer binding.
...
This adds support for eglBindTexImage and eglReleaseTexImage. They rely
on the state tracker to do the real work.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-05 16:08:07 -06:00
Chia-I Wu
0153614cb0
egl_softpipe: Flush when switching current context.
...
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-05 16:07:39 -06:00
Chia-I Wu
54a7115fc2
mesa/st: Add support for binding pipe surface to texture.
...
This commit adds functions to bind a pipe surface to a texture. This
allows texturing directly from the surface.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-05 16:07:19 -06:00
Chia-I Wu
42b6b067ac
mesa/main: Add functions to clear and dirty texture objects.
...
This commit adds a function to clear a texture object such that there is
no image data associated with it, and a function to dirty it so that it
will be re-tested for completeness.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-05 16:06:50 -06:00
Brian Paul
1f71305993
Merge branch 'mesa_7_5_branch'
...
Conflicts:
src/mesa/main/state.c
2009-08-05 14:13:48 -06:00
Brian Paul
5b3428d745
docs:fix glBlitFramebuffer() for Gallium
2009-08-05 13:50:21 -06:00
Brian Paul
a59579c983
st/mesa: implement BlitFramebuffer() for depth/stencil (incomplete)
...
We now handle the case of blitting Z+stencil to/from combined Z/stencil
surfaces. But Z-only or stencil-only and separate depth/stencil surfaces
are not yet implemented.
2009-08-05 13:46:47 -06:00
Brian Paul
dcebe220f4
mesa: generate GL_INVALID_OPERATION for missing z/stencil when blitting
...
If glBlitFramebuffer() is called with GL_DEPTH_BUFFER_BIT or
GL_STENCIL_BUFFER_BIT and the src/dst depth/stencil buffers are absent,
report an error.
2009-08-05 13:44:59 -06:00
Brian Paul
f792137593
st/mesa: fix Y inversion and optimize st_BlitFramebuffer()
...
Need to check for Y inversion separately for src/dest buffers.
If both the src and dest regions are upside down, make them right-side
up for a better chance at a fast path.
progs/tests/copypixrate -blit is much faster now.
2009-08-05 13:26:19 -06:00
Brian Paul
2cd33afa00
util: added comment/question about blit clipping
2009-08-05 13:22:26 -06:00
Brian Paul
727b2d747e
mesa: make _mesa_clip_blit() a shared function
2009-08-05 13:21:59 -06:00
Brian Paul
4f36164024
util: added util_blit_pixels() overlap test
...
A comment alluded to this. Now it's checked.
2009-08-05 13:19:03 -06:00
Brian Paul
05d393f59f
util: fix util_blit_pixels() test for surface_copy() path
...
For the surface_copy() path require same format, no flipping and no stretching.
Fixes progs/tests/copypixrate -blit
2009-08-05 13:09:15 -06:00
Brian Paul
854ea483d4
util: reformatting and comments
2009-08-05 13:08:19 -06:00
Jakob Bornecrantz
3905119b47
st/xorg: Make it work again
2009-08-05 19:29:31 +01:00
Jakob Bornecrantz
8ccec83e63
st/egl: Create primary texture not display target
2009-08-05 19:29:30 +01:00
Jakob Bornecrantz
0500404cdf
i915g: Treat primary textures as scanout buffers
2009-08-05 19:29:30 +01:00
Jakob Bornecrantz
ec269c198a
i915g: Link with trace on EGL and Xorg
2009-08-05 19:29:30 +01:00
Jakob Bornecrantz
1f9ee623d1
trace: Use correct texture in drm_api wrapper
2009-08-05 19:29:29 +01:00
Jakob Bornecrantz
6160c8be57
softpipe: Also defere primary textures to backend
2009-08-05 19:29:29 +01:00
Dave Airlie
ac3de85eb6
r200: emit colorpitch
2009-08-05 11:26:29 +10:00
Eric Anholt
63d7a2f53f
i965: Fix dangerous warning I let slip in.
2009-08-04 18:07:01 -07:00
Eric Anholt
78c022acd0
i965: Respect CondSwizzle in OPCODE_IF.
...
Fixes piglit glsl-vs-if-bool and progs/glsl/twoside, and will likely be
useful for the looping code.
Bug #18992
2009-08-04 18:06:34 -07:00
Eric Anholt
7007f8b352
i965: Emit conditional code updates as required for GLSL VS if statements.
...
Previously, we'd be branching based on whatever condition code happened to be
laying around.
2009-08-04 18:06:34 -07:00
Eric Anholt
011244853b
i965: Don't set pop_count in the reserved MBZ area of IF statements.
2009-08-04 18:06:34 -07:00
Eric Anholt
8288ab4518
i965: Print out ELSE and ENDIF src1 arguments like IF does.
2009-08-04 18:06:34 -07:00
Roland Scheidegger
8b9a5cfce0
r200: fix off-by-one errors causing 6th texture unit to not work
...
both for normal and cube textures, this fixes demos/multiarb
(with 6 enabled texture units) and fixes #23142 .
2009-08-05 02:33:34 +02:00
Roland Scheidegger
7c0fb3a1be
r200: fix compiler warning (unused var)
2009-08-05 02:33:34 +02:00
Roland Scheidegger
15f5f839b1
radeon: fix miptree comparison breakage
...
another case of image never matching miptree in case of compressed textures
2009-08-05 01:13:22 +02:00
Roland Scheidegger
80cab49481
intel: implement intelCompressedTexSubImage2D
...
similar to the radeon code.
passes tests/texcompsub
2009-08-05 01:13:22 +02:00
Roland Scheidegger
0abc9e7565
tests: also test xoffset in texcompsub test
...
use glCompressedTexSubImage2DARB also with xoffset by splitting into 3 calls
in total. Dunno if the top/bottom reversal is intentional but leave as is.
2009-08-05 01:13:21 +02:00
Eric Anholt
de80eeea0e
intel: Add support for EXT_provoking_vertex.
2009-08-04 15:32:18 -07:00
Eric Anholt
b010814e9c
i965: Spell "conditional" correctly.
2009-08-04 15:32:18 -07:00
Eric Anholt
1d4bace9fc
i965: Hook up the disassembler for INTEL_DEBUG={wm,vs}.
...
I was getting tired of doing the dance of INTEL_DEBUG=batch, copying it out,
and running intel-gen4disasm on it.
2009-08-04 15:32:18 -07:00
Eric Anholt
ce63e9929c
i965: Initial import of disasm code from intel-gen4asm.
...
There's a bunch of stuff from gen4asm and gpu-tools that we probably want
to make into a library instead of cargo-culting it around.
2009-08-04 15:32:18 -07:00
Eric Anholt
def85826a0
i965: warning fix
2009-08-04 15:32:17 -07:00
Brian Paul
cd7a8225e8
tests/getteximage: test more texture sizes, including npot
2009-08-04 16:17:09 -06:00
Brian Paul
a746ef28df
mesa: log the shader checksum
2009-08-04 15:36:29 -06:00
Brian Paul
f7783badb5
mesa: compute, print shader checksum
2009-08-04 15:36:29 -06:00
Brian Paul
b501263bf5
mesa: added gl_shader::SourceChecksum field (for debug purposes)
2009-08-04 15:36:28 -06:00
Brian Paul
9f8110adcc
mesa: added _mesa_str_checksum()
2009-08-04 15:36:28 -06:00
Brian Paul
84c8315ae6
mesa: clean-up error debug/count code
2009-08-04 15:36:28 -06:00
Brian Paul
def77160d6
mesa: reset ErrorDebugCount to zero in glGetString()
2009-08-04 15:36:28 -06:00
Brian Paul
b98f0f2d51
mesa: better texture dump/debug code
2009-08-04 15:36:28 -06:00
Brian Paul
2b82bc93e2
mesa: more error message info for vertex pointer functions
2009-08-04 15:36:28 -06:00
Brian Paul
2465c4fa9c
mesa: more glGetTexImage() error checking consolidation, new assertion
2009-08-04 15:36:28 -06:00
Eric Anholt
191e028de2
i965: Fix RECT shadow sampling by not losing the other texcoords.
...
Bug #20821
2009-08-04 12:43:18 -07:00
Brian Paul
3a221a9018
docs: 7.5.1 bug fixes
2009-08-04 09:27:49 -06:00
Brian Paul
61673aebb0
intel: Fix inverted test for disabling flushing of front buffer output.
...
The comment disagreed with the code, and nicely drew my eyes to what was
going wrong.
Bug #21774 (blender)
Bug #21788 (readpix)
(cherry picked from master, commit fd65418f60 )
2009-08-04 09:23:17 -06:00
Brian Paul
f5f8be8bb2
intel: Wait on the last swapbuffers to complete before queuing a new one.
...
This fixes jerkiness in doom3 and other apps since the kernel change to
throttle less absurdly, which led to a thundering herd of frames.
Because this is a rather minimal fix, there is at least one downside: If
the whole scene completes in one batchbuffer, we'll end up stalling the GPU.
Thanks to Michel Dänzer for suggesting using glFlush to signal frame end
instead of going to all the effort of adding a new DRI2 extension.
(cherry picked from master, commit 0828579a65 )
2009-08-04 09:22:15 -06:00
Brian Paul
2bec909c69
texenv: Use VP->Current, since _Current isn't updated at this point.
...
(cherry picked from master, commit a9ba1bfeb3 )
2009-08-04 09:15:33 -06:00
Brian Paul
f0df08abbe
texenv: Match state.c in deciding whether we'll be using a vertex shader.
...
(cherry picked from master, commit 40990d9dfb )
2009-08-04 09:15:09 -06:00
Brian Paul
9d3929b60c
texenv: Add missing dependency on VP changes.
...
Funny thing is I annotated this dependency in
e5f63c403b , but didn't actually use it.
(cherry picked from master, commit 03187571b6 )
Conflicts:
src/mesa/main/state.c
2009-08-04 09:14:33 -06:00
Dan Nicholson
9185a61c8a
mklib: Ensure target directory exists for library
...
Instead of relying on the Makefile to always generate $(TOP)/$(LIB_DIR),
just have mklib handle creating the directory. This should fix any races
when using parallel make.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com >
(cherry picked from commit 23671e5358 )
2009-08-04 06:30:46 -07:00
Peter Hutterer
0ce73f84e9
Add missing X11_INCLUDES to egl/drivers/demo and egl/main.
...
Compiling mesa on a system with no X headers installed in the default
include paths fails due to missing X11 includes. The header includes are
picked up by configure but not applied.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net >
Signed-off-by: Dave Airlie <airlied@redhat.com >
(cherry picked from commit 5358e54d1a )
2009-08-04 06:30:30 -07:00
Dan Nicholson
23671e5358
mklib: Ensure target directory exists for library
...
Instead of relying on the Makefile to always generate $(TOP)/$(LIB_DIR),
just have mklib handle creating the directory. This should fix any races
when using parallel make.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com >
2009-08-04 06:25:26 -07:00
Michel Dänzer
048f988aeb
r300g: Slightly saner initialization of some texture / transfer fields.
2009-08-04 10:57:47 +02:00
Eric Anholt
d7430d942f
i965: Assert that the offset in the VBO is below the VBO size.
...
This avoids sending a bad buffer address to the GPU due to programmer error,
and is permitted by the ARB_vbo spec. Note that we still have the opportunity
to dereference past the end of the GPU, because we aren't clipping to a
correct _MaxElement, but that appears to be harder than it should be. This
gets us the 90% solution.
Bug #19911 .
2009-08-03 17:56:49 -07:00
Eric Anholt
e340d4f986
i965: Even if no VS inputs are set, still load some amount of URB as required.
...
See comment on Vertex URB Entry Read Length for VS_STATE.
This, combined with the previous three commits, fixes #22945 .
2009-08-03 17:19:03 -07:00
Eric Anholt
e93848e595
i965: Make sure the VS URB size is big enough to fit a VF VUE.
...
This fix is just from code and docs inspection, but it may fix hangs on
some applications.
2009-08-03 17:19:03 -07:00
Eric Anholt
d1fbfd0f96
i965: Don't emit bad packets when no VBs are referenced.
...
It appears that sometimes Mesa (and I suppose a VS could as well) emits
a program which references no vertex data, and thus we end up with
nr_enabled == 0 even though some VBs are enabled. We'd end up emitting
VB/VE packet headers of 0xffffffff in that case, leading to GPU hangs.
Bug #22945 (wine with an uncompiled VS)
2009-08-03 17:19:03 -07:00
Eric Anholt
9b9cb30d12
i965: Calculate enabled[] and nr_enabled once and re-use the values.
...
The code duplication bothered me.
2009-08-03 17:19:03 -07:00
Robert Ellison
1f1ead9947
typo fix
...
somehow, this change was missed on the last checkin
2009-08-03 17:09:14 -06:00
Robert Ellison
0d18e9259e
mesa: fix up some GLAPI XML
...
- Added specifications for the extensions GL_APPLE_flush_buffer_range and
GL_APPLE_texture_range
- EXT_framebuffer_object.xml strangely held specifications for both
the GL_EXT_framebuffer_object extension and the GL_EXT_texture_array
extension. Split out the GL_EXT_texture_array data into its own
file.
2009-08-03 17:04:50 -06:00
Roland Scheidegger
50c736589e
radeon: more fixes for compressed textures
...
- fix not respecting required hardware stride with compressedTexImage -
this fixes #22615 .
- make sure correct stride is used in various places
- fix stored miptree never matching with a TexImage call with compressed
texture
- don't always store data with compressedtexsubimage at offset 0,
and actually use the supplied pixel data... (untested)
- make sure rows for compressed texture handling are rounded up not down
Note that trying to access stored compressed textures in hardware miptrees
from core mesa (get_compressed_teximage, swrast fallbacks) can't work correctly,
since RowStride isn't really set to anything useful, plus some places (at least
get_compressed_teximage) assume this data has native stride and no padding.
2009-08-04 00:21:07 +02:00
Eric Anholt
4221e81b24
radeon: Fix inverted test for disabling flushing of front buffer output.
...
(corresponding fix to the intel driver one)
2009-08-03 14:40:46 -07:00
Eric Anholt
fd65418f60
intel: Fix inverted test for disabling flushing of front buffer output.
...
The comment disagreed with the code, and nicely drew my eyes to what was
going wrong.
Bug #21774 (blender)
Bug #21788 (readpix)
2009-08-03 14:33:40 -07:00
Eric Anholt
0828579a65
intel: Wait on the last swapbuffers to complete before queuing a new one.
...
This fixes jerkiness in doom3 and other apps since the kernel change to
throttle less absurdly, which led to a thundering herd of frames.
Because this is a rather minimal fix, there is at least one downside: If
the whole scene completes in one batchbuffer, we'll end up stalling the GPU.
Thanks to Michel Dänzer for suggesting using glFlush to signal frame end
instead of going to all the effort of adding a new DRI2 extension.
2009-08-03 13:34:07 -07:00
Alex Deucher
e0d61fd696
r600: add some new r7xx pci ids
2009-08-03 16:10:32 -04:00
Eric Anholt
a9ba1bfeb3
texenv: Use VP->Current, since _Current isn't updated at this point.
2009-08-03 12:54:41 -07:00
Eric Anholt
40990d9dfb
texenv: Match state.c in deciding whether we'll be using a vertex shader.
2009-08-03 12:54:33 -07:00
Eric Anholt
03187571b6
texenv: Add missing dependency on VP changes.
...
Funny thing is I annotated this dependency in
e5f63c403b , but didn't actually use it.
2009-08-03 12:54:17 -07:00
Pauli Nieminen
fb7cf731f9
xdemo/glxswapcontrol: Move get_framge_usage after the swap.
...
This fixes the problem that first frame would report bogus usage values.
Problem was caused because get_frame_usage returned data from previous buffer
swap.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com >
2009-08-03 13:42:05 -06:00
Pauli Nieminen
b59eb3b8b1
xdemos/glxcontexts: Don't leak visual info when choosing visual again.
...
Signed-off-by: Pauli Nieminen <suokkos@gmail.com >
2009-08-03 11:55:29 -06:00
Chia-I Wu
7420e33848
egl_softpipe: Add support for pbuffer surface.
...
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-03 11:36:08 -06:00
Chia-I Wu
8a130a65aa
egl: Correct the default values of surface attributes.
...
EGL_TEXTURE_FORMAT and EGL_TEXTURE_TARGET should default to
EGL_NO_TEXTURE.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-03 11:35:44 -06:00
Chia-I Wu
8cdc6c66f9
egl: Make eglMakeCurrent more robust.
...
Now that a current surface points back to its binding context, and a
current context points back to its binding thread, make sure there is no
dangling pointers. This commit reworks eglMakeCurrent, adds more checks
to avoid stealing context or surfaces from another thread, and correctly
destroys unlinked context and surfaces.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-03 11:35:14 -06:00
Chia-I Wu
07ee01365a
egl: Replace IsBound by a pointer to the binding.
...
IsBound tells if a context or surface is current. What it does not tell
is, to which thread a context is current, or to which context a surface
is current. This commit replaces IsBound by a pointer to the binding
thread or context.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-08-03 11:34:37 -06:00
Brian Paul
27148ccaba
gl: upgrade wglext.h to version 15
2009-08-03 11:24:09 -06:00
Brian Paul
39bf48f281
gl: upgrade glxext.h to version 23
2009-08-03 11:24:09 -06:00
Brian Paul
2d725dac40
gl: upgrade glext.h to version 54
2009-08-03 11:24:09 -06:00
Brian Paul
4f61bc135a
tgsi: report opcode name in addition to the number when translation fails
2009-08-03 11:24:09 -06:00
Brian Paul
c3c90c2dd9
tgsi: added tgsi_get_opcode_name()
2009-08-03 11:24:09 -06:00
Brian Paul
2e9bf10014
gallium: comments, reformatting
2009-08-03 11:24:09 -06:00
Brian Paul
ed6125fe9b
st/mesa: we don't support GL_NV_point_sprite (see comment)
2009-08-03 11:16:23 -06:00
Alex Deucher
f538d02753
r600: add some missing pci ids
2009-08-03 11:21:10 -04:00
Alex Deucher
583ed4aae5
r600: fix the build when RADEON_DEBUG_BO is set
2009-08-03 03:12:56 -04:00
Alex Deucher
282c0c411c
r600: fix r600SetTexOffset
...
We need to properly set up a fake bo for the texture override,
so add a new function to radeon_bo_legacy.c. This could probably
be used on radeon/r200/r300 to unify the bo handling for
texture override.
compiz now works :)
2009-08-03 02:28:22 -04:00
Corbin Simpson
30bca7a4e6
Merge commit 'nha/r300-compiler-gallium'
2009-08-02 16:56:52 -07:00
Alex Deucher
d07bf2b35c
r600: handle state emit better
...
- move shader-related state with the rest of the shader setup/emit
- start to track dirty state better
2009-08-02 18:26:12 -04:00
vehemens
562ca49611
r600: Logic Operations Fix
...
fixes bug 23087
2009-08-02 18:03:58 -04:00
Alex Deucher
5e51903606
r600: fix regression in texenv
...
Emit shader consts with the shader program itself
2009-08-02 13:29:18 -04:00
Nicolai Hähnle
b1700b03af
r300: Fix a regression on non-KMS
...
The regression was introduced by 9a1c336253
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-08-02 16:24:52 +02:00
Alex Deucher
86ac0ae0b0
r600: fix rectangle textures
...
It might be better to add an instruction to normalize the
coordinates for rectanglular textures as there are some limitations
to wrap modes on unnormalized tex coords.
fixes texrect
2009-08-01 20:55:43 -04:00
Nicolai Hähnle
9a1c336253
r300: Fix corner-case of KIL on R300
...
R300 hardware (but _not_ R500) hardware requires an enabled texture unit
if KIL is used in fragment programs. We now work around the CS checker
correctly when enabling such a fake texture unit.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-08-01 19:00:55 +02:00
Nicolai Hähnle
3d21e3d3a2
r300: Fix Z buffer re-emit after window resize
...
We used to not always correctly re-emit the Z buffer size in all cases,
in particular the clear path, and invalidated state was not always picked
up correctly.
This fixes a bug where the kernel CS checker correctly complains about
a Z buffer that is too small.
Note that this bug was probably only visible with ridiculously high
framerates, i.e. glxgears.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-08-01 17:16:50 +02:00
Patrice Mandin
fc3d564dae
mesa st: Use POT texture for draw pixels operations if NPOT texture is not supported
2009-08-01 11:15:18 +02:00
Patrice Mandin
c1785c19ca
mesa st: Move logbase2 function to util/u_math.h
2009-08-01 11:03:30 +02:00
Roland Scheidegger
801c3fcbca
radeon: fix r100/r200 compressed texture stride
...
This almost fixes compressed mipmapped textures on r200, though some small
mip levels are still broken.
Leave r300 compressed texture stride as is though afaik it's different
to pre-radeon-rewrite too. Also do the fixup for rs600 uncompressed row stride
at same place.
2009-07-31 23:24:44 +02:00
Roland Scheidegger
2730ee75c7
radeon: s/r300/radeon in shared code error message
2009-07-31 23:20:22 +02:00
Brian Paul
f7618f4f37
swrast: fix incorrect texcoord attribute test
2009-07-31 13:57:03 -06:00
Brian Paul
23c0e812bc
draw: fix-ups for point coord attribute
...
progs/glsl/pointcoord.c works again
2009-07-31 13:56:17 -06:00
Pauli Nieminen
55bc8b1390
radeon: Cliprects has to be updated before doing anything with clip rectangles
...
Reported to fix corruption while dragging an active window by John Bridgman.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com >
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-31 21:44:31 +02:00
Pauli Nieminen
1fcb321e2f
radeon: Remove unused variable from context.
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-31 21:39:25 +02:00
Alex Deucher
95b64c0ed2
r600: make sure bos are valid before usign that
2009-07-31 15:11:41 -04:00
Alex Deucher
80d80d23b6
r600: fix reloc setup
...
re-use the same reloc index for bos that are referenced
multiple times.
Fixes rain demo.
2009-07-31 14:52:56 -04:00
Alex Deucher
177c33c481
r600: remove unused offset_mod stuff
...
this is a step in migrating to the common cs code
2009-07-31 14:52:56 -04:00
Alex Deucher
19ce428c8a
r600: ensure we have enough room for full state emit
...
full state is roughly 4000 dwords, but will vary depending
on the rendering.
Also fix some warnings.
2009-07-31 14:52:56 -04:00
Alex Deucher
54a1641923
r600: unify state emit into one function
2009-07-31 14:52:55 -04:00
Alex Deucher
be1687a892
r600: re-arrange state setup and emit so they are not mixed
2009-07-31 14:52:55 -04:00
Michal Krol
cb90c43676
Rename TGSI LOOP instruction to better match theri usage.
...
The LOOP/ENDLOOP pair is renamed to BGNFOR/ENDFOR as its behaviour
is similar to a C language for-loop.
The BGNLOOP2/ENDLOOP2 pair is renamed to BGNLOOP/ENDLOOP as now
there is no name collision.
2009-07-31 18:14:40 +02:00
Chia-Wu
dc516d6e2a
egl: Silence warnings on x86-64.
...
Casting an unsigned int to or from a pointer directly gives warnings on
x86-64. Add wrappers to silence the warnings.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-07-31 07:30:13 -06:00
Alex Deucher
826f1f9c6f
r600: get updated pending age from cs ioctl
...
REQUIRES AN UPDATED DRM
2009-07-31 02:13:43 -04:00
Alex Deucher
643d52a394
r600: warning fixes
2009-07-30 21:32:36 -04:00
Alex Deucher
e0e51ab1ea
r600: split primitive draw into a separate function
2009-07-30 21:32:36 -04:00
Nicolai Hähnle
d0c398a8e2
r300g: Use radeon compiler for fragment programs
...
This is entirely untested on R500, and needs more testing on R300.
2009-07-30 23:55:12 +02:00
Nicolai Hähnle
fbc88a7334
r300g: Remove extraneous printf
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-30 23:45:18 +02:00
Nicolai Hähnle
188f8c6792
r300g: Use r300compiler for vertex shaders
2009-07-30 23:45:18 +02:00
Nicolai Hähnle
cab62aa28f
r300/compiler: Remove inst_offset from r500_fragment_program_code
...
The field is not used, and in any case it would be more interesting to
manipulate from *outside* the compiler if we ever wanted to load several
fragment programs at the same time or something.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-30 23:42:59 +02:00
Ian Romanick
9f26f801dc
progs/vp: Correct the PARAM array sizes in arl-*.txt
2009-07-30 14:08:53 -07:00
Ian Romanick
565a2a8f38
ARB prog parser: Add support for RGBA components to SWZ instruction in fp
2009-07-30 10:51:43 -07:00
Chia-I Wu
27fb3ff858
softpipe: Mark texture dirty when unmapped.
...
When a texutre transfer is mapped for writing, mark the texture dirty
when unmapped. This was done in surface creation, and this commit moves
it to happen in texture unmapping.
This fixes subtex test in progs/tests/.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-07-30 10:42:46 -06:00
Ian Romanick
17534ab88c
ARB prog parser: Prevent NULL ptr deref for KIL instruction
...
The KIL instruction doesn't have a destination register, so
dereferencing dst in asm_instruction_ctor would cause a segfault.
2009-07-30 09:41:35 -07:00
Brian Paul
9c936403de
mesa: re-enable _mesa_source_buffer_exists() call
...
Somehow this code wound up inside a comment a while back.
2009-07-30 10:04:42 -06:00
Brian Paul
4406f79402
mesa: get_current_tex_unit() helper function
2009-07-30 09:59:52 -06:00
Brian Paul
25be043940
mesa: refactor glGetTexImage error checking code
2009-07-30 09:50:36 -06:00
Brian Paul
783a93a2c3
tests: glGetTexImage() test
2009-07-30 09:46:57 -06:00
Brian Paul
c156eeb682
mesa: simplify _mesa_select_tex_image()
2009-07-30 09:24:01 -06:00
Brian Paul
9c9a9abd7b
mesa: simplify _mesa_set_tex_image()
2009-07-30 09:10:26 -06:00
Brian Paul
1e355a0cb3
Merge branch 'mesa_7_5_branch'
2009-07-30 09:03:43 -06:00
Brian Paul
35e3449ad7
mesa: move misplaced return statement
...
Fixes regression from commit 7d93f817c9
2009-07-30 09:02:36 -06:00
Brian Paul
288299ae12
Merge branch 'mesa_7_5_branch'
2009-07-30 08:24:10 -06:00
Brian Paul
7d93f817c9
mesa: add missing return after catching program error
2009-07-30 08:23:26 -06:00
Brian Paul
e87320b5e0
Merge branch 'mesa_7_5_branch'
2009-07-30 08:22:57 -06:00
Brian Paul
aefaeba54a
docs: document new i915/945 extensions
2009-07-30 08:22:26 -06:00
Thomas Hellstrom
98ba6cfb4c
mesa st: Change the preferred internal format for some RGB formats.
...
For GL_RGB5, GL_RGB4 and GL_R3_G3_B2, prefer
PIPE_FORMAT_R5G6B5_UNORM over PIPE_FORMAT_A1R5G5B5_UNORM, since hardware
is more likely to support the previous format for rendering.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com >
2009-07-30 12:43:35 +02:00
Thomas Hellstrom
f583745519
mesa st: Report unsupported render-to-texture formats.
...
If a texture image is bound to a framebuffer for render-to-texture, but
the hardware doesn't support rendering to its internal format,
report the framebuffer as incomplete with FRAMEBUFFER_UNSUPPORTED.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com >
2009-07-30 12:43:35 +02:00
Michal Krol
6c70285e33
tgsi: Add proper constraints to sanity.
2009-07-30 11:39:06 +02:00
Michal Krol
cf8907018e
tgsi: Declare a LOOP register.
...
The only valid usage for LOOP/ENDLOOP instructions
is LOOP[0] as a destination register.
The only valid usage for the remaining instructions
is LOOP[0].x as an indirect register.
2009-07-30 10:34:06 +02:00
Michal Krol
65fb2c52f9
tgsi: Fix number operands for LOOP/ENDLOOP.
2009-07-30 10:33:18 +02:00
Michal Krol
1e9d3ad4e1
vbo: Fix build on windows.
2009-07-30 10:31:57 +02:00
Michal Krol
b724dd28e2
tgsi: Document LOOP/ENDLOOP instruction operation.
2009-07-30 10:14:17 +02:00
Xiang, Haihao
3e2b6a2049
i965: Postpone ff_sync message in CLIP kernel on IGDNG
...
In addition, it guarantees ff_sync message is issued
2009-07-30 15:40:08 +08:00
Alex Deucher
0fdac3529c
r600: fix mipmaps
...
redbook mipmap works
2009-07-30 03:31:37 -04:00
Eric Anholt
246729162c
i915: Add support for EXT_stencil_two_side and ATI_separate_stencil.
...
Passes tests/stencil_twoside and glean/stencil2.
2009-07-29 21:25:39 -07:00
Ian Romanick
600710907c
ARP prog parser: Implement the spec, not what makes sense
2009-07-29 21:07:41 -07:00
Eric Anholt
92b9aa1646
i915: Add ARB_point_sprite since we already expose NV_point_sprite.
...
It's all fallbacks anyway due to the DD_POINT_ATTEN fallback.
2009-07-29 20:56:14 -07:00
Ian Romanick
48183ca8b6
ARB prog parser: Get program limits from the context
...
Some debug code from the older stand-alone version of the assembler
was hanging around and needed to go.
2009-07-29 20:51:38 -07:00
Ian Romanick
cbe4133109
ARB prog lexer: attenuation is not just for vp
2009-07-29 20:42:28 -07:00
Ian Romanick
333bb4f291
ARB prog parser: Finish implementing fp state.depth.range
2009-07-29 20:41:48 -07:00
Ian Romanick
e511633985
ARB prog: Fix the order of swizzle application
...
The swizzle used to generate the "original" value from the value
stored in the parameter array happens before the swizzle specified in
the instruction. This fixes problems seen in progs/vp/vp-tris with arl-*.txt.
2009-07-29 20:07:59 -07:00
Brian Paul
9d0b8d72d8
mesa: add new FRAG_ATTRIB_FACE and FRAG_ATTRIB_PNTC fragment program inputs
...
Previously, the FOGC attribute contained the fragment fog coord, front/back-
face flag and the gl_PointCoord.xy values. Now each of those things are
separate fragment program attributes. This simplifies quite a few things in
Mesa and gallium.
Need to test i965 driver and fix up point coord handling in the gallium/draw
module...
2009-07-29 20:07:41 -06:00
Brian Paul
b9889517f5
gallium: fix SSE shadow texture instructions
...
When sampling a 2D shadow map we need 3 texcoord components, not 2.
The third component (distance from light source) is compared against
the texture sample to return the result (visible vs. occluded).
Also, enable proper handling of TGSI_TEXTURE_SHADOW targets in Mesa->TGSI
translation. There's a possibility for breakage in gallium drivers if
they fail to handle the TGSI_TEXTURE_SHADOW1D / TGSI_TEXTURE_SHADOW2D /
TGSI_TEXTURE_SHADOWRECT texture targets for TGSI_OPCODE_TEX/TXP instructions,
but that should be easy to fix.
With these changes, progs/demos/shadowtex.c renders properly again with
softpipe.
2009-07-29 16:33:58 -06:00
Alex Deucher
9c4c9f2837
r600: remove extraneous semicolon
2009-07-29 18:12:33 -04:00
Alex Deucher
b116f57bac
r600: fix texture pitch alignment
...
fixes texwrap
2009-07-29 18:06:20 -04:00
Alex Deucher
1e207ba9c1
r600: minor fixes
...
- set MAX_LOD properly
- min texel pitch is 8 texels
- emit old command buffer when re-initing base state
2009-07-29 17:25:56 -04:00
Nicolai Hähnle
0723cd1b0a
r300: Cleanup r300_fragment_program_code
...
Configuration register values are now stored directly in that structure.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-29 21:15:00 +02:00
Nicolai Hähnle
d3a1fc62f4
r300/compiler: Adapt AllocateHwInputs interface to common usage pattern
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-29 21:15:00 +02:00
Eric Anholt
88ebf514a4
swrast: enable ARB_vertex_array_object.
...
It was getting enabled anyway but without the entrypoints installed. Whoops.
2009-07-29 11:17:53 -07:00
Ian Romanick
8a430dd4da
Indentation fixes.
2009-07-29 09:50:06 -07:00
Ian Romanick
4c5879ff31
ARB prog parser: Set NumAttributes based on the number of attribs read
2009-07-29 09:47:14 -07:00
Keith Whitwell
6842829539
mesa/st: short-circuit glFinish calls on WIN32 only
...
Windows opengl32.dll calls glFinish prior to every swapbuffers, which
makes it pretty hard to get decent performance...
Work around by mapping finish to flush on PIPE_OS_WINDOWS. This is
conformant, though it might confuse poorly-written benchmarks which
attempt to measure a single event rather than figuring out the rate of
continuous processing.
2009-07-29 12:48:05 +01:00
Keith Whitwell
2420b283b7
mesa/st: recognize no-op scissor state when checking clear_with_quads
...
Some apps enable scissor but set the rectangle to the dimensions of
the window. Don't let this force us onto a slower clear path.
2009-07-29 12:48:04 +01:00
Keith Whitwell
4d99e14535
util: _debug_printf should print even when DEBUG is not defined
...
The leading underscore is meaningful... This function is used by
_warning and _error functions as well as the more common
debug_printf().
debug_printf (without underscore) gets turned off when DEBUG is
disabled, but warning/error messages still use this function to get
their message out.
(cherry picked from commit 0ac879dca7 )
2009-07-29 12:48:04 +01:00
Cooper Yuan
03607708b0
r600: emit fog color in PS input map, fix fog related applications
2009-07-29 15:31:41 +08:00
Cooper Yuan
0f6d3aece7
R6xx/r7xx: VS export fog color as parameter
2009-07-29 15:23:56 +08:00
Ian Romanick
648dac4251
ARB prog parser: Set component negation mask for SWZ instruction
2009-07-28 21:57:28 -07:00
Ian Romanick
86b33b5649
ARB prog parser: Set correct register file for OUTPUT variables
2009-07-28 21:56:42 -07:00
Ben Skeggs
693f900b16
nv50: support non-blocking query_result()
2009-07-29 11:19:52 +10:00
Ben Skeggs
625bc0cfa2
nouveau: map_range returning -EBUSY isn't necessarily an error
2009-07-29 10:58:05 +10:00
Christoph Bumiller
84166a021f
nv50: correct zeta formats
...
What was Z24S8 before is actually S8Z24, and what we had for Z16
is actually X8Z24. Now, we also have the REAL Z24S8 and I added
Z32_FLOAT as well; most of the formats need different tile_flags.
2009-07-29 09:40:35 +10:00
Christoph Bumiller
987c59c486
nv50: use new 2D surface format names
2009-07-29 09:40:35 +10:00
Christoph Bumiller
1f17b8ff59
nv50: support more vtxelt formats
...
NOTE: we must not try to emit buffer relocations when
vtxbuf_nr is 0 but vtxelt_nr is not
2009-07-29 09:40:35 +10:00
Christoph Bumiller
72813ba5b6
nv50: should use uint32_t ptr in draw_elements_inline_u32
2009-07-29 09:40:34 +10:00
Christoph Bumiller
df189c9efc
nv50: TIC/TSC fixes and additions
...
Red and blue were interchanged in TIC.
Add border color and some formats.
2009-07-29 09:40:34 +10:00
Christoph Bumiller
f498ccd654
nv50: fix sx/dx typo in transfer_rect_m2mf
2009-07-29 09:40:34 +10:00
Christoph Bumiller
d1b9183e64
nv50: fix viewport transform
...
The translation also needs to be inverted, and in bypass mode
the state tracker incorrectly assumes that Y = 0 = TOP, so we
need inversion there to; NDC clipping has to be deactivated
explicitly.
2009-07-29 09:40:34 +10:00
Christoph Bumiller
b0341f994f
nv50: use correct scissor reg
2009-07-29 09:40:33 +10:00
Alex Deucher
8c56029b1e
r600: fix tex clamp modes
...
This makes texwrap look better.
2009-07-28 18:09:38 -04:00
Alex Deucher
e629c50e2b
r600: implement texture border color
2009-07-28 17:59:54 -04:00
Alex Deucher
719abd7fc0
r600: fix flat shading
...
Set the flat shading bit on the appropriate PS input
depending on the type of attribute it is. The VS output
and PS input routing should probably be made more dynamic
at some point. We may want to use semantic ids to make
it easier.
2009-07-28 16:58:41 -04:00
Alex Deucher
dbdb3952c1
r600: don't call r700UpdateShaders twice for each render
2009-07-28 15:58:01 -04:00
Alex Deucher
b1f7c844a3
r600: move r700TranslateFragmentShader into r700UpdateShaders
2009-07-28 15:53:45 -04:00
RALOVICH, Kristóf
45f4e8842e
glx: assign per screen driver configs (DRISW)
2009-07-28 10:35:56 -06:00
RALOVICH, Kristóf
d090ba9e00
glx: assign per screen driver configs (DRI)
2009-07-28 10:35:56 -06:00
RALOVICH, Kristóf
82f4dc21cc
glx: assign per screen driver configs (DRI2)
2009-07-28 10:35:56 -06:00
RALOVICH, Kristóf
e32b601e7d
glx: properly release DRI configs
...
Release per screen DRI driver configs during screen destruction.
2009-07-28 10:35:56 -06:00
RALOVICH, Kristóf
ce0ad53281
glx: cache DRI configs in __GLXscreenConfigsRec
2009-07-28 10:35:56 -06:00
Alex Deucher
4d648523aa
r600: disable flat shade fix in 506bacb8e4
...
This breaks textures. We need to only set this bit for
attributes that that need flat shading.
2009-07-28 11:12:36 -04:00
Brian Paul
d2f6d6ce49
Merge branch 'mesa_7_5_branch'
...
Conflicts:
Makefile
configs/default
docs/relnotes.html
src/mesa/main/version.h
2009-07-28 08:58:25 -06:00
Brian Paul
94726bc69e
gallium: minor code/comments clean-up
2009-07-28 08:55:43 -06:00
Chia-I Wu
a744a496d5
egl: Comment out unused tables in_eglFillInConfigs
...
This silences a compiler warning.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-07-28 08:55:43 -06:00
Vinson Lee
bc60b88411
progs/trivial: add missing files to Makefile, .gitignore
2009-07-28 08:54:48 -06:00
Cooper Yuan
506bacb8e4
R6xx/r7xx: enable flat shading, this can fix quadric/accanti/accpersp
2009-07-28 13:57:07 +08:00
Ian Romanick
aafd576259
ARB prog parser: Add support for GL_MESA_texture_array
...
This isn't really tested yet as no drivers actually support this extension.
2009-07-27 17:22:21 -07:00
Ian Romanick
41d5696628
ARB prog parser: More robust error message for bad OPTION string
2009-07-27 17:10:01 -07:00
Ian Romanick
1edd13bf23
ARB prog parser: Add support for GL_ARB_fragment_program_shadow
...
Passes the piglit asmparsertest shadow-0[123].txt tests and
progs/demos/shadowtex.
2009-07-27 16:24:49 -07:00
Ian Romanick
88018e2e07
ARB prog parser: Fix handling of RECT
...
Require that GL_{ARB,EXT,NV}_texture_rectangle be supported before
allowing use of RECT texture target.
2009-07-27 15:47:52 -07:00
Ian Romanick
4821099429
ARB prog: Fix parameters to _mesa_calloc
...
So totally awesome that _mesa_calloc has a different parameter
signature than calloc. Why do these libc wrappers still exist?!?
2009-07-27 15:46:07 -07:00
Alex Deucher
fcf317ac16
r600: fix _REV texture format component swizzles
2009-07-27 18:14:45 -04:00
Brian Paul
6c03563af7
mesa: regenerated file
2009-07-27 15:42:29 -06:00
RALOVICH, Kristóf
8363dff251
glx: remove XTHREADS support
2009-07-27 15:38:04 -06:00
RALOVICH, Kristóf
27e55588e0
docs: do not mentions xthreads any more
2009-07-27 15:38:04 -06:00
RALOVICH, Kristóf
bdb8ee5186
glapi: regenerated GL API assembly files
2009-07-27 15:38:04 -06:00
RALOVICH, Kristóf
8f397bffa8
glapi: remove XTHREADS support
2009-07-27 15:38:04 -06:00
Brian Paul
3dbaf68bdc
intel: Fix leak of DRI option info due to using the wrong free routine.
...
(cherry picked from commit 6d66f23c50 )
2009-07-27 15:33:07 -06:00
Brian Paul
722d136f7b
intel: Clean up leak of driver context structure on context destroy.
...
(cherry picked from commit ddef7dc87b )
2009-07-27 15:33:07 -06:00
Ian Romanick
054ab5a50a
ARB prog parser: Correct handling of some extensions that interact w/ARB_vp
2009-07-27 14:18:40 -07:00
Brian Paul
a7427b0f7b
st/mesa: silence warning
2009-07-27 15:10:28 -06:00
Brian Paul
0ad9eba333
mesa: separate some finite/pragma Watcom stuff
2009-07-27 15:10:00 -06:00
Brian Paul
7e2f26cbbf
softpipe: include sp_winsys.h to silence function prototype warning
2009-07-27 15:08:44 -06:00
Nicolai Hähnle
3ccf89d584
r300/compiler: Make calculate_inputs_outputs available to external users
...
In the long run, it's probably better to just get rid of InputsRead and
OutputsWritten.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 22:51:40 +02:00
Nicolai Hähnle
59fff53492
r300/compiler: Add vertex program code dumper from Gallium driver
2009-07-27 22:51:39 +02:00
Nicolai Hähnle
6bc0e1054a
r300/compiler: Prepare for hookup to Gallium
2009-07-27 22:51:39 +02:00
Nicolai Hähnle
e82a50a6a1
r300/fragprog: Move wpos_attr and fog_attr where they belong
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 22:51:39 +02:00
Nicolai Hähnle
790334883a
r300/fragprog: Remove hardcoded FRAG_ATTRIB_xxx constants
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 22:51:38 +02:00
Nicolai Hähnle
e034683eda
r300/fragprog: No longer rely on hardcoded FRAG_RESULT_xxx constants
...
Also, this makes radeon_program_pair depend on the r300 fragment program
compiler. Since we now know that r600+ no longer use the same pairing
style in their ALU, we can stop pretending that program_pair is useful
for anything but r300-r500 fragment programs.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 22:51:38 +02:00
Nicolai Hähnle
836050ba5e
r300/fragprog: Move some of the attribute handling out of the compiler
...
Attribute indices will probably be different in Gallium, so make the compiler
independent of magic values.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 22:51:38 +02:00
Nicolai Hähnle
1348a7ebc0
r300/fragprog: Finally get rid of the duplicate program copy
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 22:51:38 +02:00
Nicolai Hähnle
3f78381687
r300/vertprog: Move Mesa-dependent input/output handling out of compiler
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 22:51:37 +02:00
Nicolai Hähnle
d6a304800b
r300: Remove ugly PSIZ hack
...
Instead of setting Sourced, we simply force writemasks to begin with.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 22:51:37 +02:00
Nicolai Hähnle
05a51f4b3d
r300/vertprog: Refactor wpos rewrite using rc_program
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 22:51:37 +02:00
Nicolai Hähnle
ce0c32e3d2
r300/vertprog: Refactor fog_as_texcoord to use rc_program
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 22:51:36 +02:00
Nicolai Hähnle
a1e8992ffa
r300/vertprog: Refactor addArtificialOutputs to use rc_program
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 22:51:36 +02:00
Nicolai Hähnle
273af68570
r300/fragprog: Refactor wpos rewrite to use rc_program
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 22:51:36 +02:00
Nicolai Hähnle
9dc1be4158
r300/compiler: Refactor fragment program fog rewrite to use rc_program
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 22:51:36 +02:00
Nicolai Hähnle
aab949cb9d
r300/compiler: Refactor rewrite_depth_out to use rc_program
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 22:51:35 +02:00
Nicolai Hähnle
6f4608f53c
r300/compiler: Refactor local transforms to use rc_program
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 22:51:14 +02:00
Brian Paul
d2f56fe687
intel: Use _mesa_warning() to report GEM warnings
2009-07-27 14:35:18 -06:00
Ian Romanick
be32fb779b
ARB prog: Update generated files missed on previous two commits
...
The changes are, as it turns out, purely cosmetic.
2009-07-27 12:48:44 -07:00
Ian Romanick
6d3ccaf366
ARB prog: Delete comment about possibly needing to free a buffer
...
Valgrind doesn't complain about a leak here, so delete the comment
about possibly needing to free the state returned by yy_scan_bytes.
2009-07-27 12:38:52 -07:00
Karl Schultz
09ef339b69
windows: updated VC8 project files
...
See bug 22882.
2009-07-27 13:38:35 -06:00
Brian Paul
25e371fb7b
docs: 7.5 tarball md5sums
2009-07-27 13:27:54 -06:00
Ian Romanick
94b4556704
ARB prog: Clean up several memory leaks
...
As far as I am able to determine via code inspection and using
Valgrind, that should be all of the leaks in the parser.
2009-07-27 12:21:26 -07:00
Ian Romanick
946ea82bff
Add destructor for symbol_table
2009-07-27 12:19:14 -07:00
Ian Romanick
0044d3ba94
Add destructor for hash_table
2009-07-27 12:17:06 -07:00
Nicolai Hähnle
800f482586
r300: Allow compiler to add constants in a cleaner way
...
Adding constants is used in a number of non-native instruction
rewrites, and it required us to keep copies of modified gl_programs
around. This is a first step towards ending this.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:07 +02:00
Nicolai Hähnle
92f7a599c7
r300/compiler: Refactor nqssadce to use rc_program
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:07 +02:00
Nicolai Hähnle
a898e7d66c
r300/compiler: Refactor for rc_program usage
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:07 +02:00
Nicolai Hähnle
2237d136cd
r300/compiler: Add rc_print_program
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:07 +02:00
Nicolai Hähnle
8bcb6ef786
r300/compiler: Lay groundwork for better error handling
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:06 +02:00
Nicolai Hähnle
c5cb9a3378
r300: Remove dependency on GLcontext from compiler
...
Unfortunately, this does cause some code duplication (which we can hopefully
eliminate eventually).
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:06 +02:00
Nicolai Hähnle
d65404225d
r300/vertprog: Cleanup source conflict handling
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:06 +02:00
Nicolai Hähnle
86e3334333
r300/vertprog: Massively reduce code duplication
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:06 +02:00
Nicolai Hähnle
127ca61fa3
r300/vertprog: Use generic transforms and throw away unneeded code
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:06 +02:00
Nicolai Hähnle
84445273ed
r300: Move vertex program compilation to compiler
...
This is just the first step of refactoring. The separation is not yet
clean enough with this commit.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:05 +02:00
Nicolai Hähnle
11cd795940
r300: Cleanup vertex_program structure
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:05 +02:00
Nicolai Hähnle
927f5f1682
r300: Remove faux lazy translation of vertex programs
...
De facto, vertex programs were translated immediately in all situations,
so let's just stop pretending that we do lazy translation.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:05 +02:00
Nicolai Hähnle
a808b10ce8
r300: Reduce include dependencies
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:05 +02:00
Nicolai Hähnle
9198ab8bfc
r300: Introduce rc_program and use it in radeon_pair
...
The goal is to convert both Mesa and TGSI programs into an intermediate format
that happens to be convenient for us.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:05 +02:00
Nicolai Hähnle
9cd5e3e13a
r300: Add radeon_compiler as a base for compilation-related tasks
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:04 +02:00
Nicolai Hähnle
647766494f
r300: Remove some unnecessary includes
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:04 +02:00
Nicolai Hähnle
77a6ae64b6
r300/compiler: Compile the compiler seperately into an archive
...
This is all part of untangling the compiler from the classic driver, so that
it may be used in Gallium without depending on Mesa stuff if possible
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:04 +02:00
Nicolai Hähnle
d6275ccf79
r300: Further reduce dependency between compiler and classic driver
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:04 +02:00
Nicolai Hähnle
f70d3ee371
r300: Remove some dependencies on additional fragment program copies
...
The copy is still needed because some program transforms add state variables
or constants.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:04 +02:00
Nicolai Hähnle
b54e083201
r300: Remove GLcontext from r300_fragment_program_compiler
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:03 +02:00
Nicolai Hähnle
e93d70e3e9
r300: Remove GLcontext requirement from radeonLocalTransform
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:03 +02:00
Nicolai Hähnle
9ceee4d3e4
r300: Remove unused enums
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:03 +02:00
Nicolai Hähnle
b4b286b980
r300: Remove GLcontext requirement from radeon_nqssadce
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:03 +02:00
Nicolai Hähnle
d29cdde569
r300: Remove GLcontext requirement from radeon_program_pair
...
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:03 +02:00
Nicolai Hähnle
cb8c694adb
r300/program_pair: Introduce driver-specific texture instruction structure
...
This is to prepare more experimentation and possible internal changes in the
compiler.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:02 +02:00
Nicolai Hähnle
78f88d8b87
r300/program_pair: Dynamically allocate instructions temporarily
...
In preparation of using TGSI, where we cannot easily predict the number
of instructions.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:02 +02:00
Nicolai Hähnle
e5bed439be
r300: Detangle fragment program compiler from driver-specific structure
...
This is in preparation of sharing the fragment program compiler with Gallium:
Compiler code is moved into its own directory and modified so that it no
longer depends on driver structures.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-27 20:32:02 +02:00
Pauli Nieminen
6b142866ab
radeon: Add r6xx/r7xx chip family to get_chip_family_name
...
This fixes problem that glxinfo was reporting r600+ cards as unknown.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com >
2009-07-27 11:06:18 -04:00
Patrice Mandin
1ee3bcfff0
nouveau: swizzle a single row or column, doing it one pixel at a time
2009-07-27 10:58:11 +02:00
Alex Deucher
7d3190a85b
r600: fix textures
...
We weren't allocating enough gprs for the fragment shader
in some cases. There are likely other issues that still need
to be sorted out for textures, but at least they now work.
2009-07-27 03:52:37 -04:00
Alex Deucher
7e6819f843
r600: don't draw when num indices is 0
...
fixes engine demo
2009-07-27 02:26:41 -04:00
Alex Deucher
48b2fea142
r600: set VGT NUM_INSTANCES as part of the draw command
...
set VGT NUM_INSTANCES as part of the draw command rather
than as state as recommended by the pm4 guide. Also,
use the NUM_INSTANCES packet.
2009-07-27 02:26:41 -04:00
Alex Deucher
600a53a32e
r600: Use R600_SCRATCH_REG_OFFSET rather than RADEON_SCRATCH_REG_OFFSET
...
noticed by vehemens on IRC.
2009-07-27 02:26:41 -04:00
Alex Deucher
0b3d51ee31
r600: switch vtx resource setup to use SETfield macros
...
For consistency
2009-07-27 02:26:41 -04:00
Alex Deucher
2c5e55d919
r600: switch tex code to use SETfield macros
...
for consistency with the rest of the code.
2009-07-27 02:26:41 -04:00
Corbin Simpson
7a10472f09
r300g: Fix two trivial texture size issues.
...
Next thing to fix: progs/tests/mipgen.
2009-07-26 22:48:20 -07:00
Corbin Simpson
725c1f004c
radeon-gallium: If BO allocation fails, return NULL.
2009-07-26 22:35:26 -07:00
Corbin Simpson
2cbd5ecfb6
r300g: Add some debugging, correct little bits of math in texture setup.
...
Simple stuff still works, but not sure about some of the more complex things.
2009-07-26 21:38:24 -07:00
Julien Cristau
a151efc6cc
Use dh_lintian.
2009-07-27 00:29:45 +02:00
Julien Cristau
05c0e10a9e
Override 'package-name-doesnt-match-sonames' lintian warnings
2009-07-27 00:29:44 +02:00
Patrice Mandin
8df35b7b57
nouveau: only swizzle square textures for copy
2009-07-26 22:30:35 +02:00
José Fonseca
5276b049b4
util: fix typo.
2009-07-26 20:31:59 +01:00
Patrice Mandin
2b8a8f75f3
nouveau: Take into account destination position for copy_swizzle, need to split copy a bit more
2009-07-26 16:18:06 +02:00
Patrice Mandin
77a8a650e6
nouveau: Recursively swizzle an NPOT sized copy
2009-07-26 12:30:12 +02:00
Ian Romanick
258f640eda
ARB prog: Layout parameters from parameter type, not src type
...
Use the type stored in the Parameters array to determine the layout
instead of the type in the instruction register field. Also, update
the instruction register field based on the parameter type.
This makes Google Earth work exactly like with Mesa master.
2009-07-24 18:14:47 -07:00
Ian Romanick
a7400e7364
ARB prog: _mesa_print_program output should go to same place as _mesa_printf
2009-07-24 18:03:02 -07:00
Ian Romanick
f3cba9d66a
ARB prog parse: Fix cut-and-paste error for constant vectors
2009-07-24 18:01:59 -07:00
Ian Romanick
6f8214cae6
ARB prog: get frag prog texture info from the right place
...
This gets basic texturing working. w00t!
2009-07-24 17:33:30 -07:00
Patrice Mandin
8c30292a6e
nouveau: use nv04_surface_copy_swizzle only for POT sizes
2009-07-24 23:37:46 +02:00
Joakim Sindholt
12b183d250
radeon-gallium: remove old getparam ioctl
2009-07-24 14:54:00 +02:00
Brian Paul
c57d81ddc9
mesa: include glew headers in MesaDemos tarballs
2009-07-23 20:20:39 -06:00
Brice Goglin
3c4727a4e9
Prepare changelog for upload
2009-07-24 00:29:35 +02:00
Brice Goglin
40f217aea7
Enable i686 optimized libraries on hurd-i386
2009-07-24 00:29:25 +02:00
Alex Deucher
3b4235d4eb
r600: fix segfault in morph3d
...
These attributes still need work, but it shouldn't hurt to
enable them.
2009-07-23 18:26:02 -04:00
Brice Goglin
d3403389cd
Only install the huge upstream changelog in mesa-common-dev
2009-07-23 23:41:19 +02:00
Brice Goglin
a70d1eb1ee
Pull from upstream mesa_7_5_branch
2009-07-23 21:11:22 +02:00
Brice Goglin
d7aa5d5ca0
Merge branch 'mesa_7_5_branch' of git://anongit.freedesktop.org/mesa/mesa into debian-unstable
2009-07-23 21:09:47 +02:00
Keith Whitwell
aa99a765c1
draw: correct address for machine struct in llvm path
...
This changed after a recent commit.
2009-07-23 18:48:04 +01:00
Keith Whitwell
adc6f8cdfc
gallivm: updates for TGSI changes
...
make linux-llvm succeeds, but doesn't seem to be working, at least with
llvm 2.5
2009-07-23 17:59:08 +01:00
Corbin Simpson
ca83d5a8db
r300g, radeon-gallium: Fix API, cleanup.
...
Something called "validate" should return FALSE on failure, not TRUE.
2009-07-23 07:18:29 -07:00
Nicolai Hähnle
27b3c435ba
radeon-gallium: Build fixes wrt changed libdrm_radeon space check API
...
Had to be hacked up a bit to apply to master. Sorry 'bout that. :3
2009-07-23 07:18:29 -07:00
Corbin Simpson
256eacbde4
r300g: PIPE_CAP_BLEND_EQUATION_SEPARATE.
2009-07-23 07:18:29 -07:00
Keith Whitwell
d0d98f3ecf
gallium: clean up opcode definitions
...
Remove commented-out opcodes. Remove information about API mappings
to opcodes, but add a reference to tgsi-instruction-set.txt where
that information is better presented.
2009-07-23 14:39:07 +01:00
Keith Whitwell
78379abcbf
gallium: remove deprecated TGSI opcodes
...
Various opcodes which can be implemented trivially with other TGSI opcodes,
such as matrix multiplication and negation. These were not used by any
state tracker or implemented by any of the drivers.
2009-07-23 14:38:26 +01:00
José Fonseca
8b78294d21
r600: Remove CRLF line endings.
2009-07-23 14:11:10 +01:00
Vinson Lee
af1163cc41
util: Add support for Mac OS.
2009-07-23 14:08:07 +01:00
Corbin Simpson
07961bb05e
r300g: Actually mark shaders as translated/untranslated.
...
Also trust that Gallium will not give us TGSI that miscounts shader consts.
This creates a 20x speedup on glxgears, from 8 FPS to 160 FPS.
2009-07-23 00:00:28 -07:00
Brian Paul
895c435def
cell: update TGSI_OPCODE_ cases
2009-07-22 21:04:07 -06:00
Ian Romanick
ef80c2012d
parser: Clean up a bunch of silly compiler warnings
2009-07-22 17:13:08 -07:00
Ian Romanick
0db5ef0741
parser: Track a few more frag prog related values
2009-07-22 16:21:54 -07:00
Ian Romanick
28b13038d8
parser: Ensure that param_binding_type is set correctly
2009-07-22 16:03:32 -07:00
Michel Dänzer
d602966f89
gallium: Fix PPC build.
2009-07-23 00:47:32 +02:00
Ian Romanick
5f090bb074
GIT ignore program_parse.output
2009-07-22 15:28:31 -07:00
Ian Romanick
c2ee82d693
parser: Set NumParameters
2009-07-22 15:27:31 -07:00
Ian Romanick
44843c7533
parser: Clean up generation of error strings during assembly
2009-07-22 15:06:49 -07:00
Patrice Mandin
b7042399fd
nouveau: nv30: wrong variable for format
2009-07-22 22:26:08 +02:00
Maciej Cencora
b129c55f42
r300: fix address register handling in NQSSADCE
...
For address register we always use X component
2009-07-22 22:10:22 +02:00
Ian Romanick
aec4291706
parser: Initialize unused instruction source registers
...
The 965 driver expects unused source registers (e.g., SrcReg[2] of a
DP3 instruction) to have a register file of PROGRAM_UNDEFINED.
Initializing these source registers ensures that this happens.
2009-07-22 12:29:48 -07:00
Patrice Mandin
db40bb0287
nouveau: Take into account sx,sy parameters to read from source surface
2009-07-22 21:10:20 +02:00
Brian Paul
b4ba6a66b7
docs: initial release notes for 7.5.1
2009-07-22 12:49:34 -06:00
Brian Paul
9c4b877519
mesa: bump version to 7.5.1
2009-07-22 12:46:53 -06:00
Brian Paul
b9e2e32daf
mesa: include GLEW sources in MesaDemos tarball
2009-07-22 12:34:07 -06:00
Ian Romanick
69d3d19b54
parser: Anonymous constants come from the PROGRAM_CONSTANT file
2009-07-22 10:51:18 -07:00
Keith Whitwell
ede9f3b52e
gallium: remove multiple aliases for TGSI opcodes
...
This is a source of ongoing confusion. TGSI has multiple names for
opcodes where the same semantics originate in multiple shader APIs.
For instance, TGSI includes both Mesa/GLSL and DX/SM30 names for
opcodes with the same semantics, but aliases those names to the same
underlying opcode number.
This makes it very difficult to visually inspect two sets of opcodes
(eg in state tracker & driver) and check if they implement the same
functionality.
This patch arbitarily rips out the versions of the opcodes not currently
favoured by the mesa state tracker and leaves us with a single name
for each distinct operation.
2009-07-22 12:42:09 +01:00
Keith Whitwell
fd31f92cea
gallium: simplify tgsi_full_immediate struct
...
Remove the need to have a pointer in this struct by just including
the immediate data inline. Having a pointer in the struct introduces
complications like needing to alloc/free the data pointed to, uncertainty
about who owns the data, etc. There doesn't seem to be a need for it,
and it is unlikely to make much difference plus or minus to performance.
Added some asserts as we now will trip up on immediates with more
than four elements. There were actually already quite a few such asserts,
but the >4 case could be used in the future to specify indexable immediate
ranges, such as lookup tables.
2009-07-22 12:42:09 +01:00
Richard Li
5e3c62b550
r600: fix dst reg indexing for real
...
This fixes segfaults in apps like teapot and tunnel
2009-07-21 17:56:06 -04:00
Alex Deucher
7edb2a9eef
Revert "r600: fix dst reg indexing"
...
This reverts commit cc893d9a98 .
Richard has the proper fix.
2009-07-21 17:44:36 -04:00
Alex Deucher
72a3d8845f
r600: add stencil support
2009-07-21 17:10:54 -04:00
Alex Deucher
db0160bb9d
r600: use state functions to set default state
2009-07-21 17:10:54 -04:00
Alex Deucher
bd62cd735f
r600: fill in point functions
2009-07-21 17:10:54 -04:00
Alex Deucher
5a615e7e65
r600: set provoking vertex to last vertex for OGL
2009-07-21 17:10:54 -04:00
Alex Deucher
60787df1e5
r600: fill in r700UpdateViewportOffset
2009-07-21 17:10:53 -04:00
Alex Deucher
549b8e6f1a
r600: first pass at polyoffset support
...
not working yet
2009-07-21 17:10:53 -04:00
Brice Goglin
04493de67b
Prepare changelog for upload
2009-07-21 22:22:07 +02:00
Brice Goglin
e06e2b001f
Install the upstream ChangeLog
2009-07-21 22:21:47 +02:00
Jerome Glisse
7247446ba8
radeon: fix colorbuffer pitch emission regarding tiling in KMS/CS case
...
We need to emit a relocation for pitch register so that kernel can
check and properly setup tiling on the color buffer.
2009-07-21 21:14:19 +02:00
Brice Goglin
d740456ee5
Install the upstream ChangeLog
2009-07-21 20:42:50 +02:00
Brice Goglin
45c5ed4bb8
Pull from upstream mesa_7_5_branch
2009-07-21 20:38:30 +02:00
Brice Goglin
19a8ce6f70
Merge branch 'mesa_7_5_branch' of git://anongit.freedesktop.org/mesa/mesa into debian-unstable
2009-07-21 20:05:24 +02:00
Alex Deucher
ecead30111
R600: fix up some build problems
2009-07-21 11:09:05 -04:00
Alex Deucher
9e6d38f8a2
r600: add alpha test support
2009-07-21 10:53:20 -04:00
Michel Dänzer
cf24119d38
Track Radeon driver symlinks in Git.
2009-07-21 10:47:42 +02:00
Eric Anholt
a6b314150c
intel: Fall back on glBitmap with fog enabled.
...
We would have to build the program with the appropriate fog mode, and
also supply the fog coordinate if appropriate.
Bug #19413 .
(cherry picked from commit 8ae02a3919 )
2009-07-20 19:10:32 -07:00
Eric Anholt
1b445f9673
i965: Don't clip everything if FRONT_AND_BACK culling while culling disabled.
...
Fixes everything-black with meta_clear_tris on quake4-mpdemo and doom3-demo.
Bug #18844 , 22077.
(cherry picked from commit 81d5550684 )
2009-07-20 19:10:20 -07:00
Peter Hutterer
5358e54d1a
Add missing X11_INCLUDES to egl/drivers/demo and egl/main.
...
Compiling mesa on a system with no X headers installed in the default
include paths fails due to missing X11 includes. The header includes are
picked up by configure but not applied.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net >
Signed-off-by: Dave Airlie <airlied@redhat.com >
2009-07-21 11:45:49 +10:00
Eric Anholt
81d5550684
i965: Don't clip everything if FRONT_AND_BACK culling while culling disabled.
...
Fixes everything-black with meta_clear_tris on quake4-mpdemo and doom3-demo.
Bug #18844 , 22077.
2009-07-20 18:31:13 -07:00
Ian Romanick
770cebbc29
ARB_fp/vp: Initial import of new ARB vp/fp assembler
...
This still needs quite a bit of work, but a bunch of the programs in progs/vp
produce correct results.
2009-07-20 17:44:36 -07:00
Alex Deucher
6617fa6fab
r600: fix typo in blend code
2009-07-20 19:33:05 -04:00
Kevin DeKorte
cc893d9a98
r600: fix dst reg indexing
...
This fixes segfaults in apps like teapot and tunnel
2009-07-20 19:00:57 -04:00
Alex Deucher
265d5eba65
r600: add blending support
2009-07-20 19:00:57 -04:00
Alex Deucher
a369963b18
r600: add user clip plane support
2009-07-20 19:00:57 -04:00
Alex Deucher
ce9c5a1a27
r600: add logicop support
2009-07-20 19:00:57 -04:00
Ian Romanick
480567d5c4
Add new _mesa_new_parameter_list_sized to pre-allocate a parameter list
2009-07-20 15:37:24 -07:00
Keith Whitwell
cad82cd063
tgsi: get texturing working in vertex shader sse2 path
...
Missing file from previous commit.
2009-07-20 19:47:38 +01:00
Michel Dänzer
cd63e35603
Merge branch 'mesa_7_5_branch'
2009-07-20 20:41:11 +02:00
Michel Dänzer
5ed4404005
radeon: With DRI1, if we have HW stencil, only expose fbconfigs with stencil.
...
Otherwise simple apps like glxgears pick up a DirectColor visual since the X
server mixes the depth 32 visual in with the other GLX visuals, and this seems
to result in a (mostly) black screen due to a bad ColorMap for a lot of people.
The bad ColorMap may be a bug in the apps, the X server or X driver, and
regardless of that I think the X server should ideally make the depth 32 GLX
visual separate from the rest again, but in the meantime this makes us cope.
(depth_bits is either 16 or 24, never 0)
2009-07-20 20:34:04 +02:00
Keith Whitwell
442101dad7
tgsi: get texturing working in vertex shader sse2 path
2009-07-20 19:32:28 +01:00
Keith Whitwell
27a19be8d1
tgsi: fix regression in indexed const lookups
...
This function was calling get_input_base() and get_output_base() to
get the names of a couple of register to use as temps. Those
functions no longer return registers, so adjust it to get the
registers elsewhere.
This change doesn't address the issue that it's a fairly poor way to
grab a register name by calling a function with an apparently
unrelated meaning.
2009-07-20 19:32:28 +01:00
Kevin DeKorte
91512fa019
r600: Fix compilation
2009-07-20 09:27:17 -04:00
Cooper Yuan
19249a1ae7
R6xx/r7xx: Fix line stipple and width issue
2009-07-20 17:42:47 +08:00
Michel Dänzer
cf721c8137
Add common_ppc.c to MESA_GALLIUM_SOURCES.
2009-07-20 02:11:17 +02:00
Michel Dänzer
3d0009ce45
r300g: Fix SCons build.
2009-07-20 02:06:37 +02:00
Michel Dänzer
0b7a907f39
gallium/trace: Fix SCons build.
2009-07-20 02:05:38 +02:00
Michel Dänzer
3326be6c0a
r300g: Guard R500 register writes by is_r500 check.
...
Flagged by the DRM command stream checker. This allows the driver to work on
non-R500 cards.
2009-07-20 01:53:15 +02:00
Brice Goglin
767c0b16f3
Prepare changelog for upload
2009-07-19 12:54:22 +02:00
Brice Goglin
3041819a4e
New upstream release
2009-07-19 12:51:08 +02:00
Brice Goglin
4a9beaf2e9
Merge tag 'mesa_7_5' into debian-experimental
...
Conflicts:
progs/tests/.gitignore
progs/tests/Makefile
progs/tests/SConscript
progs/trivial/Makefile
scons/dxsdk.py
scons/gallium.py
2009-07-19 12:50:28 +02:00
Dave Airlie
a8921d0b52
gallium: make g3dvl build again
2009-07-18 17:44:44 +10:00
Brian Paul
b96ae1b2c4
Merge branch 'mesa_7_5_branch'
...
Conflicts:
Makefile
progs/glsl/multitex.c
src/mesa/main/enums.c
src/mesa/main/state.c
src/mesa/main/texenvprogram.c
src/mesa/main/version.h
2009-07-17 22:00:47 -06:00
Alex Deucher
f81f57e25d
R6xx/R7xx: add fine grained syncing support
2009-07-17 19:05:30 -04:00
Alex Deucher
b192b9dac6
R6xx/r7xx: send depth state in it's own function
2009-07-17 19:05:29 -04:00
Andrew Randrianasulu
2a6f58460a
st/egl: Fix broken build after EGL thread changes
2009-07-18 00:55:12 +02:00
Alex Deucher
5008269cfe
R200: fix build when RADEON_DEBUG_BO is set
2009-07-17 18:19:01 -04:00
Dave Airlie
a046beaffe
radeon: disable BO debug
2009-07-18 08:00:23 +10:00
Brian Paul
cd10996d4f
progs/util: remove extfuncs.h (we use GLEW instead)
2009-07-17 14:43:29 -06:00
Brian Paul
40fd101919
egl: commit missing eglcurrent.[ch] files
...
Not sure how these got left out from earlier commit.
2009-07-17 13:36:58 -06:00
Brian Paul
ee0b1bc7d3
progs/glsl: finish conversion to GLEW
...
This is a follow-on to b799af91d5 .
Remove _func function suffix and unneeded #includes.
2009-07-17 13:23:11 -06:00
Alex Deucher
e910f6831b
Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa into r6xx-rewrite
2009-07-17 14:46:40 -04:00
Kevin DeKorte
79a170108f
R6xx/r7xx: warning fixes
...
patch from Kevin DeKorte with some minor fixes from me.
2009-07-17 14:43:42 -04:00
Brian Paul
a77b455af0
mesa: set version to 7.5
2009-07-17 12:40:48 -06:00
Brian Paul
71b9e10291
mesa: set version to 7.5
2009-07-17 12:40:44 -06:00
Brian Paul
7fd3674672
docs: set date for 7.5 release
2009-07-17 12:40:24 -06:00
Chia-I Wu
30bccf8ea9
xeglthreads: Check current context for EGL per-thread support.
...
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-07-17 11:56:32 -06:00
Chia-I Wu
15fdbc8361
egl: Remove redundant DeletePending flag.
...
A context or surface that is neither linked to a display nor current to
a thread should be destroyed. Therefore, an unlinked context or surface
implies a pending delete automatically.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-07-17 11:56:00 -06:00
Chia-I Wu
3f7e0d5302
egl: Destroy display's resources upon termination.
...
eglTerminate should destroy the contexts and surfaces of the display.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-07-17 11:54:06 -06:00
Chia-I Wu
be9d1ab171
egl: Return the same EGL Display for the same native display.
...
The latest revision of the spec explicitly requires the same handle to
be returned for the same native display.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-07-17 11:53:39 -06:00
Chia-I Wu
cca31340b5
egl: Use the link functions to manage resources.
...
This commit uses the newly introduced link functions to manage EGL
contexts and surfaces. As a result of this, the API for drivers are
changed. All drivers are updated for the change.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-07-17 11:53:03 -06:00
Chia-I Wu
18457cb263
egl: Add funtions to link contexts and surfaces to displays.
...
EGL contexts and surfaces are resources of displays. They should be
managed by displays. This commit adds a bunch of functions to
egldisplay.c to help establish the links between contexts/surfaces and
displays. How links are established is considered opaque outside
display. Functions like _eglGetSurfaceHandle or _eglLookupSurface are
therefore moved to egldisplay.c, with some small modifications.
The idea is also extended to display. That is, displays need to link to
themselves to be looked up.
This commit only adds the functions. A commit to use them should
follow.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-07-17 11:48:27 -06:00
Chia-I Wu
21b635ffa8
egl: Extend per-thread info for multiple current contexts.
...
EGL allows multiple current contexts, as long as they are bound to
different client APIs.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-07-17 11:42:04 -06:00
Chia-I Wu
75da80b295
egl: Support per-thread info.
...
This commit introduces a "current" system to manage per-thread info. It
uses TLS, if GLX_USE_TLS is defined, or pthread, if PTHREADS is defined.
If none of them are defined, it uses a dummy implementation that is just
like before.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-07-17 11:41:02 -06:00
Chia-I Wu
8e92ec9fdd
egl: Add eglcompiler.h for compiler features.
...
Only INLINE (from mesa/main/compiler.h) is defined now. It may be used
to deal with symbol visibility and int/pointer conversion in the future.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
Signed-off-by: Brian Paul <brianp@vmware.com >
2009-07-17 11:36:45 -06:00
Alex Deucher
c4ab08a0cd
R6xx/r7xx: disable depth/stencil compression for now
2009-07-17 12:21:33 -04:00
Brice Goglin
fe9b9fec39
Enable i686 optimized libraries on kfreebsd-i386
2009-07-17 18:21:27 +02:00
Alex Deucher
60d681f367
R6xx/r7xx: add some missing state regs
2009-07-17 12:07:15 -04:00
Brian Paul
27587f46e5
docs: news entry for 7.5 release
2009-07-17 09:40:59 -06:00
Brian Paul
8c6e81f97d
docs: update links to Gallium wiki page on freedesktop.org
2009-07-17 09:40:59 -06:00
Eric Anholt
9cea84b6b5
texenv: Calculate whether we need to do secondary color on our own.
...
The _TriangleCaps bit is deprecated, not updated when we require, and
is set based on state that hasn't been updated at that point in
_mesa_update_state_locked().
Fixes incorrect clear color in glsl/twoside.c with meta_clear_tris.
2009-07-16 19:02:04 -07:00
Eric Anholt
99174e7630
i965: Add missing state dependency of sf_unit on _NEW_BUFFERS.
2009-07-16 19:00:34 -07:00
Alex Deucher
6f63698d26
R6xx: fix rendering on r6xx/rs780 chips
...
You always need to emit a fetch shader (fs) even if you
aren't using it. For now, just emit the fs with the
vs address to make the kernel happy.
2009-07-16 17:35:44 -04:00
José Fonseca
2ba98efdf6
python/retrace: Process the call no passed to --to option inclusively.
2009-07-16 19:34:44 +01:00
José Fonseca
cf7e8fbc2e
python/retrace: Dump the surface copy contents.
2009-07-16 19:32:40 +01:00
José Fonseca
5807ccb41b
python/retrace: Flush stdout before calling the pipe driver.
...
So that messages are in sync with stderr.
2009-07-16 19:31:36 +01:00
José Fonseca
d4e6df9ab6
mesa: Fix logbase2.
...
It was providing 1 too many for non power two values.
2009-07-16 19:20:25 +01:00
Keith Whitwell
04dd8b71b4
draw: fix ppc build regression
...
Found by x.org tinderbox, reported by Chris Ball.
2009-07-16 19:01:29 +01:00
Kevin DeKorte
c42a616314
Warning fixes
2009-07-16 11:57:14 -04:00
Alex Deucher
0850776f1a
R6xx/r7xx: remove unused function
...
Spotted by kdekorte on IRC
2009-07-16 11:53:58 -04:00
Brian Paul
3e8832d24b
st/mesa: add some array index bounds assertions
2009-07-16 08:44:51 -06:00
Chia-I Wu
721f80b82a
egl: Add xeglthreads
...
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
2009-07-16 08:29:57 -06:00
Richard Li
00a216fd1e
Restore vp input mapping, fix vtx stream missing problem.
2009-07-16 10:28:58 -04:00
Keith Whitwell
caf5d52d48
tgsi: simplify and fix sse KIL implementation
...
Use sse_movmskps to extract the correct bits of the comparison result
for use in updating the killmask. Simplify some logic around
identifying the set of necessary comparisons to make.
2009-07-16 12:49:27 +01:00
Keith Whitwell
e1ad38ad8e
rtasm: export sse_movmskps
2009-07-16 12:47:11 +01:00
Keith Whitwell
3858f47994
tgsi: initial texturing support on sse path
...
Most obvious problem is drawpixels comes out blocky, but this may be
an existing issue of KIL on the sse path.
2009-07-16 11:37:52 +01:00
José Fonseca
0c4350790a
python: Hack to prevent segmentation faults when python exits.
2009-07-16 11:22:56 +01:00
José Fonseca
4e1e18a772
wgl: Expose pipe_screen/pipe_context via an extension.
2009-07-16 11:22:56 +01:00
José Fonseca
3ab3209a1f
python: Obtain pipe_screen/pipe_context from the system's OpenGL driver.
2009-07-16 11:22:56 +01:00
Keith Whitwell
a01383ff6a
tgsi: make sse function callout mechanism more generic
...
Take a list of arguments rather than hardcoding TEMP_R0.
2009-07-16 10:11:46 +01:00
Keith Whitwell
ebc4a9bf2e
tgsi: reduce x86 reg usage in tgsi_sse generated programs
...
Pass the tgsi_exec_machine struct in directly and just hold a single
pointer to this struct, rather than keeping one for each of its
internal members.
2009-07-16 09:53:08 +01:00
Keith Whitwell
4e3002b50f
tgsi: no need to separately malloc input and output arrays
...
Can now guarantee alignment in the initial allocation of the tgsi exec machine.
2009-07-16 09:53:08 +01:00
Keith Whitwell
c202fe187c
gallium: reduce recursive include of tgsi_exec.h
...
A lot of draw code no longer needs to see this header.
2009-07-16 09:53:07 +01:00
Keith Whitwell
7fb702705a
tgsi: make function call code in tgsi_sse.c less opaque
...
Explictly pass src and dst arguments (previously dst argument was also
being used as a src). Separate argument handling from the rest of
the function call emit.
2009-07-16 09:53:07 +01:00
Keith Whitwell
6175653d0b
gallium: proper constructor and destructor for tgsi_exec_machine
...
Centralize the creation, initialization and destruction of this struct.
Use align_malloc instead of home-brew alternatives.
2009-07-16 09:53:07 +01:00
Alex Deucher
11606e873d
Fix more merge fallout
2009-07-16 02:59:36 -04:00
Kevin DeKorte
92a2f0164a
R6xx/r7xx: warning fixes
2009-07-15 17:13:09 -04:00
Richard Li
01b793ec7d
R6xx/r7xx: fix missing vertex stream
...
Somehow context->radeon.tcl.aos[j].bo is not null sometimes,
but it is safe for now because it is only a pointer to
dma.current so overwriting it would not hurt anything.
2009-07-15 17:00:42 -04:00
Alex Deucher
1e8a6068ee
radeon bo: Fix merge fall out
2009-07-15 15:59:04 -04:00
Alex Deucher
582838a666
R6xx/r7xx: more Makefile fixes
2009-07-15 15:40:35 -04:00
Alex Deucher
2ab328e5e4
Fix r600 makefile for lastest CS changes
2009-07-15 15:23:11 -04:00
Alex Deucher
c5c19919ce
Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa into r6xx-rewrite
...
This builds, but I get an assertion in radeonGetLock() due to
the drawable being null.
2009-07-15 14:17:07 -04:00
Luca Barbieri
6b7b13b5eb
softpipe: limit blend results to [0,1]
2009-07-15 11:34:36 -06:00
Brian Paul
d970313b66
Fix state flag dependencies for fixed function fragment program updates.
...
I started looking into why _NEW_ARRAY punishes us, and while annotating
dependencies noticed that a bunch of dependencies were missing.
(cherry picked from master, commit e5f63c403b )
2009-07-15 11:12:44 -06:00
Alex Deucher
a0d4a12614
make sure ctx->Driver.Flush is valid before calling it
2009-07-15 11:31:24 -04:00
Alex Deucher
efe7ad233c
Use memcpy directly in the common code
...
This alleviates the need for an additional symbol.
2009-07-15 11:16:41 -04:00
José Fonseca
0474b5cb2a
python/retrace: Interpret surface_copy.
2009-07-15 16:02:39 +01:00
José Fonseca
c68f659be3
python/samples: Use PIPE_FORMAT_Z16_UNORM instead of PIPE_FORMAT_Z32_UNORM.
...
More common. True fix would be to use whatever the screen supports though.
2009-07-15 16:02:39 +01:00
Keith Whitwell
fdeb778990
mesa: recognize and eliminate repeated error messages
2009-07-15 13:31:51 +01:00
Keith Whitwell
59de430de7
mesa: split out errorstring switch from _mesa_error
...
Move a chunk of code out of _mesa_error()
2009-07-15 13:31:51 +01:00
Keith Whitwell
df5f7a6761
mesa: remove dead code in _mesa_error
...
Remove early and unused snprintf and where[] string.
2009-07-15 13:31:51 +01:00
Keith Whitwell
6c9d8a6f24
mesa: don't call getenv every time _mesa_error is called
...
Buggy apps can generate thousands of mesa_error calls. Don't need
to keep calling getenv to retreive the same MESA_DEBUG string each
time.
2009-07-15 13:31:50 +01:00
Dave Airlie
3a3b83e511
radeon: update span reading micro tile code
...
tested on r500 with zreaddraw with Z buffer in all 3 modes
2009-07-15 14:23:14 +10:00
Dave Airlie
bd4ed25222
r300: emit z depth pitch reloc in preparation for tiling
2009-07-15 14:23:14 +10:00
Dave Airlie
94d2a809f9
radeon: r300 fix span reading for macro tiled buffers.
...
this uses the correct formula for macro tiled buffers for readback
2009-07-15 14:23:13 +10:00
Dave Airlie
9b17f041d1
radeon: for tiling you really need to use GET/PUT VALUE not PTR.
...
since the surfaces aren't linear you can't just use GET_PTR
2009-07-15 14:23:13 +10:00
Xiang, Haihao
868aa16074
i965: the offset of any branch/jump instruction is in unit of 64bits on IGDNG
2009-07-15 10:48:13 +08:00
Alex Deucher
10b3e64bca
R6xx/r7xx: implement memcpy buffer swaps
...
This allows double buffered apps to run, but perfomance
will be awful until we implement something faster.
You must update to the latest kernel modules.
2009-07-14 21:19:32 -04:00
Dave Airlie
f6f0e117a4
intel/radeon: add common metaops code.
...
Move all the metaops to a dri_metaops file and port radeon/intel
to use the new common meta ops code.
2009-07-15 10:30:23 +10:00
Alex Deucher
9385e4e1ff
r6xx/r7xx: fix buffer aging bug
...
We were using sparse indexing for aos, while the common
code expected packed indexing.
2009-07-14 20:08:27 -04:00
Alex Deucher
9ae78dc0bc
R6xx/R7xx: no irqs yet.
2009-07-14 20:06:29 -04:00
Dave Airlie
681ede8836
radeon: fix unsigned vs signed comparison in stencil code.
...
This function takes a GLint not a GLuint, passing in -1
breaks internally.
2009-07-15 08:19:34 +10:00
Eric Anholt
99d07d0f91
intel: Fix ClearDepth to not be affected by DepthRange.
...
Fixes new piglit depthrange-clear.c test.
2009-07-14 15:14:52 -07:00
Eric Anholt
b677c40abb
intel: Set DepthRange in the metaops using RasterPos[2].
...
RasterPos[2] is already sent through the window transform, which includes
DepthRange handling. So make DepthRange for the metaops a noop.
Fixes a failure in oglconform depthrange.c
2009-07-14 15:14:52 -07:00
Eric Anholt
e5f63c403b
Fix state flag dependencies for fixed function fragment program updates.
...
I started looking into why _NEW_ARRAY punishes us, and while annotating
dependencies noticed that a bunch of dependencies were missing.
2009-07-14 15:14:52 -07:00
Eric Anholt
374110bc98
intel: Flag _NEW_ARRAY state when doing array object binding in clears.
...
This is just following bind_vertex_array()'s behavior.
2009-07-14 15:14:51 -07:00
Alex Deucher
a1ecbb2356
Disable shader dumps
2009-07-14 18:01:29 -04:00
Brian Paul
9aca6769df
mesa: fix texture border color code for glPopAttrib()
...
The texture object's border color used to be stored as GLchan but it's
been GLfloat for a while now.
2009-07-14 14:28:01 -06:00
Jakob Bornecrantz
26e58a42b0
progs/tests: Use compressed texture in mipmap_comp_tests
2009-07-14 17:11:07 +01:00
Jakob Bornecrantz
b0a17581e2
progs/tests: Tests more views in mipmap_comp_tests
2009-07-14 17:11:05 +01:00
Jakob Bornecrantz
a36b9987cd
progs/tests: Add yet another mipmap test
2009-07-14 17:11:01 +01:00
Brian Paul
6ec955efaf
mesa: regenerated enums.c file
2009-07-14 07:58:43 -06:00
Brian Paul
e786ecbfb5
mesa: regenerated enums.c file
2009-07-14 07:47:19 -06:00
José Fonseca
7325c1ebc8
scons: Monkey patch os.spawnve on Windows to become thread safe.
...
See also:
- http://bugs.python.org/issue6476
- http://scons.tigris.org/issues/show_bug.cgi?id=2449
2009-07-14 12:21:25 +01:00
José Fonseca
4ed1de8b84
mesa: Report the true face number when flushing.
2009-07-14 12:20:43 +01:00
Corbin Simpson
b727150b14
dri-st: Unbreak GL_EXT_blend_equation_separate.
...
Since it has a dispatch table entry (for BlendEquationSeparateEXT,)
can't omit it from this list. It'll still get disabled if the cap
(PIPE_CAP_BLEND_EQUATION_SEPARATE) isn't set.
Somebody that doesn't suck at GL (read: not me) should probably add
this into progs/samples/blendeq or similar so we can test it.
2009-07-14 01:16:25 -07:00
Patrice Mandin
54cf63278f
gallium: Define PIPE_CAP_BLEND_EQUATION_SEPARATE, remove extension from default extension list
2009-07-14 09:44:49 +02:00
Michel Dänzer
33f56b4612
radeon: Differentiate 16 bpp destination formats.
...
Fixes those formats in fbo_firecube.
Only tested with r300, radeon and r200 compile tested only.
2009-07-14 08:25:27 +02:00
Michel Dänzer
60e60bb302
radeon: Invert front face winding when rendering to FBO.
...
Fixes fgl_glxgears and progs/demos/fbotexture after pressing 'c'.
Tested with r300, radeon and r200 compile tested only.
2009-07-14 08:00:49 +02:00
Cooper Yuan
f4646f3247
R6xx/r7xx: Fix specular lighting issue
2009-07-14 10:39:07 +08:00
Nicolai Hähnle
59155f70e7
r300g: Small compile warning fixes.
...
Signed-off-by: Corbin Simpson <MostAwesomeDude@gmail.com >
2009-07-13 16:26:29 -07:00
Nicolai Hähnle
b3f1d370a2
r300g, radeon: Whitespace fixes.
...
Signed-off-by: Corbin Simpson <MostAwesomeDude@gmail.com >
2009-07-13 16:26:29 -07:00
Corbin Simpson
ca28e591f2
r300g: Use align() instead of inline maths.
2009-07-13 16:26:29 -07:00
Maciej Cencora
9226e3d6a6
Merge branch 'shaders_cleanup'
2009-07-13 20:29:11 +02:00
Eric Anholt
0dc700850a
intel: Partially fix fallback detection for glCopyTexSubImage.
...
Really, we should be checking that the MesaTexFormat for the read buffer
and the texture match, but the previous code wasn't even doing that, so
matching the cpp should be an improvement (and potentially fix some hangs!).
The previous code also rejected GL_RGB even though blitting the alpha
channel to the ignored channel of an x8r8g8b8 texture should be fine, which
tripped up compiz's blur plugin.
2009-07-13 10:57:12 -07:00
Maciej Cencora
582bd34665
r300: always assume all components are read by fragment program
...
Components of input attributes that are used by fragment program aren't part of vertex program key, and that may lead to situations when vertex program writes only TEX1.xy and fragment program reads TEX1.xyz, resulting in rendering errors.
Reported-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-13 19:28:15 +02:00
Nicolai Hähnle
f06910f6c3
r300: Fix fogcoord rewriting
...
We only care about the actual fogcoord itself now, reducing the rewriting
done for the vertex program.
The rewriting of source operand swizzles in the fragment program takes
care that fogcoord.yzw = 001.
This should fix fogcoord rewriting entirely, which had been horribly
broken in the face of dot-product instructions, and just broken (though
not horribly so) in the face of almost every other instruction (the W
component would be incorrect for most arithmetic instructions).
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-13 19:28:15 +02:00
Maciej Cencora
3f5382819e
r300: fix swizzle masking in getUsedComponents
2009-07-13 19:28:15 +02:00
Maciej Cencora
acd3360041
r300: minor fix
...
Split initializations becase the vars are of different type.
Reported-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-13 19:28:15 +02:00
Maciej Cencora
1a5520fcd3
r300: move variables declarations
2009-07-13 19:28:14 +02:00
Maciej Cencora
b3716eeb61
r300: document r300_vertex_program_cont structure
...
Reported-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-13 19:28:14 +02:00
Maciej Cencora
a0204ce456
r300: document r300_fragment_program_cont struct
2009-07-13 19:28:14 +02:00
Maciej Cencora
ec854729d1
r300: fix indentation
...
Reported-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-13 19:28:13 +02:00
Maciej Cencora
48cc352a71
r300: fix StrideB == 0 case when converting data format
...
Reported-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-13 19:28:13 +02:00
Maciej Cencora
4eff323731
r300: hw can handle per component negations in vertex shaders
...
Reported-by: Nicolai Haehnle <nhaehnle@gmail.com >
2009-07-13 19:28:13 +02:00
Maciej Cencora
4efb9f053c
r300: fix WPOS for SWTCL
2009-07-13 19:28:13 +02:00
Maciej Cencora
bdc8a95fc9
r300: removed unnecessary params
...
We don't have check which attributes are used by fragment program - it's already done by NQSSADCE.
2009-07-13 19:28:12 +02:00
Maciej Cencora
65d9f23c7c
r300: use NQSSADCE for vertex programs
2009-07-13 19:28:12 +02:00
Maciej Cencora
70448b9f95
r300: operate on copy of a program when pairing instructions
...
We need to keep unpaired program for vertex program NQSSADCE.
2009-07-13 19:28:12 +02:00
Maciej Cencora
12a6d73c75
r300: handle relative addressing in NQSSADCE
2009-07-13 19:28:11 +02:00
Maciej Cencora
96b2eb18c5
r300: handle ARB_vertex_program specific instructions in NQSSADCE
2009-07-13 19:28:07 +02:00
Maciej Cencora
e43cc28c1b
r300: move depth output rewrite out of NQSSADCE
2009-07-13 19:25:59 +02:00
Maciej Cencora
f79ef95df4
r300: rewrite FOGC and HPOS attribs handling
...
Rewrite vertex and fragment programs so that we don't have to do any hacks on lower level.
2009-07-13 19:25:59 +02:00
Maciej Cencora
df5fe747fa
r300: bind vertex program to fragment program
2009-07-13 19:25:58 +02:00
Maciej Cencora
d1e4caa6e2
r300: recalculate used inputs and outputs after dead code removal
2009-07-13 19:25:58 +02:00
Maciej Cencora
7360f83364
r300: move fragment program selection before vertex program selection
...
Prepare for wpos and fogc handling rewrite.
2009-07-13 19:25:58 +02:00
Maciej Cencora
37c319f62f
r300: implement proper IsProgramNative check for vertex programs
2009-07-13 19:25:57 +02:00
Maciej Cencora
bce224c1f1
r300: don't modify original vertex program
...
Keep the original vertex program untouched because it may be needed after some state change for generating new r300 specific vertex program.
2009-07-13 19:25:57 +02:00
Maciej Cencora
7829b7a1b8
r300: cache translated fragment programs
2009-07-13 19:25:56 +02:00
Maciej Cencora
28066ed012
r300: update state parameters only once per rendering operation
2009-07-13 19:25:56 +02:00
Maciej Cencora
21db37d432
r300: translate non native insts earlier for easier debugging
2009-07-13 19:25:55 +02:00
Maciej Cencora
0b411a72f3
r300: print vertex program after adding artificial output insts
2009-07-13 19:25:55 +02:00
Maciej Cencora
4a6899e080
r300: use mesa provided function for adding MVP code
2009-07-13 19:25:54 +02:00
Maciej Cencora
9b781ca2ce
r300: simplify insert_wpos a little
2009-07-13 19:25:54 +02:00
Brian Paul
9615daa932
Merge branch 'mesa_7_5_branch'
2009-07-13 08:47:37 -06:00
Dave Airlie
bb4c703587
radeon: port more front fixes from intel.
...
Port fixes to read buffer from front.
2009-07-14 01:23:24 +10:00
Dave Airlie
504d01b275
radeon/r200: fix color masking under dri2
...
Need to retrieve the bits from the rrb not from screen struct
2009-07-14 01:23:24 +10:00
Dave Airlie
a79aefb177
radeon: Use Stencil.Enabled instead of Stencil._Enabled in DrawBuffers.
...
The _Enabled field isn't updated at the point that DrawBuffers is called,
and the Driver.Enable() function does the testing for stencil buffer
presence anyway.
2009-07-14 01:23:23 +10:00
Dave Airlie
d9913d7c09
radeon/fbo: stencil bits fix from Michel in intel fbo code
2009-07-14 01:23:23 +10:00
Peteri Andras
680f7d09b0
r128: fix two-sided lighting segfault seen in GLUT's olight demo
2009-07-13 08:04:08 -06:00
Ian Romanick
022e8e582e
intel: Bump driver data, add RC3 tag
2009-07-12 21:07:38 -07:00
Xiang, Haihao
2995bf0d68
i965: add support for new chipsets
...
1. new PCI ids
2. fix some 3D commands on new chipset
3. fix send instruction on new chipset
4. new VUE vertex header
5. ff_sync message (added by Zou Nan Hai <nanhai.zou@intel.com >)
6. the offset in JMPI is in unit of 64bits on new chipset
7. new cube map layout
2009-07-13 11:01:13 +08:00
Dave Airlie
f030e2ba17
r300: move fallback warnings inside fallback debugging
...
random output is bad
2009-07-12 21:37:47 +10:00
Dave Airlie
dfecf217fa
r300: fix clear mask to not use sw if not necessary
2009-07-12 21:37:46 +10:00
Nicolai Hähnle
b484c71036
radeon: Fix crash when rendering to incomplete texture and other formats
...
It is possible to bind texture images of an incomplete mipmapped texture.
Software fallbacks in this case incorrectly tried to mmap the entire texture.
Additionally, add span functions for 1555 and 4444 formats.
This fixes crashes in piglit's fbo-readpixels test; unfortunately, the test
itself still fails - this needs to be investigated.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-07-12 12:50:36 +02:00
Dave Airlie
a10244453c
radeon: update clear code from Intel codebase.
...
This updates some of the clear code from Intel gives a 5x clearspd perf
for me here. played openarena also, not sure if the viewport changes
broke anything,
2009-07-12 17:28:14 +10:00
Dave Airlie
b06cb372bf
radeon: fbo fix firecube crashes
...
it might still be misrendering not sure
2009-07-12 12:13:40 +10:00
Michel Dänzer
65059606e9
radeon: Fix scissor rectangle calculation when rendering to FBO.
...
fgl_glxgears -fbo runs, though the gears don't look right yet.
2009-07-11 20:25:09 +02:00
Zack Rusin
1c1307e7c5
gallium: compare the actual register, not all the inputs
...
otherwise we decrement indexes for all registers
2009-07-11 13:48:41 -04:00
Brian Paul
cff2126f52
tgsi: update some assertions
2009-07-10 16:26:09 -06:00
Brian Paul
a79586ce18
tgsi: tgsi: add semantic_names[] string for TGSI_SEMANTIC_FACE
...
Same story as in the tgsi_dump.c code (see prev commit).
2009-07-10 15:44:48 -06:00
Brian Paul
f01af4dbd2
tgsi: add semantic_names[] string for TGSI_SEMANTIC_FACE
...
Fixes TGSI dump output when front/back-face register is declared.
Also, add some assertions to make sure the semantic/interpolate string
arrays have as many elements as there are tokens in the p_shader_tokens.h
file. That should catch problems like this in the future.
2009-07-10 15:41:26 -06:00
Brian Paul
762c1d11ff
st/mesa: implement indirect addressing for destination registers
2009-07-10 13:09:09 -06:00
Brian Paul
baa7ff47d5
tgis: implement indirect addressing for destination registers
...
Includes the TGSI interpreter, but not the SSE/PPC/etc code generators.
2009-07-10 13:09:09 -06:00
Brian Paul
ca1b71b78d
vbo: fix vbo/dlist memory leak
...
Based on a patch by kristof.ralovich@gmail.com
2009-07-10 13:09:09 -06:00
Brian Paul
6ff1a5385e
demos: set 4th component of texcoord to 1.0
...
Avoid potential randomness in resulting texcoords.
2009-07-10 13:09:09 -06:00
Dave Airlie
db618427ab
radeon: enable GL_NV_texture_rectangle under dri2.
2009-07-11 03:17:13 +10:00
Dave Airlie
85957cb512
radeon: set texture in state properly.
...
make sure to turn off when no texture is used in hw
2009-07-11 03:17:12 +10:00
Dave Airlie
a6a11e1dc0
radeon: make swtcl emit size bigger
2009-07-11 03:17:12 +10:00
Alex Deucher
37c0cde80a
R6xx/r7xx: use packet 3 for scratch emit
...
no need to allow packet 0 scratch regs in the drm
2009-07-10 12:04:56 -04:00
Michel Dänzer
cade071d52
Remove stale reference to non-Gallium nouveau driver from configure.ac.
2009-07-10 14:49:46 +02:00
Ian Romanick
fcd3572edf
mesa: From float type modifier from values to large for singles
...
The values 2147483648.0 and 4294967294.0 are too larget to be stored in single
precision floats. Forcing these to be singles causes bits to be lost, which
results in errors in some pixel transfer tests.
This fixes bug #22344 .
(cherry picked from commit 70e72070fc )
2009-07-09 16:07:05 -07:00
Alex Deucher
0de26dba2e
R6xx/r7xx: disable CS dump
...
Don't fprintf to a xterm with the lock held.
2009-07-09 17:15:23 -04:00
Brian Paul
8987410ab6
Merge branch 'mesa_7_5_branch'
2009-07-09 08:05:56 -06:00
Brian Paul
78af70be37
docs: document gl_TextureMatrix[i][j] array indexing bug fix
2009-07-09 08:04:07 -06:00
Brian Paul
c86b076668
glsl: do const parameter optimization for array element actual parameters
...
When a function parameter is const-qualified we can avoid making a copy
of the actual parameter (we basically do a search/replace when inlining).
This is now done for array element params too, resulting in better code
(fewer MOV instructions).
We should allow some other types of function arguments here but let's be
conservative for the moment.
2009-07-09 07:58:50 -06:00
Brian Paul
abdb0fdcc0
glsl: fix incorrect indexing for gl_TextureMatrix[i][j]
...
The two indexes were mixed up when accessing a row of a matrix in an array
of matrices.
2009-07-09 07:57:29 -06:00
Brian Paul
36e906aad6
docs: document glMaterial/glShadeModel display list optimization
2009-07-08 14:14:03 -06:00
Richard Li
93ab69a0ef
Fix buffer age implementaion bug.
2009-07-08 14:49:48 -04:00
Brian Paul
4adc9b4a5b
mesa: only use fallback texture when using shaders, not fixed-function (take two)
...
The semantics are a little different for shaders vs. fixed-function when
trying to use an incomplete texture. The fallback texture returning
(0,0,0,1) should only be used with shaders. For fixed function, the texture
unit is truly disabled/ignored.
Fixes glean fbo test regression.
(cherry picked from commit 01e16befd4 )
(cherry picked from commit 51325f44d1 )
[anholt: squashed these two together from master, skipping the mess in between]
2009-07-07 16:02:45 -07:00
Zack Rusin
7b861b9b9e
gallium: fixup register indexes for fog/frontface/point coord
2009-07-07 12:48:50 -07:00
Alex Deucher
f9db04878b
R6xx/r7xx: remove some left over debugging
2009-07-07 15:44:44 -04:00
Alex Deucher
0396795689
R6xx/R7xx: fix texture reloc emit
...
Textures don't look right yet, but tex demos run.
2009-07-07 15:40:28 -04:00
Michel Dänzer
71633abafc
gallium: Fixes for clobbering stencil values in combined depth/stencil textures.
...
Also fix one case where a 32 bit depth value was incorrectly converted to a
combined depth/stencil value.
2009-07-07 14:49:52 +02:00
Michel Dänzer
25b492b976
GLX/DRI1: Mark GLX visuals with depth != screen depth non-conformant.
...
Such visuals are subject to automatic compositing in the X server, so DRI1
can't render to them properly.
2009-07-07 13:59:59 +02:00
Michel Dänzer
96601ec8e0
gallium: Only set FRONT_STATUS_COPY_OF_BACK if there is a back buffer.
...
Fixes potential crash when SwapBuffers is called but there's no back buffer.
2009-07-07 12:17:04 +02:00
Alex Deucher
f74d1c26ac
r6xx/r7xx: add sw blit for tex upload
...
Can be used for buffer swap as well.
2009-07-07 02:12:38 -04:00
Alex Deucher
6799bc0b6b
tex wip
2009-07-07 01:02:08 -04:00
Zack Rusin
a4d952358d
gallium: more fog extraction fixes
...
fix the cases when fog coord/front face/point coord are used in the same
shader.
2009-07-06 21:35:15 -04:00
Ian Romanick
7fb4becf98
demos: Fix vsync checking in glxgears
...
Of course glXGetVideoSyncSGI doesn't return the swap interval. The feature
only exists in the Mesa extension... which is the whole reason I created the
Mesa extension! Note that the Mesa extension allows drivers to default to a
swap interval of 0. If the Mesa extension exists, use its value. Only
consider the SGI extension when the Mesa extension is not available.
Fixes bug #22604 .
2009-07-06 11:42:12 -07:00
José Fonseca
1068c15c61
wgl: Make the stw_framebuffer destructions threadsafe.
...
Ensure no other thread is accessing a framebuffer when it is being destroyed by
acquiring both the global and per-framebuffer mutexes. Normal access only
needs the global lock to walk the linked list and acquire the per-framebuffer
mutex.
2009-07-06 18:23:37 +01:00
José Fonseca
6f4167c8a2
wgl: Check for multiple threads before GET_CURRENT_CONTEXT.
...
Fixes wglthreads -- the 2nd thread MakeCurrent call was trying to flush
the first thread context while still in use.
2009-07-06 17:40:08 +01:00
José Fonseca
5470a67335
wgl: Listen to WM_WINDOWPOSCHANGED instead of WM_SIZE messages.
...
According to
http://blogs.msdn.com/oldnewthing/archive/2008/01/15/7113860.aspx
WM_SIZE is generated from WM_WINDOWPOSCHANGED by DefWindowProc so it
can be masked out by the application.
Also there were some weird bogus WM_SIZE 0x0 messages when starting
sharedtex_mt which we don't get like this.
2009-07-06 17:08:37 +01:00
Alex Deucher
1bad691a17
R6xx/r7xx: first pass at texture support
...
texture bo setup isn't quite working yet
2009-07-06 10:25:48 -04:00
Cooper Yuan
c6b0b46d6d
R6xx/r7xx: DEPTH_CONTROL will be reset by this function
2009-07-06 16:30:43 +08:00
Jakob Bornecrantz
7ccb00b1ac
Merge branch 'mesa_7_5_branch'
2009-07-05 04:14:41 +02:00
Brian Paul
f742f2c0b3
demos: indentation fix
2009-07-08 13:59:03 -06:00
Brian Paul
820436f978
demos: use glEnable/DisableClientState() for vertex arrays
2009-07-08 13:58:30 -06:00
RALOVICH, Kristóf
bf71ece171
glx: death to RCS tag
2009-07-08 13:34:57 -06:00
Corbin Simpson
67a43b2cfc
r300g: Remove VAP_CNTL_STATUS from invariant state.
...
Seriously.
2009-07-08 11:59:56 -07:00
Corbin Simpson
c737e57357
r300g: Disable MSPOS registers for glisse's CS security checker.
...
These will come back in someday, when we can properly use them.
2009-07-08 11:55:27 -07:00
Corbin Simpson
746140e215
r300-gallium: Unify sampler and texture emit.
...
They have to cross into each other's registers.
2009-07-08 11:39:34 -07:00
Corbin Simpson
1aa38b2c2d
r300-gallium: Mipmap setup.
...
(cherry picked from commit 88c01a15da5639dd68a6a0133724994cb66f1316)
2009-07-08 11:30:59 -07:00
Corbin Simpson
e46d12d394
r300g: Add endian fix to vertex fetcher setup.
...
As reported and initially tested by MrCooper.
2009-07-08 11:27:26 -07:00
Corbin Simpson
ce0f7954f8
gallium: Add endian detection to p_config.
2009-07-08 11:26:52 -07:00
Maciej Cencora
186d187ff7
r300: fix regression introduced by ca13937ef9
...
Stride == 0 means that we value for first vertex should be copied to every other vertices (e.g. constant color).
This fixes glean/vertProg1 and sauerbraten with enabled shaders.
2009-07-08 18:42:39 +02:00
Maciej Cencora
95df7bfc03
radeon: fix copy and paste typo
2009-07-08 18:42:39 +02:00
Maciej Cencora
afd687b0dc
mesa/vbo: always recalculate min_index and max_index when splitting vertices
2009-07-08 18:42:39 +02:00
Jakob Bornecrantz
eb33c0ab8b
progs/tests: Use compressed texture in mipmap_comp_tests
2009-07-04 16:01:45 +02:00
Eric Anholt
be64e66e5a
intel: Fix flipped Y for glDrawPixels(GL_STENCIL_INDEX) to window system.
...
Even after fixing bugs in this code, it doesn't make me feel any cleaner.
Fixes piglit stencil-drawpixels.
2009-07-07 15:43:44 -07:00
Eric Anholt
bdd7506f10
intel: Fall back on glCopyPixels(GL_DEPTH) or GL_STENCIL.
2009-07-07 15:36:10 -07:00
Eric Anholt
510c3bd7a1
i965: Remove BRW_NEW_INPUT_VARYING
...
This state flag has been unused since the ffvertex_prog move to core.
2009-07-07 15:16:29 -07:00
Eric Anholt
058e96916b
Cap array elements at 0 when passed an invalid pointer for an array object.
...
Otherwise, a pointer greater than the size would underflow and give a large
maximum element.
Reviewed-by: Brian Paul <brianp@vmware.com > (previous version)
2009-07-07 15:16:28 -07:00
Roland Scheidegger
fc6e02ce62
i965: fix fetching constants from constant buffer in glsl path
...
the driver used to overwrite grf0 then use implicit move by send instruction
to move contents of grf0 to mrf1. However, we must not overwrite grf0 since
it's still used later for fb write.
Instead, do the move directly do mrf1 (we could use implicit move from another
grf reg to mrf1 but since we need a mov to encode the data anyway it doesn't
seem to make sense).
I think the dp_READ/WRITE_16 functions may suffer from the same issue.
While here also remove unnecessary msg_reg_nr parameter from the dataport
functions since always message register 1 is used.
2009-07-04 15:35:07 +02:00
Eric Anholt
c30f23c123
i965: Remove bad constant buffer constant-reg-already-loaded optimization.
...
Thanks to branching, the state of c->current_const[i].index at the point
of emitting constant loads for this instruction may not match the actual
constant currently loaded in the reg at runtime. Fixes a regression in my
GLSL program for idr's class since b58b3a786a .
2009-07-04 15:32:56 +02:00
Jakob Bornecrantz
28471cfa97
Merge branch 'mesa_7_5_branch'
2009-07-04 07:43:01 +02:00
Jakob Bornecrantz
9982821cda
progs/tests: Tests more views in mipmap_comp_tests
2009-07-04 07:41:40 +02:00
Zack Rusin
edb0267170
Merge commit 'origin/openvg-1.0'
2009-07-06 21:43:26 -04:00
Zack Rusin
124a6b1958
gallium: rearrange some members to avoid memory holes/padding
...
plus it saves us a cacheline in the cso
2009-07-06 17:21:37 -04:00
Zack Rusin
5920b6b679
pipebuffer: handle possible null pointer dereference
...
reported by clang static analyzer
2009-07-06 17:21:37 -04:00
Zack Rusin
f311893bf4
cso: possible null pointer dereference
...
reported by clang static analyzer
2009-07-06 17:21:37 -04:00
Zack Rusin
4873031e29
util: fix possible null pointer usage
...
found by the clang static analyzer
2009-07-06 17:21:37 -04:00
Zack Rusin
21cce6afb0
exa: some infrastucture work for accelerating composite
2009-07-06 17:21:36 -04:00
Dave Airlie
d66de6c341
radeon: ensure cmdbuf space for state + AOS is available
...
The problem is if we find out later we don't have any cmdbuf space but
we've already written the arrays to the DMA buffer object, we end up
emitting the current cmdbuf which has references to the current DMA object
we then send that to the hw and we can't reference the arrays we just emitted
to the old DMA buffer. things go bad, crash boom.
This can probably be tuned further + swtcl probably needs some fixes
2009-07-06 20:39:49 +10:00
Dave Airlie
7266e33abd
r200: fix makefile
2009-07-06 17:46:36 +10:00
Dave Airlie
f110c5fd6e
radeon: fixup FBO depth 24 allocations to avoid assert
2009-07-06 15:50:24 +10:00
Dave Airlie
c27f21f92d
radeon/r200/r300: port to new space checking code in libdrm
...
This moves a big chunk of the space checking code into libdrm so
it can be shared by the DDX.
2009-07-06 15:12:17 +10:00
Corbin Simpson
645bfa32c9
radeon-gallium: Compile warning fix.
...
Fixes flush during validation, in case a buffer is double-validated.
2009-07-05 11:56:40 -07:00
Corbin Simpson
c8e0d55ac6
radeon-gallium: Use FLINK to do proper global buffers.
2009-07-05 11:55:47 -07:00
Corbin Simpson
df04e72d25
radeon-gallium: Wait for BOs before mapping them.
2009-07-05 11:29:13 -07:00
Maciej Cencora
6fff62ee3f
r300: fix vertex limits
...
- don't limit vertex count if we are using indices
- max indices count is 65535 not 65536
- remove some comments that don't apply anymore
- remove unreachable code
2009-07-05 15:22:37 +02:00
Jakob Bornecrantz
862488075c
Merge branch 'mesa_7_5_branch'
...
Conflicts:
src/mesa/main/dlist.c
src/mesa/vbo/vbo_save_api.c
2009-07-03 18:53:58 +02:00
Michel Dänzer
94e1117c9b
intel: Also update stencil bits in intel_update_wrapper().
...
Fixes assertion failure when binding depth/stencil texture to FBO stencil
attachment.
2009-07-03 17:54:34 +02:00
Keith Whitwell
f580494bef
progs: revert damage to progs/SConscript from recent compressed texture commit
2009-07-03 16:40:03 +01:00
Keith Whitwell
b928d18398
mesa/shaders: fix gl_NormalMatrix state parameters
...
gl_NormalMatrix is the inverse transpose of the modelview matrix, but
as every matrix here needs to be transposed, we end up with
{MODELVIEW_MATRIX, INVERSE}.
2009-07-03 14:31:07 +01:00
Keith Whitwell
aa98575ebb
st/wgl: don't advertise WGL_EXT_swap_interval string
...
This is a tweak to a previous fix -- it's not necessary to actually
advertise this extension to prevent these games from crashing -- they
ignore the extension string anyway. It's sufficient to just have
GetProcAddress return some dummy function addresses for SwapInterval.
Given we don't really implement this funcitonality, this is a better
fix.
2009-07-03 14:31:06 +01:00
José Fonseca
cffe7c8bd0
wgl: Lookup framebuffers by HWND whenever possible.
...
Some applications create several HDCs for the same window, so spite the WGL
API is geared towards HDCs it is not reliable searching by HDC.
2009-07-03 14:21:55 +01:00
Michel Dänzer
060c7f2321
radeon: Wait for BO idle if necessary before mapping it.
...
Fixes fighting between GPU and software rendering with TTM.
2009-07-03 12:44:19 +02:00
Michel Dänzer
6b2461fec9
r300: Guard debugging output.
2009-07-03 12:44:02 +02:00
Eric Anholt
8ae02a3919
intel: Fall back on glBitmap with fog enabled.
...
We would have to build the program with the appropriate fog mode, and
also supply the fog coordinate if appropriate.
Bug #19413 .
2009-07-02 19:31:51 -07:00
Eric Anholt
ae1bfb6427
intel: Flush when mapping buffer objects so writes don't get reordered.
...
While GEM covers this for execution it knows about, it doesn't know about
the batchbuffer we're preparing. Fixes piglit vbo-map-remap.c testcase.
2009-07-02 18:53:56 -07:00
Corbin Simpson
9a0b570ab6
vbo: If MapBufferRange fails, try MapBuffer instead.
...
Fixes segfaults with radeon winsys.
(Probably libdrm_radeon doing something that it shouldn't.)
2009-07-02 16:32:59 -07:00
Corbin Simpson
aa5b9c050f
Nuke old trace-drm integration.
...
AFAICT nobody will miss it.
2009-07-02 16:32:59 -07:00
Eric Anholt
6d66f23c50
intel: Fix leak of DRI option info due to using the wrong free routine.
2009-07-02 14:07:10 -07:00
Eric Anholt
ddef7dc87b
intel: Clean up leak of driver context structure on context destroy.
2009-07-02 14:07:10 -07:00
Eric Anholt
cb4ef34214
intel: Init num_fences to clean up valgrind warning.
...
Valgrind doesn't know that a successful getparam sets the target of the
pointer, so just set the value beforehand.
2009-07-02 14:07:09 -07:00
José Fonseca
2a2236606f
mesa: Assume depth textures have a single level unless told otherwise.
2009-07-02 17:24:50 +01:00
Richard Li
bb429803e0
r6xx/r7xx: Better fix for fragment temps
...
This doesn't waste as many in generic cases.
2009-07-02 12:08:57 -04:00
Keith Whitwell
588c862571
mesa: s/TRUE/GL_TRUE
...
Fix compile breakage on Linux.
2009-07-02 14:44:06 +01:00
Jakob Bornecrantz
d1c8a0a308
r300g: Readd trace driver support
2009-07-02 15:07:53 +02:00
Jakob Bornecrantz
59abfa8e42
i915g: Readd trace driver support
2009-07-02 15:05:17 +02:00
Jakob Bornecrantz
c0d7502a2c
trace: Add drm api integration
...
This is okay since drm_api.h doesn't have any external
dependancies, one could make it only compile on platforms
that support drm.
2009-07-02 14:57:55 +02:00
Keith Whitwell
798cd2a98d
glapi: ensure _mesa_lookup_prim_by_nr() is not clobbered on regeneration
...
Propogate changes to enums.c back up to the python source.
2009-07-02 13:33:20 +01:00
Keith Whitwell
1668a679c4
Merge commit 'origin/dlist-statechange-shortcircuit' into mesa_7_5_branch
...
Conflicts:
progs/trivial/Makefile
Pull in a minimal version of statechange shortcircuiting in display
list compilation. This affects only glMaterial and glShadeModel state,
and includes quite a few tests to exercise various tricky cases.
If this goes well, will consider extending to all state in the future.
2009-07-02 13:29:46 +01:00
Dave Airlie
54ee188a00
radeon/r200/r300: drop radeon renderbuffer private width/height
...
half stealing the code without taking the intel regions
2009-07-02 20:57:45 +10:00
Dave Airlie
2ed3eddf9a
radeon/r300: use base width/height.
...
I suspect this might break TFP in some way but it makes firecube run here
2009-07-02 20:45:19 +10:00
Keith Whitwell
b3e8e1cd4c
mesa: ensure UsesFogFragCoord value is set for non-glsl shaders
...
With recent changes to support frontfacing in glsl, it is necessary
to ensure that the UsesFogFragCoord value is accurate in all shaders.
We were previously not setting it for fixed-function and ARB_fs shaders.
2009-07-02 11:28:56 +01:00
Cooper Yuan
c571395e5d
R6xx/r7xx: Fix line width issue, ROUND_MODE and QUANT_MODE aren't bits of LINE_CNTL
2009-07-02 16:52:11 +08:00
Cooper Yuan
da88333671
R6xx/r7xx: Correct the indeices of DRAW_INDEX_IMMD
2009-07-02 16:49:19 +08:00
Xiang, Haihao
73137997e2
i965: fixes for JMPI
...
1. the data type of <src1> (JMPI offset) must be D
2. execution size must be 1
3. NoMask
4. instruction compression isn't allowed.
2009-07-02 16:32:19 +08:00
Corbin Simpson
96ef7aae1d
r300g: Fix recursive Draw flush.
...
Also just noticed that demos/copypix walks around the overlapping blit rules.
Bad, bad Mesa. :3
2009-07-01 23:25:47 -07:00
Corbin Simpson
8799a9d24d
r300g: Use floats for surface_copy texcoords, use correct src and dest.
...
This makes demos/copypix better-looking. Horizontal dimensions are right now.
2009-07-01 23:09:18 -07:00
Corbin Simpson
338db0af61
radeon-gallium: Adapt to drm_api changes.
...
Note that trace debugging is temporarily gone. I'll rework it later.
2009-07-01 22:33:17 -07:00
Alex Deucher
8bda0f1f4f
r6xx/r7xx: rework aos setup
...
In theory this should fix the stride = 0 case,
but I can't seem to reproduce that anymore
with mesa master.
2009-07-01 14:41:57 -04:00
Alex Deucher
65cdf9c561
R6xx/R7xx: Fix number of temps used in fragment program
...
Spotted by Cooper. This gets hello, aargb, smooth, etc.
working.
2009-07-01 11:10:10 -04:00
Eric Anholt
5e6b593d35
intel: Avoid pointer arithmetic on void *.
...
Bug #22000 .
2009-06-30 22:57:56 -07:00
Eric Anholt
c3499f6c66
i965: Increase G4X default VS URB allocation to actually allow 32 threads.
...
This improves the performance of my GLSL demo by 30%. It also fixes the
VS deadlock that ut2004 had, for reasons I can't explain. Bug #21330 .
2009-06-30 17:55:23 -07:00
Ian Romanick
f359165a82
demos: Set the depth mask correctly to get the desired blending
2009-06-30 17:29:52 -07:00
Ben Skeggs
18a1c36c2d
nouveau: return some supported zeta formats
2009-07-01 09:26:57 +10:00
Ben Skeggs
55e5ac17c1
nouveau: deal with PIPE_CAP_TGSI_CONT_SUPPORTED
2009-07-01 09:26:57 +10:00
Ben Skeggs
55fc63cd7d
nouveau: fix build...
2009-07-01 09:26:56 +10:00
Jakob Bornecrantz
64849d1236
drm/st: Remove drm_api struct from drivers
...
Remove the drm_api from the functions in the softpipe and
i915simple drivers. Create wrapper functions in the
backends instead.
2009-07-01 01:20:04 +02:00
Brian Paul
119eb40942
i965: first attempt at handling URB overflow when there's too many vs outputs
...
If we can't fit all the VS outputs into the MRF, we need to overflow into
temporary GRF registers, then use some MOVs and a second brw_urb_WRITE()
instruction to place the overflow vertex results into the URB.
This is hit when a vertex/fragment shader pair has a large number of varying
variables (12 or more).
There's still something broken here, but it seems close...
2009-06-30 17:12:44 -06:00
Brian Paul
1b6ae2e004
i965: use BRW_MAX_MRF
2009-06-30 17:12:44 -06:00
Brian Paul
76a5a5dace
i965: use BRW_MAX_GRF, BRW_MAX_MRF
2009-06-30 17:12:44 -06:00
Brian Paul
0fe19bc91d
i965: move BRW_MAX_GRF, define BRW_MAX_MRF
2009-06-30 17:12:44 -06:00
Brian Paul
0b7b8c8ddf
i965: defined BRW_MAX_MRF
2009-06-30 17:12:44 -06:00
Brian Paul
6eb2ca500d
i965: comments and a new assertion
2009-06-30 17:12:44 -06:00
Alex Deucher
d10006e67f
R6xx/r7xx: fix locking for clear
...
this allows redbook hello to render correctly mostly.
2009-06-30 18:40:48 -04:00
Keith Whitwell
1fa4cde757
mesa/vbo: fix compile and replay of nodes ending in a FALLBACK
...
Where vbo save nodes are terminated with a call to DO_FALLBACK(), as in
the case of a recursive CallList which is itself within a Begin/End pair,
there two problems:
1) The display list node's primitive information was incorrect, stating
the cut-off prim had zero vertices
2) On replay, we would get confused by a primitive that started in a
node, but was terminated by individual opcodes.
This change fixes the first problem by correctly terminating the last
primitive on fallback, and the second by forcing the display list to
use the Loopback path, converting all nodes into immediate-mode rendering.
The loopback fix is a performance hit, but avoiding this would require
a fairly large rework of this code.
2009-06-30 19:52:44 +01:00
Eric Anholt
57a06d3a48
i915: Fix assertion failure on remapping a non-BO-backed VBO.
...
Failure to set the obj->Pointer back to null tripped up the assertion.
Bug #22428 .
2009-06-30 10:41:18 -07:00
Keith Whitwell
70ae7ba818
mesa/dlist: fixes and improvements for material caching
...
Only short-circuit material call if *all* statechanges from this call
are cached. Some material calls (eg with FRONT_AND_BACK) change more
than one piece of state -- need to check all of them before returning.
Also, Material calls are legal inside begin/end pairs, so don't need
to be as careful about begin/end state as with regular statechanges
(like ShadeModel) when caching. Take advantage of this and do better
caching.
2009-06-30 18:40:20 +01:00
Keith Whitwell
c48c01c9e7
progs/trivial: add dlist-mat-tri.c
2009-06-30 18:37:34 +01:00
Keith Whitwell
1ca836f0de
progs/trivial: add test case for short-circuiting material changes
...
Similar to dlist-tri-flat-tri, but using glMaterial calls, which
have the extra property of being legal within Begin/End calls.
2009-06-30 18:17:39 +01:00
Keith Whitwell
d6c2347d79
mesa/dlist: don't cache state which may not be replayed on CallList
...
Statechanges which occur before the first End in a display list may
not be replayed when the list is called, in particular if it is called
from within a begin/end pair.
Recognize vulnerable statechanges and do not use them to fill in the
state cache.
2009-06-30 17:10:56 +01:00
Keith Whitwell
09a3a28fc8
progs/trivial: add dlist-flat-tri.c
...
State-change functions which precede the first call to glEnd() in
a compiled list are vulnerable to not being executed when that list
is called.
In particular this can happen if a list is invoked from within a
begin/end pair, as in this example.
2009-06-30 17:06:50 +01:00
Keith Whitwell
7e91d035b9
mesa/dlist: invalidate cached dlist compile state after CallList
...
When compiling a display list containing a CallList, it is necessary to
invalidate any assumption about the GL state after the recursive call
completes.
2009-06-30 17:04:11 +01:00
Keith Whitwell
2e570be852
progs/trivial: add dlist-recursive-call
...
When one display list calls another display list, it is possible
that the calling display list makes state-changes or other actions which
invalidate any attempt at caching or state-change elimination in the
calling list.
This test exercises one such case, where the called list consists of just
a single glShadeModel() call.
2009-06-30 17:02:16 +01:00
Keith Whitwell
1730eaa2a2
dlist-tri-flat-tri: make tri render differently if flatshade not enabled
...
When testing flat-shading, it helps to specify per-vertex colors so
that you can distinguish between flat & smooth shading.
2009-06-30 16:57:21 +01:00
Keith Whitwell
4147bb24d4
Merge branch 'mesa_7_5_branch' into dlist-statechange-shortcircuit
...
Need this to pick up fixes for per-vertex materials.
2009-06-30 16:28:54 +01:00
Keith Whitwell
6af783bea0
progs/trivial: add test case for lighting plus per-vertex materials
...
Exercise material-within-begin/end case.
2009-06-30 16:19:23 +01:00
Keith Whitwell
a9ae89d104
progs/isosurf: add materials mode for glVertex + TRISTRIP
2009-06-30 16:14:08 +01:00
Keith Whitwell
6dfb89e4a0
mesa: remove whitespace
2009-06-30 16:14:05 +01:00
Keith Whitwell
cea259f039
mesa: remove dead constant pointsize code from ffvertex_prog.c
2009-06-30 16:13:58 +01:00
Keith Whitwell
79047cc1dd
mesa: remove dead vertex fog code from ffvertex_prog.c
2009-06-30 16:13:53 +01:00
Keith Whitwell
f6c8ca06f6
mesa: fix material inputs in ffvertex_prog.c
...
Varying material inputs were not being picked up from the same slots
where the VBO code is currently placing them (GENERIC0 and above).
Most often they were just being ignored.
2009-06-30 16:13:22 +01:00
Brian Paul
b40dc7e7fc
Merge branch 'mesa_7_5_branch'
...
Conflicts:
src/mesa/vbo/vbo_exec_draw.c
2009-06-30 08:56:53 -06:00
Brian Paul
b750b9fc3d
gallium: remove the pipe_sampler_state::shadow_ambient field
...
This was only present for the sake of GL_ARB_shadow_ambient which we
never implemented in Gallium. If we someday want GL_ARB_shadow_ambient
we can implement it in the state tracker by adding a MAD after the
relevant TEX instructions.
2009-06-30 08:51:32 -06:00
Arthur HUILLET
4c31632817
mesa: fix transform_points_3d_no_rot using undefined values in %xmm0
...
Signed-off-by: Arthur HUILLET <arthur.huillet@free.fr >
2009-06-30 08:43:23 -06:00
Kristof Ralovich
fa5b0364f9
glx: plug a leak
...
Swrast was missing a free for the culmination of driConcatConfigs.
Use free(), not _mesa_free() since we shouldn't be calling any Mesa
functions from the GLX code. driConcatConfigs() should probably use
regular malloc/free to be consistant but the Mesa functions just wrap
the libc functions anyway.
2009-06-30 08:43:22 -06:00
Brian Paul
52f895df51
glx: fix null pointer dereference segfault (bug 22546)
2009-06-30 08:43:22 -06:00
Keith Whitwell
14a2b5445a
progs/util: make sure function pointers are initialized
...
Call Init() from CompileShaderFile, was previously only called for the
Text version of this function.
2009-06-30 15:41:43 +01:00
José Fonseca
6e09c1fd08
mesa: Set FLUSH_EXPLICIT_BIT flags when calling FlushMappedBufferRange.
...
As prescribed by ARB_map_buffer_range.
2009-06-30 15:33:53 +01:00
José Fonseca
18a6f0f1a7
util: Set PIPE_BUFFER_USAGE_FLUSH_EXPLICIT when calling buffer_flush_mapped_range.
2009-06-30 15:33:53 +01:00
José Fonseca
4ffe2844a4
gallium: New PIPE_BUFFER_USAGE_FLUSH_EXPLICIT flag for buffer_flush_mapped_range.
...
When a buffer was mapped for write and no explicit flush range was provided
the existing semantics were that the whole buffer would be flushed, mostly
for backwards compatability with non map-buffer-range aware code.
However if the buffer was mapped/unmapped with nothing really written --
something that often happens with the vbo -- we were unnecessarily assuming
that the whole buffer was written.
The new PIPE_BUFFER_USAGE_FLUSH_EXPLICIT flag (based from ARB_map_buffer_range
's GL_MAP_FLUSH_EXPLICIT_BIT flag) allows to clearly distinguish the
legacy usage from the nothing written usage.
2009-06-30 15:33:53 +01:00
Jakob Bornecrantz
578230dbbf
st/gl: Add stubs for CompressedTexSubImage[1D|3D]
2009-06-30 14:11:49 +02:00
Jakob Bornecrantz
a4fd94a54a
st/gl: Add support for glCompressedTexSubImage
2009-06-30 14:11:45 +02:00
Jakob Bornecrantz
ba7f45ac0c
progs/tests: Add tests for glCompressedTexSubImage
2009-06-30 14:11:29 +02:00
José Fonseca
f2de2d5f37
util: Increase OutputDebugStringA to 4k.
...
According to http://unixwiz.net/techtips/outputdebugstring.html that's
how big the buffer is.
The 512bytes limitation is in kernel mode.
2009-07-01 19:10:50 +01:00
José Fonseca
e2a8ef4430
mesa: Unbind depth/stencil surface from pipe_framebuffer when none is attached.
2009-07-01 19:10:49 +01:00
Keith Whitwell
6c913411d3
st/wgl: dummy implementation of wgl swapinterval extension
...
Required as some applications
retrieve and call these functions regardless of the fact that we
don't advertise the extension and further more the results of
wglGetProcAddress are NULL.
2009-07-01 17:37:15 +01:00
Zack Rusin
1c04731b87
gallium: fix the front face semantics
...
mesa allocates both frontface and pointcoord registers within the fog
coordinate register, by using swizzling. to make it cleaner and easier
for drivers we want each of them in its own register. so when doing
compilation from the mesa IR to tgsi allocate new registers for both
and add new semantics to the respective declarations.
2009-07-01 10:45:55 -04:00
José Fonseca
e8c4663c11
wgl: Optimize wglGetProcAddress.
...
Do linear search only if prefix matches.
2009-07-01 10:03:59 +01:00
Eric Anholt
c72261f2a8
i915: Fix assertion failure on remapping a non-BO-backed VBO.
...
Failure to set the obj->Pointer back to null tripped up the assertion.
Bug #22428 .
(cherry picked from commit 57a06d3a48 )
2009-06-30 13:29:37 -07:00
Jon TURNEY
57955451f8
xdemos: Fix xdemos which default to using display :0.0 to default to $DISPLAY
...
Fix xdemos which default to using display :0.0 to default to $DISPLAY,
this is kind of irritating when testing on a display other than :0.0
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk >
2009-06-30 13:58:21 -06:00
Keith Whitwell
e5cb11adda
mesa/vbo: fix compile and replay of nodes ending in a FALLBACK
...
Where vbo save nodes are terminated with a call to DO_FALLBACK(), as in
the case of a recursive CallList which is itself within a Begin/End pair,
there two problems:
1) The display list node's primitive information was incorrect, stating
the cut-off prim had zero vertices
2) On replay, we would get confused by a primitive that started in a
node, but was terminated by individual opcodes.
This change fixes the first problem by correctly terminating the last
primitive on fallback, and the second by forcing the display list to
use the Loopback path, converting all nodes into immediate-mode rendering.
The loopback fix is a performance hit, but avoiding this would require
a fairly large rework of this code.
2009-06-30 19:59:38 +01:00
Keith Whitwell
53f8dccd0c
progs/trivial: test case for dlist statechange elimination
...
Creates a display list with redundant call to glShadeModel.
View dlist contents with MESA_VERBOSE=list
2009-06-30 12:20:24 +01:00
Keith Whitwell
00438bb94a
mesa/dlist: restore missing SAVE_FLUSH_VERTICES in save_ShadeModel
...
Reorganization of ShadeModel to avoid flushing vertices too often
ended up never flushing vertices due to omitted line of code.
2009-06-30 12:19:11 +01:00
Keith Whitwell
0846c88ec3
mesa/vbo: use _lookup_prim_by_nr for debugging
...
Switch over to specialized enum lookup for primitives
2009-06-30 12:16:41 +01:00
Keith Whitwell
aa688d1579
mesa: add debug printer for primitive name
...
Add a simple version of _mesa_lookup_enum_by_nr() which expects a primitive
enum (GL_POINTS..GL_POLYGON). This avoids some annoying duplicates
when looking up primitives, such as the GL_FALSE/GL_POINTS clash.
2009-06-30 12:13:59 +01:00
Brian Paul
8d24160a40
progs/glsl: link with GLEW library
...
(cherry picked from commit b1f2f92d9b )
2009-06-30 11:47:51 +01:00
Jakob Bornecrantz
f7cbaae13d
identity: Create a drm_api wrapper
2009-06-30 12:24:47 +02:00
Jakob Bornecrantz
303cbb45b5
drm/st: Return drm_api struct from a function
2009-06-30 12:20:39 +02:00
Keith Whitwell
47173cf67f
mesa/dlist: shortcircuit some redundant statechanges at compile time
...
Currently, state-changes in mesa display lists are more or less
a verbatim recording of the GL calls made during compilation.
This change introduces a minor optimization to recognize and eliminate
cases where the application emits redundant state changes, eg:
glShadeModel( GL_FLAT );
glBegin( prim )
...
glEnd()
glShadeModel( GL_FLAT );
glBegin( prim )
...
glEnd()
The big win is when we can eliminate all the statechanges between two
primitive blocks and combine them into a single VBO node.
This commit implements state-change elimination for Material and ShadeModel
only. This is enough to make a start on debugging, etc.
2009-06-30 09:55:33 +01:00
Brian Paul
efe9faf061
softpipe: use shadow_compare4() to compare texcoord to four texture samples
2009-06-29 22:46:55 -06:00
Brian Paul
005ee9f4e0
softpipe: pass sampler state to shadow_compare()
2009-06-29 22:46:49 -06:00
Younes Manton
0eb1b3fac1
nouveau: Expect right params to tex_transfer_destroy().
...
Never crashed on x86, ptx is in the same stack slot in either case.
Thanks to Bob Gleitsmann for catching this.
2009-06-29 22:22:25 -04:00
Younes Manton
78aaf2a4f1
nouveau: Turn off debug cannon.
2009-06-29 22:22:25 -04:00
Eric Anholt
1f070125e3
intel: Enable EXT_gpu_program_parameters.
...
There doesn't appear to be any driver impact for enabling this, and
tests/prog_parameter passes.
2009-06-29 15:14:50 -07:00
Brian Paul
b8c479d4b0
Merge branch 'mesa_7_5_branch'
2009-06-29 15:27:49 -06:00
Brian Paul
423f45d18a
gallium/draw: sketch out some missing pointcoord code
...
The gl_PointCoord attribute is currently expected to be in the fog coord
register's z/w components. This was never totally fleshed out though.
This is just some placeholder code.
2009-06-29 15:27:28 -06:00
Brian Paul
5c06c52116
st/mesa: enable GL_ARB_framebuffer_object
...
All gallium drivers should be able to support mixed-size color/depth/stencil
buffers. If not, we'll need a new PIPE_CAP_ query.
2009-06-29 15:27:28 -06:00
Brian Paul
f44638fa61
mesa: check for ARB_framebuffer_object for GL_TEXTURE_STENCIL_SIZE_EXT query
2009-06-29 15:27:28 -06:00
Brian Paul
cb0ea416bd
mesa: alphabetize lines
2009-06-29 15:27:28 -06:00
Brian Paul
4e43126a59
intel: added null ptr check
...
This fixes a segfault seen with piglit's fdo20701 test.
2009-06-29 15:26:28 -06:00
Eric Anholt
a96f86831e
Revert "intel: Remove unneded pthread mutex in LOCK_HARDWARE."
...
This reverts commit de447afff2 but
puts the lock under DRI1-only.
From keithw:
> It's there because the DRI1 code doesn't actually achieve the mutexing
> which it looks as if it should. For multi-threaded applications it was
> always possible to get two threads inside locked regions -- I have no
> idea how, but it certainly was and presumably still is possible.
2009-06-29 11:39:09 -07:00
Eric Anholt
94008088c1
intel: Move note_unlock() implementation to the one place it's needed.
2009-06-29 10:33:50 -07:00
Eric Anholt
de447afff2
intel: Remove unneded pthread mutex in LOCK_HARDWARE.
...
This would cause LOCK_HARDWARE to mutex all contexts in this process on
both DRI1 and DRI2. On DRI1, LOCK_HARDWARE already does it for all
processes on the system. On DRI2, LOCK_HARDWARE doesn't, but there shouldn't
be any state outside the context that needs any additional protection.
Notably, the bufmgr is protected by its own mutex and not
LOCK_HARDWARE.
This code was originally introduced with the i915tex code dump, so it's not
clear what it was there for.
2009-06-29 10:33:50 -07:00
Eric Anholt
3927874d9c
intel: Make LOCK_HARDWARE recursive to avoid hand-rolling recursiveness.
2009-06-29 10:33:50 -07:00
Brian Paul
7b5373c434
Merge branch 'mesa_7_5_branch'
2009-06-29 11:20:07 -06:00
Brian Paul
b1f2f92d9b
progs/glsl: link with GLEW library
2009-06-29 10:32:04 -06:00
Keith Whitwell
9014f475ff
progs/util: make sure function pointers are initialized
...
Call Init() from CompileShaderFile, was previously only called for the
Text version of this function.
2009-06-29 16:07:14 +01:00
Keith Whitwell
b799af91d5
progs/glsl: compile with scons and glew
...
Get most of these working with scons.
2009-06-29 14:15:08 +01:00
Timo Aaltonen
082f547492
Move dri.pc to mesa-common-dev ( closes : #521667 )
2009-06-29 15:22:21 +03:00
José Fonseca
9a5ee12434
scons: Don't raise an exception when DXSDK is not found.
...
Unfortunately scons does not check if a tool exists before it invokes
its generate function.
2009-06-29 12:56:47 +01:00
Julien Cristau
9032d6b40b
Prepare changelog for upload
2009-06-28 20:22:05 +02:00
Julien Cristau
489ca73db1
Merge commit 'mesa-7.4.4-1' into debian-experimental
...
Conflicts:
debian/changelog
2009-06-28 20:20:56 +02:00
Julien Cristau
2c8046b1bc
Prepare changelog for upload
2009-06-28 18:58:41 +02:00
Julien Cristau
18bb120fce
Refresh patches
2009-06-28 18:41:21 +02:00
Julien Cristau
d2c8712fa4
Remove some directories absent from the tarballs, and add some missing ones
2009-06-28 18:09:58 +02:00
Julien Cristau
b59211a602
Update changelog
2009-06-28 17:46:10 +02:00
Julien Cristau
adafe6d607
Merge commit 'mesa_7_5_rc4' into debian-experimental
...
Conflicts:
progs/fp/point-position.c
progs/fp/tri-depth.c
progs/fp/tri-depth2.c
progs/fp/tri-depthwrite.c
progs/fp/tri-depthwrite2.c
progs/fp/tri-inv.c
progs/fp/tri-param.c
progs/fp/tri-tex.c
progs/tests/.gitignore
progs/tests/Makefile
progs/tests/zreaddraw.c
2009-06-28 17:41:50 +02:00
José Fonseca
bb8f3090ba
scons: Disable optimizations only for gcc-4.2
...
gcc-4.2's optimizer has a strange bug where it looses code from inner
loops in certain situations. For example, if the appearently innocent
looking code below is compiled with gcc-4.2 -S -O1, the inner loop's
code is missing from the outputed assembly.
struct Size {
unsigned width;
};
struct Command {
unsigned length;
struct Size sizes[32];
};
extern void emit_command(void *command, unsigned length);
void
create_surface( struct Size size, unsigned faces, unsigned levels)
{
struct Command cmd;
unsigned face;
unsigned level;
cmd.length = faces*levels*sizeof(cmd.sizes[0]);
for(face = 0; face < faces; ++face) {
for(level = 0; level < levels; ++level) {
cmd.sizes[face*levels + level] = size;
// This should generate a shrl statement, but the whole for body
// disappears in gcc-4.2 -O1/-O2/-O3!
size.width >>= 1;
}
}
emit(&cmd, sizeof cmd.length + cmd.length);
}
Note that this is not specific to MinGW's gcc-4.2 crosscompiler (the
version typically found in debian/ubuntu's mingw32 packages). gcc-4.2 on
Linux also displays the same error. gcc-4.3 and above gets this
correctly though.
Updated MinGW debian packages with gcc-4.3 are available from
http://people.freedesktop.org/~jrfonseca/debian/pool/main/m/
2009-06-28 11:12:22 +01:00
José Fonseca
72ad039d19
scons: Use -Bsymbolic linker option.
...
This prevents the error
relocation R_X86_64_PC32 against symbol `_gl_DispatchTSD' can not be used when making a shared object; recompile with -fPIC
when building on x86_64 architecture.
2009-06-28 10:54:23 +01:00
Brian Paul
418987ff05
docs: detect when too many varying vars are used
2009-06-26 16:54:44 -06:00
Brian Paul
21320b24c5
glsl: check number of varying variables against the limit
...
Link fails if too many varying vars.
(cherry picked from master, commit cc58fbcf2c )
2009-06-26 16:53:46 -06:00
Brian Paul
4181a107cb
docs: fix typos, remove old text from relnotes file
2009-06-26 16:47:57 -06:00
Brian Paul
2a41df86a3
docs: bring over news updates from 7.4 branch
2009-06-26 16:46:21 -06:00
Brian Paul
318122b60a
docs: bring in 7.4.3 and 7.4.4 release notes, news
2009-06-26 16:45:54 -06:00
Brian Paul
dd585db687
docs: increase max varying vars to 16
2009-06-26 16:41:54 -06:00
Brian Paul
f08bebfe24
mesa: raise MAX_VARYING (number of shader varying vars) to 16
...
16 is the limit for now because of various 32-bit bitfields.
(cherry picked from master, commit 4e762395ef )
2009-06-26 16:41:04 -06:00
Ian Romanick
2d86503471
intel / DRI2: Additional flush of fake front-buffer to real front-buffer
...
To maintain correctness, the server will copy the real front-buffer to
a newly allocated fake front-buffer in DRI2GetBuffersWithFormat.
However, if the DRI2GetBuffersWithFormat is triggered by glViewport,
this will copy stale data into the new buffer. Fix this by flushing
the current fake front-buffer to the real front-buffer in
intel_viewport.
Fixes bug #22288 .
2009-06-26 13:32:26 -07:00
Brian Paul
077a06c140
mesa: bump version to 7.5-rc4
2009-06-26 13:16:34 -06:00
Brian Paul
62ad606065
docs: document for/continue bug fix
2009-06-26 13:16:34 -06:00
Brian Paul
928e1ce47f
cell: PIPE_CAP_TGSI_CONT_SUPPORTED query
2009-06-26 13:16:34 -06:00
Brian Paul
af7fb892d8
softpipe: PIPE_CAP_TGSI_CONT_SUPPORTED query
2009-06-26 13:16:34 -06:00
Brian Paul
f5dc352e5f
gallium: added PIPE_CAP_TGSI_CONT_SUPPORTED
2009-06-26 13:16:34 -06:00
Brian Paul
e80ecdf659
glsl: move/simplify error checking for 'return' statements
2009-06-26 13:16:34 -06:00
Brian Paul
8e6dd8bf79
glsl: overhaul 'return' statement handling
...
A new node type (SLANG_OPER_RETURN_INLINED) is used to denote 'return'
statements inside inlined functions which need special handling.
All glean glsl1 tests pass for EmitContReturn=FALSE and TRUE.
2009-06-26 13:16:34 -06:00
Brian Paul
aa48becb82
glsl: predicate assignments according to __returnFlag
...
Fixes glean "function with early return (3)" case (when EmitContReturn=FALSE).
2009-06-26 13:16:34 -06:00
Brian Paul
16787c513b
glsl: added slang_variable::is_global field
2009-06-26 13:16:34 -06:00
Brian Paul
ac05996b81
glsl: silence a problem warning
2009-06-26 13:16:34 -06:00
Brian Paul
0efd25b502
glsl: code refactoring for return statements
2009-06-26 13:16:34 -06:00
Brian Paul
2ae297c318
glsl: fix assorted regressions related to early-return-removal
2009-06-26 13:16:34 -06:00
Brian Paul
ddf64be258
glsl: comments, field reordering
2009-06-26 13:16:34 -06:00
Brian Paul
f652f15e6d
glsl: rework loop nesting code
2009-06-26 13:16:34 -06:00
Brian Paul
dd453fa37c
glsl: remove test for loop unrolling when we hit conditional cont/break
...
This is no longer needed since we added the new
_slang_loop_contains_continue_or_break() function/test.
2009-06-26 13:16:34 -06:00
Brian Paul
2f1c5c58b3
glsl: checkpoint: predicate __retVal = expr with __returnFlag
...
The glean "function with early return (1)" test passes now.
2009-06-26 13:16:34 -06:00
Brian Paul
65eaafee25
glsl: use new helper functions in _slang_gen_logical_and/or()
2009-06-26 13:16:33 -06:00
Brian Paul
e139434d44
glsl: add comments
2009-06-26 13:16:33 -06:00
Brian Paul
b04605d544
glsl: checkpoint: replace 'return' with __returnFlag=true;
...
Needed for "remove early returns" transformation.
2009-06-26 13:16:33 -06:00
Brian Paul
515513b409
glsl: fix up scoping for parent/children in slang_operation_copy()
...
This will need more testing, but no regressions seen so far.
2009-06-26 13:16:33 -06:00
Brian Paul
09313043e7
glsl: fix uninitialized var in _slang_gen_for_without_continue()
2009-06-26 13:16:33 -06:00
Brian Paul
5951ab311d
glsl: added slang_operation_free_children()
2009-06-26 13:16:33 -06:00
Brian Paul
e5b53c071b
glsl: added slang_oper_num_children() helper
2009-06-26 13:16:33 -06:00
Brian Paul
3c6480ea42
glsl: check-point: declare _returnFlag
2009-06-26 13:16:33 -06:00
Brian Paul
fc0896b50b
glsl: added slang_operation_insert_child()
2009-06-26 13:16:33 -06:00
Brian Paul
f4b1a69b7d
glsl: use slang_generate_declaration() to consolidate some code
2009-06-26 13:16:33 -06:00
Brian Paul
454a717d94
glsl: remove obsolete comment
2009-06-26 13:16:33 -06:00
Brian Paul
02edc8da36
st/mesa: query PIPE_CAP_TGSI_CONT_SUPPORTED
2009-06-26 13:16:33 -06:00
Brian Paul
08025cd4a5
glsl: implement _slang_gen_while_without_continue()
2009-06-26 13:16:33 -06:00
Brian Paul
2102e301a7
glsl: fix a bug involving 'continue' in 'for' loops
...
Need to execute the for loop's increment code before we continue.
Add a slang_assemble_ctx::CurLoopOper field to keep track of the containing
loop and avoid the "cont if true" path in this situation.
Plus, assorted clean-ups.
2009-06-26 13:16:33 -06:00
Brian Paul
541594b044
glsl: added slang_oper_child_const()
2009-06-26 13:16:32 -06:00
Brian Paul
38ddbc5588
glsl: use _slang_loop_contains_continue_or_break() to check for unrolling
...
The previous test failed for nested loops.
2009-06-26 13:16:32 -06:00
Brian Paul
4dafac2b2f
glsl: use new _slang_loop_contains_continue() helper function
2009-06-26 13:16:32 -06:00
Brian Paul
aba93643be
glsl: implement continue->break translation for do-while loops
2009-06-26 13:16:32 -06:00
Brian Paul
7e0eaca201
glsl: added slang_operation_literal_int/bool() helper functions
2009-06-26 13:16:32 -06:00
Brian Paul
c1f74a6734
glsl: don't allocate 0-length children array in slang_operation_copy()
2009-06-26 13:16:32 -06:00
Brian Paul
f38872473c
glsl: remove debug code, misc clean-up
2009-06-26 13:16:32 -06:00
Brian Paul
f66733bbee
glsl: implement continue->break transformation for for-loops
2009-06-26 13:16:32 -06:00
Brian Paul
c4fd947bee
glsl: added slang_operation_add_children() and slang_oper_child() helpers
2009-06-26 13:16:32 -06:00
Brian Paul
c20bb48d3a
glsl: added slang_assemble_ctx::EmitContReturn field, init
2009-06-26 13:16:32 -06:00
Brian Paul
eb1eee03a6
demos: improve argv parsing in fslight.c
2009-06-26 13:16:32 -06:00
Brian Paul
4bc74a0756
glsl: don't unroll loops containing continue/break
...
Just search the AST in _slang_can_unroll_for_loop().
2009-06-26 13:16:32 -06:00
Brian Paul
625b0fe268
Revert "slang: if/else/break & if/else/continue work for unrolled loops"
...
We should just check if the loop contains a continue/break in the
_slang_can_unroll_for_loop() test function...
This reverts commit 989856bde4 .
Conflicts:
src/mesa/shader/slang/slang_codegen.h
2009-06-26 13:16:32 -06:00
Brian Paul
4031ea1520
glsl: Added gl_shader_state::EmitContReturn field
...
This is the start of a glsl-continue-return feature branch to support
a GLSL code generator option for 'continue' and 'return' statements.
Some targets don't support CONT or RET statements so we'll need to
try to generate code that does not use them...
2009-06-26 13:16:32 -06:00
Brian Paul
84c5e4805b
docs: updated Mesa release instructions
2009-06-26 13:16:32 -06:00
José Fonseca
72aed16aee
scons: Tool to build with DirectX SDK.
...
Also works with MinGW, as long as the path to the DirectX SDK top
directory is set in the DXSDK_DIR environment variable.
2009-06-26 19:57:47 +01:00
José Fonseca
25f6c936fe
scons: Don't use C specific options with g++
2009-06-26 19:57:46 +01:00
Keith Whitwell
3e94521912
tgsi: correct handling of return value from util_vsnprintf
...
We were failing to deal with:
- vsnprintf returns negative value on error.
- vsnprintf returns the number of chars that *would* have been
written on truncation.
2009-06-26 13:45:34 +01:00
Keith Whitwell
c9f8c400ab
aux/indices: don't use 'prim' value once it is known to be bad
...
Theoretical bugfix only - no known case where this might happen.
2009-06-26 13:44:20 +01:00
Cooper Yuan
d1bc9a29b9
Fix viewport issue
2009-06-26 17:04:53 +08:00
Cooper Yuan
eaadba6eee
Fix color data can't be fetched issue
2009-06-25 19:48:43 +08:00
Julien Cristau
c38bc21cf5
add bug closer
2009-06-24 19:54:26 +02:00
Julien Cristau
1df36638c0
Don't build gallium for now.
2009-06-24 17:30:00 +02:00
Julien Cristau
dd89f8e3ea
Merge branch 'debian-unstable' into debian-experimental
...
Conflicts:
debian/changelog
debian/patches/06_kfreebsd-ftbfs.diff
2009-06-24 17:26:42 +02:00
Julien Cristau
2ca61d4474
Merge commit 'mesa_7_4_4' into debian-experimental
2009-06-24 17:23:34 +02:00
Julien Cristau
22f1c449ae
update changelog
2009-06-24 17:20:23 +02:00
Julien Cristau
2be8cd65cb
Merge tag 'mesa_7_5_rc3' into debian-experimental
2009-06-24 17:19:16 +02:00
José Fonseca
c25534f30d
wgl: Handle flush after a window is destroyed.
...
Fixes assertion failure with conform.
2009-06-24 15:23:44 +01:00
Julien Cristau
ec4c889266
Update 04_osmesa_version.diff, refresh 06_kfreebsd-ftbfs.diff.
2009-06-24 12:37:17 +02:00
Julien Cristau
c84a384fdf
Update changelog
2009-06-24 12:32:20 +02:00
Julien Cristau
f56634caea
Merge tag 'mesa_7_4_4' into debian-unstable
2009-06-24 12:27:10 +02:00
Brian Paul
d0c391b6a2
docs: set 7.4.4 release date
2009-06-23 18:53:31 -06:00
Brian Paul
b79e6a59d8
demos: fix issues in glxcontexts.c
...
The reshape() function was called when there was no GLX context so
the viewport/modelview/projection setup wasn't doing anything. Move
the call to reshape() into draw().
Also, remove -stereo, -fullscreen options and do some general clean-up.
2009-06-23 09:31:27 -06:00
Cooper Yuan
5e1534f532
correct scissor and cliprect setting
2009-06-23 11:11:19 +08:00
Roland Scheidegger
2f184d0d9f
i965: handle OPCODE_SWZ in the glsl path
...
glsl compiler will not generate OPCODE_SWZ, and as a first step it would
be translated away to a MOV anyway (why?), but later internally this opcode is
generated (for EXT_texture_swizzling).
(cherry picked from commit 4ef1f8e3b5 )
2009-06-22 15:15:20 -07:00
Owen W. Taylor
9d367d43b2
Disable SGI_swap_control extension for DRI2
...
We currently don't have support for SGI_swap_control for direct
contexts with DRI2, so disable reporting the extension. Reporting
the extension, and then having glXSwapIntervalSGI() "succeed"
but do nothing can confuse applications.
https://bugs.freedesktop.org/show_bug.cgi?id=22123
(cherry picked from commit 279143c6e8 )
2009-06-22 15:15:20 -07:00
Michel Dänzer
0584b6e433
intel: intel_texture_drawpixels() can't handle GL_DEPTH_STENCIL.
...
Fixes glean depthStencil test.
(cherry picked from commit 3885b708fd )
2009-06-22 15:15:20 -07:00
Brian Paul
19218fe712
i965: added intelFlush() call in intel_get_tex_image()
...
Fixes the render-to-texture test in progs/tests/getteximage.c
(cherry picked from commit a03b349153 )
2009-06-22 15:15:20 -07:00
Brian Paul
a5b7e0c7d7
mesa: s/MAX_VERTEX_PROGRAM_ATTRIBS/MAX_NV_VERTEX_PROGRAM_INPUTS/ in NV funcs
...
(cherry picked from commit 4dc426c016 )
2009-06-22 15:15:20 -07:00
Brian Paul
54f425b5ce
mesa: rename MAX_VERTEX_ATTRIBS to MAX_VERTEX_GENERIC_ATTRIBS
...
Be clearer that this is the number of generic vertex program/shader
attributes, not counting the legacy attributes (pos, normal, color, etc).
(cherry picked from commit 4a95185c9f )
2009-06-22 15:15:19 -07:00
Brian Paul
810df8317d
mesa: s/MAX_VERTEX_PROGRAM_ATTRIBS/MAX_NV_VERTEX_PROGRAM_INPUTS
...
(cherry picked from commit d2a74d76c9 )
2009-06-22 15:15:19 -07:00
Brian Paul
19ca5ee1db
mesa: fix some potential state-restore issues in pop_texture_group()
...
Call the _mesa_set_enable() functions instead of driver functions, etc.
Also, add missing code for 1D/2D texture arrays.
(cherry picked from commit aac19609bf )
2009-06-22 15:15:19 -07:00
Brian Paul
ad0514b24d
vbo: return VP_NONE from get_program_mode() if running fixed-func vertex program
...
If we're running a vertex program to emulated fixed-function, we still need
to treat vertex arrays/attributes as if we're in fixed-function mode.
This should probably be back-ported to Mesa 7.5 after a bit more testing.
(cherry picked from commit dda82137d2 )
2009-06-22 15:15:19 -07:00
Brian Paul
00e203fe17
mesa: create/use a fallback texture when bound texture is incomplete
...
When a GLSL sampler reads from an incomplete texture it should
return (0,0,0,1). Instead of jumping through hoops in all the drivers
to make this happen, just create/install a fallback texture with those
texel values.
Fixes piglit/fp-incomplete-tex on i965 and more importantly, fixes some
GPU lockups when trying to sample from missing surfaces. If a binding
table entry is NULL, it seems that sampling sometimes works, but not
always (lockup).
Todo: create a fallback texture for each type of texture target?
(cherry picked from commit 3f25219c7b )
2009-06-22 15:15:19 -07:00
Brian Paul
eaed8dc609
mesa: bump version to 7.4.4
2009-06-22 15:27:03 -06:00
Brian Paul
b5609e6444
docs: release notes for 7.4.4
2009-06-22 15:26:19 -06:00
Brian Paul
0b870bbb2a
docs: 7.4.3 MD5 checksums
2009-06-22 11:24:09 -06:00
Brian Paul
1dbbc39f48
intel: added a null ptr check
...
This was hit during screen tear-down.
2009-06-22 11:23:44 -06:00
Brian Paul
4b8cd0b0ad
intel: call _mesa_unreference_framebuffer() in intelDestroyBuffer()
...
This was a call to _mesa_reference_framebuffer(ptr, NULL) but the NULL
pointer is incorrect in Mesa 7.4.x.
Fixes a failed assertion during screen tear-down.
2009-06-22 11:23:13 -06:00
Cooper Yuan
3a3c7fd52e
functions declaration with 'extern'
2009-06-22 15:10:57 +08:00
Cooper Yuan
2f6451042d
Pass viewport id to r700SendViewportState function, otherwise the radom value may beyond R700_MAX_VIEWPORTS
2009-06-22 14:33:18 +08:00
Cooper Yuan
46ca8e5782
add LINK_STATES for SPI_PS and SEMANTIC
2009-06-22 10:16:01 +08:00
Eric Anholt
abfd56c24c
intel: Fix other metaops versus GL_COMPILE_AND_EXECUTE dlists.
...
Fixes oglconform zbfunc.c and pxtrans-cidraw.c, at least.
(cherry picked from commit 405300bb19 )
2009-06-19 16:57:06 -07:00
Eric Anholt
daacac1c24
intel: Fix glClear behavior versus display lists.
...
The CALL_DrawArrays was leaking the clear's primitives into the display
list with GL_COMPILE_AND_EXECUTE. Use _mesa_DrawArrays instead, which
doesn't appear to leak. Fixes piglit dlist-clear test.
(cherry picked from commit 64edde1004 )
2009-06-19 16:54:59 -07:00
Brian Paul
5d387a35ff
docs: set 7.4.3 release date
2009-06-19 15:16:01 -06:00
Brian Paul
2ae6859215
docs: bump version to 7.4.3
2009-06-19 15:14:49 -06:00
Roland Scheidegger
43bb78f2bb
radeons: use dp4 for position invariant vertex programs
...
Fixes #22181 . R200 requires this since DP4 is used in hw tnl mode.
R300 prefers it (should be faster due to no instruction dependencies), but
both methods should be correct (when sw tcl is used though, MUL/MAD might
be faster). Probably doesn't make much difference for R100 since vertex progs
are executed in software anyway, but let's just keep it the same there too.
2009-06-19 20:00:55 +02:00
Michel Dänzer
9dfce365c7
Also release direct rendering resources in glXDestroyGLXPixmap.
...
Fixes leak running compiz with direct rendering.
2009-06-19 18:00:49 +02:00
Michel Dänzer
a120778c72
Always free image offsets memory when re-initializing texture image fields.
...
Fixes leak running compiz with direct rendering.
2009-06-19 18:00:33 +02:00
José Fonseca
3cf92e936a
scons: Output the friendly "Linking ..." message when creating DLLs with MinGW.
2009-06-19 16:08:38 +01:00
Brian Paul
0487656245
softpipe: return alpha=1 in shadow_compare() function
...
The alpha value wasn't set at all before so we got unpredictable results.
Note that we don't currently obey GL_DEPTH_TEXTURE_MODE in the state
tracker. For now, we return the result in the default mode (r,r,r,1).
2009-06-19 08:53:15 -06:00
José Fonseca
8f382fd3f3
util: Add cast.
...
It is expected to loose precision here.
2009-06-18 14:54:09 +01:00
José Fonseca
21bfd0f4bd
draw: Replace pointer arithmetic with cast.
...
Using uintptr_t as intermediate type for pointer -> integer conversions is
easier to understand and does not cause any size mismatch warnings.
uintptr_t is part of C99, and we already provide a suitable replacement
definition for all platforms we care about.
2009-06-18 14:54:09 +01:00
José Fonseca
d609df1dae
trace: Use size_t consistently.
2009-06-18 14:54:09 +01:00
José Fonseca
2af0173e9e
pipebuffer: Use a type consistently for sizes/offsets.
...
Avoids warnings on 64bit builds.
Use regular unsigned since that's what gallium expects, but use a
typedef to facilitate possible changes in the future.
2009-06-18 14:54:08 +01:00
José Fonseca
42882897c6
wgl: Fix window resizing in multithread applications.
...
In multithreading stw_call_window_proc can be called by a thread other
than the thread where the context is bound.
2009-06-18 14:54:07 +01:00
José Fonseca
4b4855c717
wgl: Move all thread related code together.
...
Not only for cosmetic reasons, but also because we need to set the
SetWindowsHookEx hook for threads created before the DllMain is called
(threads for each we don't get the DLL_THREAD_ATTACH notification).
2009-06-18 14:54:07 +01:00
Keith Whitwell
1b05b5b4fe
glew: correct misspelling of glFramebufferTextureLayer
...
This was misspelt as glFramebufferTexturLayer (missing e), causing
conflicts with the correctly spelt version in glext.h and extfuncs.h.
2009-06-18 10:13:55 +01:00
Keith Whitwell
0491142152
mesa: protect Elements against multiple definitions
...
Mesa and gallium both have a definition of this macro
2009-06-18 09:53:45 +01:00
Brian Paul
39366ed995
intel: remove extra \n from warning string
...
(cherry picked from commit 42e9bde0fa )
2009-06-17 12:55:26 -07:00
Robert Ellison
d446d3acac
i965: fix 1D texture borders with GL_CLAMP_TO_BORDER
...
With 1D textures, GL_TEXTURE_WRAP_T should be ignored (only
GL_TEXTURE_WRAP_S should be respected). But the i965 hardware
seems to follow the value of GL_TEXTURE_WRAP_T even when sampling
1D textures.
This fix forces GL_TEXTURE_WRAP_T to be GL_REPEAT whenever 1D
textures are used; this allows the texture to be sampled
correctly, avoiding "imaginary" border elements in the T direction.
This bug was demonstrated in the Piglit tex1d-2dborder test.
With this fix, that test passes.
(cherry picked from commit ab6c4fa582 )
2009-06-17 12:55:26 -07:00
Robert Ellison
56235ae504
i965: send all warnings through _mesa_warning()
...
One warning message:
drm_i915_getparam: -22
was still being sent to fprintf(). This causes all Piglit tests to fail,
even with MESA_DEBUG=0.
Using _mesa_warning() to emit the message allows the general Mesa controls
for messages like this to be applied.
(cherry picked from commit bc3270e99f )
2009-06-17 12:55:26 -07:00
Robert Ellison
e15aebe10e
i965: fix segfault on low memory conditions
...
When out of memory (in at least one case, triggered by a longrunning
memory leak), this code will segfault and crash. By checking for the
out-of-memory condition, the system can continue, and will report
the out-of-memory error later, a much preferable outcome.
(cherry picked from commit 44a4abfd4f )
2009-06-17 12:55:26 -07:00
Ian Romanick
a70c45bdab
Fast path when rebinding the same texture in single context environment
...
If there is no shared context, there is no purpose in rebinding the same
texture. In some artificial tests this improves performance 10% - 30%.
(cherry picked from commit 7f8000db8b )
2009-06-17 12:55:26 -07:00
Eric Anholt
ff3da0966f
i915: Don't put VBOs in graphics memory unless required for an operation.
...
This saves doing swtnl from uncached memory, which is painful. Improves
clutter test-text performance by 10% since it started using VBOs.
(cherry picked from commit a945e203d4 )
2009-06-17 11:08:36 -07:00
Eric Anholt
1b8e4dd2c8
i915: Fall back on NPOT textured metaops on 830-class.
...
(cherry picked from commit 8ec6e03679 )
2009-06-17 11:08:28 -07:00
Eric Anholt
cee73ffdaf
i915: Restore the Viewport and DepthRange functions on 8xx.
...
Fixes failed viewport updates on glxgears (and other apps) resize since
e41780fedc .
Bug #20473 .
(cherry picked from commit 0e83e8f51a )
2009-06-17 11:08:13 -07:00
Eric Anholt
7805c3b57b
i956: Make state dependency of SF on drawbuffer bounds match Mesa's.
...
Noticed while debugging a weird 1D FBO testcase that left its existing
viewport and projection matrix in place when switching drawbuffers. Didn't
fix the testcase, though.
(cherry picked from commit 3a521d84ec )
2009-06-17 11:07:03 -07:00
Eric Anholt
97974b7e51
intel: Don't complain on falling back from PBO fastpaths.
...
Instead, stash the debug info under the handy debug flag.
Bug #20053
(cherry picked from commit 22690482e6 )
2009-06-17 11:06:52 -07:00
Eric Anholt
957f3c8c3d
mesa: Mark FBOs with compressed color attachments as FBO-incomplete.
...
Both EXT_fbo and ARB_fbo agree on this. Fixes a segfault in the metaops
mipmap generation in Intel for SGIS_generate_mipmap of S3TC textures in
Regnum Online.
Bug #21654 .
(cherry picked from commit 0307e609aa )
2009-06-17 11:06:46 -07:00
Eric Anholt
66bfd025c8
i915: Use Stencil.Enabled instead of Stencil._Enabled in DrawBuffers.
...
The _Enabled field isn't updated at the point that DrawBuffers is called,
and the Driver.Enable() function does the testing for stencil buffer
presence anyway.
bug #21608 for Radeon
(cherry picked from commit 4c6f829899 )
2009-06-17 11:06:38 -07:00
Eric Anholt
fbd554d074
i915: Only use the new 945 cube layout for compressed textures.
...
The docs actually explain this, but not in a terribly clear manner.
This nearly fixes the piglit cubemap testcase, except that something's
going wrong with the nearest filtering at 2x2 sizes in the testcase.
Looks good by visual inspection, though.
Bug #21692
(cherry picked from commit 5c5a468848 )
2009-06-17 11:06:25 -07:00
Eric Anholt
6e0df938d4
i965: Fix varying payload reg assignment for the non-GLSL-instructions path.
...
I don't have a testcase for this, but it seems clearly wrong.
(cherry picked from commit dc657f3929 )
2009-06-17 11:05:55 -07:00
Eric Anholt
988b61be27
i965: Fix register allocation of GLSL fp inputs.
...
Before, if the VP output something that is in the attributes coming into
the WM but which isn't used by the WM, then WM would end up reading subsequent
varyings from the wrong places. This was visible with a GLSL demo
using gl_PointSize in the VS and a varying in the WM, as point size is in
the VUE but not used by the WM. There is now a regression test in piglit,
glsl-unused-varying.
(cherry picked from commit 0f5113deed )
2009-06-17 11:04:31 -07:00
Eric Anholt
320a303be0
intel: Use FRONT_AND_BACK for StencilOp as well.
...
(cherry picked from commit 64980125c7 )
2009-06-17 10:52:56 -07:00
Eric Anholt
d9e35d51fd
intel: Use GL_FRONT_AND_BACK for stencil clearing.
...
This comes from a radeon-rewrite fallback fix, but may also fix stencil
clear failure when the polygon winding mode is flipped.
(cherry picked from commit d866abeffc )
2009-06-17 10:52:54 -07:00
Eric Anholt
61a2c9668f
intel: Skip the DRI2 renderbuffer update when doing Viewport on an FBO.
...
(cherry picked from commit d4a42b0ce6 )
2009-06-17 10:52:49 -07:00
Eric Anholt
2770107d87
intel: Map write-only buffer objects through the GTT when possible.
...
This looks to be a win of a few percent in cairogears with new vbo code,
thanks to not polluting caches.
(cherry picked from commit aa422b2625 )
2009-06-17 10:52:30 -07:00
Brian Paul
afe0ca1f3f
mesa: rework viewport/scissor initialization code
...
The first time a context is bound to a drawable, the viewport and scissor
bounds are initialized to the buffer's size. This is actually a bit tricky.
A new _mesa_check_init_viewport() function is called in several places
to check if the viewport has been initialized. We also use a new
ctx->ViewportInitialized flag instead of the overloaded
ctx->FirstTimeCurrent flag.
Hand-picked from mesa_7_5_branch, commit 3f856c6b6b
2009-06-17 08:43:17 -06:00
Brian Paul
6b782231d0
mesa: added null ptr check in Fake_glXCreatePixmap()
...
Fixes segfault in progs/xdemos/glxgears_pixmap.c
(cherry picked from master, commit d18c57aaea )
2009-06-17 08:40:16 -06:00
Brian Paul
3f856c6b6b
mesa: rework viewport/scissor initialization code
...
The first time a context is bound to a drawable, the viewport and scissor
bounds are initialized to the buffer's size. This is actually a bit tricky.
A new _mesa_check_init_viewport() function is called in several places
to check if the viewport has been initialized. We also use a new
ctx->ViewportInitialized flag instead of the overloaded
ctx->FirstTimeCurrent flag.
2009-06-17 08:38:38 -06:00
Brian Paul
d18c57aaea
mesa: added null ptr check in Fake_glXCreatePixmap()
...
Fixes segfault in progs/xdemos/glxgears_pixmap.c
2009-06-17 08:38:38 -06:00
Brian Paul
3705f48688
st/glx: added null ptr check in Fake_glXCreatePixmap()
...
Fixes segfault in progs/xdemos/glxgears_pixmap.c
2009-06-17 08:38:38 -06:00
José Fonseca
c6f71eabd8
Revert "scons: Debug build by default."
...
Per Brian's request.
This reverts commit 25f0c33bb3 .
2009-06-17 15:24:06 +01:00
José Fonseca
1bee650ef3
progs/wgl: Fix shreadtex_mt too.
2009-06-17 15:23:25 +01:00
José Fonseca
6e24fdeae5
progs/wgl: Tweak the initialization wait in wglthreads.
...
There was still a non-zero probability for wglShareLists of failing.
2009-06-17 15:23:25 +01:00
José Fonseca
557421b6de
progs/wgl: Get wglShareLists working in wglthreads.
...
wglShareLists is a little picky -- it seems to check if it has exclusive
access to a lock, and fails if it doesn't.
This allows the texture to be shared with all windows.
2009-06-17 15:23:25 +01:00
José Fonseca
25f0c33bb3
scons: Debug build by default.
...
Match what autotools and other build systems do by default.
2009-06-17 15:23:24 +01:00
Brian Paul
2b890c9818
docs: document GLX/glean makeCurrent fix
2009-06-17 08:06:50 -06:00
Brian Paul
e0b13e15f1
GLX: attempt to fix glean makeCurrent test cases.
...
Two parts to this:
One we don't keep pointers to possibly freed memory anymore once we unbind the
drawables from the context. Brian I need to figure out what the comment
you made there, can we get a glean/piglit test so we can fix it properly?
If the new gc is the same as the oldGC, we call the unbind even though
we just bound it in that function. doh.
(cherry picked from master, commit 77506dac8e )
2009-06-17 08:05:54 -06:00
Brian Paul
c53705ed7b
GLX: attempt to fix glean makeCurrent test cases.
...
Two parts to this:
One we don't keep pointers to possibly freed memory anymore once we unbind the
drawables from the context. Brian I need to figure out what the comment
you made there, can we get a glean/piglit test so we can fix it properly?
If the new gc is the same as the oldGC, we call the unbind even though
we just bound it in that function. doh.
(cherry picked from master, commit 77506dac8e )
2009-06-17 08:03:19 -06:00
José Fonseca
ebe0796ba2
docs: Document building with SCons.
2009-06-17 10:12:11 +01:00
José Fonseca
d22828f716
wgl: Factor out some repetitive code into inline functions.
2009-06-17 10:08:25 +01:00
José Fonseca
992000cce7
progs/wgl: Allow resizing wglthreads' windows.
2009-06-17 10:08:24 +01:00
Brian Paul
6b917d0b17
i965: fix bugs in projective texture coordinates
...
For the TXP instruction we check if the texcoord is really a 4-component
atttibute which requires the divide by W step. This check involved the
projtex_mask field. However, the projtex_mask field was being miscalculated
because of some confusion between vertex program outputs and fragment
program inputs.
1. Rework the size_masks calculation so we correctly set bits corresponding
to fragment program input attributes.
2. Rename projtex_mask to proj_attrib_mask since we're interested in more
than just texcoords (generic varying vars too).
3. Simply the indexing of the size_masks and proj_attrib_mask fields.
4. The tracker::active[] array was mis-dimensioned. Use MAX_PROGRAM_TEMPS
instead of a magic number.
5. Update comments, add new assertions.
With these changes the Lightsmark demo/benchmark renders correctly, until
we eventually hit a GPU lockup...
2009-06-16 18:21:26 -06:00
Brian Paul
742ba08406
softpipe: fix out of bounds quad rasterization bug
...
For some triangles we can generate quads which lie just outside the
surface bounds. Just check the quad's mask before trying to emit/process
the quad.
Fixes failed assertion in Lightsmark.
2009-06-16 15:41:49 -06:00
Brian Paul
420c74b870
docs: document viewport clamping bug
2009-06-16 09:40:22 -06:00
Brian Paul
a64f994a3a
mesa: fix incorrect viewport clamping in _mesa_set_viewport()
...
A 0 by 0 viewport size is legal. Don't clamp against lower bound of one.
The error checking earlier in the function prevents negative values.
2009-06-16 09:39:33 -06:00
Brian Paul
3e48dd0445
mesa: fix incorrect viewport clamping in _mesa_set_viewport()
...
A 0 by 0 viewport size is legal. Don't clamp against lower bound of one.
The error checking earlier in the function prevents negative values.
2009-06-16 09:34:35 -06:00
Brian Paul
c568446dc6
docs: fixed bug 21872
2009-06-16 08:48:26 -06:00
Brian Paul
acbf9c6f3c
mesa: fix REMAINDER() macro
...
The results were incorrect for some negative values of A.
See bug 21872.
(cherry picked from mesa_7_5_branch, commit ed7f4b4230 )
2009-06-16 08:48:12 -06:00
Brian Paul
ed7f4b4230
mesa: fix REMAINDER() macro
...
The results were incorrect for some negative values of A.
See bug 21872.
2009-06-16 08:45:56 -06:00
José Fonseca
3463b1479d
gallium: Avoid atomic ops / locking when src is dst.
2009-06-16 13:05:25 +01:00
José Fonseca
077c5e62d8
progs/wgl: Quit after displaying usage for -h option.
2009-06-16 12:34:29 +01:00
José Fonseca
06075711af
progs/wgl: Use appropriate types to silence msvc warnings.
2009-06-16 12:29:58 +01:00
José Fonseca
566bdbe67d
progs/wgl: Fix assertion failure in wglthreads' texture creation.
2009-06-16 12:29:58 +01:00
Brian Paul
3b842feead
docs: recent fixes for 7.4.3
2009-06-15 16:24:03 -06:00
Brian Paul
6d62b8d5c1
intel: Release fb backing regions in intelDestroyBuffer()
...
Fixes memory leak when destroying framebuffers.
(cherry picked from mesa_7_5_branch, commit d027e8feff )
2009-06-15 16:22:54 -06:00
Shuang He
d027e8feff
intel: Release fb backing regions in intelDestroyBuffer()
...
Fixes memory leak when destroying framebuffers.
2009-06-15 16:19:30 -06:00
José Fonseca
227d233cff
python/tests: Add is_depth_stencil_format utility function.
2009-06-15 19:22:35 +01:00
José Fonseca
7585cbffe0
python/tests: Cleanup texture_sample.
2009-06-15 19:21:58 +01:00
José Fonseca
c6af9b2947
mesa: Always return a value.
2009-06-15 19:20:25 +01:00
José Fonseca
053d8eb891
mesa: Use appropriate float/integer types.
2009-06-15 19:20:05 +01:00
José Fonseca
6214c7262f
mesa: Use type modifier for float constants.
2009-06-15 19:19:29 +01:00
José Fonseca
37f2117cd1
mesa: Use integer type with appropriate sign.
2009-06-15 19:17:07 +01:00
José Fonseca
c33ef1f7c6
rtasm: Use 32bit constant.
...
As we're only using 32bit bitmasks.
2009-06-15 19:04:04 +01:00
José Fonseca
940cb7ce16
gallium: Ensure assert macro is defined before being used in p_thread.h
2009-06-15 18:57:45 +01:00
José Fonseca
5d0cf9ebb4
softpipe: Fix softpipe_is_texture_referenced.
...
Render results are only visible when the render cache is flushed.
softpipe_is_texture_referenced must reflect that or transfers to/from the
textures bound in the framebuffer won't be proceeded of the necessary
flush, causing transfer data to be outdated/clobbered.
This fixes conform drawpix test with softpipe.
2009-06-15 18:42:13 +01:00
José Fonseca
0e1abced56
progs/tests: Use opaque colors.
...
Transparency is not relevant for this example, and leads to distraction
due to different results in alpha visuals, when capturing images to disk.
2009-06-15 15:40:10 +01:00
Thomas Hellstrom
db22b35d21
dri st: Don't require the PIPE_TEXTURE_USAGE_RENDER_TARGET property for depth- and stencil renderbuffers.
...
Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
2009-06-15 11:48:57 +02:00
Thomas Hellstrom
cbe5af766e
gallium: Fix segfault and valgrind error introduced with commit 3f2e006b75
...
Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
2009-06-15 11:22:06 +02:00
Jakob Bornecrantz
2fe65e8f14
Merge branch 'mesa_7_5_branch'
2009-06-14 16:56:34 +02:00
Dave Airlie
6791576f6c
Revert "r200: make use of DMA buffers for Elts a lot better."
...
This reverts commit 0952645fe0 .
Need to revisit where this is going wrong
2009-06-29 20:15:47 +10:00
Corbin Simpson
928a568417
r300g: YCbCr and sRGB textures.
2009-06-27 12:07:59 -07:00
Corbin Simpson
f150e05afc
r300g: Fix EXT_packed_depth_stencil functionality.
...
Allow Z24S8 to be a true texture.
2009-06-27 12:07:59 -07:00
Jakob Bornecrantz
1ac72aedb2
st/dri: Fix last depth bits logic
2009-06-27 19:55:37 +02:00
Nicolai Hähnle
dbb56687c8
radeon: Always initialize front and back renderbuffers if present
...
This fixes an assertion in glReadPixels from the front buffer.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-06-27 18:16:49 +02:00
Nicolai Hähnle
9fa0d25c54
radeon: Update .gitignore
...
Add all source files that are symlink'ed from common radeon code to the
ignore list.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-06-27 18:08:44 +02:00
Corbin Simpson
3f15acb7e8
r300g: EXT_provoking_vertex.
2009-06-26 21:48:09 -07:00
Corbin Simpson
6ebcdc7549
r300g: S3TC.
...
tests/texcompress2 doesn't work, but tests/texcmp does (more or less.)
2009-06-26 21:25:41 -07:00
Corbin Simpson
aac6648cd8
r300g: Use real texture formats.
...
What bugs me is that the YUV444 format somehow worked properly. :3
2009-06-26 21:25:41 -07:00
Corbin Simpson
7a3224c334
r300g: Definitively forbid unusable Z buffer/stencil formats.
2009-06-26 21:25:40 -07:00
Corbin Simpson
9e7d195fdc
r300g: Comment out assert for now.
...
Will fix with better constant refactoring later.
2009-06-26 21:25:40 -07:00
Corbin Simpson
00ffc90dd2
r300g: Be more specific on surface_copy fallbacks.
2009-06-26 21:25:40 -07:00
Corbin Simpson
6a926f9997
r300g: PIPE_CAP_TGSI_CONT_SUPPORTED.
2009-06-26 21:25:40 -07:00
Corbin Simpson
f80b7f4683
r300-gallium: Ensure that no dirty state goes unemitted.
2009-06-26 21:25:40 -07:00
Brian Paul
f57280cc73
Merge branch 'arb_vertex_array_object'
2009-06-26 17:49:14 -06:00
Brian Paul
a18e209edb
Merge branch 'mesa_7_5_branch'
...
Conflicts:
Makefile
src/gallium/drivers/softpipe/sp_screen.c
src/mesa/main/version.h
2009-06-26 17:07:07 -06:00
Roland Scheidegger
4fdc6ad41b
i965: fix fetching constants from constant buffer in glsl path
...
the driver used to overwrite grf0 then use implicit move by send instruction
to move contents of grf0 to mrf1. However, we must not overwrite grf0 since
it's still used later for fb write.
Instead, do the move directly do mrf1 (we could use implicit move from another
grf reg to mrf1 but since we need a mov to encode the data anyway it doesn't
seem to make sense).
I think the dp_READ/WRITE_16 functions may suffer from the same issue.
While here also remove unnecessary msg_reg_nr parameter from the dataport
functions since always message register 1 is used.
2009-06-26 20:39:49 +02:00
Vinson Lee
d3b46fc77f
configs/darwin: Set CXX to g++.
2009-06-26 12:36:45 -06:00
Brian Paul
b2a1ca4fcf
docs: document GL_ARB_vertex_array_object
2009-06-22 17:54:16 -06:00
Brian Paul
8affcd364b
intel: enable GL_ARB_vertex_array_object extension
2009-06-22 17:54:00 -06:00
Brian Paul
cfb8158058
mesa: plug in glBindVertexArray, glGenVertexArrays functions
2009-06-22 17:52:08 -06:00
Brian Paul
31618f1a88
tests: update bufferobj.c to test GL_ARB_vertex_array_object
2009-06-22 17:51:30 -06:00
Brian Paul
2a795ad522
st/mesa: alphabetize lines
2009-06-22 17:01:44 -06:00
Brian Paul
32220c48ad
st/mesa: enable GL_ARB_vertex_array_object
2009-06-22 17:01:00 -06:00
Brian Paul
e2b7249555
mesa: enforce the rule that arrays live in VBOs for GL_ARB_vertex_array_object
2009-06-22 16:56:35 -06:00
Brian Paul
7ebadecd87
mesa: added extension flag for ARB_vertex_array_object
2009-06-22 16:47:45 -06:00
Brian Paul
9342e6f5a9
mesa: implement _mesa_GenVertexArrays() for GL_ARB_vertex_array_object
...
This also involves adding a gl_array_object::VBOonly field. For the
ARB extension, all arrays in the object must reside in a VBO. This flag
keeps track of that requirement.
2009-06-19 18:17:25 -06:00
Brian Paul
b8000c874e
mesa: implement _mesa_BindVertexArray()
2009-06-19 18:12:11 -06:00
Brian Paul
12cf98f5fc
mesa: move vertex array objects from shared state to per-context
...
The ARB version requires VAOs to be per-context while the Apple extension
was ambiguous.
2009-06-19 18:11:52 -06:00
Brian Paul
bda551898a
mesa: regenerated files related to GL_ARB_vertex_array_object
2009-06-19 18:11:29 -06:00
Brian Paul
54b03948e0
glapi: add new information for GL_ARB_vertex_array_object
2009-06-19 18:11:18 -06:00
Michel Dänzer
dd26899ca3
intel: Fixups for 'mesa: create/destroy buffer objects via driver functions'.
...
Initialize all driver function hooks before calling _mesa_initialize_context(),
and handle all buffer objects in intel_buffer_object().
Fixes assertion failure when running glxinfo.
2009-06-19 23:55:55 +02:00
Roland Scheidegger
4d2b392a0a
radeon: fix cube maps for non-mm path
...
drm cmd checker would refuse cube emits
also fix an issue in the cs path which would calculate the register
offset off by one dword.
Only same testing done as original code (none except compile tested).
2009-06-19 22:56:32 +02:00
Brian Paul
fa5b81ea8b
st/mesa: restore some parameter checking buffer object functions
...
These functions may be called from the VBO code (not just user GL calls)
so do some parameter sanity checking.
2009-06-19 14:43:55 -06:00
Roland Scheidegger
ffae82da4c
r200: fix cube maps for non-mm path
...
drm cmd checker rightfully fell over any cube emit
2009-06-19 22:32:06 +02:00
Brian Paul
e90d6a3cbf
i965: initial code for loops in vertex programs
2009-06-19 12:19:33 -06:00
Brian Paul
fd7d764514
i965: asst clean-ups, etc in brw_vs_emit()
2009-06-19 12:19:33 -06:00
Brian Paul
752204d362
i965: asst clean-ups, var renaming in brw_wm_emit_glsl()
2009-06-19 12:19:33 -06:00
Brian Paul
9d029e0e20
st/mesa: remove redundant st_buffer_object::size field and error checks
...
Just use the gl_buffer_object::Size field. Remove unnecessary size/offset
error checks. Core Mesa will have already done these checks before these
functions are called.
2009-06-19 12:19:15 -06:00
Brian Paul
1ffd074436
st/mesa: no longer special-case buffer object 0 in st_buffer_object() cast wrapper
...
Since commit 6629a35559 "mesa: create/destroy
buffer objects via driver functions" this is no longer needed, and actually
was causing a crash during context tear-down.
2009-06-19 12:13:15 -06:00
Roland Scheidegger
7ce814b25f
radeons: use dp4 for position invariant vertex programs
...
Fixes #22181 . R200 requires this since DP4 is used in hw tnl mode.
R300 prefers it (should be faster due to no instruction dependencies), but
both methods should be correct (when sw tcl is used though, MUL/MAD might
be faster). Probably doesn't make much difference for R100 since vertex progs
are executed in software anyway, but let's just keep it the same there too.
2009-06-19 20:01:14 +02:00
Brian Paul
a8da1feb23
mesa: make query-related driver fallback functions static
...
Plug them in via _mesa_init_query_object_functions().
2009-06-19 10:05:08 -06:00
Brian Paul
331eb58f68
mesa: make buffer object-related driver fallback functions static
...
Plug them in via _mesa_init_buffer_object_functions().
2009-06-19 10:00:03 -06:00
Brian Paul
6629a35559
mesa: create/destroy buffer objects via driver functions
2009-06-19 09:58:51 -06:00
Brian Paul
e164210f65
i965simple: use u_reduced_prim() function
2009-06-19 09:48:43 -06:00
Brian Paul
d2e4643767
draw: use u_reduced_prim() function
2009-06-19 09:45:23 -06:00
Brian Paul
09da78c235
softpipe: use u_reduced_prim()
2009-06-19 09:42:37 -06:00
Brian Paul
157d52143a
gallium/util: s/boolean/unsigned/
2009-06-19 09:39:56 -06:00
Brian Paul
b0b8832e6f
softpipe: whitespace, reformatting
2009-06-19 09:38:12 -06:00
Brian Paul
9038b6c8bb
Merge branch 'ext-provoking-vertex'
...
Conflicts:
docs/relnotes-7.6.html
progs/tests/Makefile
src/gallium/drivers/softpipe/sp_prim_vbuf.c
src/glx/x11/indirect.c
src/mesa/glapi/Makefile
src/mesa/glapi/dispatch.h
src/mesa/glapi/glapioffsets.h
src/mesa/glapi/glapitable.h
src/mesa/glapi/glapitemp.h
src/mesa/glapi/glprocs.h
src/mesa/main/dlist.c
src/mesa/main/enums.c
src/mesa/sparc/glapi_sparc.S
src/mesa/x86-64/glapi_x86-64.S
src/mesa/x86/glapi_x86.S
2009-06-19 09:15:34 -06:00
Brian Paul
0ddc4dbe43
draw: use flatfirst variable
2009-06-18 23:00:37 -06:00
Brian Paul
9205a871e7
draw: remove debug code
2009-06-18 22:51:41 -06:00
Brian Paul
af5fff9c23
draw: fix first provoking vertex mode for quads, quad strips and polygons
2009-06-18 22:48:51 -06:00
Brian Paul
950171be3c
draw: fix first provoking vertex mode for unfilled quads
2009-06-18 22:47:46 -06:00
Brian Paul
601065f153
mesa: fix first provoking vertex mode for unfilled tri strips
2009-06-18 22:45:57 -06:00
Brian Paul
c70a529d7c
draw: clean up indentation
2009-06-18 18:33:29 -06:00
Thomas Hellstrom
0342229289
gallium dri st: Probe the driver for supported surface formats.
...
This is done when constructing the fbconfigs, and the result is saved
for window system framebuffer creation.
Note: For dri2 the server needs to have an identical format selection
logic. Otherwise the dri state-tracker and the xorg driver (state-tracker)
will disagree on which format to use for the attachments. Some more work
is needed in this area.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com >
2009-06-17 03:07:01 +02:00
Thomas Hellstrom
c9f19571da
mesa driconf: Add macro to specify an option with a quoted default value.
...
The default values true and false will expand to "1" and "0" when
gcc -std=c99, causing bool option defaults to generate runtime failures.
One solution is to specify bool option defaults quoted as "true" and "false".
Add a macro to assist this.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com >
2009-06-17 03:07:00 +02:00
Jakob Bornecrantz
edbec6b112
progs/rbug: Add small program to add block rules
2009-06-18 14:36:19 +02:00
Eric Anholt
3addc4e307
i965: Add decode for the G4X x,y offset in surface state.
2009-06-17 21:01:48 -07:00
Eric Anholt
6c3f696891
i965: Fix up texture layout for small things with wide pitches (tiled)
...
We were packing according to the pitch, while the hardware appears to base
it on the base level width.
With this and the previous commit, fbo-cubemap now matches untiled behavior.
2009-06-17 21:01:48 -07:00
Eric Anholt
0f328c90db
i965: Fall back or appropriately adjust offsets of drawing to tiled regions.
...
3D rendering to tiled textures was being done with non-tile-aligned offsets.
The G4X hardware has fields to let us support it easily and correctly, while
the pre-G4X hardware requires a path full of suffering, so we just fall back.
2009-06-17 21:01:48 -07:00
Dave Airlie
46000cecc3
r300: use vbo_split_prims to split up large vertex buffers.
...
This lets ut2004 avoid hitting the elt warning.
2009-06-18 13:25:38 +10:00
Eric Anholt
bd10f0e84f
i965: Fix tiling for FBO depth attachments by making DEPTH_COMPONENT Y tiled.
...
This may hurt if miptree relayout occurs, since we can't blit Y tiled
objects. But it corrects depth tests on FBOs using textures.
2009-06-17 20:19:19 -07:00
Dave Airlie
b165fa7d45
radeon: don't re-add BOs to validate list
...
if its on the list its on the list don't go readding it.
multitexturing from the same texture could cause this.
2009-06-18 13:16:06 +10:00
Brian Paul
3817a54912
glsl: call _mesa_postprocess_program(), disabled
2009-06-17 09:58:29 -06:00
Brian Paul
516d20fd26
mesa: silence warning
2009-06-17 09:58:29 -06:00
Brian Paul
ec6ad7ba3c
mesa: added _mesa_postprocess_program() to aid shader debugging
2009-06-17 09:58:29 -06:00
Jerome Glisse
f806a03361
radeon: Flush command buffer on viewport change
...
We flush the command buffer so we don't emit mixed
state (with new and previous buffer size) command
buffer, this is especialy affecting zbuffer states.
2009-06-17 16:33:14 +02:00
Jerome Glisse
2506c4e8b1
r300: don't emit vap index offset on r5xx hw when using cs
...
vap index offset is programmed to 0 by the kernel, it
would add work to kernel checker to allow userspace
programming of this so it's now disallowed with CS
on KMS.
2009-06-17 13:54:09 +02:00
Dave Airlie
77506dac8e
GLX: attempt to fix glean makeCurrent test cases.
...
Two parts to this:
One we don't keep pointers to possibly freed memory anymore once we unbind the
drawables from the context. Brian I need to figure out what the comment
you made there, can we get a glean/piglit test so we can fix it properly?
If the new gc is the same as the oldGC, we call the unbind even though
we just bound it in that function. doh.
2009-06-17 13:59:28 +10:00
Dave Airlie
856221d699
radeon: fix warnings in wrapper with libdrm
2009-06-17 11:12:57 +10:00
Brian Paul
8d48222791
Merge branch 'mesa_7_5_branch'
...
Conflicts:
src/mesa/main/api_validate.c
2009-06-16 18:25:52 -06:00
Roland Scheidegger
4ef1f8e3b5
i965: handle OPCODE_SWZ in the glsl path
...
glsl compiler will not generate OPCODE_SWZ, and as a first step it would
be translated away to a MOV anyway (why?), but later internally this opcode is
generated (for EXT_texture_swizzling).
2009-06-16 21:40:41 +02:00
Brian Paul
1510c3cae1
docs: minor relnotes clean-up
2009-06-15 16:44:26 -06:00
Brian Paul
70d247c69b
Merge branch 'arb_map_buffer_range'
...
Conflicts:
docs/relnotes-7.6.html
src/mesa/main/mtypes.h
2009-06-15 16:42:42 -06:00
Brian Paul
01f7bda44c
mesa: revert some recent VBO buffer object refcounting changes
...
Reverts part of commit d7ea9ddf58 .
We were calling _mesa_reference_buffer_object() on some heap-allocated
memory that was uninitialized and could trigger an assertion.
We can actually go back to "looser" ref counting of the Null/default
buffer object in these cases.
2009-06-15 10:58:04 -06:00
Brian Paul
b0d874bfbe
mesa: regenerated gl_mange.h file
2009-06-15 10:47:07 -06:00
Roland Scheidegger
63c407db3e
enable ARB_half_float_pixel for intel drivers
2009-06-15 18:31:03 +02:00
Roland Scheidegger
4ed2c0dddc
intel: fix (cosmetic) typo flag used twice
2009-06-15 18:30:51 +02:00
Thomas Hellstrom
f5888d9ca5
Merge branch 'mesa_7_5_branch'
...
Conflicts:
progs/util/extfuncs.h
2009-06-15 11:43:48 +02:00
Maciej Cencora
e0eafde746
r300: fix 3D textures
2009-06-15 01:07:19 +02:00
Jakob Bornecrantz
6530fabb93
Merge branch 'mesa_7_5_branch'
2009-06-14 06:32:47 +02:00
Jakob Bornecrantz
210ad58ee3
trace: Don't write state objects to file if dumping is not set
2009-06-14 06:07:50 +02:00
Keith Whitwell
0cce6d7e33
tgsi: correct handling of return value from util_vsnprintf
...
We were failing to deal with:
- vsnprintf returns negative value on error.
- vsnprintf returns the number of chars that *would* have been
written on truncation.
2009-06-26 13:43:10 +01:00
Dave Airlie
0952645fe0
r200: make use of DMA buffers for Elts a lot better.
...
This allows us to return the unused portion of the dma buffer
to the allocator instead of wasting nearly 16k a pop.
2009-06-26 15:09:12 +10:00
Dave Airlie
db54579628
r200: only emit unitneeded textures
2009-06-26 15:09:11 +10:00
Joakim Sindholt
622858884f
r300-gallium: organize fragment/vertex shaders
...
Appart from separating r3xx/r5xx fragment shaders, a more consistent
naming scheme has been applied. From now on:
r300 = all chips
r3xx = R300/R400 only
r5xx = R500 only
This way r300_fragment_shader is the master struct, and the structs
r3xx_fragment_shader and r5xx_fragment_shader inherits it.
2009-06-26 01:13:06 +02:00
Vinson Lee
450b20d1ef
gallium: Add PIPE_OS_APPLE token.
2009-06-25 09:52:50 -06:00
Jakob Bornecrantz
e99d13bbc6
progs/tests: Add yet another mipmap test
2009-06-14 01:44:34 +02:00
Roland Scheidegger
43b3b745e4
radeon: fix hw texture limits
...
still always enable max, but the right values this time.
More work should probably be done for saner limits without mm, and/or
dri conf option allow_large_textures (which is ignored) removed.
3D limit on r100 is pretty arbitrary as still handled by swrast anyway.
Also fix r300 limits (except 3d I've no idea what the max is anyway so
keep using mesa default).
2009-06-25 15:57:33 +02:00
Dave Airlie
cdbcb051d9
radeon/r200: add some hw texture limits
2009-06-25 13:26:52 +10:00
Dave Airlie
69fd0cbaa2
radeon: fix stupidity in cs space check code.
...
This was already correct in the GEM code
2009-06-25 12:13:17 +10:00
Brian Paul
bc5c40d7d9
intel: fix additional merge conflicts missed in previous commit
2009-06-24 08:57:48 -06:00
Brian Paul
a04af335a4
Merge branch 'mesa_7_5_branch'
...
Conflicts:
src/mesa/drivers/dri/i915/i915_tex_layout.c
src/mesa/drivers/dri/i965/brw_wm_glsl.c
src/mesa/drivers/dri/intel/intel_buffer_objects.c
src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
src/mesa/drivers/dri/intel/intel_pixel_draw.c
src/mesa/main/enums.c
src/mesa/main/texstate.c
src/mesa/vbo/vbo_exec_array.c
2009-06-24 08:54:37 -06:00
Jakob Bornecrantz
d60b2c6855
identity: Add new identity driver
...
This driver does no transformation of the gallium calls
going to the real driver, like the identity matrix. It is
intended to be the basis for transforming and/or debug
drivers like trace and rbug.
Authors of this patch are:
Michal Krol, orignal heavy lifting.
José Fonesca, object wrapping code stolen from trace.
Jakob Bornecrantz, put it all toghether and renamed a stuff.
2009-06-24 13:04:56 +02:00
Eric Anholt
b8e638d489
i965: Disable texture tiling by default.
...
I haven't fixed all the regressions yet, and it'll be easy to re-enable when
the known problems are fixed.
2009-06-23 19:31:43 -07:00
Eric Anholt
b72dea5441
i965: Set the max index buffer address correctly according to the docs.
...
It's the last addressable byte, not the byte after the end of the buffer.
2009-06-23 19:31:13 -07:00
Eric Anholt
d43599afef
i965: Don't set a reserved bit in MI_FLUSH.
...
I noticed this when this MI_FLUSH showed up in IPEHR for the ut2004 hang.
Not setting the reserved bit didn't help, though.
2009-06-23 19:31:13 -07:00
Eric Anholt
5ca800e100
dri2: Refresh the fake front contents after glXSwapBuffers().
...
Bug #19177 .
Reviewed by: Ian Romanick <ian.d.romanick@intel.com >
2009-06-23 19:31:12 -07:00
Eric Anholt
9c0ba017c8
i965: Fix depth-texture Y-tiling detection for sized internal formats.
...
Fixes assertion failure on norsetto shadow mapping demo.
2009-06-23 19:31:12 -07:00
Eric Anholt
e0a4e25f93
i965: Fix packed depth/stencil textures to be Y-tiled as well.
...
Fixes shadowtex.c. And an assert is added to catch this sooner next time.
2009-06-23 19:31:12 -07:00
Eric Anholt
1593a1bb34
intel: Bail on blits with non-tile-aligned offsets.
2009-06-23 19:31:12 -07:00
Eric Anholt
8f81a6468f
intel: Avoid trying to do blits to Y tiled regions.
...
This is somewhat nasty, but we need to do Y-tiled depth for FBO support.
May help with corruption and hangs since enabling texture tiling, and
since switching depth textures to Y tiled.
Fixes piglit depthtex.c on 965.
2009-06-23 19:31:11 -07:00
Eric Anholt
246d59c29e
intel: Fix some potential writes to zero-copy PBOs when used as regions.
...
I was in the midst of fixing some blitting-with-Y-tiled issues when I
noticed this. Hopefully PBO usage will be a little more robust, as a
result.
2009-06-23 19:31:11 -07:00
Eric Anholt
6a49473ab5
intel: Remove long-unused intel_region_fill and intelEmitFillBlit.
2009-06-23 19:31:10 -07:00
Eric Anholt
a9b03aaebf
intel: Refuse to do texture tiling if we don't have the kernel support.
2009-06-23 19:31:10 -07:00
Pauli Nieminen
4f1e141c11
Fix crash when debug output is enabled and sarea is notset in r200Clear
2009-06-23 16:43:00 +02:00
Ian Romanick
70e72070fc
mesa: From float type modifier from values to large for singles
...
The values 2147483648.0 and 4294967294.0 are too larget to be stored in single
precision floats. Forcing these to be singles causes bits to be lost, which
results in errors in some pixel transfer tests.
This fixes bug #22344 .
2009-06-22 18:22:51 -07:00
Brian Paul
a31118c25a
st/mesa: fix setup_edgeflags() regression
...
stobj is now non-null for the default/null buffer object. Update the
test to check the buffer ID to see if it's a real buffer object.
2009-06-22 17:49:22 -06:00
Jakob Bornecrantz
7a879500ac
gallium-intel: Improve Xorg Makefile a bit
...
The real solution is to create a Makefile.template for xorg
drivers and use that here.
2009-06-22 23:45:02 +02:00
Jakob Bornecrantz
23170ab236
st/xorg: Convert to template makefile
2009-06-22 23:34:18 +02:00
Jakob Bornecrantz
5d0a1d4241
st/dri: Fix typo when checking for depth formats
2009-06-22 23:34:18 +02:00
Eric Anholt
c80ce5ac90
i965: Fix warnings in intel_pixel_read.c.
2009-06-22 08:52:52 -07:00
Michel Dänzer
2c36ed9067
intel: Fix glReadPixels regression since changing context init order.
...
Fixes regression in dd26899ca3 that also
affected some PBO operations.
2009-06-22 08:45:45 -07:00
Eric Anholt
df70d3049a
intel: Also get the DRI2 front buffer when doing front buffer reading.
2009-06-19 22:18:16 -07:00
Eric Anholt
afc981ee46
intel: Update Mesa state before span setup in glReadPixels.
...
We could have mapped the wrong set of draw buffers. Noticed while looking
into a DRI2 glean ReadPixels issue.
2009-06-19 22:17:46 -07:00
Eric Anholt
dcfe0d66bf
intel: Move intel_pixel_read.c to shared for use with i965.
2009-06-19 22:16:16 -07:00
Eric Anholt
3b08a43f32
intel: Don't map regions with drm_intel_gem_bo_map_gtt() unless they're tiled.
...
This fixes a regression in region read performance that came in with the
texture tiling changes. Ideally we'd have an access flag coming in so we
could also use bo_map_gtt for writing, like we do for buffer objects.
Bug #22190
2009-06-19 17:25:20 -07:00
Eric Anholt
405300bb19
intel: Fix other metaops versus GL_COMPILE_AND_EXECUTE dlists.
...
Fixes oglconform zbfunc.c and pxtrans-cidraw.c, at least.
2009-06-19 16:43:45 -07:00
Eric Anholt
64edde1004
intel: Fix glClear behavior versus display lists.
...
The CALL_DrawArrays was leaking the clear's primitives into the display
list with GL_COMPILE_AND_EXECUTE. Use _mesa_DrawArrays instead, which
doesn't appear to leak. Fixes piglit dlist-clear test.
2009-06-19 16:43:45 -07:00
Eric Anholt
396b4043f0
mesa: Make VBO dlist printing use the same path as other dlist printing.
...
I was rather confused when mesa_print_display_list didn't show any of
my glBegin()..glEnd(). Nothing but print_list appears to call
this function, so matching its behavior seems like a good idea.
2009-06-19 16:43:45 -07:00
Chia-I Wu
cca30245bd
intel: Do not access pbo's buffer directly when attaching.
...
pbo might be system buffer based or attached to another region. Call
intel_bufferobj_buffer to make sure pbo has a buffer of its own.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
Signed-off-by: Eric Anholt <eric@anholt.net >
2009-06-19 16:43:45 -07:00
Chia-I Wu
ed91389618
intel: Data are copied in the wrong direction when breaking COW tie.
...
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
Signed-off-by: Eric Anholt <eric@anholt.net >
2009-06-19 16:43:45 -07:00
Chia-I Wu
1a7ec317ef
intel: Fix migration from sys_buffer in intel_bufferobj_buffer.
...
intel_bufferobj_subdata is called to migrate data from sys_buffer, and
it expects only one of buffer or sys_buffer is non-NULL.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
Signed-off-by: Eric Anholt <eric@anholt.net >
2009-06-19 16:43:45 -07:00
Roland Scheidegger
402df41c1c
radeon: make cubemap mipmap generation work
...
need to pass target parameter to radeon_teximage/radeon_subteximage functions
otherwise mipmap generation for cube maps can't work (assert/segfault in
_mesa_generate_mipmap)
2009-06-20 00:28:39 +02:00
Roland Scheidegger
7a5c5b9af3
demos: make cubemap work without EXT_fbo support
...
use SGIS_generate_mipmap if EXT_fbo support (for manual mipmap generation)
is not available.
2009-06-20 00:28:38 +02:00
Brian Paul
18af7c384c
i965: interpolate colors with perspective correction by default
...
...rather than with linear interpolation. Modern hardware should use
perspective-corrected interpolation for colors (as for texcoords).
glHint(GL_PERSPECTIVE_CORRECTION_HINT, mode) can be used to get
linear interpolation if mode = GL_FASTEST.
2009-06-12 16:21:20 -06:00
Brian Paul
05f0d90962
mesa: use larger initial refcount for NullBufferObj
...
Refcounting of the null/default buffer object isn't perfect yet so be
extra safe.
2009-06-12 16:01:02 -06:00
Brian Paul
0854b7e972
mesa: use _mesa_reference_buffer_object() in a few places
2009-06-12 16:01:02 -06:00
Brian Paul
d7ea9ddf58
mesa: use _mesa_reference_buffer_object() in a few places
2009-06-12 16:01:02 -06:00
Brian Paul
193177b732
tests: added persp_hint.c test
...
Test the effect of GL_PERSPECTIVE_CORRECTION_HINT on color interpolation.
2009-06-12 15:59:53 -06:00
Dave Airlie
c4a5754a8c
add some info to relnotes on radeon
2009-06-13 07:43:04 +10:00
Maciej Cencora
4109108739
r300: add support for EXT_texture_sRGB
...
Tested with glean/texture_srgb and wine/d3d9 tests on RV535
2009-06-12 19:08:44 +02:00
Brian Paul
d0b0df380a
set/mesa: enable GL_NV_texture_env_combine4
...
This is handled entirely in core Mesa where the combiner state is converted
into a fragment program.
2009-06-12 10:18:15 -06:00
Alex Deucher
1036ef2bf4
Merge master and fix conflicts
2009-06-12 12:09:34 -04:00
Brian Paul
5379f35a15
tests: added arbgpuprog, for compile-testing ARB vertex/fragment programs
2009-06-12 08:16:18 -06:00
Brian Paul
509d9eb686
st/mesa: additional debug code (disabled)
2009-06-12 08:16:18 -06:00
Brian Paul
fb64365642
demos: update fbotexture.c to use EXT or ARB functions exclusively
...
When the -arb option is specified we use GL_ARB_framebuffer_object intead
of GL_EXT_framebuffer_object.
For some vendors' OpenGL it's important to call the ARB entrypoints
instead of the EXT entrypoints to get correct behaviour. Use some
function pointer tricks to do this (instead of GLEW).
2009-06-12 08:15:33 -06:00
Brian Paul
476685c63c
util: additional function pointers
2009-06-12 08:15:33 -06:00
Jakob Bornecrantz
1cd0afffc9
progs/rbug: Add binary to bmp converter program
2009-06-12 15:07:57 +01:00
Jakob Bornecrantz
3fff84a999
Merge branch 'mesa_7_5_branch'
2009-06-12 12:31:04 +01:00
Jakob Bornecrantz
c6de08fff4
mesa: Enable uploads of only depth to z24s8 textures
2009-06-12 12:29:02 +01:00
Owen W. Taylor
279143c6e8
Disable SGI_swap_control extension for DRI2
...
We currently don't have support for SGI_swap_control for direct
contexts with DRI2, so disable reporting the extension. Reporting
the extension, and then having glXSwapIntervalSGI() "succeed"
but do nothing can confuse applications.
https://bugs.freedesktop.org/show_bug.cgi?id=22123
2009-06-12 11:41:37 +10:00
Dave Airlie
d0fab94842
radeon: fix size of mipmap texture array
2009-06-12 11:37:13 +10:00
Dave Airlie
a5d92d7ed2
radeon/r200/r300: fix max texture levels assert
...
use the actual value set in the context
2009-06-12 11:35:10 +10:00
Dave Airlie
7f223ff891
Merge remote branch 'main/radeon-rewrite'
2009-06-12 11:17:32 +10:00
Alex Deucher
917f8bc1a8
Add RV740 support
2009-06-11 18:24:41 -04:00
Maciej Cencora
67bbfb9c68
r300: fix VAP setup
...
If GL context had e.g. tex0, tex2 and fog the VAPOutputCntl1 returned 0x104 instead of 0x124 - that meaned we're sending only 8 texcoords (instead of 12) which ended up in GPU hang.
2009-06-11 23:25:54 +02:00
Maciej Cencora
234797564d
r300: fix for SW TCL path
...
We shouldn't use i variable for SWTCL_OVM_TEX because textures doesn't have to be enabled in "packed" order.
We could have tex1,tex3 and fog which would receive 7,9,8 OVM locations instead of 6,7,8.
2009-06-11 23:25:54 +02:00
Maciej Cencora
8d728b8fe7
r300: don't send unused attributes for SW TCL path
2009-06-11 23:25:54 +02:00
Maciej Cencora
b5d49cb195
r300: send only RS_IP_* regs that we are going to use
2009-06-11 23:25:53 +02:00
Maciej Cencora
2b5f8d2b55
r300: fix RS setup when no colors and textures are sent to FP
...
RS_COL_FMT field is part of RS_IP_* reg not RS_INST_*
2009-06-11 23:25:53 +02:00
Maciej Cencora
34cb4b6be3
r300: r500 fragment program fixes
...
- when rewriting per component negate swizzle, first instruction should get not negated source
- KIL instruction ignores swizzles
TODO:
- tex instructions does not support saturation
- tex instructions cannot read from consant memory
2009-06-11 23:25:53 +02:00
Maciej Cencora
e21e82f425
radeon: increase max bo count
2009-06-11 23:25:53 +02:00
Maciej Cencora
9abc72d1fc
r300: fix a GPU lock up
...
Sending from VAP more texture coordinates than RS expects results in GPU hang.
Fixes BumpSelfShadow from DirectX8 SDK.
2009-06-11 23:24:25 +02:00
Maciej Cencora
de19eb0b0d
r300: fix vertex program bug
...
If the vertex program didn't write position attribute, the position invariant function would add necessary instructions, but the vertex position would be overwritten by artificial outputs insts added to satisfy fragment program requirements.
Fixes "whole screen is gray" problem for HW TCL path in sauerbraten when shaders are enabled, and whole slew of wine d3d9 tests.
2009-06-11 23:24:25 +02:00
Maciej Cencora
2611e92da5
r300: move some code for easier debugging
2009-06-11 23:24:25 +02:00
Maciej Cencora
52645c4647
r300: print vertex program when debugging is enabled
2009-06-11 23:24:25 +02:00
Maciej Cencora
28724b575d
r300: fix output register allocation for vertex shaders
...
If the vertex program wrote secondary color without primary color, the secondary color output register index would be 0 which resulted in overwriting vertex position in some cases.
2009-06-11 23:24:25 +02:00
Maciej Cencora
b4ebd1c191
r300: hw doesn't support saturation for tex instructions
2009-06-11 23:24:25 +02:00
Brian Paul
3754c4135c
mesa: rework vertex shader output / fragment shader input attribute matching
...
Before, if a vertex shader's outputs didn't exactly match a fragment
shader's inputs we could wind up with invalid TGSI shader declarations.
For example:
Before patch:
DCL OUT[0], POSITION
DCL OUT[1], COLOR[1]
DCL OUT[2], GENERIC[0]
DCL OUT[3], GENERIC[0] <- note duplicate [0]
DCL OUT[4], GENERIC[2]
After patch:
DCL OUT[0], POSITION
DCL OUT[1], COLOR[1]
DCL OUT[2], GENERIC[0]
DCL OUT[3], GENERIC[1]
DCL OUT[4], GENERIC[2]
2009-06-11 14:58:25 -06:00
Brian Paul
322e8556b9
mesa: add default function for ctx->Driver.CheckQuery() hook
2009-06-11 14:58:25 -06:00
José Fonseca
0ddc38309a
python/retrace: Show the contents of the depth/stencil and surfaces before/after transfers.
2009-06-11 20:46:07 +01:00
José Fonseca
e1700009b7
python/retrace: Interpret is_texture_referenced/is_buffer_referenced.
2009-06-11 19:24:48 +01:00
José Fonseca
d5ba39ad08
wgl: Fix prototype.
2009-06-11 19:05:46 +01:00
José Fonseca
877061141a
Merge branch 'mesa_7_5_branch'
2009-06-11 19:03:54 +01:00
José Fonseca
de413b1ba9
mesa: Use new pf_is_depth_and_stencil inline.
2009-06-11 19:02:59 +01:00
José Fonseca
3f2e006b75
gallium: New pf_is_depth_and_stencil / pf_is_depth_or_stencil inlines.
2009-06-11 19:02:59 +01:00
José Fonseca
7cafd49c93
mesa: Use PIPE_TEXTURE_USAGE_DEPTH_STENCIL for any depth or stencil format.
2009-06-11 19:02:59 +01:00
José Fonseca
862c7b8cd3
mesa: Remove dead code.
2009-06-11 19:02:59 +01:00
Brian Paul
bb0b954f12
st/mesa: fix typo s/BFC0/BFC1/
2009-06-11 10:40:19 -06:00
Brian Paul
9d5479eeeb
vbo: fix assertion, #define IMM_BUFFER_NAME
...
This was sometimes seen when Glean exited upon test failure when using
Gallium.
2009-06-11 09:46:02 -06:00
José Fonseca
bf89ecb6c9
Merge branch 'mesa_7_5_branch'
...
Conflicts:
src/mesa/state_tracker/st_cb_fbo.c
src/mesa/state_tracker/st_framebuffer.c
2009-06-11 16:34:56 +01:00
José Fonseca
cc09724a50
python/tests: Test sampling from a depth texture.
2009-06-11 16:22:17 +01:00
Jakob Bornecrantz
41cf681535
mesa: Only do read write when we don't have a depth value to write
2009-06-11 15:37:53 +01:00
José Fonseca
e3f14f2f3b
progs: Port fp programs to GLEW.
2009-06-11 13:19:34 +01:00
José Fonseca
48d816b8ff
mesa: Take the format from the right structure.
2009-06-11 12:23:09 +01:00
José Fonseca
96aca15c9d
meas: Use a read/write transfer when writing stencil component, but not touching the depth component.
2009-06-11 11:47:20 +01:00
Jerome Glisse
b445e54868
r300: fix indexed primitive rendering when using memory manager
2009-06-11 11:06:14 +02:00
Alex Deucher
1d8d4cad6a
Properly set aos_count
...
This is used by radeonReleaseArrays to free AOS.
2009-06-11 01:54:40 -04:00
Thomas Hellstrom
0d2ac7a10b
dri st: Don't require the PIPE_TEXTURE_USAGE_RENDER_TARGET property for depth- and stencil renderbuffers.
...
Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
2009-06-11 00:56:03 +02:00
Michel Dänzer
550a2fe1b7
scons: Indent abbreviated command line strings, so command messages stand out.
...
Also add ASPPCOMSTR.
2009-06-11 12:15:50 +02:00
Michel Dänzer
3885b708fd
intel: intel_texture_drawpixels() can't handle GL_DEPTH_STENCIL.
...
Fixes glean depthStencil test.
2009-06-11 12:09:10 +02:00
Alex Deucher
7ac2f655f8
move radeon_set_screen_flags() up so CHIP_FAMILY is set before using it
...
fixes last commit.
2009-06-10 18:02:20 -04:00
Alex Deucher
51507b0e94
Use correct scratch reg offset for r6xx/r7xx
2009-06-10 17:56:05 -04:00
José Fonseca
337f559cd2
mesa: Reverse s8z24 into z24s8 as required by EXT_packed_depth_stencil.
...
Actually, after spotting this problem, I realized this is unreachable
code. However don't bother to enable this fast path now, given the normal
path is working just fine.
2009-06-10 21:29:25 +01:00
José Fonseca
8fa8669aeb
mesa: Fix typo in bitmask.
2009-06-10 21:25:54 +01:00
José Fonseca
0a4fcabe44
mesa: Fix draw_stencil_pixels for PIPE_FORMAT_Z24S8_UNORM.
...
Reversed component order.
This fixes glean depthStencil test failures for PIPE_FORMAT_Z24S8_UNORM
visuals.
2009-06-10 20:05:00 +01:00
Brian Paul
02659868e8
glsl: fix warnings, update comments, s/TRUE/GL_TRUE/
...
(cherry picked from master, commit 7fdd64ab29 )
2009-06-10 12:26:12 -06:00
Brian Paul
457f4efab0
glsl: Handle continuation characters in preprocessor.
...
(cherry picked from master, commit cc22620e4b )
2009-06-10 12:25:35 -06:00
Brian Paul
0269eb5e3f
glsl: Fix symbol replacement handling in preprocessor.
...
(cherry picked from master, commit d9617deb00 )
2009-06-10 12:25:11 -06:00
Brian Paul
b7d9be69b2
glsl: Expand nested preprocessor macros.
...
(cherry picked from master, commit ef8caec29a )
2009-06-10 12:24:52 -06:00
Brian Paul
7b8b856c97
glsl: Fix preprocessor define argument parsing for dead sections.
...
(cherry picked from master, commit 19a54d9f10 )
2009-06-10 12:24:32 -06:00
Brian Paul
24bffc4cc2
glsl: preprocessor debug code (disabled)
...
(cherry picked from master, commit 854151ba62 )
2009-06-10 12:24:11 -06:00
Brian Paul
dbab657fe7
glsl: fix warnings, update comments, s/TRUE/GL_TRUE/
...
(cherry picked from master, commit 7fdd64ab29 )
2009-06-10 12:22:36 -06:00
Brian Paul
9225b67383
glsl: Handle continuation characters in preprocessor.
...
(cherry picked from master, commit cc22620e4b )
2009-06-10 12:21:56 -06:00
Brian Paul
7fdd64ab29
glsl: fix warnings, update comments, s/TRUE/GL_TRUE/
2009-06-10 12:16:15 -06:00
Michal Krol
cc22620e4b
glsl: Handle continuation characters in preprocessor.
2009-06-10 20:00:15 +02:00
Brian Paul
88527220e4
swrast: fix state validation bug for changing program constants
...
Add _NEW_PROGRAM_CONSTANTS to _SWRAST_NEW_DERIVED.
This makes sure that we update the fragment shader's constants when state
vars (such as point size) changes.
Fixes the progs/glsl/points.c demo.
2009-06-10 09:31:01 -06:00
Brian Paul
506989b20e
glsl: Fix symbol replacement handling in preprocessor.
...
(cherry picked from master, commit d9617deb00 )
2009-06-10 09:31:01 -06:00
Brian Paul
6f50c9865d
mesa: disable texture unit error check in _mesa_MatrixMode()
...
See comments for details.
2009-06-10 09:31:01 -06:00
Brian Paul
5450281ff7
docs: document GLSL preprocessor fixes
2009-06-10 09:31:01 -06:00
José Fonseca
4d16eb5e18
util: Single precision constants.
2009-06-10 15:39:47 +01:00
José Fonseca
978bca8b2a
mesa: Single precision constants.
2009-06-10 15:39:34 +01:00
José Fonseca
52411a1951
mesa: Pure software accum buffer.
...
The existing implementation was already implemented on software, but relied
on the pipe driver to always support the R16G16B16A16_SNORM format. This
patch eliminates that, without prejudice against a future hardware-only
implementation.
It also avoids some of the short <-> float conversions, and only does a read
transfer of the color buffer on GL_RETURN if absolutely necessary.
2009-06-10 15:39:02 +01:00
José Fonseca
8bfbb7ec8b
gallium: Shorthand functions for computing stride and sizes for a rect.
2009-06-10 15:31:12 +01:00
Brian Paul
aebc08b5cc
gallium: updated PIPE_CAP_x comments
2009-06-10 08:12:19 -06:00
Jerome Glisse
316598b96f
r300: make sure indexed rendering doesn't try to use more than the num of vertices
...
When with memory manager we need to make sure the GPU won't try to access
beyond vertex buffer size, do so by enforcing that the maximun index is the
last vertex of the buffer.
2009-06-10 14:59:33 +02:00
Brian Paul
ded8eb25ef
st/mesa: enable EXT_provoking_vertex
2009-06-09 22:01:55 -06:00
Brian Paul
0195cc1c0d
tests: prim.c demo, modified for GL_EXT_provoking_vertex
2009-06-09 22:00:22 -06:00
Brian Paul
39fd18014c
tests: need tkmap.c for prim.c
2009-06-09 21:59:36 -06:00
Brian Paul
8b45c9ce6e
draw: implement flatshade_first for drawing pipeline
2009-06-09 21:53:34 -06:00
Brian Paul
5aec03aaf4
softpipe: implement flatshade_first for triangles
2009-06-09 21:52:37 -06:00
Brian Paul
6f26f8c750
softpipe: implement flatshade_first for line setup
2009-06-09 21:51:29 -06:00
Alex Deucher
530e3e389d
Pull in additional state setup from the DDX
2009-06-09 18:20:57 -04:00
Keith Whitwell
76a1017e97
mesa/st: fix tracking of mapped buffer ranges
...
In st_bufferobj_map_range(), set obj->Offset consistently with its
usage elsewhere.
2009-06-09 18:32:18 +01:00
Keith Whitwell
9192347443
stw: ignore swapbuffer requests on singlebuffer
...
Return TRUE in this case. Returning FALSE seems to result in
mis-rendering -- possibly opengl32.dll is trying to compensate by
doing a software blit??
2009-06-09 16:37:38 +01:00
Brian Paul
cb549775a5
glsl: Expand nested preprocessor macros.
...
(cherry picked from master, commit ef8caec29a )
2009-06-09 09:14:38 -06:00
Jakob Bornecrantz
ee98ae5a29
Merge branch 'mesa_7_5_branch'
...
Conflicts:
Makefile
src/mesa/main/version.h
src/mesa/shader/slang/slang_preprocess.c
src/mesa/state_tracker/st_cb_bufferobjects.c
2009-06-09 07:53:25 +02:00
Michal Krol
d9617deb00
glsl: Fix symbol replacement handling in preprocessor.
2009-06-10 12:15:13 +02:00
Michal Krol
03760a3903
winsys/gdi: Link to ws2_32 library.
2009-06-10 12:01:13 +02:00
Michal Krol
1b334587e9
trace: __func__ --> __FUNCTION__.
2009-06-10 11:56:38 +02:00
Eric Anholt
b30dc2c66a
i915: Add an option for testing the effect of early Z in classic mode.
...
The early Z stuff is supposed to be unsafe without some more work in the
enable/disable path (in particular, how do we want to get it disabled on
the way out to the X Server?), but at the moment is 6% in OA.
2009-06-09 16:12:43 -07:00
Eric Anholt
38eddf04ed
intel: Remove an unneeded hunk that slipped in with texture tiling.
...
intel_miptree_pitch_align does this later on.
2009-06-09 15:21:17 -07:00
Eric Anholt
1362484840
intel: Base tri clearing depth on Y tiling, not IS_I965().
...
Y tiling is why the 965 check was there, but I wanted to experiment with Y
on pre-965 as well.
2009-06-09 15:21:17 -07:00
Eric Anholt
2d57e96408
intel: Fix intel_region_unmap to do unmap, not map.
...
Thanks to Shuang He for catching this.
2009-06-09 15:21:16 -07:00
Brian Paul
a03b349153
i965: added intelFlush() call in intel_get_tex_image()
...
Fixes the render-to-texture test in progs/tests/getteximage.c
2009-06-09 15:07:39 -06:00
Brian Paul
29c79a03a4
tests: check for GL_EXT/ARB_framebuffer_object
2009-06-09 15:06:41 -06:00
Brian Paul
073c20befa
tests: also test glGetTexImage with render to texture
...
Also, adjust texture dims for the original test.
And use GLEW.
2009-06-09 15:05:36 -06:00
Brian Paul
139f2ddde4
tests: quick and dirty glGetTexImage() test program
2009-06-09 14:05:17 -06:00
Brian Paul
b38dbc5179
intel: use GLboolean, not int, for compressed parameter
2009-06-09 14:05:17 -06:00
Brian Paul
89205a8760
intel: make a bunch of glTexImage-related functions static
2009-06-09 14:05:17 -06:00
Brian Paul
4eb9e58bbb
intel: whitespace clean-ups
2009-06-09 14:05:17 -06:00
Brian Paul
c55f1a6c99
vbo: more glDrawElements debug code (disabled)
2009-06-09 14:05:17 -06:00
Brian Paul
4a7fd6323a
mesa: added a simple bounds checker to glMap/UnmapBuffer() (disabled)
2009-06-09 14:05:17 -06:00
Jakob Bornecrantz
41482a6461
trace/rbug: Add support for draw block rule
2009-06-09 19:24:06 +01:00
Jakob Bornecrantz
f3cf3d2fc2
rbug: Change block protocol around a bit
2009-06-09 19:22:40 +01:00
Jakob Bornecrantz
b71a254f05
trace/rbug: Return textures currently bound to context
2009-06-09 16:00:40 +01:00
Jakob Bornecrantz
f0c21c0294
rbug: Extend context info and block ops
2009-06-09 16:00:39 +01:00
Brian Paul
42e9bde0fa
intel: remove extra \n from warning string
2009-06-09 08:53:56 -06:00
Brian Paul
a81097c545
mesa: reorder fields, update comments for gl_buffer_object
2009-06-09 08:52:56 -06:00
Michal Krol
ef8caec29a
glsl: Expand nested preprocessor macros.
2009-06-09 12:14:40 +02:00
Dave Airlie
18b3cbcede
radeon: fix mipmap_limits crasher.
...
This gets the correct srclvl image map when uploading images to the new mipmap.
2009-06-09 13:52:58 +10:00
Corbin Simpson
c534604800
r300-gallium: HW TCL glxgears. (Read the rest of the log.)
...
Um. So, yeah. Two massive WTF moments here. The first one is that, somehow,
I never actually hooked up vertex shader emission, so the only time that the
VAP gets set up is during surface_copy/surface_fill. That's why acidgears
was happening.
The second one is that, somehow, once I actually hooked it up, glxgears just
magically worked. Without any actual, real testing, I somehow accidentally
made the shader compiler work. Go figure.
2009-06-08 20:23:34 -07:00
Corbin Simpson
cb3b91f2d6
r300-gallium: Make UCP and clip work again for SW TCL.
...
SW TCL: tri-clip works, tri-userclip works
HW TCL: tri-clip fails, tri-userclip works
That is a 200% improvement over the previous situation. Woot.
2009-06-08 20:01:57 -07:00
Corbin Simpson
ffa1972efb
r300-gallium: Don't emit UCP planes for SW TCL.
2009-06-08 19:55:33 -07:00
Brian Paul
8d0f72e8f9
st/mesa: enable GL_ARB_map_buffer_range
2009-06-08 17:07:21 -06:00
Brian Paul
e297569d65
docs: new feature: GL_ARB_map_buffer_range
2009-06-08 17:06:13 -06:00
Brian Paul
e75b283b45
mesa: implement GL_ARB_map_buffer_range
...
Only enabled for software drivers at this point.
Note that the gl_buffer_object::Access enum field has been replaced by
a gl_buffer_object::AccessFlags bitfield. The new field is a mask of
the GL_MAP_x_BIT flags which is a superset of the old GL_READ_ONLY,
GL_WRITE_ONLY and GL_READ_WRITE modes. When we query GL_BUFFER_ACCESS_ARB
we translate the bitfield into the conventional enum values.
2009-06-08 17:02:36 -06:00
Brian Paul
75cb3c3b7a
mesa: regenerated files for GL_ARB_map_buffer_range
2009-06-08 17:00:12 -06:00
Brian Paul
9c4ab6f4cc
glapi: hook in ARB_map_buffer_range.xml
2009-06-08 16:59:53 -06:00
Brian Paul
b6bc5f37a5
glapi: spec/xml file for GL_ARB_map_buffer_range
2009-06-08 16:58:45 -06:00
Brian Paul
34bb024cf2
st/mesa: fix incorrect bufObj Length assignment, remove unneeded assertion
2009-06-08 16:11:17 -06:00
Brian Paul
462a9525c7
mesa: reorder fields, update comments for gl_buffer_object
2009-06-08 15:27:10 -06:00
Jon TURNEY
7eed6ab5b5
Cygwin build fixes
...
Fix mklib to deal with NOPREFIX and use --enable-auto-image-base for cygwin
Teach configure.ac some basic facts about cygwin
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk >
2009-06-08 14:30:46 -06:00
Brian Paul
304ba4bba4
glsl: Fix preprocessor define argument parsing for dead sections.
...
(cherry picked from master, commit 19a54d9f10 )
2009-06-08 13:53:33 -06:00
Michal Krol
19a54d9f10
glsl: Fix preprocessor define argument parsing for dead sections.
2009-06-08 20:52:47 +02:00
Jakob Bornecrantz
77c329a277
pipebuffer: Silence out of heap space debug print
2009-06-08 19:54:55 +02:00
Brian Paul
854151ba62
glsl: preprocessor debug code (disabled)
2009-06-08 10:58:04 -06:00
Brian Paul
cc26e27746
docs: document MESA_EXTENSION_OVERRIDE env var
2009-06-08 10:56:51 -06:00
Brian Paul
f9c0ce0e07
softpipe: advertise PIPE_CAP_MAX_TEXTURE_ANISOTROPY as 16.0
...
Note that this doesn't have any real significance since
PIPE_CAP_ANISOTROPIC_FILTER still returns 0.
2009-06-08 10:55:34 -06:00
Brian Paul
a6f2663616
mesa: new MESA_EXTENSION_OVERRIDE env var
...
Can be used to enable/disable extensions as reported by
glGetString(GL_EXTENSIONS).
If a name is preceeded by '-' it's disabled. Otherwise, the named
extension is enabled.
Intended for debug/test purposes.
2009-06-08 10:52:16 -06:00
Brian Paul
b6753adbc7
st/mesa: remove invalid assertion
...
It's legal for ARB_vertex_program programs to not write to result.position.
The results are undefined in that case. This assertion was causing us to
abort/exit though.
2009-06-08 10:46:46 -06:00
José Fonseca
e09f78d8dc
mesa: Use matching signedness for the counter as upper bound.
2009-06-08 16:56:41 +01:00
José Fonseca
42678dba94
mesa: Allocate tokens from the heap.
...
The recent increase ST_MAX_SHADER_TOKENS to 8K causes stack overflows on
windows.
Failure to allocate is not being propagated to the caller. This is not
a regression since the previous _mesa_malloc result wasn't being
checked as well. Unfortunately it is not easy to fix, as the callers of
these functions do not have failure propagation mechanism either, and
so on. So leaving a just fixme note for now.
2009-06-08 16:56:41 +01:00
Brian Paul
33d6327770
mesa: better error message for invalid texture unit index
2009-06-08 09:53:00 -06:00
Brian Paul
0bced6a326
mesa: bump MAX_PROGRAM_ENV_PARAMS from 128 to 256
...
Also, MAX_NV_VERTEX_PROGRAM_PARAMS should be 96, not 128 (or 256).
2009-06-08 09:53:00 -06:00
Keith Whitwell
0d3c8fbf12
mesa/vbo: drop all references to vbo on destroy
...
We were adding references to the input arrays, but failing to drop
them on destruction. This could lead to a 64kb buffer being leaked
each context destruction.
2009-06-08 16:27:43 +01:00
Brian Paul
fce4ee12a6
mesa: EXT_vertex_array_bgra fixes
...
1) Pass the correct format when calling update_array in
_mesa_VertexAttribPointerARB.
2) glVertexAttribPointerNV accepts GL_BGRA format too.
3) raise INVALID_VALUE error when format is BGRA and normalized is
false in glVertexAttribPointerARB
(cherry picked from commit 4adb190a16 )
2009-06-08 07:25:24 -06:00
Maciej Cencora
4adb190a16
mesa: EXT_vertex_array_bgra fixes
...
1) Pass the correct format when calling update_array in
_mesa_VertexAttribPointerARB.
2) glVertexAttribPointerNV accepts GL_BGRA format too.
3) raise INVALID_VALUE error when format is BGRA and normalized is
false in glVertexAttribPointerARB
2009-06-08 07:23:56 -06:00
Jakob Bornecrantz
8d2324d355
trace/rbug: Sleep on windows when blocked
2009-06-08 15:01:48 +02:00
Jakob Bornecrantz
4d9d0e6230
stw: If stfb not set don't call into mesa
2009-06-08 14:45:56 +02:00
Jakob Bornecrantz
283e84bfb3
progs/tests: Add some scissor tests
2009-06-08 14:45:40 +02:00
José Fonseca
78dad27564
Revert "scons: Less aggressive optimizations for MSVC 64bit compiler."
...
This reverts commit fc7f924782 .
2009-06-08 11:13:41 +01:00
Dave Airlie
8064a517b2
llvm: fix compile on gcc 4.4
2009-06-08 18:26:27 +10:00
Maciej Cencora
db63f63897
r300: fix regression caused by 056bc77547c304021a0faf204897ed238a5cf424
...
Fixes GPU hangs in software TCL path
2009-06-08 07:21:14 +10:00
Ben Skeggs
1a7739ae26
nouveau: forgotten makefile...
2009-06-07 19:29:29 +10:00
Dave Airlie
545e574cd9
Merge remote branch 'origin/master' into radeon-rewrite
2009-06-07 16:51:32 +10:00
Michel Dänzer
e2aedfa620
r300: Endianness fixes for recent vertex path changes.
...
Signed-off-by: Maciej Cencora <m.cencora@gmail.com >
2009-06-07 16:40:09 +10:00
Maciej Cencora
58982f8af1
r300: vertex array stride = 0 means that data are tightly packed in the array
2009-06-07 16:40:04 +10:00
Maciej Cencora
ca13937ef9
r300: GL_(U)SHORT and GL_(U)BYTE with < 4 components can also be HW accelerated
...
Also when index format is GL_UBYTE, convert it to GL_USHORT not GL_UINT.
Fix license header too.
Reported by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-06-07 16:39:58 +10:00
Maciej Cencora
a8c7c96be7
r300: remove unused code
2009-06-07 16:39:54 +10:00
Maciej Cencora
72c78b9992
r300: rewrite vertex setup for software T&L path using functions from software TCL path
2009-06-07 16:39:47 +10:00
Maciej Cencora
6cd0628f9f
r300: prepare for some code duplication removal
2009-06-07 16:39:43 +10:00
Maciej Cencora
365799caea
r300: enable EXT_vertex_array_bgra extensions
2009-06-07 16:39:39 +10:00
Maciej Cencora
fd80128e15
r300: add hw accelerated support for different vertex data formats
2009-06-07 16:39:33 +10:00
Maciej Cencora
e98082997c
r300: prepare for different vertex data type support
2009-06-07 16:39:28 +10:00
Maciej Cencora
a27b689d08
r300: fixup vertex attributes ordering
...
Always allocate the vertex program input registers in the same order as the vertex attributes are passed in vertex arrays.
2009-06-07 16:39:23 +10:00
Maciej Cencora
ab60a44331
r300: always pass 4 color components to RS unit
...
Even if we don't pass all 4 color components to vertex shader unit, the vertex program can generate the missing components.
2009-06-07 16:39:16 +10:00
Ben Skeggs
f1edfa09ea
nv50: fix multi-texturing
2009-06-06 16:24:09 +10:00
Ben Skeggs
6c1627a51c
nv50: support non-normalized texture coords
2009-06-06 16:24:08 +10:00
Brian Paul
586341afd9
docs: document recent bug fixes for 7.4.x
2009-06-05 17:30:51 -06:00
Brian Paul
cfff2a6189
mesa: bump version to 7.5-rc3
2009-06-05 17:16:47 -06:00
Corbin Simpson
b7aa5b1d10
r300-gallium: Use VAP_CLIP_CNTL.
...
Makes tri-userclip work with HW TCL.
2009-06-05 13:46:59 -07:00
Corbin Simpson
1a359d9835
r300-gallium: Emit UCP.
2009-06-05 11:21:09 -07:00
Corbin Simpson
9e4590dff7
r300-gallium: Improve vs emit.
2009-06-05 10:18:20 -07:00
Michal Krol
4c034441a8
mesa: Fix wglext.h prototypes.
2009-06-05 15:01:08 +02:00
Ben Skeggs
d06e380e02
nv50: use larger tile sizes
2009-06-05 22:53:24 +10:00
Ben Skeggs
a471497345
nv50: use nouveau_bo for query buffers
2009-06-05 22:53:24 +10:00
Ben Skeggs
1a92c71a66
nv50: create textures with nouveau_bo, for flexibility with tiling later
2009-06-05 22:53:23 +10:00
Michal Krol
b04470b0bc
util: Fix winsock include.
2009-06-05 14:32:31 +02:00
Corbin Simpson
90bfff0a29
r300-gallium: Mute some debug info.
...
Most of it is no longer interesting.
2009-06-05 00:12:26 -07:00
Corbin Simpson
4c66c5bf92
r300-gallium: vs: Fix negation calculation.
...
Still doesn't draw right, but at least it's the right numbers now.
Thanks to taiu in #dri-devel.
2009-06-04 23:56:32 -07:00
Corbin Simpson
571b36831b
r300-gallium: Fix pasta.
...
Trivial but annoying.
2009-06-04 23:56:08 -07:00
Corbin Simpson
8652ad6899
r300-gallium: Improve vs debug more.
...
Still not showing me why my stuff's failing, but getting there.
2009-06-04 23:27:46 -07:00
Corbin Simpson
31609acbe9
r300-gallium: vs: Add negation, SUB.
...
Doesn't work. WTF.
2009-06-04 23:27:46 -07:00
Corbin Simpson
fb7d1fb0f0
r300: Moar vs debug.
2009-06-04 23:27:46 -07:00
Ben Skeggs
36705ee044
nouveau: plug in our map_buffer_range and friends
2009-06-05 14:48:45 +10:00
Ben Skeggs
40ed449918
nouveau: fix build with libdrm_nouveau 0.6
2009-06-05 14:37:04 +10:00
Ben Skeggs
6b3ca672eb
nouveau: remove unneeded code from ws, use pipe_buffer_ instead of ws->
2009-06-05 14:37:03 +10:00
Ben Skeggs
80e9e1ee81
nouveau: move channel creation into pipe drivers
2009-06-05 14:37:03 +10:00
Ben Skeggs
1b207d9bb8
nouveau: call notifier/grobj etc funcs directly
...
libdrm_nouveau is linked with the winsys, there's no good reason to do all
this through yet another layer.
2009-06-05 14:37:03 +10:00
Ben Skeggs
d4d584b16e
nv04: remove u_simple_screen usage
2009-06-05 14:37:02 +10:00
Ben Skeggs
251c47117b
nv10: remove u_simple_screen usage
2009-06-05 14:37:02 +10:00
Ben Skeggs
74c45add47
nv20: remove u_simple_screen usage
2009-06-05 14:37:01 +10:00
Ben Skeggs
901d7c3057
nv30: remove u_simple_screen usage
2009-06-05 14:37:01 +10:00
Ben Skeggs
74adb150d5
nv40: remove u_simple_screen usage
2009-06-05 14:37:01 +10:00
Ben Skeggs
bc466be695
nouveau: add pipe_buffer/fence code to pipe drivers, move nv50 over
2009-06-05 14:37:01 +10:00
Ben Skeggs
072fdc1fd3
nouveau: pass nouveau_bo instead of pipe_buffer to so_ calls
2009-06-05 14:37:00 +10:00
Ben Skeggs
04cef8a037
nouveau: call nouveau_pushbuf directly rather than going through nvws
2009-06-05 14:37:00 +10:00
Dan Nicholson
6453605785
osmesa: Link with -ldl for dlopen code
...
Now that the dlopen wrappers are built into libmesa.a, we need to link
standalone libOSMesa with libdl to resolve dlopen and friends on
platforms that need it.
(cherry picked from commit 4795dd5950 )
2009-06-04 19:47:41 -07:00
Dan Nicholson
5df6468589
osmesa: Allow building standalone in all three channel widths
...
autoconf had been designating the 8 bit libOSMesa as the default
standalone osmesa, but the Makefile expected it to be linked to libGL.
Fix up the osmesa Makefile so that it allows any of the combinations of
standalone and channel width to be built.
Fixes bug #21980 .
(cherry picked from commit 7441dcd90b )
2009-06-04 19:47:32 -07:00
Dan Nicholson
1e4334f623
osmesa: Link with -ldl for dlopen code
...
Now that the dlopen wrappers are built into libmesa.a, we need to link
standalone libOSMesa with libdl to resolve dlopen and friends on
platforms that need it.
(cherry picked from commit 4795dd5950 )
2009-06-04 19:45:58 -07:00
Dan Nicholson
4795dd5950
osmesa: Link with -ldl for dlopen code
...
Now that the dlopen wrappers are built into libmesa.a, we need to link
standalone libOSMesa with libdl to resolve dlopen and friends on
platforms that need it.
2009-06-04 19:45:32 -07:00
Dan Nicholson
8861577fd1
osmesa: Allow building standalone in all three channel widths
...
autoconf had been designating the 8 bit libOSMesa as the default
standalone osmesa, but the Makefile expected it to be linked to libGL.
Fix up the osmesa Makefile so that it allows any of the combinations of
standalone and channel width to be built.
Fixes bug #21980 .
(cherry picked from commit 7441dcd90b )
2009-06-04 19:05:48 -07:00
Dan Nicholson
7441dcd90b
osmesa: Allow building standalone in all three channel widths
...
autoconf had been designating the 8 bit libOSMesa as the default
standalone osmesa, but the Makefile expected it to be linked to libGL.
Fix up the osmesa Makefile so that it allows any of the combinations of
standalone and channel width to be built.
Fixes bug #21980 .
2009-06-04 19:04:36 -07:00
Jakob Bornecrantz
61ffba44fd
trace/rbug: Use condvar on system that has it for blocking
2009-06-05 03:01:34 +01:00
Jakob Bornecrantz
d4c578ae41
gallium: Make pipe thread say if it has condvars or not
2009-06-05 02:57:19 +01:00
Alex Deucher
8c27d99eb8
re-arrange state structure
...
- split out renderbuffers
- split out shaders
- split our viewports
Only send the state needed.
2009-06-04 20:22:14 -04:00
Jakob Bornecrantz
76b3072e9b
trace/rbug: Add new contexts functions to trace rbug
2009-06-04 23:45:29 +01:00
Jakob Bornecrantz
384bbe278d
rbug: Update rbug protocol with new context calls
2009-06-04 23:45:29 +01:00
Alex Deucher
b591436230
Don't program VGT_OUT_DEALLOC_CNTL/VGT_VERTEX_REUSE_BLOCK_CNTL
...
These are chip specific and are programmed by the drm.
This should fix hangs on some chips.
2009-06-04 16:57:20 -04:00
Brian Paul
185fbcce36
mesa: call _mesa_ funcs, not gl funcs for debugging
2009-06-04 14:26:51 -06:00
Alex Deucher
4782bebe44
use the float interface for viewport updates
2009-06-04 15:30:37 -04:00
Brian Paul
9d58724c51
Merge branch 'mesa_7_5_branch'
...
Conflicts:
src/mesa/main/context.c
2009-06-04 13:16:13 -06:00
Brian Paul
9424d81d18
softpipe: separate case for PIPE_PRIM_POLYGON in sp_vbuf_draw()
...
Because of flat shading, we can't use same code as PIPE_PRIM_TRIANGLE_FAN.
This is a follow-on to commit a59575d8fb .
(cherry picked from commit 086ecea179 )
2009-06-04 13:13:14 -06:00
Brian Paul
6907650211
softpipe: fix incorrect tri vertex order for PIPE_PRIM_POLYGON rendering
...
This fixes incorrect front/back-face orientation.
(cherry picked from commit a64bbdaa3e )
2009-06-04 13:12:13 -06:00
Brian Paul
d37795c453
st/mesa: increase ST_MAX_SHADER_TOKENS to 8k
2009-06-04 13:10:31 -06:00
Brian Paul
45e744dddc
tgsi: increase MAX_LABELS to 4096
2009-06-04 13:10:31 -06:00
Brian Paul
81a0ef3f20
mesa: update wglext.h to latest version
2009-06-04 10:30:25 -06:00
Brian Paul
d33c315d9e
mesa: remove PFNGL typedefs that are in glext.h
2009-06-04 10:29:44 -06:00
Brian Paul
73a48a8af3
mesa: upgrade glext.h to version 52
...
A number of the PFNGL* function typedefs are now in glext.h and must be
omitted from the gl.h file. gl.h will be pruned in the next commit.
2009-06-04 10:27:47 -06:00
Eric Anholt
1ba96651e1
intel: Add support for tiled textures.
...
This is about a 30% performance win in OA with high settings on my GM45,
and experiments with 915GM indicate that it'll be around a 20% win there.
Currently, 915-class hardware is seriously hurt by the fact that we use
fence regs to control the tiling even for 3D instructions that could live
without them, so we spend a bunch of time waiting on previous rendering in
order to pull fences off. Thus, the texture_tiling driconf option defaults
off there for now.
2009-06-04 14:00:43 +00:00
Eric Anholt
165ae5e2fb
i915: Don't rely on fence regs when we don't have to.
...
We're on the way to telling the kernel about when we need fence regs on our
objects or not, and this will cut the number of places needing them.
2009-06-04 10:34:52 +00:00
Eric Anholt
1b6f7fb7d5
i915: Remove some long-dead i830 code.
2009-06-04 10:34:52 +00:00
Brian Paul
091fcf3a27
Revert "softpipe: fix flat shading provoking vertex for PIPE_PRIM_POLYGON"
...
This reverts commit 5d75124db4 .
2009-06-03 19:53:53 -06:00
Brian Paul
ab6508e399
mesa: fix parity error for tri strips with 1st provoking vertex
2009-06-03 19:52:32 -06:00
Brian Paul
8b875b732f
tnl: fix first provoking vertex case for unfilled triangles
2009-06-03 19:03:27 -06:00
Brian Paul
086ecea179
softpipe: separate case for PIPE_PRIM_POLYGON in sp_vbuf_draw()
...
Because of flat shading, we can't use same code as PIPE_PRIM_TRIANGLE_FAN.
This is a follow-on to commit a59575d8fb .
2009-06-03 18:33:07 -06:00
Brian Paul
a64bbdaa3e
softpipe: fix incorrect tri vertex order for PIPE_PRIM_POLYGON rendering
...
This fixes incorrect front/back-face orientation.
2009-06-03 18:31:55 -06:00
Brian Paul
1f1aa0c20c
tnl: fix first provoking vertex bug for line loops
2009-06-03 17:28:31 -06:00
Brian Paul
f25e1007c2
swrast: always do span clipping in _swrast_write_rgba_span()
...
It's possible for mis-behaving vertex programs to produce vertex data
with very large/NaN values. This doesn't get handled reliably by the
clipper code so we may try to rasterize triangles that extend beyond
the viewport/window. Always clip spans to avoid invalid memory accesses
later.
2009-06-03 17:16:00 -06:00
Brian Paul
0b6a0b367f
vbo: minor reformatting
2009-06-03 17:16:00 -06:00
Brian Paul
aa18e54ac9
vbo: move/refactor debug code
2009-06-03 17:16:00 -06:00
Brian Paul
13f6d07521
vbo: added debug code to check array data validity (disabled)
2009-06-03 17:16:00 -06:00
Brian Paul
e446ef50eb
vbo: new debug/dump code (disabled)
2009-06-03 17:16:00 -06:00
Brian Paul
9200954370
mesa: added NaN checking code (disabled)
2009-06-03 17:16:00 -06:00
Brian Paul
035de6a82b
mesa: check/prevent NaN for EX2/LG2
2009-06-03 17:16:00 -06:00
Brian Paul
87b2db988e
tnl: updated clip debug code (disabled)
2009-06-03 17:16:00 -06:00
Brian Paul
e7927626c1
mesa: added buffer object debug code (disabled)
2009-06-03 17:16:00 -06:00
Brian Paul
4f4280b435
tnl: add some floating point sanity checks (disabled)
2009-06-03 17:16:00 -06:00
Brian Paul
ab4fd18584
vbo: tweak out-of-bounds VBO access error message
...
Subtract 1 from _MaxElement to be clearer.
2009-06-03 17:15:59 -06:00
Alex Deucher
e355f1d642
fill in r700ColorMask, cleanup
2009-06-03 15:52:09 -04:00
Alex Deucher
ac274b68d7
start to fill in ShadeModel()
2009-06-03 15:14:44 -04:00
Alex Deucher
ada26c4059
dump command buffer
2009-06-03 14:29:06 -04:00
Alex Deucher
f5d479d7f5
Clean up scissor and viewport code
...
Switch to common functions where applicable
2009-06-03 14:19:26 -04:00
Ian Romanick
1ad1576836
Thank you git for doing the right thing.
2009-06-03 17:55:42 +01:00
Ian Romanick
c428f467b6
Fix compiling indirect.c when GLX_DIRECT_RENDERING is not defined
...
DO NOT HAND-EDIT GLX PROTOCOL FILES. Seriously. How can you miss the giant
comment at the top of the file?
2009-06-03 17:53:40 +01:00
Ian Romanick
7f8000db8b
Fast path when rebinding the same texture in single context environment
...
If there is no shared context, there is no purpose in rebinding the same
texture. In some artificial tests this improves performance 10% - 30%.
2009-06-03 17:50:37 +01:00
Brian Paul
54576130a8
st/mesa: minor clean-ups, reformatting, etc
2009-06-02 21:46:17 -06:00
Brian Paul
5cd47e0361
docs: remove version info carried over from 7.5
2009-06-02 21:41:03 -06:00
Brian Paul
8086352fef
docs: clarify GL_ARB_copy_buffer driver support
2009-06-02 21:35:11 -06:00
Brian Paul
dd174ea215
st/mesa: implement/enable GL_ARB_copy_buffer extension
2009-06-02 21:35:11 -06:00
Brian Paul
2813c08b35
mesa: fix error test mistake in _mesa_CopyBufferSubData()
2009-06-02 21:35:11 -06:00
Brian Paul
2e708fa909
docs: added GL_ARB_copy_buffer extension
2009-06-02 21:35:11 -06:00
Brian Paul
3a7399e2c4
mesa: enable GL_ARB_copy_buffer for software drivers
2009-06-02 21:35:11 -06:00
Brian Paul
08e43ebfb2
mesa: plug in new _mesa_CopyBufferSubData() functions
2009-06-02 21:35:11 -06:00
Brian Paul
dc0b71f00d
mesa: _mesa_CopyBufferSubData() function, and driver fall-back
2009-06-02 21:35:11 -06:00
Brian Paul
96a30b06db
mesa: new state for GL_ARB_copy_buffer
2009-06-02 21:35:10 -06:00
Brian Paul
76b438878e
mesa: new CopyBufferSubData() driver hook
2009-06-02 21:35:10 -06:00
Brian Paul
751977075f
glapi: regenerated files for GL_ARB_copy_buffer
2009-06-02 21:35:10 -06:00
Brian Paul
68892872ef
glapi: include ARB_copy_buffer.xml
2009-06-02 21:35:09 -06:00
Brian Paul
4a1e4f9881
glapi: GL_ARB_copy_buffer xml info
2009-06-02 21:35:09 -06:00
José Fonseca
fc7f924782
scons: Less aggressive optimizations for MSVC 64bit compiler.
...
MSVC 64bit compiler takes forever on some of the files.
Might want to revisit this again later.
2009-06-02 18:41:12 -07:00
José Fonseca
0f50c4fab8
scons: Output nice summary messages instead of long command lines.
...
You can still get the old behavior by passing the option quiet=no to scons.
2009-06-02 18:23:12 -07:00
José Fonseca
273117ceed
util: Unsaved change missing from last commit.
2009-06-02 16:41:45 -07:00
Alex Deucher
116f40a1c4
Disable clear code for now
2009-06-02 19:23:16 -04:00
Alex Deucher
b55d0dd3ba
fix an overflow in SPI_VS_OUT_CONFIG
...
VS must always export at least 1 param.
2009-06-02 19:20:24 -04:00
Joakim Sindholt
45b77830eb
r300-gallium: strip swtcl to the bare minimum
...
This was originally taken from i915 and it shows.
Basically most the stuff in r300_render.c was never needed and
shouldn't have worked in the first place
2009-06-02 22:23:17 +02:00
José Fonseca
840af5fd62
util: Support Z24S8/Z24X8 -> unsigned conversion.
2009-06-02 11:46:53 -07:00
José Fonseca
c91df4c153
util: Fix 24 to 32 bit expansion binary arithmetic expression.
...
When approaching y = x * 0xffffffff / 0xffffff with bit arithmetic, the
8 least significant bits of y should come from the
8 most significant bits of x.
2009-06-02 11:46:06 -07:00
Brian Paul
12e94d892e
mesa: release VBO and PBO references upon context destruction
2009-06-02 10:29:39 -06:00
Brian Paul
cb3a9f984d
mesa: add #define FEATURE_ARB_pixel_buffer_object
2009-06-02 10:29:38 -06:00
Ian Romanick
16fbd39129
intel: Clip to window after calling Driver.TexImage2D
...
This prevents the width / height from being clipped to the window size before
the texture is allocated. This matches intelCopyTexImage1D.
This should fix bug #21227
Signed-off-by: Ian Romanick <ian.romanick@intel.com >
(cherry picked from commit 129f311673 )
2009-06-02 16:52:03 +01:00
Ian Romanick
129f311673
intel: Clip to window after calling Driver.TexImage2D
...
This prevents the width / height from being clipped to the window size before
the texture is allocated. This matches intelCopyTexImage1D.
This should fix bug #21227
Signed-off-by: Ian Romanick <ian.romanick@intel.com >
2009-06-02 16:50:11 +01:00
Eric Anholt
a945e203d4
i915: Don't put VBOs in graphics memory unless required for an operation.
...
This saves doing swtnl from uncached memory, which is painful. Improves
clutter test-text performance by 10% since it started using VBOs.
2009-06-02 06:55:10 -07:00
Eric Anholt
0ab8e2622e
i965: Support OPCODE_TRUNC in the brw_wm_fp.c code.
...
This gets two more glean glsl1 tests using the non-GLSL path.
2009-06-02 06:21:54 -07:00
Keith Whitwell
1aef032d43
gallium/draw: Free specialized versions of driver shaders
...
The pstipple, aaline and aapoint code would create specialized versions
of shaders and upload them to the driver -- but never free them.
2009-06-01 20:35:38 -07:00
Keith Whitwell
003cfd4dd2
draw: free more token arrays
...
The AA line and point code also needs to free token arrays after
building driver shaders.
2009-06-01 20:35:38 -07:00
Keith Whitwell
69a765df1c
draw: avoid leaking tokens when building pstipple fragment shader
...
Add missing FREE() after MALLOC().
2009-06-01 20:35:38 -07:00
Keith Whitwell
503632557e
mesa/st: restore flush to copy_texsubimage (was previously finish)
...
Need a flush here even though the original finish was overkill.
2009-06-01 20:34:44 -07:00
José Fonseca
557d2bb423
wgl: Destroy the framebuffer when the window is destroyed.
2009-06-01 20:20:48 -07:00
Brian Paul
2ecc2ece9c
docs: implemented GL_EXT_provoking_vertex
2009-06-01 20:45:08 -06:00
Brian Paul
a444d245e5
mesa: enable GL_EXT_provoking_vertex for sw drivers
2009-06-01 20:43:57 -06:00
Brian Paul
82bc6e5ae3
tnl: implement GL_EXT_provoking_vertex
2009-06-01 20:43:09 -06:00
Keith Whitwell
97f5953ced
progs/vpglsl: add similar support for point rendering as progs/vp
2009-06-01 18:40:21 -07:00
Jakob Bornecrantz
f989390af6
st/gl: Fix mip gen for compressed textures
2009-06-01 18:40:12 -07:00
Keith Whitwell
00e7a60077
trivial/tri-z: add controls for depthrange min/max
...
Also add key to set up quake-1 style ztrick rendering with clear depth
1.0, deptrange(1.0, 0.0) and depthfunc GL_GREATER.
2009-06-01 18:39:58 -07:00
José Fonseca
3c756ed39f
progs/wgl: Small cleanup to wglinfo.
2009-06-01 18:23:20 -07:00
José Fonseca
76ad2b4a5a
progs/wgl: Use an invisible window in wglinfo.
2009-06-01 18:23:20 -07:00
Brian Paul
cf997e0d2e
mesa: fix loop over generic attribs in update_arrays()
...
(cherry picked from commit 1045481dd9 )
2009-06-01 15:04:35 -06:00
Brian Paul
9f6ec50f8c
Merge branch 'mesa_7_5_branch'
2009-06-01 15:01:33 -06:00
Brian Paul
0e8a5a8474
st/mesa: fix incorrect sprite origin when drawing to FBO/texture
...
Need to take the draw buffer's up/down orientation into consideration
when setting the sprite_coord_mode field.
Fixes inverted sprites when drawing into an FBO.
2009-06-01 14:59:11 -06:00
Brian Paul
427554211b
draw: reset extra_vp_outputs.slot to zero in widepoint_flush()
...
Fixes a crash when clearing the window with a quad after drawing large
points. We were asking the draw module how many vertex shader outputs
there were and got 3 instead of 2. This led to creating vertices with
too many attributes and trying to read invalid memory.
We reset extra_vp_outputs.slot to zero in the aaline/aapoint stage's
flush functions already.
This omission was just an oversight in the wide_point stage.
2009-06-01 14:28:57 -06:00
Timo Aaltonen
f3496a3cbd
mesa-common-dev.install: Don't install glxew.h, conflicts with libglew.
2009-06-01 22:26:27 +03:00
Corbin Simpson
1fa023ae48
r300-gallium: Slightly hacky fix for glxgears-style TCL.
2009-06-01 12:04:29 -07:00
Brian Paul
a5d033e89b
demos: add missing dependencies for util files
2009-06-01 11:23:39 -06:00
Nicolai Hähnle
c1ccc7d539
radeon: Provide a more detailled GL_RENDERER string.
...
Display the chip family and PCI ID. This can be parsed easily,
and essentially all information that the driver has about the chip can be
deduced from it.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-06-01 19:02:17 +02:00
Dan Nicholson
bc302b2a33
Use separate $(MINSTALL) for installing libraries
...
The special feature of bin/minstall to copy symlinks is only ever needed
when installing libraries which may have .so symlinks. All the headers
and directories can use a normal install program.
These two modes are separated as $(INSTALL) and $(MINSTALL) to allow the
user (or autoconf) to override installing normal files as they please.
An autoconf check for the install program has been added and will be
used in preference to minstall when available.
Fixes bug 16053.
2009-06-01 06:32:52 -07:00
Jakob Bornecrantz
85e0572756
progs/rbug: Add small remote debugging cli applications
2009-06-01 11:39:25 +01:00
Jakob Bornecrantz
01fa34cb98
trace/rbug: Add rbug integration for remote debugging
2009-06-01 11:19:56 +01:00
Jakob Bornecrantz
dfa4ebcbcc
rbug: Add Gallium Remote Debugger Protocol code
...
This is the (de)marshalling and connection managment code
2009-06-01 11:19:39 +01:00
Jakob Bornecrantz
aee1a6f704
util: Add simple network functions
2009-06-01 02:18:15 -07:00
José Fonseca
ea3ee4791e
wgl: Cleanup framebuffer destruction logic.
2009-05-31 17:16:26 -07:00
José Fonseca
0ea519f931
wgl: Ensure we only create framebuffers for HDC associated with a window.
2009-05-31 11:10:22 -07:00
Julien Cristau
4bcb9cc14f
Update patches
...
+ 02_use-ieee-fp-on-s390-and-m68k.patch moved from imports.h to compiler.h
+ 03_optional-progs-and-install.patch refreshed
+ 05_hurd-ftbfs.diff partly applied upstream
+ 06_kfreebsd-ftbfs.diff refreshed
2009-05-31 13:15:00 +02:00
Julien Cristau
537f3e7a1e
Install dri.pc, which will be needed to build xorg-server 1.7.
2009-05-31 12:52:47 +02:00
Cooper Yuan
8e28d64e9c
R6xx/r7xx: Fix blinn's lighting shader
2009-05-31 16:51:07 +08:00
Cooper Yuan
377d8b3673
R6xx/r7xx: Fix texture perspective gradients issue
2009-05-31 16:41:19 +08:00
José Fonseca
fe69b6bdc7
wgl: Use the right pixel format.
...
There is no current pixel format. Each HDC has its pixelformat which is
kept by gdi and set/get via the SetPixelFormat/GetPixelFormat functions.
Now the HDC's pixelformat is kept in the stw_framebuffer, which is
created during the SetPixelFormat.
2009-05-30 20:29:03 -07:00
José Fonseca
be7c56be06
wgl: Fix debugging output.
2009-05-30 20:29:03 -07:00
José Fonseca
76f2bacb07
wgl: Rename function.
2009-05-30 20:29:03 -07:00
José Fonseca
1124f786c1
wgl: Remove unused field.
2009-05-30 20:29:03 -07:00
José Fonseca
5bb2074798
mesa: Output warnings to debugger on Windows.
...
Stderr of Windows applications without console is not usually
visible.
2009-05-30 20:29:02 -07:00
José Fonseca
8aef306c34
mesa: Check/propagate return value on st_make_current.
...
Prevents segmentation fault when trying to set the viewport/scissor
after a context/drawable visual mismatch.
2009-05-30 20:29:02 -07:00
José Fonseca
29c6c8eb18
mesa: Add success/failures return value to _mesa_make_current.
2009-05-30 20:29:02 -07:00
Brian Paul
bedf7fa49f
Merge branch 'mesa_7_5_branch'
2009-05-30 20:10:04 -06:00
Brian Paul
6c3cefdda6
Revert "softpipe: fix flat shading provoking vertex for PIPE_PRIM_POLYGON"
...
This reverts commit 5d75124db4 .
This fixed unclipped polygons, but broke clipped polygons.
A better fix from the mesa 7.5 branch will be merged next...
2009-05-30 20:09:19 -06:00
Brian Paul
a59575d8fb
softpipe: fix incorrect provoking vertex color for PIPE_PRIM_POLYGON
...
This fixes the incorrect colors seen when rendering flat-shaded polygons.
Note that clipped polygons were correct, but unclipped polygons were wrong.
See the glean/clipFlat test for regression testing.
2009-05-30 20:07:18 -06:00
Julien Cristau
2096234053
clarify changelog: this is only a release candidate
2009-05-30 21:08:54 +02:00
Alex Deucher
d8694cd3f6
get rid of chip_object struct
2009-05-29 15:37:04 -04:00
Alex Deucher
cb39377253
more cleanup
2009-05-29 15:04:44 -04:00
Alex Deucher
5a8b67f363
more cleanup
2009-05-29 14:55:12 -04:00
Alex Deucher
e6eb0ce6ef
more cleanup
2009-05-29 14:45:07 -04:00
Alex Deucher
949c489f59
more cleanup
2009-05-29 14:23:04 -04:00
Alex Deucher
97ed5cffcb
remove more old r300 bits
2009-05-29 13:56:58 -04:00
Alex Deucher
616692cac5
more cleanup
2009-05-29 13:53:57 -04:00
Alex Deucher
70a0301c5b
Remove unused functions
2009-05-29 13:41:00 -04:00
Alex Deucher
37c3731819
Fix spelling in function name
2009-05-29 13:21:28 -04:00
Alex Deucher
9bcc421e68
R6xx/r7xx: remove old sw tcl bits
2009-05-29 13:16:23 -04:00
Alex Deucher
41a44ff891
R6xx/R7xx: switch to common clear with draw code
2009-05-29 13:07:05 -04:00
Alex Deucher
846b24ea82
r6xx/r7xx: switch to common dma functions for vecs
2009-05-29 12:49:45 -04:00
Brian Paul
fa0ca31586
softpipe: update comments for max texture size
2009-05-29 08:22:21 -06:00
Alex Deucher
9b10d19d4a
Remove subpixel offset from viewport
...
remove subpixel offset inherited from r100 code.
based on 038f0bf591
2009-05-29 10:04:03 -04:00
Brian Paul
425c39058b
softpipe: increase max 2D/cube texture size to 4K x 4K
2009-05-29 00:55:54 -06:00
Alex Deucher
7f022fb5cd
Argh. fix last commit. clears are still broken
2009-05-28 17:18:17 -04:00
Alex Deucher
3f14745946
R6xx/r7xx: re-enable clears
...
flush cache and wait for idle after drawing. Probably
just need the cache flush. This gets redbook hello working
properly.
2009-05-28 17:09:19 -04:00
Cooper Yuan
5ff3368c1f
R6xx, add edge rules for triangles
2009-05-28 16:51:49 -04:00
Brian Paul
b631d5fbf4
st: set pipe_rasterizer_state::flatshade_first according to provoking vertex state
2009-05-28 12:33:30 -06:00
Brian Paul
f2f89b01d2
mesa: glGet queries for GL_EXT_provoking_vertex
2009-05-28 12:31:56 -06:00
Brian Paul
fe86e50896
mesa: exec/dlist functions for glProvokingVertexEXT()
2009-05-28 12:31:18 -06:00
Brian Paul
89966cdb1b
mesa: data structure updates for GL_EXT_provoking_vertex
2009-05-28 12:30:25 -06:00
Brian Paul
bd6c44458f
mesa: regenerated enums for GL_EXT_provoking_vertex
2009-05-28 12:29:23 -06:00
Brian Paul
b9c245238c
mesa: regenerated API files for GL_EXT_provoking_vertex
2009-05-28 12:28:18 -06:00
Brian Paul
8c12c9bf76
mesa: GL API changes for GL_EXT_provoking_vertex
...
This creates the new glProvokingVertexEXT() entrypoint.
2009-05-28 12:26:19 -06:00
Corbin Simpson
b70fcd620d
r300-gallium, radeon-gallium: Make add_buffer indicate when a flush is needed.
...
On a side note, why is RADEON_MAX_BOS 24? Should ask airlied about that.
2009-05-28 07:46:34 -07:00
Jerome Glisse
5dcbcbfca4
r300: when using cs path emit scissor in the cmdbuffer
2009-05-28 13:48:38 +02:00
Jerome Glisse
2f9189d538
r300: rework texture offset emission.
2009-05-28 11:40:58 +02:00
Ben Skeggs
534f1e8f02
nv50: some mipmapping fixes
2009-05-28 16:06:25 +10:00
Christoph Bumiller
c11c107f7d
nv50: negate sources directly where supported
2009-05-28 16:06:25 +10:00
Christoph Bumiller
87eea6e2b2
nv50: introduce emit_cvt and use it
...
This makes some code cleaner, and we can now easily
do CEIL and TRUNC.
2009-05-28 16:06:24 +10:00
Christoph Bumiller
3accd7ebe9
nv50: fix TXP
...
For TXP we need to divide texture coords by their w component, or
use the coords' 1/w in the perspective interpolation instruction.
This also tries to support 1D, 3D and CUBE textures, and lets the
instruction only load the components that are used.
2009-05-28 16:06:24 +10:00
Christoph Bumiller
94ba165dff
nv50: use multiple constant buffers
...
Use different buffers for immds, FP params, and VP params.
One has to map constant buffer indices in shader code to buffers
defined via CB_DEF. In principle, we could use more buffers so
we'd have to change the shader code less frequently.
2009-05-28 16:06:24 +10:00
Christoph Bumiller
f9268ccd7f
nv50: don't look for unfreed temps in free_nv50_pc
...
Since we stopped using alloc_temp to get hw indices for FP attrs
there shouldn't be any non-deallocated temps left.
2009-05-28 16:06:23 +10:00
Christoph Bumiller
7ab96f4f73
nv50: release hw TEMPs early
...
Since we know when we don't use a TEMP or FP ATTR register anymore,
we can release their hw resources early.
2009-05-28 16:06:23 +10:00
Christoph Bumiller
708c711f83
nv50: allow immediates for MOV, ADD and MUL
...
Immediates are inlined now where possible, so we need to set
pc->allow32 to FALSE in LIT where we have the conditional MOV,
since immediates swallow the predicate bits.
2009-05-28 16:06:22 +10:00
Christoph Bumiller
d015cba88f
nv50: enable half insns for MOV and MUL
2009-05-28 16:06:22 +10:00
Christoph Bumiller
44b3bfaa75
nv50: make sure half-long insns are paired
...
I chose to just convert unpaired 32 bit length instructions
after parsing all instructions, although it might be possible
to determine beforehand whether there would be any lone ones,
and then even do some swapping to bring them together ...
2009-05-28 16:06:21 +10:00
Christoph Bumiller
de651a228f
nv50: enable KIL in register 19a8
2009-05-28 16:06:21 +10:00
Christoph Bumiller
dac709d0cf
nv50: don't overwrite sources before they're used
...
This would have happened in p.e. ADD TEMP[0], TEMP[0].xyxy, TEMP[1]
or RCP/RSQ TEMP[i], TEMP[i].
2009-05-28 16:06:21 +10:00
Christoph Bumiller
f579a99cc6
nv50: put FP outputs where they belong
...
Depth output in fragment programs should end up in the first
register after the color outputs.
2009-05-28 16:06:20 +10:00
Christoph Bumiller
dd9ded42b9
nv50: modified FP attribute loading
...
VP outputs that should be loadable in the FP are mapped to
interpolant indices by HPOS, COL0 etc.; of course HPOS is
always written, so the highest byte of 1988 is a bitmask that
selects which components of HPOS are used for interpolants,
i.e. the FP inputs in COL0 start at index POPCNT(1988[24:28]).
2009-05-28 16:06:19 +10:00
Christoph Bumiller
e88ec312df
nv50: inspect decl semantic and interpolation mode
...
Record interpolation mode for attributes while parsing declarations,
and also remember the indices of FP color inputs and FP depth output,
which has to end up in the highest output register.
2009-05-28 16:06:19 +10:00
Christoph Bumiller
bcecb8ff66
nv50: record last access to temp and attr regs
...
We now inspect the TGSI instructions in tx_prep to determine where
temps and FP attrs are last accessed.
This will enable us to reclaim some temporaries early and we also
use it to omit pre-loading FP attributes that aren't used.
2009-05-28 16:06:18 +10:00
Christoph Bumiller
7e7d3a87ec
nv50: save some space in immediate buffer
...
We could do even better (like just allocating 1 value in alloc_immd),
but that's fine for now I guess.
2009-05-28 16:06:18 +10:00
Christoph Bumiller
aad31d69ce
nv50: fix SIGN_SET case in tgsi_src
2009-05-28 16:06:17 +10:00
Christoph Bumiller
4a7cf8f66f
nv50: set dst.z,w to 0,1 in SCS and XPD
...
According to tgsi-instruction-set.txt, if they are written, z and w
should be set to 0 and 1 respectively in SCS, and w to 1.0 in XPD.
2009-05-28 16:06:17 +10:00
Christoph Bumiller
229992d281
nv50: make LRP instruction nicer
2009-05-28 16:06:17 +10:00
Christoph Bumiller
9417582f39
nv50: fix some memory leaks in shader assembler
2009-05-28 16:06:16 +10:00
Ben Skeggs
65e3fb7b46
nouveau: explicitly request mappable buffers for the moment
2009-05-28 16:06:16 +10:00
Mike Kaplinksiy
713b636a0e
draw: Fix assertion failure at fetch_emit_prepare
2009-05-27 22:53:59 -07:00
Brian Paul
5be48307d5
demos: remove some old debug/test code
2009-05-27 19:37:32 -06:00
Brian Paul
b86067c610
softpipe: comments
2009-05-27 19:36:59 -06:00
Brian Paul
31deacb8d3
softpipe: include sp_winsys.h to silence warning (unprototyped function)
2009-05-27 19:30:07 -06:00
Brian Paul
5d75124db4
softpipe: fix flat shading provoking vertex for PIPE_PRIM_POLYGON
...
Use the first vertex, not the last.
2009-05-27 19:27:31 -06:00
Brian Paul
c13bd74885
st/mesa: init Format field of vertex arrays for feedback mode
...
Fixes segfault in glRasterPos()
2009-05-27 19:24:09 -06:00
Jerome Glisse
3a6dd3ebb3
radeon: emit scissor before emiting vertices
2009-05-27 21:50:03 +02:00
Jerome Glisse
6141c9ba71
radeon: emit scissor when using cs submission style.
2009-05-27 09:36:07 +02:00
Eric Anholt
8ec6e03679
i915: Fall back on NPOT textured metaops on 830-class.
2009-05-26 20:50:54 -07:00
Eric Anholt
0e83e8f51a
i915: Restore the Viewport and DepthRange functions on 8xx.
...
Fixes failed viewport updates on glxgears (and other apps) resize since
e41780fedc .
Bug #20473 .
2009-05-26 19:50:23 -07:00
Chris Wilson
9178b31546
intel: Override MaxRenderbufferSize with hardware constraints
...
Limit the maximum renderbuffer size to 8192 on i965 and to 2048 on
earlier hardware.
2009-05-26 15:51:33 -07:00
Alex Deucher
98bc311717
enable surface sync function
...
- needs to be more fine-grained
2009-05-26 14:30:26 -04:00
Alex Deucher
f3eaba017c
r6xx: fix more r6xx specific cases
2009-05-26 12:21:54 -04:00
Alex Deucher
930b42693e
R6xx: select proper shader format
2009-05-26 11:36:55 -04:00
Alex Deucher
17417fc8ee
fix segfault when running glxinfo
2009-05-26 11:13:44 -04:00
Alex Deucher
4a28974cf5
add missing RS780 pci id
2009-05-26 10:44:44 -04:00
Alex Deucher
ced2f1b94c
fix build when HAVE_LIBDRM_RADEON is defined
2009-05-26 10:33:23 -04:00
Jerome Glisse
9dee2f20a2
radeon: on update drawable don't firevertices as it might be call from GetLock
...
To avoid locking bug we shouldn't not call firevertices from this path
as it's call from radeon get lock.
2009-05-25 16:05:45 +02:00
Jerome Glisse
714f5e689f
r200: emit scissor when dri2 is enabled
...
In DRI1 kernel emit scissor but in dri2 cs path we have to
explicitly program them.
2009-05-25 15:47:39 +02:00
Jerome Glisse
39ef33708c
r200: fix multitexturing in dri2 path
2009-05-25 13:17:22 +02:00
Timo Aaltonen
99b4daf5e1
Disable EGL.
...
Update the changelog too.
2009-05-25 12:47:02 +03:00
Jerome Glisse
80f1ac87f2
r200: emit cliprect with indexed primitive
2009-05-25 11:29:32 +02:00
Jerome Glisse
9b1efcb87c
radeon: realloc dma if needed after revalidate
...
Revalidate can trigger flushing and dma buffer deallocation,
so retry allocation on such case.
2009-05-24 16:24:53 +02:00
Nicolai Hähnle
7dd184dc4d
radeon: Remove drawable & readable from radeon_dri_mirror
...
The duplication of state data caused a crash due to double-free on destruction
of context, because a variable wasn't correctly null'ed out.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com >
2009-05-24 15:41:53 +02:00
Brian Paul
2d30dafadd
mesa: fix warning message in vbo_exec_DrawRangeElements()
2009-05-22 15:49:38 -06:00
Jerome Glisse
434f920042
radeon: reading back to scratch reg through status map doesn't work
...
For some unknown reasons the scratch reg value doesn't endup in the status
map at the scratch reg offset, this is a temporary work around until we
figure out why it doesn't work.
2009-05-22 23:44:44 +02:00
Brian Paul
68d412f31c
mesa: add missing update_min() call in update_arrays()
2009-05-22 15:35:49 -06:00
Brian Paul
2ead49f98b
mesa: reduce gl_array_object::VertexAttrib[] array from 32 to 16 elements
...
This array was mistakenly dimensioned with VERT_ATTRIB_MAX (32) but it
should really be MAX_VERTEX_GENERIC_ATTRIBS (16).
The generic vertex attributes are in addition to the conventional arrays
(except in NV vertex program mode- they alias/overlay in that case) so
the total of all conventional attributes plus generic attributes should
total 32 (not 48).
2009-05-22 14:57:51 -06:00
Brian Paul
8e3f6c0f96
mesa: use Elements() for loop limit
2009-05-22 14:42:26 -06:00
Brian Paul
842b4cd3cd
mesa: use Elements() for loop limit
2009-05-22 14:32:45 -06:00
Brian Paul
ce7a049191
mesa: use Elements() for loop limit
2009-05-22 14:32:37 -06:00
Brian Paul
8091aa8633
mesa: use Elements() for loop limit
2009-05-22 14:28:24 -06:00
Brian Paul
2a3d118a8e
mesa: use Elements() for loop limit
2009-05-22 14:27:42 -06:00
Brian Paul
180df4d328
mesa: simplify adjust_buffer_object_ref_counts()
2009-05-22 14:27:26 -06:00
Brian Paul
bf4dfd6563
mesa: minor code clean-up
2009-05-22 14:24:21 -06:00
Brian Paul
d30163ad42
mesa: use Elements() for loop limit
2009-05-22 14:23:02 -06:00
Brian Paul
b625fbaef2
vbo: s/32/VERT_ATTRIB_MAX/
2009-05-22 14:22:40 -06:00
Brian Paul
ebb991ca0d
mesa: use Elements() for loop bound
2009-05-22 14:16:00 -06:00
Brian Paul
a65f385b8d
mesa: minor code simplification
2009-05-22 14:14:53 -06:00
Brian Paul
fac334e6d3
Merge branch 'mesa_7_5_branch'
2009-05-22 14:09:35 -06:00
Brian Paul
1045481dd9
mesa: fix loop over generic attribs in update_arrays()
2009-05-22 13:50:31 -06:00
Brian Paul
4b55e36952
vbo: asst. reformatting, clean-ups
2009-05-22 13:44:59 -06:00
Brian Paul
9be72f54ac
Merge branch 'mesa_7_5_branch'
2009-05-22 13:21:23 -06:00
Brian Paul
506d340363
demos: fix multitex.c VertCoord attribute mapping
...
If the multitex.vert shader uses the VertCoord generic vertex attribute
instead of the pre-defined gl_Vertex attribute, we need to make sure that
VertCoord gets bound to generic vertex attribute zero.
That's because we need to call glVertexAttrib2fv(0, xy) after all the other
vertex attributes have been set since setting generic attribute 0 triggers
vertex submission. Before, we wound up issuing the vertex attributes in
the order 0, 1, 2 which caused the first vertex to be submitted before all
the attributes were set. Now, the attributes are set in 1, 2, 0 order.
(cherry picked from commit 58fadc6242 )
2009-05-22 13:20:48 -06:00
Brian Paul
9dbe32f5eb
vbo: fix crash in vbo_exec_bind_arrays()
...
When a vertex shader uses generic vertex attribute 0, but not gl_Vertex,
we need to set attribute[16] to point to attribute[0]. We were setting the
attribute size, but not the pointer.
Fixes crash in glsl/multitex.c when using the VertCoord attribute instead
of gl_Vertex.
(cherry picked from commit c3538969e1 )
2009-05-22 13:19:42 -06:00
Brian Paul
c3538969e1
vbo: fix crash in vbo_exec_bind_arrays()
...
When a vertex shader uses generic vertex attribute 0, but not gl_Vertex,
we need to set attribute[16] to point to attribute[0]. We were setting the
attribute size, but not the pointer.
Fixes crash in glsl/multitex.c when using the VertCoord attribute instead
of gl_Vertex.
2009-05-22 13:15:41 -06:00
Brian Paul
891a2bdd7d
demos: extend glsl/multitex.c to use a vertex buffer object
2009-05-22 13:12:28 -06:00
Brian Paul
96370113f1
demos/util: add funcs for GL_ARB_buffer_object
2009-05-22 13:12:01 -06:00
Brian Paul
58fadc6242
demos: fix multitex.c VertCoord attribute mapping
...
If the multitex.vert shader uses the VertCoord generic vertex attribute
instead of the pre-defined gl_Vertex attribute, we need to make sure that
VertCoord gets bound to generic vertex attribute zero.
That's because we need to call glVertexAttrib2fv(0, xy) after all the other
vertex attributes have been set since setting generic attribute 0 triggers
vertex submission. Before, we wound up issuing the vertex attributes in
the order 0, 1, 2 which caused the first vertex to be submitted before all
the attributes were set. Now, the attributes are set in 1, 2, 0 order.
2009-05-22 13:00:49 -06:00
Brian Paul
1b3f5df1e0
Merge branch 'mesa_7_5_branch'
2009-05-22 09:40:50 -06:00
Brian Paul
9adca8814d
mesa: allow GL_BITMAP type in _mesa_image_image_stride()
...
It's possible to hand a GL_COLOR_INDEX/GL_BITMAP image to glTexImage3D()
which gets converted to RGBA via the glPixelMap tables.
This fixes a failure with piglit/fdo10370 with Gallium.
(cherry picked from commit 995456f930 )
2009-05-22 09:38:18 -06:00
Brian Paul
995456f930
mesa: allow GL_BITMAP type in _mesa_image_image_stride()
...
It's possible to hand a GL_COLOR_INDEX/GL_BITMAP image to glTexImage3D()
which gets converted to RGBA via the glPixelMap tables.
This fixes a failure with piglit/fdo10370 with Gallium.
2009-05-22 09:35:02 -06:00
Brian Paul
a545f1ab6d
mesa: added some assertions
2009-05-22 07:51:35 -06:00
Brian Paul
42ae2a8648
mesa: use Elements() macro to limit loops instead of constants
2009-05-22 07:51:13 -06:00
Brian Paul
882cd6c839
mesa: remove MAX_VERTEX_PROGRAM_ATTRIBS
...
Use MAX_VERTEX_GENERIC_ATTRIBS instead. No need for two #defines for
the same quantity.
2009-05-22 07:30:05 -06:00
Brian Paul
4a95185c9f
mesa: rename MAX_VERTEX_ATTRIBS to MAX_VERTEX_GENERIC_ATTRIBS
...
Be clearer that this is the number of generic vertex program/shader
attributes, not counting the legacy attributes (pos, normal, color, etc).
2009-05-22 07:26:08 -06:00
Brian Paul
4dc426c016
mesa: s/MAX_VERTEX_PROGRAM_ATTRIBS/MAX_NV_VERTEX_PROGRAM_INPUTS/ in NV funcs
2009-05-22 07:19:27 -06:00
Brian Paul
42b747e57d
mesa: added comment
2009-05-22 07:14:16 -06:00
Brian Paul
8125c5ce92
docs: updates for version 7.4.3
2009-05-22 07:13:47 -06:00
Brian Paul
ba3f8dc0aa
mesa: bump version to 7.4.3
2009-05-22 07:13:34 -06:00
Brian Paul
85cf1675d4
mesa: bump version to 7.4.3
2009-05-22 07:13:30 -06:00
Brian Paul
3aeace2928
vbo: fix incorrect loop limit in bind_array_obj()
...
The generic_array[] is 16 elements in size, but the loop was doing 32
iterations. The out of bounds array write was clobbering the following
inputs[] array but as luck would have it, that didn't matter.
(cherry picked from commit 8da09e6924 )
2009-05-22 07:10:47 -06:00
Brian Paul
0edb61afef
docs: add glGet case for GL_VERTEX_ARRAY_BINDING_APPLE
2009-05-22 07:08:38 -06:00
Brian Paul
accffe2b73
mesa: add missing glGet*() case for GL_VERTEX_ARRAY_BINDING_APPLE
...
(cherry picked from commit 70c4b81e88 )
2009-05-22 07:07:38 -06:00
Brian Paul
70c4b81e88
mesa: add missing glGet*() case for GL_VERTEX_ARRAY_BINDING_APPLE
2009-05-21 21:49:57 -06:00
Brian Paul
8b91778f46
vbo: fix build breakage...oops
2009-05-21 17:07:33 -06:00
Brian Paul
3bfe312d01
vbo: comments, whitespace clean-ups
2009-05-21 17:03:52 -06:00
Brian Paul
d2a74d76c9
mesa: s/MAX_VERTEX_PROGRAM_ATTRIBS/MAX_NV_VERTEX_PROGRAM_INPUTS
2009-05-21 17:03:21 -06:00
Brian Paul
7e2fb12981
Merge branch 'mesa_7_5_branch'
2009-05-21 16:57:28 -06:00
Brian Paul
8da09e6924
vbo: fix incorrect loop limit in bind_array_obj()
...
The generic_array[] is 16 elements in size, but the loop was doing 32
iterations. The out of bounds array write was clobbering the following
inputs[] array but as luck would have it, that didn't matter.
2009-05-21 16:54:35 -06:00
Brian Paul
d4fb7615b5
mesa: use MAX_ values instead of literals
2009-05-21 16:52:45 -06:00
Brian Paul
54a5ffbfa1
mesa: freshen comments for update_array()
2009-05-21 16:10:45 -06:00
Brian Paul
667a4037fa
mesa: minor code simplification in _mesa_GetVertexAttrib*NV()
2009-05-21 16:10:45 -06:00
Brian Paul
024de60348
mesa: comment for _mesa_GetVertexAttribfvARB()
2009-05-21 16:10:45 -06:00
Brian Paul
254845fad0
mesa: minor code simplification in _mesa_GetVertexAttribfvARB()
2009-05-21 16:10:45 -06:00
Brian Paul
6a2211f000
mesa: remove const qualifier
2009-05-21 16:10:45 -06:00
Brian Paul
a554d7c4d8
mesa: VertexAttribPointer comments
2009-05-21 16:10:45 -06:00
Brian Paul
8fe3134622
mesa: call _mesa_update_array_object_max_element() before printing array info
2009-05-21 16:10:45 -06:00
Brian Paul
8fa0cb2b42
mesa: added gl_array_object::Weight array field
...
We don't really implement vertex weights but in the VBO code this
fixes and odd case for the legacy_array[] setup. Before, the
vbo->draw_prims() call was always indicating that the vertex weight
array was present/enabled when it really wasn't.
2009-05-21 16:10:45 -06:00
Brian Paul
1889890c88
mesa: check FEATURE_point_size_array for PointSize array
2009-05-21 16:10:45 -06:00
Brian Paul
aac19609bf
mesa: fix some potential state-restore issues in pop_texture_group()
...
Call the _mesa_set_enable() functions instead of driver functions, etc.
Also, add missing code for 1D/2D texture arrays.
2009-05-21 16:10:45 -06:00
Brian Paul
de1cfc5e8a
mesa: new _mesa_update_array_object_max_element() function
...
This will replace the code in state.c
2009-05-21 16:10:45 -06:00
Brian Paul
dda82137d2
vbo: return VP_NONE from get_program_mode() if running fixed-func vertex program
...
If we're running a vertex program to emulated fixed-function, we still need
to treat vertex arrays/attributes as if we're in fixed-function mode.
This should probably be back-ported to Mesa 7.5 after a bit more testing.
2009-05-21 16:10:45 -06:00
Brian Paul
a1f6f82e82
vbo: move vp_mode enum to vbo_exec.h, use enum instead of GLuint
2009-05-21 16:10:45 -06:00
Alex Deucher
b52cdb81e2
r6xx/r7xx: fix segfault in vertex shader setup
2009-05-21 17:40:27 -04:00
Alex Deucher
1b84d228d5
r6xx: fix count on START_3D packet
2009-05-21 17:38:14 -04:00
Eric Anholt
bd0861e274
i965: fix whitespace in brw_tex_layout.c
...
The broken indentation was driving me crazy, so fix other stuff while
I'm here.
2009-05-21 10:41:49 -07:00
Eric Anholt
3a521d84ec
i956: Make state dependency of SF on drawbuffer bounds match Mesa's.
...
Noticed while debugging a weird 1D FBO testcase that left its existing
viewport and projection matrix in place when switching drawbuffers. Didn't
fix the testcase, though.
2009-05-21 10:41:39 -07:00
Eric Anholt
e78a6aa2b9
intel: Fall back on any rendering to texture with no miptree.
...
Fixes segfault on an fbo.c negative test for FBO with texture width/height
of 0. Previously we just tested for border != 0 to work around this
segfault.
2009-05-21 10:40:11 -07:00
Eric Anholt
8bba183b9e
intel: Mark the FBO as incomplete if there's no intel_renderbuffer for it.
...
This happens to rendering with textures with a border, which had resulted
in a segfault on dereferencing the irb.
2009-05-21 10:40:11 -07:00
Eric Anholt
467f18f7a5
intel: Don't segfault on glGenerateMipmaps of a cube map with one face defined.
...
This presumably applies to SGIS_generate_mipmaps as well.
2009-05-21 10:40:11 -07:00
Eric Anholt
4da58bbab0
intel: Use _mesa_CheckFramebufferStatusEXT insteaad of glCheck...
...
Fixes a segfault in our oglconform fbo test.
2009-05-21 10:40:11 -07:00
Brian Paul
02f73c43b4
mesa: added debug functions for dumping color/depth/stencil buffers
2009-05-21 09:17:09 -06:00
Brian Paul
840c09fc71
i965: rename var: s/tmp/vs_inputs/
2009-05-21 09:17:09 -06:00
Brian Paul
f7ca97f85e
mesa: remove pointless null ptr check, improved some error messages
2009-05-21 09:17:09 -06:00
Brian Paul
39d7524f7b
mesa: added _mesa_print_arrays() for debugging
2009-05-21 09:17:09 -06:00
Brian Paul
15f21bf357
mesa: updated comment for _MaxElement field
...
It's the largest array index, plus one.
2009-05-21 09:17:09 -06:00
Brian Paul
a185bcbdec
mesa: move gl_array_attrib::_MaxElement to gl_array_object::_MaxElement
...
This value is per array object.
2009-05-21 09:17:08 -06:00
Brian Paul
899c524a49
vbo: s/8/MAX_TEXTURE_COORD_UNITS/
2009-05-21 09:17:08 -06:00
Jonathan Adamczewski
2c007517b5
cell: perform triangle cull a little earlier
...
In spu_tri.c:setup_sort_vertices() triangles are culled after the
vertices are sorted. This patch moves the check a little earlier
and performs the actual check a little faster through intrinsics and
a little trickery.
Reduced code size and less work is done before a triangle is deemed
OK to skip.
2009-05-21 08:19:00 -06:00
Jonathan Adamczewski
b4824520ec
cell: unroll inner loop of spu_render.c:cmd_render()
...
It was taking approximately 50 cycles to extract the vertex indices,
calculate the vertex_header pointers and call tri_draw() for each
three vertices - .
Unrolled, it takes less than 100 cycles to extract, unpack,
calculate pointers and call tri_draw() eight times. It does have a
nasty jump-tabled switch. I'm sure that there's a better way...
Code size of spu_render.o gets larger due to the extra constants and
work in the inner loop, there are extra stack saves and loads
because there are more registers in use, and an assert. spu_tri.o
gets a little smaller.
2009-05-21 08:18:03 -06:00
Brian Paul
5b27b4ad37
st: add support for GL_EXT_vertex_array_bgra
2009-05-21 08:15:54 -06:00
Carl Worth
d2f4c2b632
minstall: Don't copy over an identical file
...
The rationale here is to avoid updating a timestamp for a file that
hasn't changed. Needless updates of the timestamp can ripple into
other projects, (xserver, etc.), useless recompiling due to a
'make install' in mesa that didn't actually change anything.
2009-05-21 07:52:13 -06:00
Jerome Glisse
d7cc0eb479
radeon: maxbuffer size is in bytes
2009-05-21 13:49:15 +02:00
Corbin Simpson
3af0952bc9
r300-gallium: r500-fs: POW.
...
I feel so unclean.
2009-05-20 23:22:16 -07:00
Corbin Simpson
cfd241e8a6
r300-gallium: r500-fs: LRP.
...
Goddammit. This cannot be the "easy way." :C
2009-05-20 21:52:11 -07:00
Corbin Simpson
f1f0893eba
r300-gallium: r500-fs: Combine function.
2009-05-20 16:53:45 -07:00
Corbin Simpson
d67fb5ea1d
r300-gallium: Prevent assert when fogcoords are present.
...
Seems like this file is the source of all bad logic. (Pun intended.)
2009-05-20 16:05:11 -07:00
Corbin Simpson
d04c85d01b
r300-gallium: Another constantbuf shader recompile test.
...
Less briefly... Shaders need to be recompiled if their constantbuf
offsets have changed. However, since we only change them from shaders if
immediates need to be emitted, we shouldn't bother if the shader doesn't
use immediates.
2009-05-20 14:55:03 -07:00
Corbin Simpson
4151c0ea91
r300-gallium: Raise constantbuf limits.
...
Still not correct, but really I don't care.
2009-05-20 14:38:22 -07:00
Corbin Simpson
364a4a8293
r300-gallium: fs: Remove cruft from way back when.
2009-05-20 14:17:27 -07:00
Corbin Simpson
0ba7f76233
radeon-gallium: Add surface_buffer_create callback.
2009-05-20 13:21:17 -07:00
Jerome Glisse
a13e96359b
r200: fix vbo array rendering
2009-05-20 22:19:40 +02:00
Corbin Simpson
9e8de1b911
r300-gallium: Make surface_copy actually load the texture in shader.
2009-05-20 12:22:24 -07:00
Corbin Simpson
b22b6f0743
r300-gallium: Add missing R481 PCI ID.
...
Per 74cb2aba on xf86-video-ati.
2009-05-20 12:08:00 -07:00
Corbin Simpson
65946ef081
r300-gallium: Make surface_copy work, and refactor buffer validation.
2009-05-20 11:46:26 -07:00
Michel Dänzer
01daeadf8c
radeon: Increase reference count of current renderbuffers.
...
Fixes
glxinfo: main/renderbuffer.c:2159: _mesa_reference_renderbuffer: Assertion
`oldRb->Magic == 0xaabbccdd' failed.
2009-05-20 17:00:57 +02:00
Michel Dänzer
b9bd1abf26
Merge branch 'master' into radeon-rewrite
...
Conflicts:
src/mesa/drivers/dri/r300/r300_context.c
src/mesa/drivers/dri/r300/r300_texstate.c
2009-05-20 17:00:48 +02:00
Jerome Glisse
c696dd0f62
radeon: set max texture size
...
This still need some work to actually report somethings reasonable
if no memory manager is available.
2009-05-20 16:34:06 +02:00
Corbin Simpson
4550423211
radeon-gallium: Don't permit reading and writing a BO in one CS.
...
This fixes some silent problems in current libdrm_radeon.
surface_copy still locks up hard.
2009-05-20 07:18:08 -07:00
Brian Paul
35f5222ae0
mesa: remove texUnit->_Current = NULL assignment
...
A follow-on to commit 46a2aad2cf which
fixes a texture object memory leak.
See bug 21756.
2009-05-20 08:14:45 -06:00
root
c28e0e7d97
Add missing file from local.
2009-05-20 09:16:21 -04:00
Jerome Glisse
8308bf9ee1
r200: fix indexed draw color order and cs missmatch
2009-05-20 13:21:24 +02:00
Brian Paul
0c75cb5afe
st: reformatting, comments, var renaming
2009-05-19 20:05:28 -06:00
root
3149b87ac4
Makeup checkin for radeon code change paired with r6/7 code.
2009-05-19 16:47:39 -04:00
Brian Paul
d0eccc4187
Merge branch 'mesa_7_5_branch'
2009-05-19 10:07:45 -06:00
Brian Paul
1096a6c579
docs: 7.4.3 relnotes edits
2009-05-19 10:06:58 -06:00
Brian Paul
1eb59f49a4
docs: start 7.4.3 release notes
2009-05-19 10:06:09 -06:00
Brian Paul
63d1e89138
mesa: allow depth/stencil textures to be attached to GL_STENCIL_ATTACHMENT
...
See sourceforge bug #2793846 .
(cherry picked from commit 042d9a5132 )
2009-05-19 10:04:17 -06:00
Brian Paul
3ed7e9bfcc
mesa: assign trb->Base.StencilBits in update_wrapper().
...
When we render to a depth/stencil texture there are stencil bits.
(cherry picked from commit c99a60c40d )
2009-05-19 10:02:55 -06:00
Mathias Fröhlich
042d9a5132
mesa: allow depth/stencil textures to be attached to GL_STENCIL_ATTACHMENT
...
See sourceforge bug #2793846 .
2009-05-19 09:59:01 -06:00
Brian Paul
c99a60c40d
mesa: assign trb->Base.StencilBits in update_wrapper().
...
When we render to a depth/stencil texture there are stencil bits.
2009-05-19 09:57:01 -06:00
Brian Paul
43d8ace88d
mesa: print more info when valid_texture_object() fails
2009-05-19 09:21:39 -06:00
Brian Paul
46a2aad2cf
mesa: fix texture object reference counting in texture_override()
...
Fixes bug 21756: r200: Mesa-7.4.2 release regression: "Quit on exit".
2009-05-19 09:03:19 -06:00
Richard Li
465588cd0e
Fix nop insertion bug. redbook hello can run.
2009-05-19 10:28:40 -04:00
Jakob Bornecrantz
bd59dd69ba
trace: Improve shader wrapping
2009-05-18 20:54:09 +01:00
Jakob Bornecrantz
7d11a392d7
st/dri: Only create new textures if drawable has changed
2009-05-18 20:54:09 +01:00
Corbin Simpson
d0639d067e
r300-gallium: Fix (another) wrong value in MSPOS.
...
Again, thanks to agd5f.
2009-05-18 09:51:10 -07:00
Corbin Simpson
026f4c97dc
radeon-gallium: Remove BO validation debug.
...
It appears that that area of code "just works" much like classic Mesa's
version, so might as well not waste scrollback on it.
2009-05-18 09:51:10 -07:00
Corbin Simpson
5236ea3900
r300-gallium: Cleanup viewport state setup.
2009-05-18 09:51:09 -07:00
Corbin Simpson
301d238c1a
r300-gallium: Always do VTE, never software viewport.
...
This makes glxgears draw properly with SW TCL.
2009-05-18 09:51:09 -07:00
Brian Paul
edfbf7dccb
Merge branch 'mesa_7_5_branch'
...
Conflicts:
Makefile
src/mesa/main/version.h
2009-05-18 10:36:50 -06:00
Brian Paul
7ce105d2e6
st/mesa: fix incorrect src/dst stride params to _mesa_generate_mipmap_level()
...
The stride needs to be in texels, not bytes.
2009-05-18 10:28:04 -06:00
Brian Paul
adabd0e81e
mesa: comments for _mesa_generate_mipmap_level()
2009-05-18 10:27:31 -06:00
Brian Paul
30320f0afb
softpipe: add texture target sanity check assertion
2009-05-18 10:13:44 -06:00
Brian Paul
14e5bff97b
st: fix incorrect target parameter to screen->is_format_supported()
...
We were passing a GL texture target instead of a pipe_texture_target enum.
2009-05-18 10:12:40 -06:00
Brian Paul
df37cde309
mesa: added linux-osmesa-static config
...
Contributed by Nicolas Noble. See SF bug #2792536
2009-05-18 08:47:22 -06:00
Brian Paul
6e61700541
docs: link to 7.5 relnotes
2009-05-18 07:17:46 -06:00
Brian Paul
da0d4e1db6
docs: emphasize the incomplete status of the nouveau/R300 gallium drivers
2009-05-18 07:17:36 -06:00
Timo Aaltonen
73670d56e8
Merge branch 'debian-experimental' into test
...
Conflicts:
Makefile
configs/default
docs/download.html
docs/news.html
docs/relnotes-7.4.2.html
doxygen/.gitignore
include/GL/internal/dri_interface.h
include/GLES/egl.h
progs/demos/Windows/all.dsp
progs/demos/Windows/bounce.dsp
progs/demos/Windows/clearspd.dsp
progs/demos/Windows/cubemap.dsp
progs/demos/Windows/demos.dsw
progs/demos/Windows/drawpix.dsp
progs/demos/Windows/fire.dsp
progs/demos/Windows/gears.dsp
progs/demos/Windows/geartrain.dsp
progs/demos/Windows/glinfo.dsp
progs/demos/Windows/gloss.dsp
progs/demos/Windows/gltestperf.dsp
progs/demos/Windows/glutfx.dsp
progs/demos/Windows/ipers.dsp
progs/demos/Windows/isosurf.dsp
progs/demos/Windows/loadbias.dsp
progs/demos/Windows/morph3d.dsp
progs/demos/Windows/multiarb.dsp
progs/demos/Windows/occlude.dsp
progs/demos/Windows/osdemo.dsp
progs/demos/Windows/paltex.dsp
progs/demos/Windows/pixeltex.dsp
progs/demos/Windows/pointblast.dsp
progs/demos/Windows/rain.dsp
progs/demos/Windows/ray.dsp
progs/demos/Windows/readpix.dsp
progs/demos/Windows/reflect.dsp
progs/demos/Windows/renormal.dsp
progs/demos/Windows/shadowtex.dsp
progs/demos/Windows/spectex.dsp
progs/demos/Windows/spriteblast.dsp
progs/demos/Windows/stex3d.dsp
progs/demos/Windows/teapot.dsp
progs/demos/Windows/terrain.dsp
progs/demos/Windows/tessdemo.dsp
progs/demos/Windows/texcyl.dsp
progs/demos/Windows/texdown.dsp
progs/demos/Windows/texenv.dsp
progs/demos/Windows/texobj.dsp
progs/demos/Windows/trispd.dsp
progs/demos/Windows/tunnel.dsp
progs/demos/Windows/tunnel2.dsp
progs/demos/Windows/winpos.dsp
progs/demos/dinoshade.c
progs/demos/projtex.c
progs/egl/Makefile
progs/egl/demo1.c
progs/egl/demo2.c
progs/egl/demo3.c
progs/egl/eglgears.c
progs/egl/eglinfo.c
progs/fp/.gitignore
progs/fp/Makefile
progs/miniglx/Makefile
progs/redbook/Windows/redbook.dsw
progs/redbook/Windows/teapots.dsp
progs/slang/windows/vc60/cltest.dsp
progs/slang/windows/vc60/framework.dsp
progs/slang/windows/vc60/slang.dsw
progs/slang/windows/vc60/sotest.dsp
progs/slang/windows/vc60/vstest.dsp
progs/tests/.gitignore
progs/tests/Makefile
progs/tests/afsmultiarb.c
progs/tests/antialias.c
progs/tests/api_speed.c
progs/tests/arbfpspec.c
progs/tests/arbfptest1.c
progs/tests/arbfptexture.c
progs/tests/arbfptrig.c
progs/tests/arbnpot-mipmap.c
progs/tests/arbnpot.c
progs/tests/arbvptest1.c
progs/tests/arbvptest3.c
progs/tests/arbvptorus.c
progs/tests/arbvpwarpmesh.c
progs/tests/arraytexture.c
progs/tests/blendminmax.c
progs/tests/blendsquare.c
progs/tests/blendxor.c
progs/tests/bufferobj.c
progs/tests/bug_3050.c
progs/tests/bug_3101.c
progs/tests/bug_3195.c
progs/tests/copypixrate.c
progs/tests/crossbar.c
progs/tests/cva.c
progs/tests/debugger.c
progs/tests/drawbuffers.c
progs/tests/exactrast.c
progs/tests/ext422square.c
progs/tests/fbotest1.c
progs/tests/fbotest2.c
progs/tests/floattex.c
progs/tests/fog.c
progs/tests/fogcoord.c
progs/tests/fptest1.c
progs/tests/fptexture.c
progs/tests/interleave.c
progs/tests/invert.c
progs/tests/jkrahntest.c
progs/tests/lineclip.c
progs/tests/manytex.c
progs/tests/minmag.c
progs/tests/mipmap_limits.c
progs/tests/multipal.c
progs/tests/multitexarray.c
progs/tests/multiwindow.c
progs/tests/no_s3tc.c
progs/tests/packedpixels.c
progs/tests/pbo.c
progs/tests/prog_parameter.c
progs/tests/random.c
progs/tests/readrate.c
progs/tests/rubberband.c
progs/tests/seccolor.c
progs/tests/shader_api.c
progs/tests/stencil_twoside.c
progs/tests/stencil_wrap.c
progs/tests/stencilwrap.c
progs/tests/subtexrate.c
progs/tests/tex1d.c
progs/tests/texcmp.c
progs/tests/texcompress2.c
progs/tests/texfilt.c
progs/tests/texgenmix.c
progs/tests/texline.c
progs/tests/texrect.c
progs/tests/texwrap.c
progs/tests/unfilledclip.c
progs/tests/vao-01.c
progs/tests/vao-02.c
progs/tests/vparray.c
progs/tests/vpeval.c
progs/tests/vptest1.c
progs/tests/vptest2.c
progs/tests/vptest3.c
progs/tests/vptorus.c
progs/tests/vpwarpmesh.c
progs/tests/yuvrect.c
progs/tests/yuvsquare.c
progs/tests/zreaddraw.c
progs/trivial/.gitignore
progs/trivial/Makefile
progs/trivial/clear.c
progs/trivial/dlist-dangling.c
progs/trivial/dlist-edgeflag-dangling.c
progs/trivial/dlist-edgeflag.c
progs/trivial/drawarrays.c
progs/trivial/drawelements.c
progs/trivial/drawrange.c
progs/trivial/line-clip.c
progs/trivial/line-cull.c
progs/trivial/line-userclip-clip.c
progs/trivial/line-userclip-nop-clip.c
progs/trivial/line-userclip-nop.c
progs/trivial/line-userclip.c
progs/trivial/line.c
progs/trivial/lineloop-clip.c
progs/trivial/lineloop.c
progs/trivial/point-clip.c
progs/trivial/point-param.c
progs/trivial/point-wide.c
progs/trivial/point.c
progs/trivial/poly-flat.c
progs/trivial/poly-unfilled.c
progs/trivial/poly.c
progs/trivial/quad-clip-all-vertices.c
progs/trivial/quad-clip-nearplane.c
progs/trivial/quad-clip.c
progs/trivial/quad-degenerate.c
progs/trivial/quad-flat.c
progs/trivial/quad-offset-factor.c
progs/trivial/quad-offset-unfilled.c
progs/trivial/quad-offset-units.c
progs/trivial/quad-tex-2d.c
progs/trivial/quad-tex-3d.c
progs/trivial/quad-tex-pbo.c
progs/trivial/quad-unfilled.c
progs/trivial/quad.c
progs/trivial/quads.c
progs/trivial/quadstrip-flat.c
progs/trivial/quadstrip.c
progs/trivial/tri-blend.c
progs/trivial/tri-clip.c
progs/trivial/tri-cull.c
progs/trivial/tri-dlist.c
progs/trivial/tri-edgeflag.c
progs/trivial/tri-flat-clip.c
progs/trivial/tri-flat.c
progs/trivial/tri-tex-3d.c
progs/trivial/tri-unfilled-clip.c
progs/trivial/tri-unfilled-smooth.c
progs/trivial/tri-unfilled-userclip.c
progs/trivial/tri-unfilled.c
progs/trivial/tri-userclip.c
progs/trivial/tri.c
progs/trivial/tristrip-clip.c
progs/trivial/tristrip.c
progs/trivial/vbo-drawarrays.c
progs/trivial/vbo-drawelements.c
progs/trivial/vbo-drawrange.c
progs/trivial/vp-array.c
progs/trivial/vp-clip.c
progs/trivial/vp-line-clip.c
progs/trivial/vp-tri.c
progs/trivial/vp-unfilled.c
progs/vp/Makefile
progs/vp/vp-tris.c
src/egl/Makefile
src/egl/drivers/demo/Makefile
src/egl/drivers/demo/demo.c
src/egl/drivers/dri/Makefile
src/egl/drivers/dri/egldri.c
src/egl/drivers/dri/egldri.h
src/egl/main/Makefile
src/egl/main/eglapi.c
src/egl/main/eglapi.h
src/egl/main/eglconfig.c
src/egl/main/eglconfig.h
src/egl/main/eglcontext.c
src/egl/main/eglcontext.h
src/egl/main/egldisplay.c
src/egl/main/egldisplay.h
src/egl/main/egldriver.c
src/egl/main/egldriver.h
src/egl/main/eglglobals.c
src/egl/main/eglglobals.h
src/egl/main/egllog.c
src/egl/main/eglmode.h
src/egl/main/eglsurface.c
src/egl/main/eglsurface.h
src/egl/main/egltypedefs.h
src/glx/mini/Makefile
src/glx/x11/dri2_glx.c
src/mesa/drivers/allegro/amesa.c
src/mesa/drivers/dri/intel/intel_buffers.c
src/mesa/drivers/dri/intel/intel_clear.c
src/mesa/drivers/dri/intel/intel_context.c
src/mesa/drivers/dri/intel/intel_pixel.c
src/mesa/drivers/dri/r300/r300_texstate.c
src/mesa/drivers/dri/radeon/radeon_screen.c
src/mesa/drivers/windows/gldirect/dx7/gld_wgl_dx7.c
src/mesa/drivers/windows/gldirect/dx8/gld_wgl_dx8.c
src/mesa/drivers/windows/gldirect/dx9/gld_wgl_dx9.c
src/mesa/main/glheader.h
src/mesa/main/light.c
src/mesa/main/teximage.c
src/mesa/main/texparam.c
src/mesa/main/version.h
src/mesa/swrast/s_texfilter.c
2009-05-18 14:05:53 +03:00
Aidan Thornton
b5eafa2d51
Initialize psp->waitX/waitGL for swrast_dri.so.
...
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=21053 .
(cherry picked from commit f2445dfd85 )
2009-05-18 12:51:12 +02:00
Aidan Thornton
f2445dfd85
Initialize psp->waitX/waitGL for swrast_dri.so.
...
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=21053 .
2009-05-18 12:47:00 +02:00
Timo Aaltonen
ac00f6a47a
Merge commit 'mesa_7_4' into test
2009-05-18 13:21:01 +03:00
Jerome Glisse
d039cf4574
radeon: fix DRI1 cmd stream
2009-05-18 10:13:57 +02:00
Corbin Simpson
27206add27
r300-gallium: Enable GLSL for r500.
...
Before you get all excited, this is *not* to be construed as actual support
for GLSL shaders. The GL version is still 1.3, and stuff still sucks. Just
flicking it on so that it can be tested and developed a bit easier.
2009-05-17 21:41:25 -07:00
Corbin Simpson
9569221563
r300-gallium: r500-fs: DDX and DDY support.
...
Oh, look, GLSL instructions. I wonder what I'll do next.
2009-05-17 21:40:16 -07:00
Corbin Simpson
0036f2ccba
dri-gallium: Add GLSL support.
...
Oh, look, it's more features. :3
2009-05-17 21:39:11 -07:00
Corbin Simpson
06a7b798f2
r300-gallium: Add half-right COS and SIN.
...
HW trig does a premultiply by 2pi, where Mesa does another premultiply by pi.
This is a problem.
2009-05-17 21:10:07 -07:00
Corbin Simpson
572d7d1358
r300-gallium: Size mismatch.
2009-05-17 20:49:39 -07:00
Corbin Simpson
6a40d1e9d9
r300-gallium, radeon-gallium: Nuke gb_pipes from orbit.
...
See the previous commit for an explanation. This is just all the support code
for GB_TILE_CONFIG.
2009-05-17 17:03:15 -07:00
Corbin Simpson
d6e085bd76
r300-gallium: Don't set GB_TILE_CONFIG (in userspace.)
...
This accompanies kernel patches that make GB_TILE_CONFIG's various members
completely controlled in DRM.
GB_TILE_CONFIG has the following controls:
- The number of GB (pixel) pipes enabled
- The size and style of tiling
- Subpixel precision (either 1/12 or 1/16)
Per airlied and glisse, userspace and kernel will now agree (always) on
a subpixel precision of 1/12, and tiling will always be kernel-controlled.
2009-05-17 16:44:39 -07:00
Corbin Simpson
60665ae627
r300-gallium: Clean up more invariant state.
...
GA_ENHANCE is now the kernel's problem.
2009-05-17 13:23:39 -07:00
Corbin Simpson
e5f5390f4b
r300-gallium: Update XXX.
...
Lops work fine as long as HW TCL is off. (I think I know why.)
2009-05-17 12:51:18 -07:00
Corbin Simpson
fbcfcd9f5c
r300-gallium: Correct default MSPOS.
...
Per agd5f.
2009-05-17 11:58:53 -07:00
Corbin Simpson
45435abcb9
r300-gallium: vs: Fix vert shader init.
...
Makes the last three commits suck much less. :3
2009-05-17 10:34:41 -07:00
Corbin Simpson
8dae8f28e5
r300-gallium: r500-fs: Enable depth writes, kinda.
...
Should work, but doesn't. Hm.
2009-05-17 10:30:59 -07:00
Corbin Simpson
7e97219ff8
r300-gallium: Comment out useless debugging code.
...
Those parts are nearly solid compared to the shaders.
2009-05-17 09:44:14 -07:00
Corbin Simpson
764bf9501a
r300-gallium: vs: Dupe tokens, better debug, count spurious insts.
2009-05-17 09:39:06 -07:00
Corbin Simpson
08ec7e0d32
r300-gallium: Die on bad texture formats.
...
Odds are good that we'll die later anyway, so we might as well do it before
we start dancing on random memory.
2009-05-16 11:17:05 -07:00
Corbin Simpson
17b395638b
r300-gallium: Update floating-point params too.
...
Even though we *can* render 10,000-pixel-wide lines, let's not advertise it.
2009-05-16 10:56:17 -07:00
Corbin Simpson
13f8e7bc9c
r300-gallium: Update screen caps.
...
Anisotropic filtering should work, and OQ is broken.
2009-05-16 10:46:55 -07:00
Corbin Simpson
0e8c6e56e4
intel-gallium: Fix trace_drm integration.
...
Compile-tested only, sorry.
2009-05-16 10:07:58 -07:00
Corbin Simpson
5e39a8c450
Create common trace_drm code, add to radeon_winsys.
2009-05-16 10:07:58 -07:00
Corbin Simpson
13131adbf1
r300-gallium: Various cleanups leftover from before.
...
BEGIN/END_CS pair, a few asserts, and a slightly more correct VTE setup.
2009-05-16 10:07:58 -07:00
Keith Whitwell
57fd202375
gallium: remove occlusion_count flag from depth-stencil state
...
Drivers can just keep track of whether they are within a query
by monitoring the begin/end query callbacks. The flag adds no
information beyond that.
Only softpipe was examining this flag -- it has been fixed up
and retested with demos/arbocclude.
2009-05-16 17:26:39 +01:00
Maciej Cencora
73d2a4a047
r300: cleanup vertex program related functions
...
- move vertex program related functions to r300_vertprog.c
- use _mesa_bitcount instead of self-made bit_count function
- remove duplicated field in r300_vertex_shader_fragment.body union
- rename r300_vertex_shader_fragment to r300_vertex_shader_hw_code
- rename r300_vertex_program field native to error
- remove unnecessary r300_vertex_shader_state structure
- remove unused r300_vertex_program and r300_vertex_program_cont fields
- remove disabled code
2009-05-16 11:42:03 -04:00
Maciej Cencora
1b49f1ca7f
r300: minor code movement
2009-05-16 11:42:03 -04:00
Maciej Cencora
f8c30793d1
r300: more cleanup
...
- remove unnecessary r300TranslateFragmentShader call from r300UpdateShaderStates (it is already called in r300UpdateShaders)
- remove unnecessary null ptr checks
2009-05-16 11:42:03 -04:00
Maciej Cencora
1961caeda8
r300: move some code to common path
2009-05-16 11:42:03 -04:00
Maciej Cencora
12ed56f1dd
r300: rename functions
...
Be consistent with function naming: use Setup/Emit names for functions that modify hardware state
2009-05-16 11:42:03 -04:00
Maciej Cencora
6f1a86ca1e
r300: move forward declarations to where they belong
2009-05-16 11:42:02 -04:00
Maciej Cencora
2240c0d333
r300: software fallbacking handling rewrite
...
Until now falling back to software rasterizer worked only for TCL enabled cards.
For non TCL cards we used to plug our rendering functions in r300InitSwtcl, and we had never restored original functions for software rasterizer.
2009-05-16 11:42:02 -04:00
Maciej Cencora
621f65ab86
r300: r300EmitArrays should never fail
2009-05-16 11:42:02 -04:00
Maciej Cencora
d6da805c4e
r300: remove unnecessary switch cases
2009-05-16 11:42:02 -04:00
Maciej Cencora
42f16aa4e0
r300: further cleanup
...
- move extensions init into seperate function
- move options handling into seperate function
- create new structure to hold options values
- use context->options.hw_tcl_enabled field instead of global hw_tcl_on and future_hw_tcl_on variables
2009-05-16 11:42:02 -04:00
Jakob Bornecrantz
3259f52a92
gallium-intel: Enable trace driver
2009-05-16 01:51:30 +01:00
Jakob Bornecrantz
f04c38fa1f
trace: Export enabled status
2009-05-16 01:50:53 +01:00
Jakob Bornecrantz
ee05658798
trace: Unwrap buffer in texture_blanket
2009-05-16 01:50:53 +01:00
Jakob Bornecrantz
ab95f389a5
trace: If either shader is disabled don't draw
2009-05-16 01:50:53 +01:00
Jakob Bornecrantz
3b4da4e9da
trace: Put shaders on a list in the context
2009-05-16 01:50:53 +01:00
Jakob Bornecrantz
c30f661189
trace: Move state dump functions to tr_dump_state.[c|h]
2009-05-16 01:50:53 +01:00
Eric Anholt
22690482e6
intel: Don't complain on falling back from PBO fastpaths.
...
Instead, stash the debug info under the handy debug flag.
Bug #20053
2009-05-15 17:32:21 -07:00
Richard Li
2a7a2c6b77
Fix r6 code bugs.
2009-05-15 19:49:17 -04:00
Eric Anholt
0307e609aa
mesa: Mark FBOs with compressed color attachments as FBO-incomplete.
...
Both EXT_fbo and ARB_fbo agree on this. Fixes a segfault in the metaops
mipmap generation in Intel for SGIS_generate_mipmap of S3TC textures in
Regnum Online.
Bug #21654 .
2009-05-15 16:47:37 -07:00
Jakob Bornecrantz
97ccdee68a
gallium-intel: Build with scons
2009-05-15 22:54:07 +01:00
Jakob Bornecrantz
c4538e326a
st/egl: Use proper Makefile
2009-05-15 22:52:30 +01:00
Steinar H. Gunderson
b197a8ade3
i915: Fix 945 cube map layout for the small mipmaps along the bottom.
...
Bug #21691 .
2009-05-15 12:50:11 -07:00
Eric Anholt
4c6f829899
i915: Use Stencil.Enabled instead of Stencil._Enabled in DrawBuffers.
...
The _Enabled field isn't updated at the point that DrawBuffers is called,
and the Driver.Enable() function does the testing for stencil buffer
presence anyway.
bug #21608 for Radeon
2009-05-15 12:45:33 -07:00
Eric Anholt
5c5a468848
i915: Only use the new 945 cube layout for compressed textures.
...
The docs actually explain this, but not in a terribly clear manner.
This nearly fixes the piglit cubemap testcase, except that something's
going wrong with the nearest filtering at 2x2 sizes in the testcase.
Looks good by visual inspection, though.
Bug #21692
2009-05-15 11:43:39 -07:00
Brian Paul
d1fcb4a263
docs 7.4.2 tarball md5 sums
2009-05-15 06:32:24 -06:00
Brian Paul
da709f163f
docs: set 7.4.2 release date
2009-05-15 06:21:56 -06:00
Brian Paul
3a1bcbe579
mesa: bump version to 7.4.2
2009-05-14 13:20:13 -06:00
Eric Anholt
dc657f3929
i965: Fix varying payload reg assignment for the non-GLSL-instructions path.
...
I don't have a testcase for this, but it seems clearly wrong.
2009-05-14 11:41:04 -07:00
Eric Anholt
0f5113deed
i965: Fix register allocation of GLSL fp inputs.
...
Before, if the VP output something that is in the attributes coming into
the WM but which isn't used by the WM, then WM would end up reading subsequent
varyings from the wrong places. This was visible with a GLSL demo
using gl_PointSize in the VS and a varying in the WM, as point size is in
the VUE but not used by the WM. There is now a regression test in piglit,
glsl-unused-varying.
2009-05-14 11:41:04 -07:00
Eric Anholt
64980125c7
intel: Use FRONT_AND_BACK for StencilOp as well.
2009-05-14 11:41:04 -07:00
Eric Anholt
d866abeffc
intel: Use GL_FRONT_AND_BACK for stencil clearing.
...
This comes from a radeon-rewrite fallback fix, but may also fix stencil
clear failure when the polygon winding mode is flipped.
2009-05-14 11:41:03 -07:00
Corbin Simpson
96922d1b71
r300-gallium: Correct VTE setup for surface_fill, make surface_copy emit right.
2009-05-14 09:47:07 -07:00
Robert Ellison
ab6c4fa582
i965: fix 1D texture borders with GL_CLAMP_TO_BORDER
...
With 1D textures, GL_TEXTURE_WRAP_T should be ignored (only
GL_TEXTURE_WRAP_S should be respected). But the i965 hardware
seems to follow the value of GL_TEXTURE_WRAP_T even when sampling
1D textures.
This fix forces GL_TEXTURE_WRAP_T to be GL_REPEAT whenever 1D
textures are used; this allows the texture to be sampled
correctly, avoiding "imaginary" border elements in the T direction.
This bug was demonstrated in the Piglit tex1d-2dborder test.
With this fix, that test passes.
2009-05-14 10:36:33 -06:00
Robert Ellison
bc3270e99f
i965: send all warnings through _mesa_warning()
...
One warning message:
drm_i915_getparam: -22
was still being sent to fprintf(). This causes all Piglit tests to fail,
even with MESA_DEBUG=0.
Using _mesa_warning() to emit the message allows the general Mesa controls
for messages like this to be applied.
2009-05-14 10:36:33 -06:00
Jerome Glisse
76a64958a4
r300: don't send now forbidden register to kernel when with memory manager
2009-05-14 17:25:24 +02:00
Corbin Simpson
d3912e301f
r300-gallium: Clean up outdated comments.
2009-05-13 17:24:47 -07:00
Corbin Simpson
15601e9702
r300-gallium: Space accounting for textures.
2009-05-13 17:01:03 -07:00
Alex Deucher
7cd57e35b6
R1xx/r2xx: Don't use an alpha texture format for GLX_TEXTURE_FORMAT_RGB_EXT
...
In r*00SetTexBuffer2(), if the passed in text glx_texture_format
is GLX_TEXTURE_FORMAT_RGB_EXT, then we should use an RGB-only
texture format, even if the DRI buffer has four channels.
https://bugs.freedesktop.org/show_bug.cgi?id=21609
2009-05-13 19:43:04 -04:00
Owen W. Taylor
ca792be42b
radeon: Don't crash generating mipmaps when pixels=NULL
...
When a NULL value of pixels is passed to TexImage2D and
SGIS_generate_mipmap is enabled, don't try to generate the
mipmap tree: we don't have data yet for the texture and will
crash.
https://bugs.freedesktop.org/show_bug.cgi?id=21648
2009-05-13 19:06:24 -04:00
Owen W. Taylor
ea6a74abbe
Don't use an alpha texture format for GLX_TEXTURE_FORMAT_RGB_EXT
...
In r300SetTexBuffer2(), if the passed in text glx_texture_format
is GLX_TEXTURE_FORMAT_RGB_EXT, then we should use an RGB-only
texture format, even if the DRI buffer has four channels.
https://bugs.freedesktop.org/show_bug.cgi?id=21609
2009-05-13 19:04:18 -04:00
Owen W. Taylor
34eab5dd9c
Call _mesa_update_stencil() before accessing ctx->Stencil._Enabled
...
ctx->Stencil._Enabled is derived state and not immediately updated
when the stencil parameters are changed; we need to make sure that
it is up-to-date before accessing it.
https://bugs.freedesktop.org/show_bug.cgi?id=21608
2009-05-13 19:02:51 -04:00
Owen W. Taylor
038f0bf591
Remove subpixel offset from viewport
...
Remove an eigth-pixel offset of the viewport inherited from
R100 code. This seems not to be necessary and causes blurring
when sampling textures 1:1.
https://bugs.freedesktop.org/show_bug.cgi?id=20340
2009-05-13 18:57:47 -04:00
Brian Paul
ec863602f2
i965: fix render to FBO/texture orientation bugs
...
Anytime we're not rendering to the default/window FBO, need to invert
rendering, not just when rendering to a texture. Otherwise, if a FBO
consists of a mix of textures and renderbuffers the up/down orientation
was inconsistant.
Fixes shadowtex.c bad rendering.
(cherry picked from commit ba367f68cc )
2009-05-13 14:13:46 -07:00
Brian Paul
ca327b1688
Merge branch 'mesa_7_5_branch'
2009-05-13 11:33:52 -06:00
Brian Paul
ac5bf63f74
docs: GL_APPLE_vertex_array_object for Gallium drivers and Intel DRI drivers
2009-05-13 11:24:11 -06:00
Brian Paul
a566b6d8ff
intel: enable GL_APPLE_vertex_array_object
...
No special driver changes are needed for this extension.
2009-05-13 11:19:33 -06:00
Brian Paul
a892acef98
st/mesa: enable GL_APPLE_vertex_array_object for gallium drivers
2009-05-13 11:22:21 -06:00
Brian Paul
3039acfc5d
Merge branch 'mesa_7_5_branch'
...
Conflicts:
src/mesa/main/arrayobj.c
src/mesa/main/arrayobj.h
src/mesa/main/context.c
2009-05-13 10:33:21 -06:00
Brian Paul
10c4a10b97
i965: enable additional code in emit_fb_write()
...
Not 100% sure this is right, but the invalid assertion is fixed...
2009-05-12 15:14:34 -06:00
Brian Paul
5590798f6d
i965: increase BRW_EU_MAX_INSN
2009-05-12 15:14:34 -06:00
Brian Paul
4d244fb899
i965: comment
2009-05-12 15:14:34 -06:00
Joakim Sindholt
167a6b0804
r300-gallium: add missing semicolon
...
Yeah, that was stupid
2009-05-12 22:01:59 +02:00
Joakim Sindholt
62c0c7d81a
r300-gallium: duplicate tokens in create_fs_state
...
This was all phoenix64's idea. Credit goes to him
2009-05-12 21:41:48 +02:00
Joakim Sindholt
723bc9452f
progs/trivial: update .gitignore with new binaries
2009-05-12 21:00:39 +02:00
Eric Anholt
d4a42b0ce6
intel: Skip the DRI2 renderbuffer update when doing Viewport on an FBO.
2009-05-12 10:21:00 -07:00
Eric Anholt
aa422b2625
intel: Map write-only buffer objects through the GTT when possible.
...
This looks to be a win of a few percent in cairogears with new vbo code,
thanks to not polluting caches.
2009-05-12 10:08:19 -07:00
Eric Anholt
0fc5fa85bf
i915: Fix driver after HW glGenerateMipmap commit.
2009-05-12 10:08:19 -07:00
Brian Paul
6d63dec41f
swrast: update/restore the opt_sample_rgb/rgba_2d() functions
2009-05-12 09:05:31 -06:00
Jerome Glisse
c514c1f994
radeon: glReadBuffer set _NEW_BUFFERS, not _NEW_PIXEL
...
This was broken with last merge see 62043b2757
for explanations
2009-05-12 13:05:57 +02:00
Jerome Glisse
05c19ec7f0
r300/r500: make sure we detect constant buffer changes
...
This was broken with last merge see f48473e425
for explanations.
2009-05-12 13:04:32 +02:00
Tormod Volden
0bfa8dfaaf
radeon: avoid segfault in radeon_update_renderbuffers() if using DRI1
...
Basically the same as 43d9020ff1 for intel. Bug 21688.
Signed-off-by: Tormod Volden <debian.tormod@gmail.com >
2009-05-12 12:43:08 +02:00
Brian Paul
e7cb125b2d
Merge branch 'mesa_7_5_branch'
...
Conflicts:
Makefile
src/mesa/main/version.h
2009-05-11 16:27:50 -06:00
Joakim Sindholt
783e43064b
r300-gallium: unbreak build
2009-05-11 21:44:49 +02:00
Corbin Simpson
64f60bc046
r300-gallium: Setup surface in r300_surface_copy.
...
I haven't tested, but this may unbreak surface copies.
2009-05-11 10:09:59 -07:00
Corbin Simpson
b315ec43ee
r300-gallium: Cleanup some compile warnings.
2009-05-11 10:07:40 -07:00
Corbin Simpson
e9f8b7f1b9
r300-gallium: Cleanup PSC for HW TCL.
...
Still dies in assert, but at least it's not my assert anymore. :3
2009-05-11 09:57:57 -07:00
Corbin Simpson
f38a02212f
radeon-gallium: Forgot a typedef.
2009-05-11 09:55:28 -07:00
Corbin Simpson
2e22bd8460
radeon-gallium: Support new info ioctls in addition to classic getparams.
...
This makes non-hybrid kernels like newttm from drm-next-radeon work
while avoiding breakage with Fedora/Ubuntu/etc.
2009-05-11 09:05:33 -07:00
Brian Paul
7c3d7353d7
mesa: updated comments for _mesa_generate_mipmap()
2009-05-11 10:02:27 -06:00
Brian Paul
2ff47b80f5
docs: updated bug fix list for 7.4.2
2009-05-11 09:49:46 -06:00
Brian Paul
6697311b21
i965: handle extended swizzle terms (0,1) in get_src_reg()
...
Fixes failed assertion in progs/glsl/twoside.c (but still wrong rendering).
2009-05-11 09:47:32 -06:00
Brian Paul
7c2fe42ded
mesa: better handling/printing of driver-specific opcodes, register files
...
Drivers such as i965 define extra instruction opcodes and register files.
Improve the program printing code to handle those opcodes/files better.
2009-05-11 09:47:32 -06:00
Brian Paul
63cde0ea0e
mesa: Fixed a texture memory leak
...
The current texture for any particular texture unit is given an additional
reference in update_texture_state(); but if the context is closed before
that texture can be released (which is quite frequent in normal use, unless
a program unbinds and deletes the texture and renders without it to force
a call to update_texture_state(), the memory is lost.
This affects general Mesa; but the i965 is particularly affected because
it allocates a considerable amount of additional memory for each allocated
texture.
(cherry picked from master, commit c230767d69 )
2009-05-11 09:47:17 -06:00
Joel Bosveld
98bb5c610d
radeon: add support for new dri2 interfaces & fix single buffer rendering
2009-05-10 18:26:40 +02:00
Jerome Glisse
221b30d595
Merge commit 'origin/master' into radeon-rewrite
...
Conflicts:
src/mesa/drivers/dri/r200/r200_state.c
src/mesa/drivers/dri/r300/r300_context.h
src/mesa/drivers/dri/r300/r300_fragprog.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r300_texmem.c
src/mesa/drivers/dri/r300/r300_texstate.c
src/mesa/drivers/dri/r300/r500_fragprog.c
src/mesa/drivers/dri/radeon/radeon_screen.c
src/mesa/drivers/dri/radeon/radeon_state.c
2009-05-10 16:57:22 +02:00
Brice Goglin
ab885d7088
Enable motif in GLw
2009-05-09 20:49:15 +02:00
Jerome Glisse
13e0ff0df1
radeon: don't include cs uncondionaly
2009-05-09 12:56:27 +02:00
Corbin Simpson
53c2cc8fef
radeon-gallium: Clean up some of the BO counting logic.
2009-05-09 00:45:48 -07:00
Corbin Simpson
a738d2b4c2
r300-gallium: vs: Make imms work, cleanup some of the switches.
2009-05-09 00:45:48 -07:00
Corbin Simpson
c4c5bf31a7
r300-gallium: Start VS dumper.
2009-05-09 00:45:48 -07:00
Corbin Simpson
7e347a0f49
r300-gallium: vs: Add SLT, clean up MAX.
...
This should be all the opcodes for basic TCL.
2009-05-09 00:45:48 -07:00
Corbin Simpson
9b10777148
r300-gallium: vs: Add MAX.
2009-05-09 00:45:48 -07:00
Corbin Simpson
e669ce01d4
r300-gallium: vs: Add scalar setup, RSQ.
...
Icky icky icky icky. Icky icky, icky icky. Icky.
2009-05-09 00:45:48 -07:00
Corbin Simpson
c6d2b4a495
r300-gallium: vs: Add writemasks.
2009-05-09 00:45:47 -07:00
Corbin Simpson
ce758a21b9
r300-gallium: Fix bad cast. Space accounting completely works now.
...
Boy, is my face red. :C
2009-05-08 22:05:18 -07:00
Corbin Simpson
1b26c2bbae
r300-gallium, radeon: BO handling fixes, some useful asserts.
2009-05-08 19:41:08 -07:00
Corbin Simpson
bed917641c
radeon-gallium: Shut up Valgrind.
2009-05-08 19:41:08 -07:00
Corbin Simpson
cd59933d9f
r300-gallium, radeon: A couple cleanups.
...
Trying to track down goddamn bugs. :C
2009-05-08 19:41:08 -07:00
Corbin Simpson
4816764777
r300-gallium: Finish space accounting.
...
Still broken...
2009-05-08 19:41:08 -07:00
Richard Li
e2dcebd2e6
R6xx/R7xx: WIP r6xx-rewrite code
2009-05-08 19:23:45 -04:00
Robert Ellison
1d11220771
i965: improve debug logging
...
Looking for memory leaks that were causing crashes in my environment
in a situation where valgrind would not work, I ended up improving
the i965 debug traces so I could better see where the memory was
being allocated and where it was going, in the regions and miptrees
code, and in the state caches. These traces were specific enough
that external scripts could determine what elements were not being
released, and where the memory leaks were.
I also ended up creating my own backtrace code in intel_regions.c,
to determine exactly where regions were being allocated and for what,
since valgrind wasn't working. Because it was useful, I left it in,
but disabled and compiled out. It can be activated by changing a flag
at the top of the file.
2009-05-08 16:57:08 -06:00
Robert Ellison
fc6d89145d
i965: fix memory leak in context/renderbuffer region management
...
A temporary change to the intelMakeCurrent() function to make
it work with frame buffer objects causes the static regions
associated with the context (the front_region, back_region,
and depth_region) to take on an additional reference, with
no corresponding release. This causes a memory leak if a
program repeatedly creates and destroys contexts.
The fix is the corresponding hack, to unreference these
regions when the context is deleted, but only if the
framebuffer objects are still present and the same
regions are still referenced within.
Both sets of code have comment blocks referring to each
other.
2009-05-08 16:47:59 -06:00
Robert Ellison
44a4abfd4f
i965: fix segfault on low memory conditions
...
When out of memory (in at least one case, triggered by a longrunning
memory leak), this code will segfault and crash. By checking for the
out-of-memory condition, the system can continue, and will report
the out-of-memory error later, a much preferable outcome.
2009-05-08 16:32:29 -06:00
Robert Ellison
c230767d69
mesa: Fixed a texture memory leak
...
The current texture for any particular texture unit is given an additional
reference in update_texture_state(); but if the context is closed before
that texture can be released (which is quite frequent in normal use, unless
a program unbinds and deletes the texture and renders without it to force
a call to update_texture_state(), the memory is lost.
This affects general Mesa; but the i965 is particularly affected because
it allocates a considerable amount of additional memory for each allocated
texture.
2009-05-08 16:32:28 -06:00
Eric Anholt
1d663ae292
intel: Add a metaops version of glGenerateMipmapEXT/SGIS_generate_mipmaps.
...
In addition to being HW accelerated, it avoids the incorrect
(black) rendering of the mipmaps that SW was doing in fbo-generatemipmap.
Improves the performance of the mipmap generation and drawing in
fbo-generatemipmap by 30%.
2009-05-08 14:18:04 -07:00
Eric Anholt
b6e94f71c2
intel: Put the constant texcoords used in metaops into a vbo.
...
Make this be its own function for setup/teardown of the binding of these
texcoords. No performance difference in the engine demo (I just felt dirty
not using a VBO for this), and I think it should be more resilient to
interference from current GL state.
2009-05-08 14:18:04 -07:00
Brian Paul
f09e5a5b63
i965: const qualifiers
2009-05-08 14:34:27 -06:00
Brian Paul
4e762395ef
mesa: raise MAX_VARYING (number of shader varying vars) to 16
...
16 is the limit for now because of various 32-bit bitfields.
2009-05-08 14:35:48 -06:00
Brian Paul
17a354a119
mesa: assertions to check for too many vertex outputs or fragment inputs
2009-05-08 14:35:48 -06:00
Brian Paul
cc58fbcf2c
glsl: check number of varying variables against the limit
...
Link fails if too many varying vars.
2009-05-08 14:35:48 -06:00
Brian Paul
87fbc9a14e
mesa: issue warning for out of bounds array indexes
2009-05-08 12:45:08 -06:00
Brian Paul
e2cf522de0
i965: don't use GRF regs 126,127 for WM programs
...
They seem to be used for something else and using them for shader temps
seems to lead to GPU lock-ups.
Call _mesa_warning() when we run out of temps.
Also, clean up some debug code.
2009-05-08 12:45:08 -06:00
Brian Paul
40cba5489d
glsl: set vertex/fragment program Ids to aid with debugging
2009-05-08 12:45:08 -06:00
Brian Paul
ccaa6463a7
mesa: more shader debug code (disabled)
2009-05-08 12:45:08 -06:00
Jerome Glisse
a67c29a268
radeon: IRQ always enabled in DRI2 path no need to query kernel for it
2009-05-08 16:40:21 +02:00
Keith Whitwell
d5c2ad8514
mesa/st: keep surface_copy arguments positive
...
The src/dest x,y, and w,h arguments of the pipe->surface_copy
function are unsigned and the drivers aren't expecting negative
(or extremly-large unsigned) values as inputs. Trim the requests
at the state-tracker level before passing down.
2009-05-08 10:04:14 +01:00
Keith Whitwell
6826bad6a7
mesa/st: remove redundant call to st_finish in CopyTexSubImage
...
Rendering should already have been flushed, any synchronization will
be done by the driver or memory manager.
2009-05-08 10:04:14 +01:00
José Fonseca
626b6f37ea
wgl: Export pixelformats with accumulation bits.
2009-05-08 10:04:14 +01:00
Keith Whitwell
01280cff53
mesa/st: cope with non-ibo index data in st_draw_feedback.c
...
Previously only non-indexed or indicies-in-a-vbo cases were handled in
this code. This change adds the missing regular indices-in-memory
case.
2009-05-08 10:04:14 +01:00
Keith Whitwell
4a333c64fa
util/upload: catch failures to map_range and return error
...
Caller may be able to do something about this - eg flush and retry.
2009-05-08 10:04:14 +01:00
Keith Whitwell
5f5181021e
scons: mingw is broken with -O1 and higher
2009-05-08 10:04:13 +01:00
Keith Whitwell
48c7aa2648
stw: fix potential uninitialized use of curctx
2009-05-08 10:04:13 +01:00
José Fonseca
26ffd44586
wgl: Enforce a minimum 1x1 framebuffer size.
2009-05-08 10:04:13 +01:00
José Fonseca
3a43ea4946
wgl: Add assertion for missing function.
2009-05-08 10:04:13 +01:00
José Fonseca
082a086e9d
wgl: Remove unused variable.
2009-05-08 10:04:13 +01:00
José Fonseca
b25168c34c
mesa: Make _mesa_share_state thread safe.
2009-05-08 10:04:13 +01:00
José Fonseca
25a4156a8b
wgl: Implement ShareLists.
2009-05-08 10:04:13 +01:00
Maciej Cencora
a7bb95bf14
r300: add missing texture format
...
Fixes piglit/texdepth
2009-05-07 20:15:45 -04:00
Maciej Cencora
dc8c717759
r300: moar cleanup
...
- remove unused r300UpdateClipPlanes function
- move reg definition to r300_reg.h
- remove incorrect forward definition of tnl_UpdateFixedFunctionProgram and add proper #include
- remove unreachable code
2009-05-07 20:15:40 -04:00
Maciej Cencora
14365aa0ef
r300: fix compiler warnings
2009-05-07 20:15:34 -04:00
Ben Skeggs
71b1c92405
nouveau: respect GALLIUM_STATE_TRACKERS_DIRS
2009-05-08 09:33:02 +10:00
Ben Skeggs
9e02fa4532
nouveau: remove dri1 code now we're using the dri state tracker
2009-05-08 09:33:02 +10:00
Ben Skeggs
b7f2b7e936
nouveau: use dri state tracker for dri1
2009-05-08 09:32:56 +10:00
Brian Paul
fa95ecb467
mesa: make the array object save/remove functions static
2009-05-07 14:34:09 -06:00
Brian Paul
32b851c807
mesa: clean-up vertex array object VBO unbinding and delete/refcounting
...
Don't really delete vertex array objects until the refcount hits zero.
At that time, unbind any pointers to VBOs.
2009-05-07 14:34:09 -06:00
Brian Paul
56cfa4de91
demos: delete vertex array objects upon exit
2009-05-07 14:34:09 -06:00
Brian Paul
1030bf0ded
mesa: reference counting for gl_array_object
...
Every kind of object that can be shared by multiple contexts should be
refcounted.
2009-05-07 14:34:09 -06:00
Brian Paul
9bb6684799
mesa: array object comments
2009-05-07 14:34:09 -06:00
Brian Paul
4f6b704f97
mesa: move the NullBufferObj from GLcontext to gl_shared_state
...
Since shared array objects may point to the null/default buffer object,
the null/default buffer object should be part of the shared state.
2009-05-07 14:34:09 -06:00
Brian Paul
105c8529e7
mesa: fix comments, s/texture/buffer/
2009-05-07 14:34:09 -06:00
Brian Paul
f37cccde3c
vbo: in glDraw[Range]Element() code, check for out of bounds indexes
...
No-op the bad drawing command rather than go out of bounds and render
garbage. Print a warning to alert the developer to the bad drawing call.
2009-05-07 11:01:02 -06:00
Brian Paul
6359ecebec
mesa: remove unused gl_buffer_object::OnCard field
2009-05-07 10:12:33 -06:00
Brian Paul
dcca97a3e3
mesa: added gl_buffer_object::Written flag (for debug purposes)
...
The flag is set when we data has been written into the buffer object.
2009-05-07 10:12:33 -06:00
Brian Paul
b9d0f947f2
mesa: Compute gl_client_array->_MaxElement during array validation
...
Used to be done in the glVertex/Normal/Color/etc/Pointer() calls but
if the VBO was reallocated the size could change.
New _NEW_BUFFER_OBJECT state flag.
2009-05-07 10:12:33 -06:00
Brian Paul
800b14cd37
mesa: GLvector4f:: flags is a GLbitfield, update comments too.
2009-05-07 10:12:33 -06:00
Brian Paul
1f75c2daea
mesa: add storage_count field to GLvector4f. Useful for debugging.
2009-05-07 10:12:33 -06:00
Brian Paul
828aa76f36
mesa: use array->BufferObj instead of ctx->Array.ArrayBufferObj
...
No difference, but a little more understandable.
2009-05-07 10:12:33 -06:00
Brian Paul
0077c879b5
mesa: added _ElementSize field to gl_client_array
...
Will be handy for bounds checking later...
2009-05-07 10:12:33 -06:00
Brian Paul
a6c8e900af
mesa: use local var to make code a bit more concise
2009-05-07 10:12:33 -06:00
Brian Paul
b102c1d8f9
mesa: fix/add comments
2009-05-07 10:12:33 -06:00
Brian Paul
7e3bd457e8
mesa: use _mesa_sizeof_type() in vbo split code
2009-05-07 10:12:33 -06:00
Brian Paul
3acdab82cb
mesa: vbo code reformatting, clean-up, comments
2009-05-07 10:12:33 -06:00
Brian Paul
87ba2285fe
mesa: add GL_DOUBLE case in _mesa_sizeof_type()
2009-05-07 10:12:32 -06:00
Brian Paul
2369f14245
mesa: in vbo split code, map buffers read-only, not write-only
...
And use GL_ELEMENT_ARRAY_BUFFER where appropriate.
2009-05-07 10:12:32 -06:00
Brian Paul
74bec42b45
mesa: limit number of error raised by invalid GL_TEXTURE_MAX_ANISOTROPY_EXT
2009-05-07 10:12:32 -06:00
Brian Paul
ad32489987
tnl: added some clip debug/print code (disabled)
2009-05-07 10:12:32 -06:00
Brian Paul
424507953c
mesa: reformatting, updated comments, const-correctness
2009-05-07 10:12:32 -06:00
Brian Paul
134ac52dec
tnl: replace 0x3f with CILP_FRUSTUM_BITS
2009-05-07 10:12:32 -06:00
Brian Paul
f56893ea17
i965: relAddr local var (to make debug/test a little easier)
2009-05-07 09:59:13 -06:00
Brian Paul
9a4890dac7
Merge branch 'mesa_7_5_branch'
2009-05-07 09:46:53 -06:00
Eric Anholt
3d048e5750
i965: Remove bad constant buffer constant-reg-already-loaded optimization.
...
Thanks to branching, the state of c->current_const[i].index at the point
of emitting constant loads for this instruction may not match the actual
constant currently loaded in the reg at runtime. Fixes a regression in my
GLSL program for idr's class since b58b3a786a .
2009-05-06 21:44:13 -07:00
Eric Anholt
156a79f5bd
intel: Unmap buffers if needed at DeleteBuffer time.
...
This fixes a crash in glean's pbo test, which tripped over the assert when a
context was destroyed while a buffer was still mapped (Mesa doesn't call
UnmapBuffer in that case). Regression in
c6bde8873f
2009-05-06 20:44:34 -07:00
Owen W. Taylor
cfc3ac8d6e
When clearing the stencil buffer, don't use a two-sided stencil
...
In radeon_clear_tris(), when clearing the stencil buffer,
pass GL_FRONT_AND_BACK to _mesa_StencilFuncSeparate(), to avoid
triggering a software fallback on r300 and below.
https://bugs.freedesktop.org/show_bug.cgi?id=21601
2009-05-06 17:10:06 -04:00
Brian Paul
58544a28ad
mesa: remove unnecessary buffer size check
2009-05-06 12:38:35 -06:00
Brian Paul
bb1fb2a544
mesa: code consolidation in glDraw[Range]Elements() validation
2009-05-06 12:38:35 -06:00
Brian Paul
88af3f8783
mesa: new comments, minor reformatting
2009-05-06 12:38:35 -06:00
Brian Paul
a13df193c2
mesa: use elementBuf local var instead of ctx->Array.ElementArrayBufferObj
...
Makes no real difference, but more consistant.
2009-05-06 12:38:35 -06:00
Eric Anholt
f831d2d41b
i965: Remove the forced lack of caching for renderbuffer surface state.
...
This snuck in with the multi-draw-buffers commit, and is a major penalty
to performance. It doesn't appear to be required, as the only dependency
the surface BO has is on the state key (and if there's some other dependency,
it should just be in the key).
This brings openarena performance up to almost 2% faster than Mesa 7.4.
2009-05-06 10:54:32 -07:00
Eric Anholt
4cb87840ff
i965: Remove _NEW_PROGRAM from brw_wm_surfaces setup dependencies.
...
This was a leftover from the brw_wm_constant_buffer change.
2009-05-06 10:54:32 -07:00
Brian Paul
9b678af796
mesa: be smarter about allocating vert/frag program constants
...
Try to re-use constants/literals more often to make best use of the
constant buffer space.
See bug 21354.
2009-05-06 08:53:41 -06:00
Eric Anholt
71fb9d62ec
i965: Split WM constant buffer update from other WM surfaces.
...
This can avoid re-uploading constant data when it isn't necessary, and is
a step towards not updating other surfaces just because constants change.
It also brings the upload of the constant buffer next to the creation.
This brings openarena performance up another 4%, to 91% of the Mesa 7.4 branch.
2009-05-06 06:44:14 -07:00
Eric Anholt
9490d86808
i965: Disentangle VS constant surface state from WM surface state.
...
Also, only create VS surface state if there's a VS constant buffer to be
uploaded, and set the contents of the buffer at the same time as creation.
2009-05-06 06:44:14 -07:00
Eric Anholt
d277547dc6
i965: Don't create constant buffers if they won't be used.
...
Really, the creation and upload of constants should be in the same place,
since they should only happen together, and a state flag should be
triggered by them so that we don't thrash state around so much for just
updating constants. But this still recovers openarena performance by
another 19%, leaving us 16% behind Mesa 7.4 branch.
2009-05-06 06:44:13 -07:00
Dave Airlie
7f65fea95e
radeon: hopefully fixup radeon cube state emission for kms
2009-05-06 14:43:07 +10:00
Dave Airlie
d7f62e5405
r100/r200: try and allocate miptree correct for hw.
...
This doesn't make things worse but according to sroland it
is how the GPU hw expects things on the r100/r200
2009-05-06 14:06:13 +10:00
Dave Airlie
acf086ebfa
r200: fix cubic emission.
...
Still doesn't fix cubemaps, I really missed the whole drmsupports
thing when testing this all originally
2009-05-06 13:34:34 +10:00
Brian Paul
51325f44d1
mesa: only use fallback texture when using shaders, not fixed-function (take two)
...
The semantics are a little different for shaders vs. fixed-function when
trying to use an incomplete texture. The fallback texture returning
(0,0,0,1) should only be used with shaders. For fixed function, the texture
unit is truly disabled/ignored.
Fixes glean fbo test regression.
2009-05-05 16:31:44 -06:00
Brian Paul
823815a485
Revert "mesa: only use fallback texture when using shaders, not fixed-function"
...
This reverts commit a0edbfb28f .
This patch didn't completely fix the problem. The next patch will.
2009-05-05 16:30:30 -06:00
Brian Paul
a0edbfb28f
mesa: only use fallback texture when using shaders, not fixed-function
...
The semantics are a little different for shaders vs. fixed-function when
trying to use an incomplete texture. The fallback texture returning
(0,0,0,1) should only be used with shaders.
Fixes glean fbo test regression.
2009-05-05 16:29:04 -06:00
Brian Paul
01e16befd4
mesa: only use fallback texture when using shaders, not fixed-function
...
The semantics are a little different for shaders vs. fixed-function when
trying to use an incomplete texture. The fallback texture returning
(0,0,0,1) should only be used with shaders.
Fixes glean fbo test regression.
2009-05-05 16:21:20 -06:00
Brian Paul
c0d3761c16
mesa: minor simplification in enable_texture(), updated comments
2009-05-05 16:17:55 -06:00
Eric Anholt
c521d4629b
Flag GLSL programs as depending on constant state when they use uniforms.
...
This is not a cherry-pick, as it got fixed in master with the
_NEW_PROGRAM_CONSTANTS change. Fixes bad rendering with various GLSL programs
idr and I have been writing.
2009-05-05 12:14:29 -07:00
Roland Scheidegger
5f8381724e
r200: fix some cube map issues
...
remove the r100-ism of swapping cube faces which doesn't apply to r200,
and also use precalculated offsets.
Note that cube textures will still not work on r100 and r200 since mipmap
layout is level-first order (for r300) whereas r100/r200 require
face-first (and possibly also 2k alignment for face at least with tiling).
2009-05-05 21:01:36 +02:00
Roland Scheidegger
3503af07c4
r200: fix another section size mismatch
2009-05-05 20:17:37 +02:00
Brian Paul
b3fc832ac7
Merge branch 'mesa_7_5_branch'
2009-05-05 10:13:13 -06:00
Brian Paul
95b7771ea7
gallium: remove redundant cube face #defines
2009-05-05 10:13:11 -06:00
Roland Scheidegger
b2577937b6
r200: fix CS section size mismatch (bug 21565)
2009-05-05 17:45:50 +02:00
Keith Whitwell
077c904b76
progs/trivial: add test for vertex program invarient transform
2009-05-05 13:14:54 +01:00
Keith Whitwell
113403ef51
mesa: more complete fix for transform_invarient glitches
...
Add a new flag mvp_with_dp4 in the context, and use that to switch
both ffvertex.c and programopt.c vertex transformation code to
either DP4 or MUL/MAD implementations.
2009-05-05 13:14:53 +01:00
Keith Whitwell
22b417b75c
mesa/main: set PREFER_DP4 to match position_invarient code
...
This is a quick fix for z fighting in quake4 caused by the mismatch
between vertex transformation here and in the position_invarient code.
Full fix would be to make this driver-tunable and adjust both
position_invarient and ffvertex_prog.c code to respect driver
preferences.
2009-05-05 13:14:52 +01:00
José Fonseca
c6bfb4c559
wgl: Implemente SwapLayerBuffers.
2009-05-05 13:14:51 +01:00
José Fonseca
e9fb90ab88
scons: Don't use deprecated Options.
2009-05-05 13:14:51 +01:00
José Fonseca
3537c3420d
util: Limit the stack walk to avoid referencing undefined memory.
2009-05-05 13:14:50 +01:00
Keith Whitwell
b865501bda
gallium/tgsi: hack around linker/archiver breakage
...
Add a dummy function which exists only so that tgsi_text_translate()
doesn't get magic-ed out of the libtgsi.a archive by the build system.
Don't remove unless you know this has been fixed - check on
mingw/scons builds as well.
2009-05-05 13:14:49 +01:00
Keith Whitwell
5f2569a1b9
progs/trivial: add vbo-noninterleaved test
2009-05-05 13:14:48 +01:00
José Fonseca
6b89c35c9f
wgl: Include alpha bits in pixel format's cColorBits field.
2009-05-05 13:14:47 +01:00
Keith Whitwell
c6b3c2f34b
gallium/draw: cope with unused vertex_elements
2009-05-05 13:14:46 +01:00
Keith Whitwell
4d548bd069
trivial: add line-flat.c
2009-05-05 13:14:45 +01:00
José Fonseca
ccec9f76d5
wgl: UINT_PTR null value is an integral type, so return 0 instead of NULL.
2009-05-05 13:14:44 +01:00
José Fonseca
a47f15ba1d
pb: Save the stack backtrace when creating/mapping a debug buffer.
2009-05-05 13:14:42 +01:00
José Fonseca
4fd6f296f8
pb: Dump the fenced buffer sizes.
2009-05-05 13:14:38 +01:00
Stephane Marchesin
8edb50ff1e
nv04: small fix again
2009-05-05 12:03:38 +02:00
Stephane Marchesin
39ebeead56
Fix an nv04 bug (thanks Mhopf).
2009-05-05 11:29:58 +02:00
Dave Airlie
f616995e5e
radeon/r200: enable all the optional drm support bits
2009-05-05 10:51:44 +10:00
Brian Paul
f95c0c06c0
mesa: also print program params/constants when dumping shaders to disk
2009-05-04 11:14:35 -06:00
Brian Paul
27dbdb1684
mesa: remove some unfinished/devel code
2009-05-04 11:13:35 -06:00
Maciej Cencora
0b22615c2c
r300: set proper texture row alignment for IGP chips
...
Looks like r400 based IGP chips require 64 byte alignment
2009-05-04 12:09:36 -04:00
Brian Paul
e9d5569bf3
glx: replace Xmalloc() calls with Xcalloc()
...
Fixes a bug where psp->WaitX was uninitialized. Reported by Chris Clayton.
(cherry picked from commit dd4c142e90 )
2009-05-04 08:34:20 -06:00
Julien Cristau
84ae506072
Don't build hardware dri drivers on s390.
2009-05-03 19:30:02 +02:00
Julien Cristau
4842cde28f
Prepare changelog for upload
2009-05-03 16:05:30 +02:00
Julien Cristau
b651c02dca
Fix Architecture field for libgl1-mesa-dri-dbg
2009-05-03 16:04:39 +02:00
Julien Cristau
ec44d955bb
Move -dbg packages to new 'debug' section.
2009-05-03 16:03:58 +02:00
Julien Cristau
914edc46fa
Update changelog
2009-05-03 14:31:05 +02:00
Julien Cristau
64cb29deca
Merge branch 'mesa_7_4_branch' of git.freedesktop.org:/git/mesa/mesa into debian-unstable
2009-05-03 14:26:30 +02:00
Brian Paul
6337525497
mesa: fix state validation bug for glCopyTex[Sub]Image()
...
We need to make sure the framebuffer state is up to date to make sure we
read pixels from the right buffer when doing a texture image copy.
(cherry-picked from master, commit 63f0130980 )
2009-05-01 20:24:39 -06:00
Brian Paul
986d4a9ec6
draw: added some inf/nan debug code (disabled)
2009-05-01 18:35:59 -06:00
Brian Paul
08bc3d1750
gallium/glx: say we're direct rendering
2009-05-01 18:35:59 -06:00
Brian Paul
62043b2757
mesa: in glReadBufer() set _NEW_BUFFERS, not _NEW_PIXEL
...
Since GL_READ_BUFFER is historically part of the gl_pixel_attrib group
it made sense to signal changes with _NEW_PIXEL. But now with FBOs it's
also part of the framebuffer state.
Now _NEW_PIXEL strictly indicates pixels transfer state changes.
This change avoids framebuffer state validation when any random bit of
pixel-transfer state is set.
DRI drivers updated too: don't check _NEW_COLOR when updating framebuffer
state. I think that was just copied from the Xlib driver because we care
about dither enable/disable state there.
2009-05-01 18:31:04 -06:00
Brian Paul
a7ef5b76d6
Merge branch 'mesa_7_5_branch'
2009-05-01 18:21:02 -06:00
Zack Rusin
54324d9e0c
vg: remove a silly demo and add a bit better one
2009-05-01 19:08:32 -04:00
Brian Paul
602833b107
st: if st_swapbuffers() is called for single-buffered visual don't crash
...
Furthermore, return pointer(s) to the front color buffer(s).
2009-05-01 16:44:04 -06:00
Brian Paul
b57b6c2d2c
xlib winsys: use new st_swapbuffers() function
...
The front/back buffer pointers are truly swapped (when there is an actual
front buffer).
This fixes some issues seen with apps/tests that draw to both the front
and back color buffers. The true swap allows us to avoid the (potentially)
slow surface_copy() call in update_framebuffer_state() and is cleaner
overall.
2009-05-01 12:54:20 -06:00
Brian Paul
3f52a853f7
st: when creating an on-demand front color buffer, init to back buffer image
...
When we create a new front color buffer (user called glDrawBuffer(GL_FRONT))
initialize it to the contents of the back buffer. Any previous call to
SwapBuffers() would have done that in effect, so make it reality.
2009-05-01 12:54:16 -06:00
Brian Paul
b85b315ebb
st: added st_renderbuffer::defined flag
...
Indicates whether there's defined image contents, or garbage/don't care.
This is set when we draw into a renderbuffer and cleared when we resize/
reallocate a renderbuffer or do a buffer swap (back buffer becomes undefined).
We use this to determine whether the front color buffer has been drawn to,
and whether to display its contents upon glFlush/Finish(), when the new
st_swapbuffers() function is used.
2009-05-01 12:25:42 -06:00
Brian Paul
30b3d80091
mesa: fix comment
2009-05-01 12:12:43 -06:00
Brian Paul
06cd826fcb
Merge branch 'mesa_7_5_branch'
2009-05-01 11:57:00 -06:00
Brian Paul
d6318ba8a8
docs: asst updates to openvg.html
2009-05-01 11:37:09 -06:00
Brian Paul
3534539557
set: new st_swapbuffers() which does a true front/back buffer swap
...
The pointers to the front/back renderbuffers are exchanged.
This new function isn't actually used yet...
2009-05-01 11:24:08 -06:00
Zack Rusin
544dd4b11f
OpenVG 1.0 State Tracker
...
Import of the OpenVG 1.0 state tracker for Gallium.
2009-05-01 12:51:59 -04:00
Zack Rusin
fbceedd2de
actually add debug to the debug config
2009-05-01 12:51:01 -04:00
José Fonseca
293f576db7
egl_xlib: Pass RTLD_LAZY to dlopen.
...
dlopen manpage mandates that either RTLD_LAZY or RTLD_NOW flags must be
passed. Not doing so was causing a NULL return on debian unstable x86-64.
2009-05-01 12:51:01 -04:00
Ian Romanick
2085cf2462
Test either GL_FRONT_LEFT or GL_FRONT for front-buffer rendering
...
For non-stereo visuals, which is all we support, we treat
GL_FRONT_LEFT as GL_FRONT. However, they are technically different,
and they have different enum values. Test for either one to determine
if we're in front-buffer rendering mode.
This fix was suggested by Pierre Willenbrock.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com >
2009-05-01 09:49:06 -07:00
Brian Paul
cd6734288d
st: when double buffered, only create front color buffer on demand
...
Before we always created the front color buffer, even if was never used.
This can save some memory.
2009-05-01 10:19:00 -06:00
Brian Paul
b9196c1fa3
Merge branch 'const-buffer-changes'
...
Conflicts:
src/mesa/drivers/dri/i965/brw_curbe.c
src/mesa/drivers/dri/i965/brw_vs_emit.c
src/mesa/drivers/dri/i965/brw_wm_glsl.c
2009-05-01 09:37:14 -06:00
Brian Paul
3f25219c7b
mesa: create/use a fallback texture when bound texture is incomplete
...
When a GLSL sampler reads from an incomplete texture it should
return (0,0,0,1). Instead of jumping through hoops in all the drivers
to make this happen, just create/install a fallback texture with those
texel values.
Fixes piglit/fp-incomplete-tex on i965 and more importantly, fixes some
GPU lockups when trying to sample from missing surfaces. If a binding
table entry is NULL, it seems that sampling sometimes works, but not
always (lockup).
Todo: create a fallback texture for each type of texture target?
2009-05-01 09:30:32 -06:00
Brian Paul
7ca0427338
docs: initial 7.6 release notes page
2009-05-01 09:24:19 -06:00
Brian Paul
666e5bf4a6
mesa: bump version to 7.6 (devel)
2009-05-01 09:22:20 -06:00
Brian Paul
7541c3806a
docs: fix typos
2009-04-30 17:08:37 -06:00
Michel Dänzer
a1ce4efefb
r300: Increase reference count of texture objects referenced by current state.
...
Fixes a use-after-free reported in
http://bugs.freedesktop.org/show_bug.cgi?id=20539 , so this possibly fixes that
bug. It has been confirmed to fix
http://bugs.freedesktop.org/show_bug.cgi?id=17895 .
(cherry picked from commit c28707b507 )
2009-04-30 13:50:36 +02:00
Brian Paul
dca190e943
mesa: added _mesa_check_soa_dependencies() function
...
This function will check an instruction to see if there's data dependencies
between the dst and src registers if executed in an SOA manner.
2009-04-29 13:04:42 -06:00
Brian Paul
656cd707db
mesa: Fix buffer overflow when parsing generic vertex attributes.
...
(cherry picked from master, commit fa92756400 )
2009-04-28 10:58:13 -06:00
Alex Deucher
55db6ce537
R300: add quadpipe overrides
...
RV410 SE chips only have 1 quadpipe.
Also, handle other R300 chip with quadpipe override.
2009-04-28 12:50:38 -04:00
Alex Deucher
ce7f78694d
R300: add quadpipe overrides
...
RV410 SE chips only have 1 quadpipe.
Also, handle other R300 chip with quadpipe override
2009-04-28 12:40:04 -04:00
Brian Paul
fd95e8ee33
docs: fix swrast texrect bug 21461
2009-04-28 09:11:05 -06:00
Brian Paul
d2b8c41b7a
swrast: add missing break in clamp_rect_coord_linear()
...
See bug 21461.
(cherry picked from master, commit dcf571aff9 )
2009-04-28 09:09:41 -06:00
Dave Airlie
5ca4f3c5da
radeno: cleanup the startup path further
2009-04-28 15:44:10 +10:00
Dave Airlie
a9d64873d7
radeon: further cleanup dri1 screen init
2009-04-28 15:35:52 +10:00
Dave Airlie
7731d93165
r300: remove unused debugging in set tex buffer paths
2009-04-28 15:27:31 +10:00
Dave Airlie
4e7d603fae
radeon: remove kernel mm, dri2 path takes care of it
2009-04-28 15:26:24 +10:00
Maciej Cencora
ce0d10dd6c
r300: fix fragment program limits
2009-04-27 14:33:24 -04:00
Maciej Cencora
3c6bffa761
r300: fallback only if stencil test is enabled
2009-04-27 14:33:24 -04:00
Maciej Cencora
e33e28f52a
r300: do front/back color selection in HW for software TCL path
2009-04-27 14:33:23 -04:00
Maciej Cencora
3d83a709b9
r300: fix valgrind warnings
2009-04-27 14:33:23 -04:00
Maciej Cencora
78c0e6aefc
r300: fix point size clamping when point is not attenuated
2009-04-27 14:33:23 -04:00
Brian Paul
dd4802176f
i965: #include prog_print.h to silence warning
2009-04-27 10:46:30 -06:00
Brian Paul
777b9ff43e
i965: only upload constant buffer data when we actually need the const buffer
...
Make the use_const_buffer field per-program and only call the code which
updates the constant buffer's data if the flag is set.
This should undo the perf regression from 20f3497e4b
(cherry picked from master, commit dc9705d12d )
2009-04-27 10:45:41 -06:00
Maciej Cencora
033d1365e6
r300: fix performance regression
...
This performance regression on non TCL hw was introduced by ed4c6cbe01 .
This patch depends on "r300: always route 4 texcoord components to RS" and "r300: add point attenuation stage for TCL fallbacks".
2009-04-27 19:08:41 +10:00
Maciej Cencora
7f6b13be86
r300: add point attenuation stage for TCL fallbacks
2009-04-27 19:08:12 +10:00
Maciej Cencora
d014d7d1bb
r300: always route 4 texcoord components to RS
...
Routing <4 components may lead to lock up.
Thanks to Alex Deucher for suggestion.
2009-04-27 19:07:50 +10:00
Maciej Cencora
22c0652c38
r300: flush stdout to get consistent debugging info
2009-04-27 19:07:16 +10:00
Maciej Cencora
7ff2dcbbdc
r300: add atom print function for kernel mm path
2009-04-27 19:06:38 +10:00
Maciej Cencora
25dd867c58
r300: handle texcoords properly
...
add 1D texture case and setup default Q value to 1.0
2009-04-27 19:06:00 +10:00
Maciej Cencora
199710914a
r300: remove unnecessary function calls
...
ae_create_context is called by vbo_CreateContext
ae_invalidate_state is called by vbo_InvalidateState
2009-04-27 19:05:37 +10:00
Maciej Cencora
607c6cf188
r300: rename state
...
According to r300_reg.h from radeon drm module 0x4f30 is ZB_ZMASK_OFFSET.
Also cleanup as trailing whitespaces.
2009-04-27 19:04:52 +10:00
Maciej Cencora
931c89f6f6
r300: remove unnecessary function calls
...
r300SetEarlyZState is called during r300UpdateShaderStates which is called for every rendering operation.
2009-04-27 19:04:21 +10:00
Brian Paul
b58b3a786a
i965: rework GLSL/WM register allocation
...
Use a bitvector of used/free flags.
If we run out of temps, examine the live intervals of the temp regs in
the program and free those which are no longer alive.
Also, enable the new WM const buffer code.
2009-04-24 16:33:46 -06:00
Brian Paul
7da3f9403b
mesa: refactor code and make _mesa_find_temp_intervals() public
2009-04-24 16:28:36 -06:00
Jerome Glisse
32d185eb60
r300: fix cliprect values
2009-04-24 19:54:01 +02:00
Alan Hourihane
bfd6bb31a6
demos: ensure display lists are destroyed for next generation
2009-04-24 17:22:52 +01:00
Brian Paul
027ed1b505
mesa: signal _NEW_PROGRAM_CONSTANTS instead of _NEW_PROGRAM
...
Use _NEW_PROGRAM_CONSTANTS when changing constant/uniform buffer values.
Binding a new program/shader sets both _NEW_PROGRAM and _NEW_PROGRAM_CONSTANTS.
2009-04-24 09:43:44 -06:00
Jerome Glisse
5dec94696e
r300: emit cliprect when in dri2 mode
2009-04-24 15:03:23 +02:00
Eric Anholt
c3e7fc394f
i965: Support drawing to FBO cube faces other than positive X.
...
Also fixes drawing to 3D texture depth levels.
(cherry picked from commit 8374379572 )
2009-04-23 14:05:58 -07:00
Eric Anholt
dd56897b27
intel: Fix commented-out glViewport in intel_meta_set_passthrough_transform.
...
Too much commit -a while debugging.
(cherry picked from commit 8910da5b7a )
2009-04-23 14:00:56 -07:00
Brian Paul
ebfbd8c4fe
i965: disable debug printf
2009-04-22 13:46:58 -06:00
Brian Paul
ac22178eb0
i965: enable VS constant buffers
...
In the VS constants can now be handled in two different ways:
1. If there's room in the GRF, put constants there. They're preloaded from
the CURBE prior to VS execution. This is the historical approach. The
problem is the GRF may not have room for all the shader's constants and
temps and misc registers. Hence...
2. Use a separate constant buffer which is read from using a READ message.
This allows a very large number of constants and frees up GRF regs for
shader temporaries. This is the new approach. May be a little slower
than 1.
1 vs. 2 is chosen according to how many constants and temps the shader needs.
2009-04-22 11:52:16 -06:00
Brian Paul
5c8fb6acc1
i965: define BRW_MAX_GRF
2009-04-22 11:47:59 -06:00
Brian Paul
21a422d97e
i965: remove old code to init surface-related cache IDs
...
These types are only found in the new surface state cache now.
2009-04-22 11:29:49 -06:00
Brian Paul
c0c58cf5cf
i965: comments, reformatting
2009-04-22 11:28:24 -06:00
Brian Paul
4843e54fc6
i965: actually use the new, second surface state cache
2009-04-22 11:12:07 -06:00
Brian Paul
f9af97c7a5
i965: checkpoint commit: use two state caches instead of one
...
The new, second cache will only be used for surface-related items.
Since we can create many surfaces the original, single cache could get
filled quickly. When we cleared it, we had to regenerate shaders, etc.
With two caches, we can avoid doing that.
2009-04-22 11:08:46 -06:00
Brian Paul
a071a8d2e7
i965: remove unused state atom entries
2009-04-22 10:44:36 -06:00
Brian Paul
f428255bde
i965: the brw_constant_buffer state atom is no longer dynamic
...
No more dynamic atoms so we can simplify the state validation code a little.
2009-04-22 09:23:15 -06:00
Brian Paul
e5681fc176
i965: add _NEW_PROGRAM_CONSTANTS to mesa_bits[] list
2009-04-22 09:16:21 -06:00
Brian Paul
a36dd5d54e
i915: check the new _NEW_PROGRAM_CONSTANT flag
2009-04-22 09:14:53 -06:00
Brian Paul
1dbab84e21
i965: use _NEW_PROGRAM_CONSTANTS and always create new const buffers
...
When program constants change we create a new VS constant buffer
instead of re-using the old one. This allows us to have several
const buffers in flight with vertex rendering.
2009-04-22 09:14:16 -06:00
Brian Paul
6b6a23c0f7
i965: updates to some debug code
2009-04-22 09:07:46 -06:00
Brian Paul
817dcdd280
i965: use new _NEW_PROGRAM_CONSTANTS flag instead of dynamic flags
2009-04-22 09:07:02 -06:00
Brian Paul
f48473e425
r200/r300/r500: add _NEW_PROGRAM_CONSTANTS flag
...
Make sure we detect constant buffer changes indicated by the new flag.
Should be able to remove _NEW_PROGRAM (and _NEW_MODELVIEW, _NEW_LIGHT, etc)
from several places (someday.
2009-04-22 08:59:47 -06:00
Dave Airlie
466c78c935
Merge remote branch 'origin/master' into radeon-rewrite
2009-04-22 21:41:57 +10:00
Richard Li
604dd37f66
R6xx/R7xx: remove unused files
2009-04-21 15:04:54 -04:00
Richard Li
581093d27c
R6xx/R7xx: add updated reg file
2009-04-21 14:30:52 -04:00
Richard Li
27c07b6b28
Initial pull of code from r6xx-r7xx-support branch
...
Not functional yet.
2009-04-21 12:54:20 -04:00
Brian Paul
e8807a14a6
fixed intel front-buffer rendering segfault
2009-04-20 16:13:04 -06:00
Brian Paul
c38397866d
intel: added null screen->dri2.loader pointer check
...
Fixes front-buffer rendering with DRI1.
2009-04-20 16:12:16 -06:00
Brice Goglin
d7b9a6c9ef
Add patch by Aurelien Jarno to fix FTBPS on kfreebsd-i386
2009-04-20 12:36:44 +02:00
Maciej Cencora
65fe0c86ff
r300: fix missing function declaration
2009-04-19 15:04:54 -04:00
Maciej Cencora
bcef4b63eb
r300: revert part of cb4bef7ae0
...
Some debugging code got there by accident
2009-04-19 15:04:44 -04:00
Maciej Cencora
78878a13fe
r300: cleanup includes
2009-04-19 22:15:05 +10:00
Maciej Cencora
a2d49eeaeb
r300: move common fp functions to seperate file
2009-04-19 22:15:01 +10:00
Maciej Cencora
300661d12a
r300: more r300/r500 unification
...
reuse insert_WPOS_trailer function
2009-04-19 22:14:56 +10:00
Maciej Cencora
155cc1647f
r300: more prepare for merge
2009-04-19 22:14:53 +10:00
Maciej Cencora
97104c2559
r300: further r300/r500 merge preparation
2009-04-19 22:14:50 +10:00
Maciej Cencora
33af54af0d
r300: merge r300/r500 fragment program compiler structure
2009-04-19 22:14:46 +10:00
Maciej Cencora
aa04e7d475
r300: merge r300/r500 fragment program structures
2009-04-19 22:14:42 +10:00
Maciej Cencora
27d4546f60
r300: r300/r500 fp shader merge WIP
2009-04-19 22:14:39 +10:00
Maciej Cencora
cb4bef7ae0
r300: general cleanup
...
- remove unused fields
- remove unused defines and macros
- flatten one structure
2009-04-19 22:14:36 +10:00
Maciej Cencora
b552446b95
r300: remove unnecessary forward function declaration
2009-04-19 22:13:06 +10:00
Maciej Cencora
3fd0084154
r300: context creation cleanup
...
- move constant values initialization to seperate function
- remove obvious comments
2009-04-19 22:12:31 +10:00
Dave Airlie
3230cb5f53
radeon: update clear state with latest intel code
2009-04-19 22:04:42 +10:00
Julien Cristau
4f2bc058f3
Add patch by Samuel Thibault to fix FTBFS on hurd-i386.
2009-04-19 00:46:32 +02:00
Julien Cristau
909afc5304
Adjust libgl1-mesa-glx and libgl1-mesa-dri package relationships
...
Drop the dependency on libgl1-mesa-glx from -dri, and make -glx
recommend -dri instead. The dri drivers are also loaded by the X
server, which doesn't need libGL. On the other hand, libGL needs one of
the dri drivers for direct rendering (either software or hardware).
Mark libgl1-mesa-dri as breaking old xserver-xorg-core and
libgl1-mesa-glx, to avoid incompatibilities.
2009-04-18 22:28:35 +02:00
Julien Cristau
4deb679b42
Make libgl1-mesa-dri 'Architecture: any'
...
swrast_dri.so should get built everywhere.
2009-04-18 22:27:51 +02:00
Brian Paul
dce84002c2
docs: create 7.4.2 release notes page
2009-04-18 11:12:41 -06:00
Brian Paul
c490349825
docs: remove unused sections
2009-04-18 11:12:33 -06:00
Brian Paul
f62d45fd0d
docs: MD5 sums for 7.4.1 release
2009-04-18 11:03:25 -06:00
Brian Paul
b2dfc29a82
intel: update driver date, remove RC3 designation
2009-04-18 10:51:41 -06:00
Brian Paul
7c1e61f41c
mesa: bump version to 7.4.1
2009-04-18 10:49:35 -06:00
Brian Paul
5654197d12
docs: prep for 7.4.1 release
2009-04-18 10:49:08 -06:00
Brian Paul
87cb55e9c6
mesa: bump version to 7.4.1
2009-04-18 10:48:57 -06:00
Brian Paul
e7d499f935
mesa: add switch case for GL_VERTEX_STATE_PROGRAM_NV in _mesa_new_program()
...
Fixes bug seen in progs/tests/vptest1.c
(cherry picked from master, commit c5af2ed60f )
2009-04-18 10:21:00 -06:00
Michel Dänzer
51e7600d77
intel: Handle ARB_vertex_buffer_object state in intel_clear_tris().
...
Fixes gearsvbo app by Michael Clark.
(cherry picked from commit 54fb6f0053 )
2009-04-18 15:53:08 +02:00
Brian Paul
69b17abd6b
intel: make sure polygon mode is set properly in intel_clear_tris()
...
Fixes progs/glsl/skinning.c demo.
(cherry picked from master, commit 794d488e6d )
2009-04-17 16:14:39 -06:00
Maciej Cencora
9028335371
r300: we always want non NDC coords format for swtcl
2009-04-17 11:27:36 +10:00
Maciej Cencora
d7d5c97a21
r300: cleanup frag prog setup a little
...
Use proper fields for marking if fp is translated, and if is translated succesfully.
Now if fp gets translated (even unsuccesfully) fp->translated is true. If the translation failed (i.e. because we exceeded limit of
maximum texture indirections) the fp->error is set. With a little updated fallback function it prevents non native fragment programs
from beeing translated with every frame (the translation would fail anyway so there's no point to try again).
Also implement IsProgramNative function for GL_FRAGMENT_PROGRAM_ARB (it should give some performance boost in apps that checks if
program is native and falls back to simpler shader to meet hw limits if necessary) and cleanup indentation (remove whitespaces on empty
lines).
2009-04-17 11:27:31 +10:00
Maciej Cencora
a92bc56e24
r300: update r500 path for reordered WPOS and FOG fp attributes
...
Report and regression testing by Fabio Pedretti.
2009-04-17 11:27:27 +10:00
Brian Paul
a975da7aca
docs: fixed user clip plane restore bug in glPopAttrib()
2009-04-16 10:16:38 -06:00
Brian Paul
ecf47b5046
mesa: fix bad mask bit in clip plane restore code for glPopAttrib()
...
(cherry picked from master commit d82876e850 )
2009-04-16 10:16:26 -06:00
Brian Paul
fed8dc53ad
mesa: add distclean target to top-level Makefile
...
(cherry picked from master, commit 666702baec )
2009-04-16 09:34:06 -06:00
Brian Paul
1f462e26c0
demos: use larger buffer for snprintf() call, see bug 21220
...
(cherry picked from master, commit 0d0028e6df )
2009-04-16 09:26:54 -06:00
Dave Airlie
3264352c57
dri: attempt to actually refcount the __DRIDrawable
...
valgrind was showing a race between the drawable getting destroyed
by the X resource freeing code, and the context getting destroyed
later and freeing the drawable.
However I've no idea if some other combination of things could cause
this code to leak.
2009-04-16 13:06:24 +10:00
Dave Airlie
143b416af6
radeon: take a bo reference when adding to validate list
2009-04-16 13:06:08 +10:00
Ian Romanick
85396d8ef4
intel: Bump driver date
2009-04-15 15:12:48 -07:00
Ian Romanick
f11b84998d
docs: more bug fixes for Mesa 7.4.1
2009-04-15 15:10:33 -07:00
Julien Cristau
5d4659e7c7
Install pkgconfig files for libGLU, libOSMesa and libGLw.
2009-04-15 21:31:24 +02:00
Julien Cristau
c422347bee
Make libgl1-mesa-dev and mesa-common-dev 'Architecture: any'.
...
This gets rid of uninstallability when a new upstream version
isn't built on all architectures, and allows us to ship potentially
arch-specific .pc files.
2009-04-15 21:25:17 +02:00
Brian Paul
d2f6791062
glx: added null pointer check in glXGetFBConfigs()
...
Fixes segfault seen with glxinfo with NVIDIA OpenGL.
(cherry picked from master, commit 05471828dc )
2009-04-15 08:02:38 -06:00
Jerome Glisse
1fd76ae930
r200: fix texture level for compiz case
2009-04-12 15:51:31 +02:00
Jerome Glisse
02b130fd4b
r200: validate vertex buffer
2009-04-12 14:25:36 +02:00
Jerome Glisse
8181f8fbf9
radeon: emit scissor when using cs path
2009-04-12 13:11:06 +02:00
Ian Romanick
49e0c74ddd
DRI2: Don't fault on NULL DrawBuffer
...
It is possible for ctx->DrawBuffer to be NULL, so don't fault when
that happens. This change is not being committed to master because it
doesn't appear to be necessary there.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com >
2009-04-11 20:24:15 -07:00
Alex Deucher
9b162cdda7
Fix build errors from merge
2009-04-10 17:36:31 -04:00
Alex Deucher
04f335fd16
Merge branch 'radeon-rewrite' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa into r6xx-rewrite
2009-04-10 17:16:08 -04:00
Alex Deucher
c0419f190c
Remove r500 stuff
2009-04-10 16:36:18 -04:00
Eric Anholt
83e14773c5
dri2: Don't crash if the server returns more buffers than expected.
...
(cherry picked from commit f967e8b507 )
2009-04-09 15:15:33 -07:00
Ian Romanick
4605937843
intel / DRI2: Accept fake front-buffer from loader
...
Handle the loader returning a fake front-buffer. Since the driver
never specifically requests a fake front-buffer, the driver assumes
that it will never receive both a fake and a real front-buffer.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com >
Reviewed-by: Kristian Høgsberg <krh@redhat.com >
(cherry picked from commit 6a6e478e55 )
2009-04-09 14:44:53 -07:00
Ian Romanick
b8ef30c45c
DRI2: Assume that there is always a front buffer
...
Assume that the front-buffer exists even if the server didn't tell the
client that it exists.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com >
Reviewed-by: Kristian Høgsberg <krh@redhat.com >
(cherry picked from commit e6386e0d9a )
2009-04-09 14:44:44 -07:00
Ian Romanick
4f17040cb1
intel / DRI2: Track and flush front-buffer rendering
...
Track two flags: whether or not front-buffer rendering is currently
enabled and whether or not front-buffer rendering has been enabled
since the last glFlush. If the second flag is set, the front-buffer
is flushed via a loader call back. If the first flag is cleared, the
second flag is cleared at this time.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com >
Reviewed-by: Kristian Høgsberg <krh@redhat.com >
(cherry picked from commit 43cf0d1eeb )
2009-04-09 14:44:34 -07:00
Ian Romanick
98c2c9ef8c
DRI2: Provide an interface for drivers to flush front-buffer rendering
...
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com >
Reviewed-by: Kristian Høgsberg <krh@redhat.com >
(cherry picked from commit 82634ee8df )
2009-04-09 14:44:17 -07:00
Alex Deucher
69edb8a156
R600/r700: add new cmdbuf macros
2009-04-09 16:05:50 -04:00
Brian Paul
d805c82068
mesa: fix potential recursive locking deadlock in _mesa_HashWalk()
...
If the walk callback called _mesa_HashRemove() we'd deadlock.
(cherry picked from master, commit deff099215 )
2009-04-09 10:55:06 -06:00
Alex Deucher
e24e4ae2e8
R6xx/R7xx: r300 -> r600 symbols
2009-04-09 10:55:41 -04:00
Dave Airlie
5e361c47ab
r300: fix color tiling
2009-04-09 10:51:10 +10:00
Maciej Cencora
1ec0efa7d3
r300: reorder fog coordinate and WPOS fp attributes
...
HW TCL path currently assumed fog, WPOS order. The order was inverted for SW TCL path.
This hopefully fixes rest of fog and WPOS related bugs.
Additionally fix some indentation, don't route unnecessary components of fog coordinates for performance reasons and simplify vertex
attribute emitting for SW TCL path.
2009-04-09 10:31:51 +10:00
Maciej Cencora
3b1d544001
r300: fix regression from swtcl rewrite
...
Fix wrong attribute emit and revert to previous behaviour of calculating VAP_OUT_VTX_FMT_1 register value.
We can't use r300VAPOutputCntl1 function because it assumes that all texture coords have 4 components and that is the case for HW TCL
path, but not for SW TCL.
2009-04-09 10:31:36 +10:00
Dave Airlie
d1a9b1f513
Merge remote branch 'origin/master' into radeon-rewrite
...
Conflicts:
src/mesa/drivers/dri/r200/r200_tex.c
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_context.h
src/mesa/drivers/dri/r300/r300_swtcl.c
src/mesa/drivers/dri/r300/r300_tex.c
src/mesa/drivers/dri/r300/r300_texmem.c
src/mesa/drivers/dri/r300/r300_texstate.c
src/mesa/drivers/dri/radeon/radeon_tex.c
2009-04-09 10:31:08 +10:00
Julien Cristau
3d81e934e5
Upload to unstable.
2009-04-08 23:53:54 +01:00
Alex Deucher
4138bdb3b1
R600: initial copy of r300 code
2009-04-08 15:16:35 -04:00
Brian Paul
6c3bec4387
swrast: fix point rendering function selection
...
Need to clamp default point size to min/max range before checking if it's one.
Fixes glean pointAtten test.
(cherry picked from master, commit 228f20e324 )
2009-04-07 13:44:50 -06:00
Alex Deucher
90ffce4973
radeon: fix compiler warning
2009-04-07 12:37:10 -04:00
Brian Paul
7d3561c871
docs: more bug fixes for Mesa 7.4.1
2009-04-07 08:37:22 -06:00
Brian Paul
5c47d53924
mesa: in mesa_add_named_constant(), avoid adding duplicate constants
...
(cherry picked from master, commit 80197a0c1b )
2009-04-07 08:35:01 -06:00
Brian Paul
a18216308a
mesa: fix parameter counting in ARB vertex/fragment program parsing
...
Duplicated unnamed constants were getting counted more than once.
(cherry picked from master, commit 866bdd0509 )
2009-04-07 08:34:32 -06:00
Brian Paul
14f13fbcfa
mesa: replace >= with > when testing if we've exceeded max local params
...
Now a program that uses 256 locals works as it should.
(cherry picked from master, commit a4173956eb )
2009-04-07 08:34:04 -06:00
Brian Paul
ca24095c1e
mesa: only clear matrix MAT_DIRTY_INVERSE flag when we actually compute the inverse
...
If _math_matrix_analyse() got called before we allocated the inverse
matrix array we could lose the flag indicating that we needed to compute
the inverse. This could happen with certain vertex shader cases.
(cherry picked from master, commit ce461ffc5a )
2009-04-07 08:33:43 -06:00
Brian Paul
d5e0e03d43
mesa: for OPCODE_LIT, use _mesa_pow() instead of exp() and log()
...
Also, s/pow/_mesa_pow/
(cherry picked from master, commit b8a200ac9d )
2009-04-07 08:32:42 -06:00
Maciej Cencora
e2ce1d80d1
r300: swtcl rewrite and cleanup
...
- remove unused variables
- silence compiler warnings
- fix twosided lighting
- fix point attenuation
- unify indentation
2009-04-07 21:08:40 +10:00
Dave Airlie
86556f8bda
radeon/r200/r300: fix missing dma buffer validation
...
this make gnome shell run
2009-04-07 15:08:56 +10:00
Dave Airlie
23478f1c03
radeon: fix bocs wrapper
2009-04-07 15:08:56 +10:00
Jerome Glisse
741aaaa288
radeon: add support for new ttm
2009-04-06 11:58:08 +02:00
Michel Dänzer
775ca8e3fa
radeon: Expose a 32 bit RGBA fbconfig even when the screen depth is 16.
...
Otherwise current xserver / libGL no longer expose a 32 bit RGBA GLX visual,
and compiz fails.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=20479 .
(Cherry picked from commit e798bf8053 )
2009-04-06 09:27:17 +02:00
Brian Paul
39345a4928
mesa: don't normalize spot light direction until validation time
...
In glLight() we're only supposed to transform the direction by the modelview
matrix, not normalized it too.
(cherry picked from commit 650d147289 )
2009-04-03 10:16:31 -06:00
Roland Scheidegger
7be149cfd1
mesa: fix TexParameter functions
...
premature return in TexParameterf caused mesa to never call Driver.TexParameter
breaking drivers relying on this (fix bug #20966 ).
While here, also fix using ctx->ErrorValue when deciding to call
Driver.TexParameter. Errors are sticky and uncleared errors thus would cause
this to no longer get called. Since we thus need return value of
set_tex_parameter[if] can also optimize this to only call when value changed.
2009-04-03 00:00:40 +02:00
Brian Paul
8c9d7b2474
docs: fix TXB texture unit bias error
2009-04-02 13:11:56 -06:00
Brian Paul
6ef0951b17
mesa: don't call ctx->Driver.ReadPixels() if width or height is zero
...
(cherry picked from commit master, 7b9bf39543 )
2009-04-02 13:11:33 -06:00
Brian Paul
2b33b77337
mesa: don't call ctx->Driver.Draw/CopyPixels() if width or height is zero
...
(cherry picked from master, commit f6a3f1f52a )
2009-04-02 13:10:41 -06:00
Brian Paul
0590edeea0
mesa: use correct tex unit lod bias for TXB instruction
...
(cherry picked from master, commit 1ab225017e )
2009-04-02 13:09:32 -06:00
Brian Paul
7511d76bd7
swrast: fix glDrawBuffer(GL_FRONT_AND_BACK)
...
We weren't putting the right colors into the back buffer in this mode.
(cherry picked from master, commit 9cc79fc2dc )
2009-04-02 13:07:53 -06:00
Dave Airlie
05304d41f2
radeon/r200/r300: fix up the whole buffer space checking.
...
This fixes up the buffer validation scheme, so that we keep a list
of buffers to validate so cmdbuf flushes during a pipeline get
all the buffers revalidated on the next emit.
This also fixes radeonFlush to not flush unless we have something
useful to send to the GPU, like a DMA buffer or something not state
2009-04-02 18:58:49 +10:00
Dave Airlie
4170216009
radeon/common: use glCtx not ctx
2009-04-02 14:47:51 +10:00
Dave Airlie
e00ef43d79
radeon/r200/r300: collapse context destruction down to a common path.
...
Context destruction was nearly the same over all the drivers,
so collapse it down.
2009-04-02 14:44:29 +10:00
Dave Airlie
104d542205
radeon: tiling support
2009-04-02 14:44:08 +10:00
Dave Airlie
617c5262c6
r300: fix qtdemo qt4 startup
2009-04-02 11:30:03 +11:00
Julien Cristau
99f159339e
Prepare changelog for upload
2009-04-01 20:25:25 +02:00
Brian Paul
7f30aba920
docs: fix bug 20986
2009-04-01 07:39:43 -06:00
Brian Paul
4fa700260e
glsl: fix texgen state variable tokens in emit_statevars()
...
This fixes broken variable indexing into the gl_Eye/ObjectPlaneS/T/R/Q arrays.
See bug 20986.
(cherry picked from master, commit f8dd6594bf )
2009-04-01 07:39:26 -06:00
Dave Airlie
f9d272fa41
radeon: go back and repick texture formats.
...
This might trip up some serious FBO users, will have to see, but
it avoids the slow paths for all the demos I have.
2009-04-01 16:13:30 +10:00
Dave Airlie
6e30fe4873
radeon: fixup render buffer cleanups
...
this fixes qtdemo-qt4 starting and a leak in glxgears exit
2009-04-01 15:41:58 +10:00
Brian Paul
781fb79c59
docs: first 7.4.1 bug fixes
2009-03-31 16:29:23 -06:00
Brian Paul
5b7e9f2f3a
mesa: fix bug in GPU codegen for fixed-function two-sided lighting
...
The 'dots' register wasn't getting properly un-negated and un-swizzled
after emitting the code for back-face lighting. So, if more than one
light source was enabled, the specular exponent for the next light source
was wrong.
During execution we were evaluating pow(x, y) where y was negative instead
of positive. This led to the outcome being zero or NaN.
This fixes the occasional black triangles seen in isosurf when hacked to
enable two-sided lighting.
(cherry picked from master, commit 919f57078b )
2009-03-31 16:28:17 -06:00
Brian Paul
d4d4b63d7f
docs: prep for Mesa 7.4.1 release notes
2009-03-31 16:26:24 -06:00
Jeremy Huddleston
9e9fe51acd
Updated CPU_TO_LE32 to work on darwin
2009-03-31 14:59:28 -07:00
Jeremy Huddleston
b65bc1b6cb
Fix compiling indirect.c when GLX_DIRECT_RENDERING is not defined
2009-03-31 14:48:19 -07:00
Jeremy Huddleston
6cb796f6fc
Updated darwin config for when X11 is not in the same location as we're installing to
...
(cherry picked from commit 7817fea0b6 )
2009-03-31 14:37:27 -07:00
Dave Airlie
d81a48757a
radeon/dri2: if the depth buffer is 16-bit force cpp == 2
...
This is because the DDX always allocates using the drawable sizes.
which gives me twice the depth buffer I asked for, dumb.
2009-03-31 15:50:19 +10:00
Dave Airlie
2f3be8ab14
radeon: fix pixel readback for RGB8 tests
2009-03-31 14:43:14 +10:00
Dave Airlie
5ad32cfd21
r200: fix glean pixelFormats regression
2009-03-31 13:39:57 +10:00
Dave Airlie
5c7fc1cb8e
r300: fix stencil clears
2009-03-31 20:10:48 +10:00
Dave Airlie
226c876a52
r200: only set all dirty on kernel clears
2009-03-31 10:46:27 +10:00
Dave Airlie
e1d1657493
radeon/r200: fix glean failures on readPixSanity since EXT_DEPTH_STENCIL support
2009-03-31 10:36:06 +10:00
Dave Airlie
1570bde279
r200: fix veclinear emission
2009-03-31 10:35:16 +10:00
Timo Aaltonen
4830fab603
update the changelog.
2009-03-30 10:41:39 +03:00
Timo Aaltonen
1e142bf63d
Merge commit 'mesa_7_4' into debian-experimental
2009-03-30 10:38:45 +03:00
Dave Airlie
3b09f6544a
radeon: fix readback problem for piglit tests
2009-03-30 12:28:55 +10:00
Brian Paul
de197cf991
docs: 7.4 release md5 sums
2009-03-27 19:12:16 -06:00
Brian Paul
bf1e6581a5
docs: set 7.4 release date
2009-03-27 18:57:39 -06:00
Brian Paul
80ec7843bc
mesa: set VERSION=7.4
2009-03-27 18:57:23 -06:00
Brian Paul
366d6e8cd1
mesa: set version to 7.4
2009-03-27 18:57:07 -06:00
Ian Romanick
63ed288396
intel: Add extra, stronger flushes around CopyTexSubImage blits
2009-03-27 15:22:27 -07:00
Eric Anholt
88ce34f400
swrast: Add support for x8r8g8b8 fbconfig.
...
This lets swrast produce an fbconfig suitable for the root visual now that
the server's not allowing mismatched fbconfigs.
(cherry picked from commit 529d1d720e )
2009-03-27 15:20:09 -07:00
Ian Romanick
f535de8721
Mark current bits as 2009Q1-RC2 for Intel driver.
2009-03-26 15:32:29 -07:00
Eric Anholt
1db913f687
i965: Fix glFrontFacing in twoside GLSL demo.
...
This also cuts instructions by just using the existing bit in the payload
rather than computing it from the determinant in the SF unit and passing it
as a varying down to the WM. Something still goes wrong with getting the
backface color right, but a simpler shader appears to get the right result.
(cherry picked from commit 699db6d842 )
2009-03-26 15:15:51 -07:00
Eric Anholt
0e5d1f43af
i965: Fix fog coordinate g,b,a values when glFrontFacing isn't used.
...
Previously, we would sample (f,glFrontFacing,undef,undef) instead of the
(f,0,0,1) that fragment.fogcoord is supposed to return. Due to
glFrontFacing's presence in FOGC.y, we'll still give bad results there when
glFrontFacing is used.
Bug #19122 , piglit testcase fp-fog.
(cherry picked from commit 411d913cce )
2009-03-26 15:15:27 -07:00
Eric Anholt
09c587ae55
i965: Clean up a bit of mess with unneeded variables in emit_interp.
...
(cherry picked from commit b013f945d8 )
2009-03-26 15:15:14 -07:00
Brian Paul
775d8431e9
i965: separate emit_op() and emit_tex_op() functions
...
(cherry picked from commit a79186e29e )
2009-03-26 15:14:56 -07:00
Brian Paul
3217ea8a1d
i965: minor clean-up, comments, etc.
...
(cherry picked from commit 9e7903e492 )
2009-03-26 15:14:22 -07:00
Dave Airlie
8ed405cd37
radeon/r200/r300: set correct row stride for rbs
2009-03-26 13:24:21 +10:00
Dave Airlie
e757bf964f
r300: check buffer sizes in non-tcl case + set correct VRAM limits
2009-03-26 13:24:21 +10:00
Dave Airlie
258686a973
radeon: fixup map/unmap texture to work with override BOs
...
if you hit this you've already failed but we shouldn't crash
2009-03-26 13:24:21 +10:00
Brian Paul
00aea5853d
docs: mention Solaris updates in release notes
2009-03-25 21:08:21 -06:00
Brian Paul
20d34b50b5
mesa: bump version to 7.4 rc2
2009-03-25 21:06:41 -06:00
Dave Airlie
4d36a19c90
r200: add fbo files to the compile
2009-03-26 11:15:07 +10:00
Alan Coopersmith
9cff0acb36
define __builtin_expect for non-gcc compilers in two more glx files
...
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com >
2009-03-25 16:26:03 -07:00
Alan Coopersmith
791b59493f
mklib improvements for Solaris
...
Move flags for linking standard C/C++ libraries from configure.ac to mklib
Use -norunpath flag when linking with Sun C++ compiler
Convert mklib -exports list into a linker mapfile
Set FINAL_LIBS correctly when -noprefix is used
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com >
2009-03-25 16:26:02 -07:00
Michel Dänzer
7dff7029fa
Revert "dri2: Avoid round-tripping on DRI2GetBuffers for the same set of buffers."
...
This scheme breaks when the display connection doesn't receive ConfigureNotify
events. This caused reporoducible problems (cropped / misplaced output) when
starting a 3D application in a guest operating system in VMware Workstation.
This reverts commit dd1c68f151 .
Conflicts:
src/glx/x11/dri2_glx.c
(cherry picked from commit 11da7e02aa )
2009-03-25 15:55:20 +01:00
Brian Paul
f8fd9bc46b
docs: update glext.h to version 48
2009-03-25 08:35:15 -06:00
Brian Paul
53f0e141c0
gl: update include/GL/glext.h to version 48
2009-03-25 08:35:02 -06:00
Julien Cristau
af3c568475
Prepare changelog for upload
2009-03-25 11:34:58 +01:00
Julien Cristau
7d01429512
Build-depend on linux-libc-dev >= 2.6.29 on linux archs.
...
The 2.6.28 kernel headers miss some compat defines.
2009-03-25 01:51:02 +01:00
Brian Paul
14a794300e
demos: add LDFLAGS for corender target, bug 20844
...
(cherry picked from commit c4c4358e08 )
2009-03-24 16:09:23 -06:00
Dave Airlie
f577c8e462
radeon/r200/r300: fix warnings
2009-03-24 18:32:46 +10:00
Dave Airlie
5021b47dd3
r300: remove lock.h link
2009-03-24 15:21:49 +10:00
Dave Airlie
20981c0a0b
radeon: fixup some issue with fbos and sw fallbacks
2009-03-24 15:06:19 +10:00
Dave Airlie
0a725db10c
radeon/r200/r300: set the texture depth correctly for DRI2
2009-03-24 11:19:09 +10:00
Dave Airlie
ccd18f462c
radeon: actual format is rgba8
2009-03-24 09:45:26 +10:00
Dave Airlie
2aa097f963
radeon: fix typo
2009-03-24 09:45:18 +10:00
Dave Airlie
28e082197d
radeon: setup pipes for r300
2009-03-24 09:28:52 +10:00
Dave Airlie
9f11b3311e
radeon: stupid mesa extension fail
2009-03-24 09:26:31 +10:00
Eric Anholt
912ec292c1
i965: Fix occlusion query when no other WM state updates occur.
...
Turns out that XXX comment was important. We weren't flagging the WM to
re-update with the statistics enable, so we got zeroes out of our query.
Bug #20740 , fixes piglit occlusion_query test.
Signed-off-by: Eric Anholt <eric@anholt.net >
(cherry picked from commit c0d6e07909 )
2009-03-23 12:49:31 -07:00
Tom Fogal
e814b5ae2f
mesa: fix _glxapi_get_proc_address() for mangled names
...
(cherry picked from commit 7399d56ec6 )
2009-03-23 12:49:13 -07:00
Brian Paul
0fea05915a
glapi: update find_entry() for mangled names
...
(cherry picked from commit 4447fddc82 )
2009-03-23 12:49:05 -07:00
Brian Paul
dfa44f0ff9
mesa: regenerated gl_mange.h file
...
(cherry picked from commit fe0ccf323d )
2009-03-23 12:48:56 -07:00
Julien Cristau
8d088cd34f
update changelog
2009-03-23 17:25:04 +01:00
Julien Cristau
094d627885
Merge tag 'mesa_7_4_rc1' into debian-experimental
2009-03-23 17:21:26 +01:00
Brian Paul
f850ff2bcc
mesa: remove unused 'out' label
2009-03-23 08:27:00 -06:00
Brian Paul
66f972ab55
Add Solaris to OS'es using PROT_EXEC mmap() to get executable heap space
...
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com >
(cherry picked from master, commit a06dd4de87 )
2009-03-23 08:18:48 -06:00
Dave Airlie
f9d3de06bd
radeon: fixup wrapper bo name
2009-03-23 19:32:10 +10:00
Dave Airlie
cb68588c93
Merge branch 'radeon-fbo-hacking' into radeon-rewrite
2009-03-23 18:56:34 +10:00
Dave Airlie
8c7e30fb95
raedon/r200/r300: mega-FBO commits.
...
Re work depth issues.
Do a lot more FBO abstactions
fixup depth/stencil buffer interactions
2009-03-23 18:54:06 +10:00
Dave Airlie
c607a664dd
radeon fbo: add draw offset calcs
2009-03-22 19:11:46 +10:00
Dave Airlie
4a2cb696cc
radeon/r200/r300: add support for new tfp interface
...
also fixup old interface, gets rid of white boxes in compiz
2009-03-22 12:03:24 +10:00
Dave Airlie
2d26d4ac66
Merge remote branch 'origin/master' into HEAD
2009-03-22 12:01:21 +10:00
Dave Airlie
06cb6f7aa7
radeon: use mipmap fns in FBO code
2009-03-22 11:57:03 +10:00
Dave Airlie
0968512f8f
radeon: add miptree offset functions
2009-03-22 11:56:41 +10:00
Dave Airlie
c73f4fdb65
r200: fix for sure
2009-03-21 22:41:42 +10:00
Dave Airlie
4bd5ee2d97
radeon/r200: oops make correct fbo init calls
2009-03-21 22:35:01 +10:00
Dave Airlie
9f7a03d945
radeon: add xRGB span functions
...
same as ARGB need to add a parameter to get ptr32
2009-03-21 21:42:54 +10:00
Dave Airlie
218083c542
radeon: dri2 is hooked up elsewhere now
2009-03-21 22:38:28 +11:00
Dave Airlie
98f1b1e6f9
radeon/r200: add fbo init
2009-03-21 22:38:11 +11:00
Dave Airlie
6c48c93a53
radeon/r200: add fbo state changes
2009-03-21 22:36:18 +11:00
Dave Airlie
712478cfdd
r300: fix viewport inversion for FBOs
2009-03-21 22:27:01 +11:00
Dave Airlie
8ab7c77dc2
radeon: align FBO pitch
2009-03-21 18:16:21 +10:00
Dave Airlie
56c5df33de
radeon: fixup last missing x_off/y_off
2009-03-21 18:16:02 +10:00
Dave Airlie
8a60083676
radeon: add cpp/pitch to rrb
2009-03-21 18:07:33 +10:00
Dave Airlie
e795bd3c90
radeon/fbo: add x_off and y_off in correct places
2009-03-21 18:05:54 +10:00
Dave Airlie
86dcbb5457
radeon: dPriv handling is now in cliprects code
2009-03-21 16:51:46 +10:00
Dave Airlie
9368dcb426
radeon: fixup span code for FBOs
2009-03-21 16:08:20 +10:00
Dave Airlie
fbda2ad445
r300: hw clear buffer 0 hopefully
2009-03-21 15:05:34 +10:00
Dave Airlie
ffde891a03
radeon: fix up span function setting
2009-03-21 14:31:14 +10:00
Brian Paul
17db2db9dc
docs: prep for 7.4 release
2009-03-20 17:34:54 -06:00
Brian Paul
dba79af9bc
mesa: prep for 7.4-rc1 release
2009-03-20 17:26:04 -06:00
Brian Paul
b009a32bf4
r300: don't crash on sw tcl hw if point size vertex attrib is sent
...
(cherry picked from master, commit 005ad1a71d )
2009-03-20 08:49:39 -06:00
Dave Airlie
22443d5cc0
r300: init fbos
2009-03-20 22:34:30 +10:00
Dave Airlie
ba890ad35b
more fbo fillin
2009-03-20 22:29:15 +10:00
Dave Airlie
e3faf5b51d
r300: enable FBO for a test
2009-03-20 22:15:22 +10:00
Dave Airlie
230abc06f8
radeon: some more fbo work
2009-03-20 22:07:05 +10:00
Dave Airlie
fabce837f9
radeon: initial couch code copy from radeon
2009-03-20 18:23:38 +10:00
Dave Airlie
407e8ae5b1
Merge remote branch 'main/master' into radeon-rewrite
...
Conflicts:
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r300_swtcl.c
src/mesa/drivers/dri/r300/radeon_ioctl.c
src/mesa/drivers/dri/radeon/radeon_screen.c
2009-03-20 10:52:17 +10:00
Dave Airlie
bdaa0341ca
radeon/r200/r300: cleanup some of the renderbuffer code
2009-03-19 15:31:03 +10:00
Dave Airlie
c0c06803fe
radeon: fix up locking like the intel driver for pageflip/swaps
2009-03-19 14:46:52 +10:00
Brian Paul
7122490982
mesa: avoid setting texObj->_Complete = GL_FALSE when there's no state change
...
Avoid a little bit of unneeded state validation and fixes a bug where the
texture complete flags was set to false, but we didn't signal _NEW_TEXTURE.
Fixes piglit tex1d-2dborder failure.
(cherry picked from commit aad3f546a0 )
2009-03-18 14:47:47 -07:00
Brian Paul
6ada1d47d9
mesa: add no-change testing for a few more texture parameters
...
(cherry picked from commit 37c768b36a )
2009-03-18 10:54:09 -07:00
Robert Ellison
55865335f4
i965: fix polygon stipple when rendering to FBO
...
The polygon stipple pattern, like the viewport and the
polygon face orientation, must be inverted on the i965
when rendering to a FBO (which itself has an inverted pixel
coordinate system compared to raw Mesa).
In addition, the polygon stipple offset, which orients
the stipple to the window system, disappears when rendering
to an FBO (because the window system offset doesn't apply,
and there's no associated FBO offset).
With these fixes, the conform triangle and polygon stipple
tests pass when rendering to texture.
(cherry picked from commit 29309b45b0 )
2009-03-18 10:47:24 -07:00
Robert Ellison
918e5221ef
i965: fix polygon face orientation when rendering to FBO
...
In the i965, the FBO coordinate system is inverted from the standard
OpenGL/Mesa coordinate system; that means that the viewport and the
polygon face orientation have to be inverted if rendering to a FBO.
The viewport was already being handled correctly; but polygon face
was not. This caused a conform failure when rendering to texture with
two-sided lighting enabled.
This fixes the problem in the i965 driver, and adds to the comment about
the gl_framebuffer "Name" field so that this isn't a surprise to other
driver writers.
(cherry picked from commit 6dceeb2eb8 )
2009-03-18 10:47:24 -07:00
Brian Paul
9feb26584a
swrast: use better _swrast_compute_lambda() function
...
The MAX-based function can produce values that are non-monotonic for a span
which causes glitches in texture filtering. The sqrt-based one avoids that.
This is perhaps slightly slower than before, but the difference
probably isn't noticable given we're doing software mipmap filtering.
Issue reported by Nir Radian <nirr@horizonsemi.com >
(cherry picked from master, commit c334ce273e )
2009-03-17 10:34:45 -06:00
Ian Romanick
a8528a2e86
Mark current bits as 2009Q1-RC1 for Intel driver.
2009-03-16 13:39:32 -07:00
Michel Dänzer
aa85973f95
Fixup previous commit.
...
radeonScheduleSwap() already takes the lock in the SwapBuffers case, only
the CopySubBuffer case was missing it.
2009-03-16 12:51:50 +01:00
Michel Dänzer
9c591c52c7
radeon: Take the hardware lock for swaps and flips.
...
Otherwise they fail with AIGLX at least.
2009-03-16 11:33:14 +01:00
Brian Paul
119360cccd
i965: init dest reg CondMask = COND_TR (the proper default)
...
Plus fix up a debug printf.
(cherry picked from commit 20f49252e1 )
2009-03-13 17:38:40 -07:00
Brian Paul
ac2216542d
glsl: fix vec4_texp_rect IR code (need projective version) (cherry picked from commit ad2cfa4199)
2009-03-13 17:38:40 -07:00
Brian Paul
37e5c057f1
i965: check if we run out of GRF/temp registers
...
Before this change we would up emitting instructions with invalid register
numbers. This typically (but not always) hung the GPU. For now, just
prevent emitting bad instructions to avoid hangs. Still need to do some
kind of proper error recovery.
(cherry picked from commit e60b3067d8 )
2009-03-13 17:38:40 -07:00
Brian Paul
4d9b8e0f93
mesa: added _mesa_fprintf() wrapper (cherry picked from commit 596b8fbbbf)
2009-03-13 17:38:40 -07:00
Brian Paul
c1b71f46b5
i965: fix emit_math1() function used for scalar instructions
...
Instructions such as RCP, RSQ, LOG must smear the result of the function
across the dest register's X, Y, Z and W channels (subject to write masking).
Before this change, only the X component was getting written.
Among other things, this fixes cube map texture sampling in GLSL shaders
(since cube lookups involve normalizing the texcoord).
(cherry picked from commit 3485801978 )
2009-03-13 17:38:39 -07:00
Brian Paul
4a25ac9564
i965: rewrite the code for handling shader subroutine calls
...
Previously, the prog_instruction::Data field was used to map original Mesa
instructions to brw instructions in order to resolve subroutine calls. This
was a rather tangled mess. Plus it's an obstacle to implementing dynamic
allocation/growing of the instruction buffer (it's still a fixed size).
Mesa's GLSL compiler emits a label for each subroutine and CAL instruction.
Now we use those labels to patch the subroutine calls after code generation
has been done. We just keep a list of all CAL instructions that needs patching
and a list of all subroutine labels. It's a simple matter to resolve them.
This also consolidates some redundant post-emit code between brw_vs_emit.c and
brw_wm_glsl.c and removes some loops that cleared the prog_instruction::Data
fields at the end.
Plus, a bunch of new comments.
(cherry picked from commit c51c822ee0 )
2009-03-13 17:38:39 -07:00
Eric Anholt
35d965b39b
intel: Fix bpp setting of blits to 8bpp targets.
...
This was causing hangs in cairogears, as we would blit to the 8bpp target
(A8 texture) as 16bpp, and stomp over state objects.
(cherry picked from commit 19e134051c )
2009-03-13 17:38:39 -07:00
Robert Ellison
d0aab00609
i965: add software fallback for conformant 3D textures and GL_CLAMP
...
The i965 hardware cannot do GL_CLAMP behavior on textures; an earlier
commit forced a software fallback if strict conformance was required
(i.e. the INTEL_STRICT_CONFORMANCE environment variable was set) and
2D textures were used, but it was somewhat flawed - it could trigger
the software fallback even if 2D textures weren't enabled, as long
as one texture unit was enabled.
This fixes that, and adds software fallback for GL_CLAMP behavior with
1D and 3D textures.
It also adds support for a particular setting of the INTEL_STRICT_CONFORMANCE
environment variable, which forces software fallbacks to be taken *all*
the time. This is helpful with debugging. The value is:
export INTEL_STRICT_CONFORMANCE=2
(cherry picked from commit 3468315087 )
2009-03-13 17:38:39 -07:00
Brian Paul
ef33d0f103
mesa: don't draw arrays if vertex position array is not enabled
...
For regular GL, we must have vertex positions in order to draw. But ES2
doesn't have that requirement (positions can be computed from any array
of data).
See bug 19911.
(cherry picked from commit 97dd2ddbd9 )
2009-03-13 17:38:39 -07:00
Robert Ellison
349b819768
i965: texture fixes: bordered textures, fallback rendering
...
i965 doesn't natively support GL_CLAMP; it treats it like
GL_CLAMP_TO_EDGE, which fails conformance tests.
This fix adds a clause to the check_fallbacks() test to check
whether GL_CLAMP is in use on any enabled 2D texture. If so,
and if strict conformance is required (via INTEL_STRICT_CONFORMANCE),
a software fallback is mandated.
In addition, validate textures *before* checking for fallbacks,
rather than after; otherwise, the texture state is never validated
and can't be trusted. (In particular, if texturing is enabled and
the sampler would access any level beyond level 0 of a texture, the
sampler will segfault, because texture validation sets the firstLevel
and lastLevel fields of a texture object so that the valid levels
will be mapped and accessed correctly. If texture validation doesn't
occur, only level 0 is accessed correctly, and that only because
firstLevel and lastLevel happen to be set to 0.)
(cherry picked from commit 17c7852bf9 )
2009-03-13 17:38:39 -07:00
Dave Airlie
50443db882
texmem: fix typo from brianp's changes.
...
Reported by cjb via tinderbox on irc
(cherry picked from commit 487a55af78 )
2009-03-13 17:38:39 -07:00
Brian Paul
c503cacb53
mesa: use an array for current texture objects
...
Use loops to consolidate lots of texture object code.
(cherry picked from commit 9818734e01 )
2009-03-13 17:38:39 -07:00
Brian Paul
e862b4e38f
mesa: use an array for default texture objects
...
Replace Default1D/2D/3D/Cube/etc with DefaultTex[TEXTURE_x_INDEX].
The same should be done with the Current1D/2D/3D/etc pointers...
(cherry picked from commit 4d24b639d1 )
2009-03-13 17:38:39 -07:00
Robert Ellison
e9dfc858fb
Fix an i965 assertion failure on glClear()
...
While running conform with render-to-texture:
conform -d 33 -v 2 -t -direct
the i965 driver failed this assertion:
intel_clear.c:77: intel_clear_tris: Assertion `(mask & ~((1 << BUFFER_BACK_LEFT) | (1 << BUFFER_FRONT_LEFT) | (1 << BUFFER_DEPTH) | (1 << BUFFER_STENCIL))) == 0' failed.
The problem is that intel_clear_tris() is called by intelClear() to
clear any and all of the available color buffers, but intel_clear_tris()
actually only handles the back left and front left color buffers; so
the assertion fails as soon as you try to clear a non-standard color
buffer.
The fix is to have intelClear() only call intel_clear_tris() with
buffers that intel_clear_tris() can support. intelClear() already backs
down to _swrast_Clear() for all buffers that aren't handled explicitly.
(cherry picked from commit 0ccbc3c905 )
2009-03-13 17:38:39 -07:00
Brian Paul
5efbca1e21
intel: fix datatype typo, s/GLboolean/GLuint/
...
Fixes mysterious failures in glean glsl1 test.
(cherry picked from commit da2b661ee4 )
2009-03-13 17:38:39 -07:00
Kristian Høgsberg
d6d8663a88
intel: Fix intelSetTexBuffer miptree leak.
...
The intelImage also holds a reference to the miptree, so unref that as well.
(cherry picked from commit 5b354d39d4 )
2009-03-13 17:38:39 -07:00
Eric Anholt
13990bd98a
intel: tell libdrm whether we want a cpu-ready or gpu-ready BO for regions.
...
This lets us avoid allocing new buffers for renderbuffers, finalized miptrees,
and PBO-uploaded textures when there's an unreferenced but still active one
cached, while also avoiding CPU waits for batchbuffers and CPU-uploaded
textures. The size of BOs allocated for a desktop running current GL
cairogears on i915 is cut in half with this.
Note that this means we require libdrm 2.4.5.
(cherry picked from commit 40dd024be6 )
2009-03-13 17:38:39 -07:00
Eric Anholt
def630d0a2
i965: Fix render target read domains.
...
We were asking for something illegal (write_domain != 0 && read_domains !=
write_domain) because at the time of writing the region surfaces were used
for texturing occasionally as well, and we weren't really clear on the model
GEM was going to use.
This reliably triggered a kernel bug with domain handling, resulting in
oglconform mustpass.c failure. Of course, it only became visible after
01bc4d441f cleaned up some gratuitous flushing.
(cherry picked from commit 078e8a61b2 )
2009-03-13 17:38:39 -07:00
Eric Anholt
ca2564f1e6
intel: Don't do the extra MI_FLUSH in flushing except when doing glFlush().
...
Everything other than "make sure the last rendering ends up visible on the
screen" doesn't need that behavior.
(cherry picked from commit 01bc4d441f )
2009-03-13 17:38:38 -07:00
Eric Anholt
711a57f7c7
intel: don't crash when dri2 tells us about buffers we don't care about. (cherry picked from commit f82f1ffba9)
2009-03-13 17:38:38 -07:00
Eric Anholt
058cf2fff1
dri2: Initialize variables for the getbuffers round-trip reduction.
...
Missed setting the initial values which usually didn't hurt at runtime.
(cherry picked from commit 680c708dee )
2009-03-13 17:38:38 -07:00
Eric Anholt
715f509c5d
intel: Fix tri clear to do FBO color attachments as well.
...
This is a 2% win in fbo_firecube, and would avoid a sw fallback for
masked clears.
(cherry picked from commit fd51cf1531 )
2009-03-13 17:38:38 -07:00
Eric Anholt
e704e6c6f3
i965: Fix fallback on stencil drawing to fbo when the visual lacks stencil.
...
Noticed this with the fbotexture demo.
(cherry picked from commit c06f4e2a37 )
2009-03-13 17:38:38 -07:00
Brian Paul
01f34e667a
i965: need to disable current shader, if any, in intel_clear_tris()
...
Fixes bad background in all the progs/glsl/ tests.
(cherry picked from commit 60b3fe6c19 )
2009-03-13 17:38:38 -07:00
Eric Anholt
4d0a7b33c5
intel: Speed up glDrawPixels(GL_ALPHA) by using an alpha texture format. (cherry picked from commit 0b63f6449e)
2009-03-13 17:38:38 -07:00
Eric Anholt
fb1d2ed34c
intel: Fix some state leakage of {Client,}ActiveTexture in metaops.
...
Found while debugging cairo-gl.
(cherry picked from commit d11981e0d7 )
2009-03-13 17:38:38 -07:00
Eric Anholt
9395fedf98
i965: Remove brw->attribs now that we can just always look in the GLcontext. (cherry picked from commit 052c1d66a1)
2009-03-13 17:38:38 -07:00
Eric Anholt
9abc0d80af
i965: Delete old metaops code now that there are no remaining consumers. (cherry picked from commit 14321fcfde)
2009-03-13 17:38:38 -07:00
Brian Paul
90e89c01df
i965: init array->Format fields (see bug 19708) (cherry picked from commit 628b52241b)
2009-03-13 17:38:38 -07:00
Eric Anholt
790d93e362
intel: If we're doing a depth clear with tris, do color with it.
...
This is a 10% win on the ever-important glxgears not-a-benchmark.
(cherry picked from commit 67ee22c89f )
2009-03-13 17:38:38 -07:00
Eric Anholt
e9f3783169
i915: Only call CalcViewport from DrawBuffers instead of Viewport.
...
This saves an inadvertent round-trip to the X Server on DrawBuffers, which was
hurting some metaops.
(cherry picked from commit ac0dfbdf0f )
2009-03-13 17:38:38 -07:00
Brian Paul
e41780fedc
intel: move some driver functions around
...
A step toward consolidating i915/intel_state.c and i965/intel_state.c
(cherry picked from commit 84c8b5bbf9 )
2009-03-13 17:38:38 -07:00
Eric Anholt
d0edbbb3f3
intel: replace custom metaops clear with generic.
...
No real-world impact on performance seen. Even glxgears seems to be, if
anything, happier.
(cherry picked from commit c96bac0950 )
2009-03-13 17:38:38 -07:00
Brian Paul
e10119c23e
intel: make intelUpdateScreenFromSAREA() static (cherry picked from commit aae2729aeb)
2009-03-13 17:38:38 -07:00
Brian Paul
208c087f39
intel: remove unused var (cherry picked from commit 66c7f06413)
2009-03-13 17:38:38 -07:00
Shaohua Li
0c8b40b42b
i915: Add support for a new G33-like chipset.
...
Signed-off-by: Shaohua Li <shaohua.li@intel.com >
Signed-off-by: Eric Anholt <eric@anholt.net >
(cherry picked from commit 40290745ea )
2009-03-13 17:38:37 -07:00
Xiang, Haihao
5199f451bb
i965: fix for RHW workaround
...
It is possible that an object whose vertices all are outside of a
view plane is passed to clip thread due to the RHW workaround. This
object should be rejected by clip thread. Fix bug #19879
(cherry picked from commit 68915fd6fa )
2009-03-13 17:38:37 -07:00
Brian Paul
dd7cde5230
i965: tell GLSL compiler to emit code using condition codes
...
The default for EmitCondCodes got flipped when gallium-0.2 was merged.
This fixes GLSL if/else/endif regressions.
Drivers that use GLSL should always explicitly set the flag to be safe.
(cherry picked from commit a9e753c84c )
2009-03-13 17:38:37 -07:00
Eric Anholt
ab5746e5d8
tdfx: Fix begin/endquery for current API. (cherry picked from commit 0cb295584f)
2009-03-13 17:38:37 -07:00
Brian Paul
3bd446c0ab
i965: add missing break for OPCODE_RET case
...
This doesn't effect correctness, but we were emitting an extraneous ADD.
(cherry picked from commit 74b6d55864 )
2009-03-13 17:38:37 -07:00
Brian Paul
9b78402ee4
mesa: more info in error messages (cherry picked from commit 1ca05a066b)
2009-03-13 17:38:37 -07:00
Brian Paul
cf1ef0f308
mesa: minor error msg improvement (cherry picked from commit 803504e69f)
2009-03-13 17:38:37 -07:00
Chris Wilson
fd1f65ba61
intel: Decode MI operands using specific length masks
...
The MI opcodes have different variable length masks, so use an operand
specific mask to decode the length.
(cherry picked from commit e92d97d75b )
2009-03-13 17:38:37 -07:00
Chris Wilson
967345b497
intel: Correct decoding of 3DSTATE_PIXEL_SHADER_CONSTANTS
...
A couple of minor typos that proclaimed an error in the wrong command, and
failed to offset the mask.
(cherry picked from commit 05d130a35a )
2009-03-13 17:38:37 -07:00
Ian Romanick
41ad853a6a
glxgears: No, really. Fix the dyslexia. (cherry picked from commit 5b5ddfb89c)
2009-03-13 17:38:37 -07:00
Ian Romanick
842baa29cb
Fix dyslexia. (cherry picked from commit 9d6880ec8d)
2009-03-13 17:38:37 -07:00
Ian Romanick
9556d870a1
glxgears: Log a message if synched to vblank
...
Tries to use either GLX_MESA_swap_control or GLX_SGI_video_sync to
detect whether the display is synchronized to the vertical blank. If
it detects this, a message will be printed. HOPEFULLY this will
prevent some of the bug reports such as "glxgears only gets 59.7fps.
What's wrong with my driver?"
(cherry picked from commit 58b9cd411f )
2009-03-13 17:38:37 -07:00
Brian Paul
42ce790086
mesa: refactor glTexParameter code (cherry picked from commit 318e53a4bf)
2009-03-13 17:38:37 -07:00
Robert Ellison
b17769af42
mesa: add missing texture_put_row_rgb() function in texrender.c
...
The wrap_texture() function doesn't set the renderbuffer PutRowRGB() method,
which is used to implement DrawPixels(). This fix adds an implementation
of this method.
(cherry picked from commit 523febe12e )
2009-03-13 17:38:37 -07:00
Brian Paul
9030277b0d
intel: move glClear-related code into new intel_clear.c file (cherry picked from commit 4451eb2e75)
2009-03-13 17:38:37 -07:00
Brian Paul
a37a9bf769
intel: Move swap-related functions from intel_buffers.c to new intel_swapbuffers.c (cherry picked from commit 6fcebbe719)
2009-03-13 17:38:37 -07:00
Brian Paul
8afb8a8145
i965: scissor rect was inverted when rendering to texture (cherry picked from commit 3b23a8e07d)
2009-03-13 17:38:37 -07:00
Brian Paul
801f933694
mesa: consolidate glGetTexEnvi/f() code with new get_texenvi() helper (cherry picked from commit ad338c14c2)
2009-03-13 17:38:36 -07:00
Jesse Barnes
75ecd6ebbf
intel: fix the mismerge of the vblank pipe enable sanity check
...
Fix the last merge fix, had the blocks ordered incorrectly.
(cherry picked from commit e57e398960 )
2009-03-13 17:38:36 -07:00
Jesse Barnes
1cd7317fdb
intel: move pipe enable sanity check to where it belongs
...
Bah, applied the patches in the wrong order, not Owain's fault...
(cherry picked from commit 216bff5fd4 )
2009-03-13 17:38:36 -07:00
Owain Ainsworth
1865291701
intel: fix vblank crtc selection with DRI1 when only one pipe is enabled.
...
On Mobile chipsets, we often enable PipeB instead of PipeA, but the test
in here was insufficient, falling back to pipe A if the area
intersection returned zero. Therefore, in the case where a window went
off to the top of the left of the screen, it would freeze, waiting on
the wrong vblank.
Fix this mess by checking the sarea for a crtc being zero sized, and in
that case always default to the other one.
(cherry picked from commit 0b5266ff64 )
2009-03-13 17:38:36 -07:00
Owain G. Ainsworth
3edbcce7d5
intel: Prevent an "irq is not working" printf when only pipe B is enabled.
...
intelMakeCurrent is called before intelWindowMoved (in fact, it calls
it), so calculation of the correct vblank crtc has not happened yet.
Fix this by making a function that fixes up a set of vblank flags and
call if from both functions.
(cherry picked from commit 39b4061bb9 )
2009-03-13 17:38:36 -07:00
Robert Ellison
b1fb34d0ac
i965: fix line stipple fallback for GL_LINE_STRIP primitives
...
When doing line stipple, the stipple count resets on each line segment,
unless the primitive is a GL_LINE_LOOP or a GL_LINE_STRIP.
The existing code correctly identifies the need for a software fallback
to handle conformant line stipple on GL_LINE_LOOP primitives, but
neglects to make the same assessment on GL_LINE_STRIP primitives.
This fixes it so they match.
(cherry picked from commit 73658ff04f )
2009-03-13 17:38:36 -07:00
Ian Romanick
606099f545
swrast: Enable GL_EXT_stencil_two_side (cherry picked from commit b5fbdef7ec)
2009-03-13 17:38:36 -07:00
Brian Paul
32e3142071
i965: minor improvements in brw_wm_populate_key() (cherry picked from commit 89fddf978c)
2009-03-13 17:38:36 -07:00
Brian Paul
66eea4e104
mesa: fix/update/restore comments related to two-sided stencil (cherry picked from commit a304cc6cca)
2009-03-13 17:38:36 -07:00
Brian Paul
e428cf3afd
mesa: initialize ctx->Stencil._BackFace = 1
...
Back-face stencil operations didn't work correctly because this value was
zero. It needs to be 1 or 2. The only place it's set otherwise is in
glEnable/Disable(GL_STENCIL_TEST_TWO_SIDE_EXT).
(cherry picked from commit 2a968113a9 )
2009-03-13 17:38:36 -07:00
Ian Romanick
842b5164d2
Track two sets of back-face stencil state
...
Track separate back-face stencil state for OpenGL 2.0 /
GL_ATI_separate_stencil and GL_EXT_stencil_two_side. This allows all
three to be enabled in a driver. One set of state is set via the 2.0
or ATI functions and is used when STENCIL_TEST_TWO_SIDE_EXT is
disabled. The other is set by StencilFunc and StencilOp when the
active stencil face is set to BACK. The GL_EXT_stencil_two_side spec has
more details.
http://opengl.org/registry/specs/EXT/stencil_two_side.txt
(cherry picked from commit dde7cb9628 )
2009-03-13 17:38:36 -07:00
Brian Paul
a6f7e909a7
mesa: fix transposed red/blue in store_texel_rgb888/bgr888() functions
...
(cherry picked from master, commit 862dccd560 )
2009-03-12 09:32:55 -06:00
Brian Paul
ca87e5a7bd
mesa: add missing _glthread_INIT_MUTEX in _mesa_new_framebuffer()
...
(cherry picked from master, commit 81569c2f69 )
2009-03-12 08:12:54 -06:00
Alan Hourihane
45c4b4dfbd
xdemos: On termination with esc close the contexts correctly.
2009-03-11 13:36:26 +00:00
Dave Airlie
0fc6c2644c
radeon: remove unused lines
2009-03-10 11:00:14 +10:00
Dave Airlie
14c3bddbac
r200: enable hw clears
2009-03-10 19:03:07 +10:00
Brian Paul
2adaec1226
xmesa: set back-buffer's drawable field
...
Fixes back-buffer rendering when MESA_BACK_BUFFER=pixmap
(cherry picked from master, commit 22bac2a1a0 )
2009-03-09 16:28:50 -06:00
Brian Paul
549586c319
i965: fix cube map lock-up / corruption
...
If we're using anything but GL_NEAREST sampling of a cube map, we need to
use the BRW_TEXCOORDMODE_CUBE texcoord wrap mode. Before this, the GPU
would either lock up or subsequent texture filtering would be corrupted.
(cherry picked from master, commit 6f915b10d5 )
2009-03-09 11:57:16 -06:00
Dave Airlie
c122cc4097
r300: emit texture in GTT or VRAM
2009-03-09 13:44:03 +10:00
Dave Airlie
778cf80d9e
r300: move firevertices out into the main place its needed.
...
This fixes a hang on context destruction on rs690
2009-03-09 13:06:10 +11:00
Dave Airlie
1386e8a6ba
radeon: fix cut-n-paste typo
2009-03-08 02:41:30 +10:00
Dave Airlie
f881035fd8
rs690: fix r300 swtcl bug in DMA code.
...
When we finish emitting swtcl objects, we request space in the cmdbuf,
and flush if no space exists. However in this case we also flush
the DMA buffer we just put the vertices we wanted to send in.
This checks in advance if we have space in the buffer.
2009-03-07 17:23:40 +11:00
Dan Nicholson
463ac421a5
autoconf: Restore _GNU_SOURCE for all Linux systems
...
This catches the linux-uclibc case and any others that were being set
prior to 98fcdf3f . Fixes bug 20345.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com >
(cherry picked from commit ac55db1d7d )
2009-03-06 07:59:00 -08:00
Brian Paul
6801240205
mesa: Reads must also be done with lock held.
...
Otherwise two threads might think each made the refcount go zero.
(cherry picked from master, commit 8bbb6b352a )
2009-03-06 07:51:18 -07:00
Brian Paul
a22088b7d5
mesa: Fix typo.
...
Windows threads block if one over-unlocks them.
(cherry picked from master, commit f6159ba4d5 )
2009-03-06 07:50:55 -07:00
Dave Airlie
760068cc8d
r300: fix uninit variable warning
2009-03-06 23:42:35 +11:00
Dave Airlie
e0313ef061
r300: fix swtcl codepaths
2009-03-06 23:42:17 +11:00
Dave Airlie
c6ac53bc40
radeon: implement userspace clears
...
This is pretty much Eric Anholts implementation of clear using the GL state machine
from the Intel drivers.
It works quite well for now for us, probably could do with trying to use Z engine for
clears.
2009-03-06 16:07:23 +10:00
Dave Airlie
b074aacdb2
r200: cs emit state fixups
2009-03-06 05:42:37 +10:00
Dave Airlie
a03a4dd524
r200: remove depth check for dri2
2009-03-06 04:48:20 +10:00
Dave Airlie
7ba9eb1e85
r200: temporary sw clear code
2009-03-06 04:48:20 +10:00
Brian Paul
e89c49147f
docs: update glext.h to version 46
2009-03-05 08:25:17 -07:00
Brian Paul
67634240d1
gl: update glext.h to version 46
2009-03-05 08:25:09 -07:00
Dave Airlie
9d72a75917
radeon: use t->bo to figure out of settexbuffer override is in action
2009-03-05 19:00:17 +10:00
Dave Airlie
eba8008916
r200: port over state emits for kms from radeon
...
this needs testing on real hw
2009-03-05 18:58:48 +10:00
Dave Airlie
5c80eb7ec1
r200: add set tex buffer support
2009-03-06 02:37:10 +10:00
Dave Airlie
31f1298807
radeon: r100 clean up CS packet size calc
2009-03-04 22:26:44 +10:00
Dave Airlie
924bf0d8d3
radeon: settexbuffer support
...
This gets DRI2 compiz going
2009-03-04 22:26:20 +10:00
Dave Airlie
26d0172a5b
radeon: fix texturing for r100
2009-03-04 20:24:08 +10:00
Dave Airlie
940d47de08
radeon: use swrast clear - fail on depth
...
need to write real hw user clear
2009-03-04 18:36:46 +10:00
Dave Airlie
e0de73e8a5
radeon: fixup some segfaults/exit at startup
2009-03-04 18:36:13 +10:00
Brian Paul
819b028a8e
mesa: fix sw fallback state validation bug
...
When a hw driver fell back to swrast, swrast wasn't always getting informed
of program changes. When fixed function is translated into shaders, flags
like _NEW_LIGHT, _NEW_TEXTURE, etc. should really signal _NEW_PROGRAM.
In this case, swrast wasn't seeing _NEW_PROGRAM when new fragment shaders
were generated.
(cherry picked from master, commit de1caa5507 )
2009-03-03 14:25:28 -07:00
Dave Airlie
54b42c0a4a
radeon: remove debugging
2009-03-03 03:37:23 +10:00
Dave Airlie
2b85fccae5
radeon: refactor framebuffer code like intel
...
this is a step towards fbos and should fix pageflipping, but
I think the first flip seems broken.
2009-03-03 03:29:37 +10:00
Brian Paul
a43c30ef41
mesa: update fragResults array in arb_output_attrib_string()
...
Plus add some comments.
(cherry picked from master, commit a070937c00 )
2009-02-27 13:49:58 -07:00
Brian Paul
b65bfde84d
mesa: set bufObj->Pointer = NULL after unmapping
...
Also, ctx->Driver.UnmapBuffer can never be null, so remove conditional.
(cherry picked from master, commit 67025f7893 )
2009-02-27 13:13:31 -07:00
Brian Paul
c39e6917ac
mesa: if a buffer object is mapped when glDeleteBuffers() is called, unmap it
...
(cherry picked from master, commit a7f434b486 )
2009-02-27 13:05:51 -07:00
Brian Paul
c79079895f
mesa: fix incorrect error handling in glBufferDataARB()
...
If glBufferDataARB() is called while a buffer object is currently mapped
we're supposed to unmap the current buffer, then replace it. Don't generate
an error.
(cherry picked from master, commit 75e3ccf6a5 )
2009-02-27 12:58:07 -07:00
Alex Deucher
863c76a7bb
R300: add support for RS600 chips
2009-02-27 14:48:24 -05:00
Alex Deucher
5a34ace3e6
R300: set the number of GB pipes on all r3xx-r5xx chips
2009-02-27 14:31:14 -05:00
Dave Airlie
0dba8883e3
r300: make ste text buffer work with > 2048 on r500
2009-02-27 14:04:03 +10:00
Dave Airlie
26c1b0af02
radeon: add more fbconfigs
...
this makes glxgears get its background back when running under DRI2
2009-02-27 14:04:03 +10:00
Dave Airlie
7f44b62a4a
r300: remove depth offset exits in favour of rrb depth changes
2009-02-27 14:04:03 +10:00
Dave Airlie
294aab9b71
r200: fixup emit sizes for kms
2009-02-27 03:37:30 +10:00
Dave Airlie
e267a090ab
r200: port over cs emit changes from radeon
2009-02-27 03:05:42 +10:00
Dave Airlie
2972d06526
radeon: fixup old packets emission for CS case
2009-02-26 18:26:22 +10:00
Dave Airlie
6d7164705b
r100: fixup kms state emissions
2009-02-26 15:32:34 +10:00
Dave Airlie
6415e64cbc
radeon: avoid page flip code in DRI2
2009-02-26 15:32:34 +10:00
Dave Airlie
3ec7137a75
radeon: enable DRI2 for r100
2009-02-26 15:32:33 +10:00
Dave Airlie
925ea2d9a5
radeon: move CB/ZB state init into emit code
...
This removes the use of the sarea for this stuff so makes DRI2 easier
and emits the CB/ZB info in the correct place
2009-02-26 15:32:27 +10:00
Dave Airlie
158ede35d5
r300: fixup texture state emission for kms path
2009-02-26 11:09:32 +10:00
Dave Airlie
2c033f3893
r300: don't call page flip on DRI2
2009-02-26 11:09:16 +10:00
Dave Airlie
bc5f94c1e1
r300: don't flush VAP too often.
...
Flush the VAP the first time for each state atom we upload new
VAP data
2009-02-26 11:08:14 +10:00
Alex Deucher
4480e631cd
R300: Add support for RS600 chips
2009-02-25 17:48:45 -05:00
Dave Airlie
199867bd45
r300: drop r300Flush for the generic one
2009-02-25 18:06:44 +10:00
Brian Paul
c32661c3ce
mesa: Build DRI by default on Linux/sparc
...
Signed-off-by: David S. Miller <davem@davemloft.net >
(cherry picked from master, commit 32dc28ac7a )
2009-02-24 20:08:00 -07:00
Brian Paul
d5c06bb812
glsl: yet another swizzled expression fix
...
This fixes swizzled conditional expressions such "(b ? p : q).x"
(cherry picked from master, commit 00f0b05d5f )
2009-02-24 08:32:01 -07:00
Brian Paul
9d5aa36239
glsl: fix another swizzle-related bug
...
This fixes the case of "infinitely" nested swizzles such as EXPR.wzyx.yxwz.xxyz
This doesn't appear in typical shaders but with function inlining and the
compiler's internal use of swizzles it can happen.
New glean glsl1 test case added for this.
(cherry picked from master, commit d9881356a6 )
2009-02-24 08:31:02 -07:00
Dave Airlie
2ebf9b9521
r300: fix bo ref/unref, plugs DRI handle leaks
2009-02-24 12:04:49 +10:00
Brian Paul
e3050c1777
docs: Haiku fixes
2009-02-23 08:16:09 -07:00
Brian Paul
06295ddbdd
mesa: fixes for building on Haiku
...
(cherry picked from master, commit 41172c0430 )
Conflicts:
src/mesa/main/dlopen.c
2009-02-23 08:15:43 -07:00
Dave Airlie
c32a28d86e
r300: fixup old setTexOffset DRI1 extension
2009-02-23 15:41:30 +10:00
Dave Airlie
f4502f0f8c
radeon: add more debug info to the flush debug
2009-02-23 14:04:22 +10:00
Dave Airlie
018f5f92cc
r300: revert back autostate change on cacheflush emit
2009-02-23 14:04:22 +10:00
Dave Airlie
13ed7985b2
r300: use OUT_BATCH_REGVAL in a few more places
2009-02-23 14:04:20 +10:00
Dave Airlie
6ffd472b0e
r300: set u to 0 so debug logs are easier to read
2009-02-23 14:04:19 +10:00
Dave Airlie
8c23970479
radeon: stabilise r300 driver like the F10 mesa bufmgr
...
For some reason flushs caused by this CS needs flush hook,
caused the chip to lockup on r300 under compiz, whereas
the F10 driver was rock solid.
2009-02-23 14:04:18 +10:00
Dave Airlie
77161c5ff5
radeon: add some debugging for flush ioctls
2009-02-23 14:04:18 +10:00
Dave Airlie
d4bfe34cb9
radeon: make state atom print like old r300 code
2009-02-23 14:04:17 +10:00
Dave Airlie
b4a90c6213
radeon: fixup legacy bo/cs out of VRAM waiting.
...
This is similiar to the code from the F10 r300 bufmgr
2009-02-23 14:04:17 +10:00
Brian Paul
e2092bb23c
demos: update multitex.c GLSL demo to use vertex arrays or glVertex-mode
...
Press 'a' to toggle drawing mode.
(cherry picked from master, commit 8e8b25c26a )
2009-02-19 17:05:14 -07:00
Brian Paul
528836d0ad
util: added more functions to extfuncs.h
...
(cherry picked from master, commit 4c5f390328 )
2009-02-19 17:04:42 -07:00
Brian Paul
3511442e43
mesa: fix GLSL issue preventing use of all 16 generic vertex attributes
...
Only 15 actually worked before since we always reserved generic[0] as an
alias for vertex position.
The case of vertex attribute 0 is tricky. The spec says that there is no
aliasing between generic vertex attributes 0..MAX_VERTEX_ATTRIBS-1 and the
conventional attributes. But it also says that calls to glVertexAttrib(0, v)
are equivalent to glVertex(v). The distinction seems to be in glVertex-mode
versus vertex array mode.
So update the VBO code so that if the shader uses generic[0] but not gl_Vertex,
route the attribute data set with glVertex() to go to shader input generic[0].
No change needed for the glDrawArrays/Elements() path.
This is a potentially risky change so regressions are possible. All the usual
tests seem OK though.
(cherry picked from mesa, commit dea0d4d563 )
Follow-up: This patch doesn't seem to be as risky as noted above.
There have been no known regressions on Mesa/master because of it.
2009-02-19 17:01:17 -07:00
Brian Paul
d20c53b511
glsl: update program->InputsRead when referencing input attributes
...
This info will be used in the linker for allocating generic vertex attribs.
(cherry picked from master, commit 1cb7cd1292 )
2009-02-19 17:00:06 -07:00
Brian Paul
091cc122ad
glsl: asst improvements, clean-ups in set_program_uniform()
...
Move the is_boolean/integer_type() calls out of the loops.
Move the is_sampler_type() function near the bool/int functions.
Add a bunch of comments.
(cherry picked from master, commit c4ffbf009e )
2009-02-18 17:53:08 -07:00
Brian Paul
c983abbb9e
glsl: fix inequality in set_program_uniform()
...
We were off by one when checking for too many uniform values.
(cherry picked from master, commit b9d8f717d2 )
2009-02-18 17:52:47 -07:00
Brian Paul
a0a81204c2
mesa: bump gl.h version comment to 7.4 (bug 20170)
2009-02-18 15:37:44 -07:00
Brian Paul
409d4f839c
glsl: fix link failure for variable-indexed varying output arrays
...
If the vertex shader writes to a varying array with a variable index,
mark all the elements of that array as being written.
For example, if the vertex shader does:
for (i = 0; i < 4; i++)
gl_TexCoord[i] = expr;
Mark all texcoord outputs as being written, not just the first.
Linking will fail if a fragment shader tries to read an input that's not
written by the vertex shader. Before this fix, this linker test could fail.
(cherry picked from master, commit dac19f17f3 )
2009-02-18 14:29:46 -07:00
Brian Paul
0ab36958ea
mesa: improved error msg
...
(cherry picked from master, commit 621c999d82 )
2009-02-18 13:41:12 -07:00
Brian Paul
c2445f43a3
mesa: increase MAX_UNIFORMS to 1024 (of vec4 type)
...
Old limit was 256. Note that no arrays are declared to this size.
The only place we have to be careful about raising this limit is the
prog_src/dst_register Index bitfields. These have been bumped up too.
Added assertions to check we don't exceed the bitfield in the future too.
(cherry picked from master, commit 5b2f8dc013 )
2009-02-18 13:40:57 -07:00
Brian Paul
f3d1c136b7
glsl: fix a swizzle-related regression
...
This new issue was exposed by commit 6eabfc27f1
(cherry picked from master, commit 212f41b80f )
2009-02-18 13:37:31 -07:00
Dave Airlie
da17b36412
r300: make DRI2 not crash on compiz start
2009-02-18 10:47:17 +10:00
Dave Airlie
e9d6beaab4
radeon: move device param id check ifndef
2009-02-18 10:47:17 +10:00
Brian Paul
dd10a8b09d
docs: 7.4 relnotes: report GLSL 1.20, fixed GLSL array index bug
2009-02-17 16:39:45 -07:00
Brian Paul
dd312366da
glsl: silence some uninit var warnings
...
(cherry picked from master, commit 9d49802b7a )
2009-02-17 16:38:30 -07:00
Brian Paul
d2fe466ef3
mesa: turn on reporting of GLSL version 1.20
...
The new array features, precision/invariant/centroid qualifiers, etc. were
done a while back. The glGetString(GL_SHADING_LANGUAGE_VERSION) query returns
"1.20" now (for drivers that support it anyway).
(cherry picked from master, commit f59719c6c7 )
2009-02-17 16:37:41 -07:00
Brian Paul
fe5328bfad
glsl: fix mistake in a comment
...
(cherry picked from master, commit be8dd01678 )
2009-02-17 16:36:15 -07:00
Brian Paul
c0891dde07
glsl: fix an array indexing bug
...
This fixes a bug found with swizzled array indexes such as in "array[index.z]"
where "index" is an ivec4.
(cherry picked from master, commit 6eabfc27f1 )
2009-02-17 16:35:59 -07:00
Dave Airlie
745c787338
radeon: initialise swapped objects pointer
2009-02-17 16:01:16 +10:00
Dave Airlie
9c040745fe
radeon: legacy texMem interface fixups.
...
The texmem.c interface is wildly messed up it really wants to own the objects
so let it, pain in the ass but this code should work a lot better now
2009-02-17 14:48:49 +10:00
Dave Airlie
7ce6af25e5
Revert "dri/radeon: export a function to cleanup a texture object."
...
This reverts commit 5325f86240 .
2009-02-17 14:46:12 +10:00
Dave Airlie
2ba4fc3d60
radeon/r200: drop legacy texture heap code
2009-02-17 14:00:24 +10:00
Dave Airlie
48e7b940eb
radeon/r200: fixup texturing aging calls
2009-02-17 13:39:38 +10:00
Brian Paul
0e6d9c1a55
docs: recent 7.4 bug fixes
2009-02-16 20:35:12 -07:00
Brian Paul
5f74a66132
glsl: allow setting arrays of samplers in set_program_uniform()
...
Arrays of sampler vars haven't been tested much and might actually be broken.
Will need to be revisited someday.
Another fix for bug 20056.
(cherry picked from master, commit 2b4f0216bf )
2009-02-16 20:30:49 -07:00
Brian Paul
46f8b62d5f
glsl: raise GL_INVALID_OPERATION for glUniform(location < -1)
...
location = -1 is silently ignored, but other negative values should raise
an error.
Another fix for bug 20056.
(cherry picked from master, commit 234f03e90a )
2009-02-16 20:30:06 -07:00
Brian Paul
3e3e80c431
glsl: rework _mesa_get_uniform[fi]v() to avoid using a fixed size intermediate array
...
(cherry picked from master, commit 4ef7a93296 )
2009-02-16 20:29:36 -07:00
Brian Paul
0486d117e4
glsl: fix glUniform() array bounds error checking
...
If too many array elements are specified, they're to be silently ignored (don't
raise a GL error).
Fixes another issue in bug 20056.
(cherry picked from master, commit 2c1ea0720d )
2009-02-16 20:28:57 -07:00
Brian Paul
29981c14da
glsl: fix incorrect size returned by glGetActiveUniform() for array elements.
...
Fixes one of the issues in bug 20056.
(cherry picked from master, commit 369d1859d7 )
2009-02-16 20:28:14 -07:00
Brian Paul
98d5efb2c5
glsl: use _slang_var_swizzle() in a few places to simplify the code.
...
(cherry picked from master, commit 285b500bb7 )
2009-02-16 20:26:58 -07:00
Brian Paul
77a44aafaf
mesa: another fix for program/texture state validation
...
This fixes a regression introduced in 46ae1abbac
Break program validation into two steps, do part before texture state
validation and do the rest after:
1. Determine Vertex/Fragment _Enabled state.
2. Update texture state.
3. Determine pointers to current Vertex/Fragment programs (which may involve
generating new "fixed-function" programs).
See comments in the code for more details of the dependencies.
(cherry picked from master, commit 537d3ed6f3 )
2009-02-16 20:23:17 -07:00
Brian Paul
8278c70716
mesa: fix/change state validation order for program/texture state
...
Program state needs to be updated before texture state since the later depends
on the former.
Fixes piglit texgen failure. The second time through the modes (press 't'
three times) we disable the fragment program and return to conventional texture
mode. State validation failed here because update_texture() saw stale fragment
program state.
(cherry picked from master, commit 46ae1abbac )
2009-02-16 20:22:46 -07:00
Dave Airlie
7c7ff659ce
radeon: fixup destroy texture object exit path and update LRU
...
the destroy path was doing bad things with structure names, make it do less
bad things, use container_of instead
2009-02-17 11:17:22 +10:00
Dave Airlie
43c71a2d40
radeon: remove leftover debug
2009-02-17 10:42:51 +10:00
Dave Airlie
62d504d818
radeon/r200: drop dirty state from texture object + pp_txoffset
...
this is just more code cleanup for old dead code
2009-02-17 10:41:21 +10:00
Dave Airlie
a365f9b78b
r200: align with r100 code
2009-02-17 10:28:43 +10:00
Dave Airlie
646325a5ef
radeon: fix not emitting texture state correctly
...
this is whole texture dirty bit is probably not needed with the current
codebase, need to revisit
2009-02-17 10:27:45 +10:00
Dave Airlie
0a8cba9a65
radeon: steal miptree optimisation from intel codebase
...
This replaces a miptree if it won't distrub anything else.
2009-02-17 10:26:58 +10:00
Dave Airlie
7a1dbcabf3
radeon: move YUV on first texunit check after hw state is setup
2009-02-17 10:26:33 +10:00
Dave Airlie
5325f86240
dri/radeon: export a function to cleanup a texture object.
...
The radeon legacy code want to cleanup not free the texture obj,
so export a function to do that and wrap it.
2009-02-17 10:25:34 +10:00
Alan Hourihane
ac0955f5e2
demos: fix glxpixmap and call glXWaitGL before calling XCopyArea.
2009-02-16 11:55:47 +00:00
Alan Hourihane
4130c35ca8
dri2: support glXWaitX & glXWaitGL by using fake front buffer.
2009-02-16 11:48:24 +00:00
Dave Airlie
ecf0a3eac1
radeon: fix texcompress2 test.
...
this makes compressed subimages work properly.
2009-02-16 09:51:08 +10:00
Dave Airlie
f069bc4a8e
radeon: fix compressed tex subimage unpack parameter
2009-02-16 17:16:28 +10:00
Dave Airlie
b0e8ac8fd2
radeon: add cflags to decide whether to link libdrm_radeon or not.
...
You don't need libdrm_radeon for the legacy driver to build,
only for the experimental mm/cs paths.
2009-02-15 17:03:47 +10:00
Nicolai Haehnle
7d19d27684
radeon-common: Fix crash in glGetTexImage
...
Since texture images are now stored in miptrees, we cannot usually
access them directly via the Data pointer.
So we wrap Mesa's implementation by map/unmap calls.
This crash was triggered by Sauerbraten, Piglit now contains a
regression test.
Signed-off-by: Nicolai Haehnle <nhaehnle@gmail.com >
2009-02-14 21:46:44 +01:00
Nicolai Haehnle
2d9471b281
r300: Fix crash in cubemap tree creation
...
The mip tree creation would crash if the first baselevel image to be uploaded
was not the positive-x image.
Found with Sauerbraten, also added a regression test to Piglit.
Signed-off-by: Nicolai Haehnle <nhaehnle@gmail.com >
2009-02-14 20:47:08 +01:00
Nicolai Haehnle
9a26164f35
r300: Redirect constant TEX coordinates
...
R3xx/R5xx fragment program texture constants must come from a hardware
register instead of the constant file, so we redirect if necessary during
the native rewrite phase.
The symptoms of this bug started appearing when the Mesa fixed function
texenvprogram code started using STATE_CURRENT_ATTRIB constants for
texture coordinates when the corresponding attributes were constant across
all vertices.
Signed-off-by: Nicolai Haehnle <nhaehnle@gmail.com >
2009-02-14 17:09:54 +01:00
Michel Dänzer
5f3ab230ea
r300: Fix R300_CMD_SCRATCH on big endian.
2009-02-14 20:40:48 +10:00
Dave Airlie
b1b7bc66a4
radeon: remove unused radeon_compat.c
2009-02-14 20:34:20 +10:00
Dave Airlie
f8c2beccd4
r200: fixup cube emit debug
2009-02-14 20:13:55 +10:00
Dave Airlie
fd81835dc7
r200: fix another cmdbuf sizing issue
2009-02-14 20:13:55 +10:00
Dave Airlie
f3a1f321cf
radeon: check for valid bo in release arrays
2009-02-14 12:05:36 +10:00
Dave Airlie
fcc7a691dc
radeon: remove old cube code
2009-02-14 12:05:36 +10:00
Dave Airlie
c0ae4d3c55
radeon/r300: fix warnings
2009-02-14 07:49:15 +10:00
Dave Airlie
cd4e37c8fb
radeon: add initial cubemap support appears to work
2009-02-14 05:57:52 +10:00
Brian Paul
d440647eb8
autoconf: Use include-fixed directory with makedepend on newer GCC
...
On newer GCC releases, the compiler's headers have been split between
the include and include-fixed directories. Add both if the directories
exist.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com >
Signed-off-by: Julien Cristau <jcristau@debian.org >
(cherry picked from master, commit a3d223f0d2 )
2009-02-13 09:10:09 -07:00
Dave Airlie
2753dd42fd
radeon/r200: make setTexOffset work again
2009-02-13 23:34:53 +10:00
Dave Airlie
f363a97d25
radeon/r200: fix set tex offset functions
2009-02-13 23:29:27 +10:00
Dave Airlie
ed8340192e
radeon: revert unneeded change to texturing code
2009-02-13 23:02:12 +10:00
Dave Airlie
9fd8da299b
radeon: fix compressed texture upload on all radeons
...
tested on r200, texcmp works. May need more verification
2009-02-13 22:49:06 +10:00
Dave Airlie
8123897615
r200: update with changes from r100 driver for texture state
2009-02-13 19:39:21 +10:00
Dave Airlie
695ca1e2be
r200: port over state emit fix from r100
2009-02-13 18:50:57 +10:00
Dave Airlie
ade3660942
r200: fixup some CS emission sizes
2009-02-13 01:27:21 +10:00
Dave Airlie
393c699e21
r200: use correct finish interface
2009-02-13 00:04:11 +10:00
Dave Airlie
5ee1dd2133
radeon: fixup include ordering
2009-02-13 01:21:37 +10:00
Dave Airlie
53116910b1
Merge remote branch 'origin/master' into radeon-rewrite
...
Conflicts:
configure.ac
src/mesa/drivers/dri/r200/r200_context.c
src/mesa/drivers/dri/r300/r300_render.c
2009-02-13 01:11:25 +10:00
Dave Airlie
7e104f9cde
r300: fix warning about mesa_lock_context_texture
2009-02-13 01:04:18 +10:00
Dave Airlie
dc531ba406
radeon: add stdint include
2009-02-12 14:44:20 +10:00
Dave Airlie
899b91b1fb
radeon: add mminfo struct to wrapper
2009-02-12 14:43:25 +10:00
Dave Airlie
ec0939b013
radeon: add defines for future bits
2009-02-12 14:41:16 +10:00
Dave Airlie
1e77f7b55c
r200: make build complete
2009-02-12 14:39:33 +10:00
Dave Airlie
56a13a7ca9
r300: make r300 work with latest changes
2009-02-12 14:36:12 +10:00
Dave Airlie
c83d0bfe06
radeon: make build without libdrm_radeon better
2009-02-12 14:16:24 +10:00
Dave Airlie
d513915d27
radeon/r200/r300: make build again with tracker changes
2009-02-13 00:05:39 +10:00
Dave Airlie
9314d936e8
radeon: remove depends on libdrm_radeon for now.
...
will fixup makefiles later to detect and use libdrm_Radeon in proper
places
2009-02-12 23:53:41 +10:00
Dave Airlie
dc8a707c67
radeon/r200/r300: make build with out libdrm_radeon installed for now
2009-02-12 23:52:51 +10:00
Dave Airlie
8cb16e6daf
r200/r300: get up to speed on renamed files
2009-02-12 22:48:18 +10:00
Dave Airlie
23d3559bd4
radeon: renaming and headers cleanup
2009-02-12 22:38:10 +10:00
Dave Airlie
df4a1348b1
r100/r200: fix front rendering issue.
2009-02-12 21:44:34 +10:00
Dave Airlie
1090d206de
radeon/r200/r300: another big merge upheavel.
...
This merges lots of the hw state atom emission and firevertices code.
it also removes a lot of the extra radeon crap from r300
and merge scissor
2009-02-12 21:16:39 +10:00
Dave Airlie
f3f1f7dc20
r300: disable assert that fires
2009-02-11 19:04:39 +10:00
Dave Airlie
3713a7accf
radeon: unmap in case of two dma regions being used for one cmdbuf
2009-02-11 19:03:56 +10:00
Dave Airlie
7e98907eb8
radeon: cleanup cmdbuffer
2009-02-11 16:52:56 +10:00
Dave Airlie
832446c892
r300: fix front buffer rendering properly fixes tests in glean
2009-02-11 16:50:19 +10:00
Dave Airlie
c5d9a7ab30
r200: fix build
2009-02-11 20:10:59 +10:00
Dave Airlie
edbe1fac6a
radeon: fix span init needs more work
2009-02-11 07:02:18 +10:00
Dave Airlie
45496122b7
radeon/r200/r300: merge span code into single shared file
2009-02-11 05:47:55 +10:00
Dave Airlie
7394c429c0
radeon/r200: flush vertices when data in cmdbuf.
...
This fixes a whole bunch of regressions in piglit
2009-02-11 05:07:31 +10:00
Dave Airlie
18aca218a2
radeon: r100 can't use some of the texture formats.
...
this fixes the texrect-many test
2009-02-11 02:41:39 +10:00
Dave Airlie
4c36282ef9
radeon/r200/r300: fix span code for depth reading.
...
makes the maskedClear test work
2009-02-11 02:41:11 +10:00
Dave Airlie
3e4d0c2a5d
r100: remove debug code
2009-02-10 23:39:13 +10:00
Dave Airlie
639b5fca0c
r100: fix 3D texture fallback
2009-02-10 23:38:51 +10:00
Dave Airlie
c3ca94bc91
radeon: fix fallback case where t->mt is valid NULL
2009-02-10 23:36:28 +10:00
Dave Airlie
b1df5ed6db
radeon: put back state emission lastcmd
2009-02-10 04:57:37 +10:00
Dave Airlie
d2fa89140e
r200: invalidate texture paths in some more places
2009-02-10 04:56:16 +10:00
Dave Airlie
ccf7814a31
radeon: major cleanups removing old dead codepaths.
...
This should be working gears on radeon state
2009-02-10 04:54:24 +10:00
Dave Airlie
9df844b109
radeon: fix alignment issues in ELT code
2009-02-09 23:19:42 +10:00
Dave Airlie
3fafaf8959
radeon: make more r100 work
2009-02-09 03:50:38 +10:00
Dave Airlie
abdf1f65d2
r200: cleanup some bits that aren't used
2009-02-09 03:50:07 +10:00
Brian Paul
7e8f2c56c0
mesa: fix logic error in computing enableBits in update_texture_state()
...
If we had a vertex shader but no fragment shader (i.e. fixed function) we
didn't get the right enabled texture targets.
Fixes blank/white texture problem.
(cherry picked from master, commit b46611633c )
2009-02-07 12:04:15 -07:00
Brian Paul
a0880a152f
mesa: fix tnl->render_inputs_bitset setup for fragment program texcoords
...
Handle the case where there's no per-vertex texcoords but the fragment shader
needs texcoords.
Fixes piglit shaders/fp-generic/dph test.
(cherry picked from master, commit f6d23943cd )
2009-02-07 12:03:37 -07:00
Brian Paul
4608a9172f
swrast: return (0,0,0,1) when sampling incomplete textures, not (0,0,0,0)
...
Fixes piglit shaders/fp-incomplete-tex test.
(cherry picked from master, commit 1df62651b2 )
Conflicts:
src/mesa/swrast/s_fragprog.c
Also updated the fetch_texel_lod(), fetch_texel_deriv() functions to match
those in git/master.
2009-02-07 12:02:22 -07:00
Brian Paul
d0e38f7ec0
glsl: replace assertion with conditional in _slang_pop_var_table()
...
We were hitting the assertion when we ran out of registers, which can happen.
Also, add some additional assertions and freshen up some comments.
(cherry picked from master, commit 0744805d58 )
2009-02-07 11:57:43 -07:00
Dave Airlie
e223b7c312
radeon: port over arrays code even though not in use yet
2009-02-06 20:30:03 +10:00
Dave Airlie
36d3f3e74a
r100: fixup radeon so gears seems to work
2009-02-06 20:04:42 +10:00
Dave Airlie
16f4b10170
radeon: remove unused texmem
2009-02-06 19:36:39 +10:00
Dave Airlie
0a43603c1c
r300: fix some autostate batch setups
2009-02-06 09:18:15 +10:00
Dave Airlie
8fe61fc5ba
radeon/r200 remove more unused code
2009-02-04 16:01:41 +10:00
Dave Airlie
b584b0728d
radeon: make compile again.
...
Not tested but ripped out lots of stuff unneeded anymore time to test later
2009-02-04 15:58:08 +10:00
Dave Airlie
88a409fa8e
r300: fix up CS for modesetting - gears under kms works
2009-02-04 15:12:16 +10:00
Dave Airlie
c370776b02
radeon: make generate_mipmap static
2009-02-04 13:41:05 +10:00
Dave Airlie
0bcac04100
r300: fix swtcl
2009-02-04 13:40:48 +10:00
Dave Airlie
c1a42f5cdc
r200: fixup DMA region stuff
2009-02-04 23:40:41 +10:00
Dave Airlie
e44effcfcb
radeon: call getpagesize once and store in a static
2009-02-04 13:16:41 +10:00
Dave Airlie
711cbf30a1
r300: make dma buffer reuse much more sensible
2009-02-04 13:16:03 +10:00
Dave Airlie
55c8a79a33
radeon: add support for stencil buffers + misc debug changes
...
this adds the stencil rb setup, along with misc changes to formatting
and debug
2009-02-04 11:19:26 +10:00
Dave Airlie
3f59bee438
r200: move to new mipmap interface
2009-02-04 11:17:37 +10:00
Dave Airlie
c85a3851b6
radeon: only do the fb read if we are mapping a VRAM object
...
this makes writing the DMA buffers got a lot better
2009-02-04 11:14:38 +10:00
Dave Airlie
e8f575d657
radeon_cs: move to inline cs_write_dword
...
this gets back some of the CPU this was wasting
2009-02-04 11:13:54 +10:00
Brian Paul
a69bdbbbdd
docs: fixed Windows build error, added MESA_GLX_FORCE_DIRECT env var
2009-02-03 15:40:16 -07:00
Brian Paul
88c97a2662
docs: document new MESA_GLX_FORCE_DIRECT env var for the Xlib driver
...
(cherry picked from master, commit 2f51be75c5 )
2009-02-03 15:39:13 -07:00
Brian Paul
ce9c69ddbc
xlib: use MESA_GLX_FORCE_DIRECT to make glXIsDirect() always return True
...
Some apps won't run w/ indirect rendering contexts.
Also, consolidate some context-init code in new init_glx_context() function.
(cherry-picked from master, commit 49e80bf6b1 )
2009-02-03 15:38:44 -07:00
Eric Anholt
e430fcb716
dri2: Avoid round-tripping on DRI2GetBuffers for the same set of buffers.
...
We only wanted to request when asked for the same set of buffers when a resize
has happened. We can just watch the protocol stream for a ConfigureNotify
and flag to do it then.
This is about a 5% win from doing two glViewport()s per frame in openarena.
2009-02-03 21:36:38 +00:00
Dave Airlie
4c078cfbad
radeon: add a reference to the static buffers so they don't get deleted
2009-02-03 12:38:31 +10:00
Dave Airlie
d9cf131925
r300: fixup mipmap + texsubimage issues
...
This fixes a few regression in piglit, and adds some debug to the mipmap code
2009-02-03 09:49:45 +10:00
Dave Airlie
dbf72bdd3d
radeon_bo: align size of bo to page size.
...
This is really required for the VRAM allocator upload function.
2009-02-03 09:48:27 +10:00
Brian Paul
11a363e632
mesa: move code after decls. Fixes Window build failure.
...
(cherry picked from master, commit 92ced46eaf )
2009-02-02 07:50:31 -07:00
Dave Airlie
75762a8219
radeon: this code forgot to add dPriv x/y back to spans
2009-02-02 12:26:22 +10:00
Dave Airlie
f4dfafd50a
r300: rename validate textures to validate buffers
2009-02-02 12:26:04 +10:00
Julien Cristau
9a3a20b2b9
debian/rules: on lpia, only build the i915 and i965 dri drivers
...
Based on Ubuntu changes, modified to also build swrast.
2009-01-31 23:04:06 +01:00
Julien Cristau
4672811541
debian/control: build the dri drivers on lpia
...
add lpia to the Architecture field for libgl1-mesa-dri{,-dbg} to match Ubuntu.
2009-01-31 22:30:15 +01:00
Julien Cristau
3cad3d28a5
mangle upstream version in debian/watch
...
Fix watch file to make uscan not consider release candidates as newer than
actual releases.
2009-01-31 22:07:51 +01:00
Brian Paul
41e63fbdb2
docs: recent bug fixes for 7.4
2009-01-30 16:09:58 -07:00
Brian Paul
b543401a5c
mesa: fix incorrect call to clear_teximage_fields() in _mesa_TexImage2D()
...
Fixes failed assertion / segfault for particular proxy texture tests.
(cherry picked from master, commit ea4b183b8c )
2009-01-30 16:06:52 -07:00
Brian Paul
8c4f08fbad
mesa: add missing _mesa_reference_texobj() calls for texture array targets
...
(cherry picked from master, commit 7c48719a5f )
2009-01-30 16:06:21 -07:00
Brian Paul
f3081a34d2
mesa: remove incorrect refcounting adjustment in adjust_buffer_object_ref_counts()
...
Fixes bug 19835. However, a more elaborate fix should be implemented someday
which uses proper reference counting for gl_array_object.
(cherry picked from master, commit 88e0b92a74 )
2009-01-30 16:05:51 -07:00
Julien Cristau
cff0971f87
Prepare changelog for upload
2009-01-30 20:00:37 +01:00
Julien Cristau
5ac4c69d83
More superfluous directories
2009-01-30 19:56:29 +01:00
Julien Cristau
a314c40cc4
Document my changes in debian/changelog
2009-01-30 19:42:38 +01:00
Julien Cristau
959fd6b8f6
Add back progs/fbdev
...
It was added to the tarballs in 22b0b2f47e
2009-01-30 19:34:47 +01:00
Julien Cristau
937f0da04a
Delete more directories that aren't in the tarball
2009-01-30 19:25:50 +01:00
Julien Cristau
73bc5967e2
Merge commit '5a458977113e4a0d3c389b03801cf6ce580d3935' into debian-experimental
2009-01-30 19:06:19 +01:00
Dave Airlie
f68a61d883
r200/r300: swtcl fixups to use old dma buffers on top of BOs
2009-01-31 02:00:12 +10:00
Dave Airlie
e45213d89b
r200/r300: add aperture space checks
2009-01-31 01:59:57 +10:00
Dave Airlie
08bb7eedfb
r200: fix swtcl - slow but works
2009-01-30 20:03:17 +10:00
Dave Airlie
70661f678e
WIP comit
2009-01-29 20:46:31 +10:00
Dave Airlie
c9bb5cd20e
r200: bring back single dma flush
2009-01-29 20:33:07 +10:00
Dave Airlie
59b183ce0f
radeon: remove even more common code
2009-01-29 19:11:31 +10:00
Dave Airlie
5ba92a5b05
radeon/r200/r300: bring back old style DMA buffer on top of BOs.
...
this gets back a lot of the lots speed in gears on r500 at least
I also fixed the legacy bufmgr to deal when the dma space fills up
2009-01-29 16:47:37 +10:00
Dave Airlie
682ebc79d5
r200: start work on userspace clear for r200
2009-01-29 23:03:47 +10:00
Dave Airlie
5fbb00a11e
r200: unref swtcl buffer correctly
2009-01-29 23:03:34 +10:00
Dave Airlie
b13746b558
r300: fix some whitespace
2009-01-29 23:03:21 +10:00
Dave Airlie
474d282a1d
r200: re-write state handlers for new CS mechanism
2009-01-29 23:02:43 +10:00
Dave Airlie
31a112e6e8
r200: avoid setting variable on kernel mm setup
2009-01-29 23:01:41 +10:00
Dave Airlie
ab6edc9dce
radeon: add repeated register packet one
2009-01-29 23:01:21 +10:00
Brian Paul
7b1d3cf392
docs: i965 fixes
2009-01-28 17:02:39 -07:00
Brian Paul
25515b557e
i965: fix bug in pass0_precalc_mov()
...
Previously, "in-place" swizzles such as:
MOV t, t.xxyx;
were handled incorrectly. Fixed by splitting the one loop into two loops so we
get all the refs before assigning them (to avoid potential clobbering).
(cherry picked from master/commit faa48915d2 )
2009-01-28 17:01:34 -07:00
Brian Paul
51625ff86e
i965: widen per-texture bitfields for 16 texture image units
...
(cherry picked from master/commit f78c388b6c )
2009-01-28 17:01:03 -07:00
Brian Paul
4d8f661726
intel: check if stencil test is enabled in intel_stencil_drawpixels()
...
(cherry picked from master/commit 72ee0e247d )
2009-01-28 17:00:23 -07:00
Brian Paul
efa69a2f66
intel: save/restore GL matrix mode in intel_meta_set_passthrough_transform(), intel_meta_restore_transform()
...
(cherry picked from master, commit 723648f2ee )
2009-01-28 16:55:16 -07:00
Timo Aaltonen
a2dce49158
New changelog entry for 7.3
2009-01-25 17:51:16 +02:00
Timo Aaltonen
e4b28de803
Merge branch 'upstream-experimental' into debian-experimental
2009-01-25 17:30:47 +02:00
Brian Paul
30a6dd78d5
docs: fix typo
2009-01-22 10:39:05 -07:00
Brian Paul
9f75836308
mesa: set version to 7.4 for mesa_7_4_branch
2009-01-22 10:19:39 -07:00
Dave Airlie
f69e2f42d5
r200: fix up swtcl/tcl flushes
2009-01-22 22:50:36 +10:00
Dave Airlie
d93dc43382
radeon: plug memory leak running gears
2009-01-23 08:08:34 +10:00
Dave Airlie
9780127449
radeon: remove some debugging
2009-01-23 08:03:03 +10:00
Dave Airlie
8b56a86385
radeon: better free of array
2009-01-22 21:49:58 +10:00
Dave Airlie
860d0cc656
radeon: free all relocs in array
2009-01-22 21:47:38 +10:00
Dave Airlie
02952a41eb
radeon: check relocs before deref
2009-01-22 21:38:35 +10:00
Dave Airlie
2c8b55b351
radeon: fix relocs even more
2009-01-22 21:35:58 +10:00
Dave Airlie
c66e38d24f
radeon: fix reloc free harder
2009-01-22 21:31:06 +10:00
Dave Airlie
bb7756eaed
radeon: free indices caught with valgrind
2009-01-22 21:29:22 +10:00
Dave Airlie
a5b54eb3c9
radeon: cleanup bo unref codepath in pending code
...
assert for bad case hopefully
2009-01-22 21:19:56 +10:00
Dave Airlie
11995807f1
radeon: fix counting for cfree handles in an inline
2009-01-22 21:12:54 +10:00
Dave Airlie
014c52eb6b
radeon: add r100/r200 workarounds for legacy aging
2009-01-23 02:47:15 +10:00
Dave Airlie
4ca76586c2
r200: disable some debug
2009-01-23 00:23:10 +10:00
Dave Airlie
7d01cb37d9
r200: emit elts into a separate ELT bo
2009-01-23 00:17:38 +10:00
Dave Airlie
eda2284961
r200r300: start merging span code
2009-01-22 04:14:40 +10:00
Julien Cristau
f5c47105db
Prepare changelog for upload
2009-01-21 19:01:24 +01:00
Julien Cristau
f1939c8685
Refresh patches 03 and 04.
2009-01-21 19:01:17 +01:00
Julien Cristau
3ac4d678ef
Delete some more files which aren't in the tarballs
2009-01-21 18:51:07 +01:00
Dave Airlie
0788e42471
r200: remove indexed verts
2009-01-22 02:38:00 +10:00
Dave Airlie
909aeb005f
radeon: fix 1D textures
2009-01-22 01:24:50 +10:00
Dave Airlie
674b204ba7
r200: fix cubemaps
2009-01-22 01:17:31 +10:00
Dave Airlie
61bb82636f
r200/r300: port r200 texture handling to common code
...
we now get texrect + trivial textures working
2009-01-22 01:05:43 +10:00
Dave Airlie
2bf31b7ffd
r300/radeon: move face_for_target
2009-01-21 18:41:11 +10:00
Julien Cristau
fcfec66865
update changelog
2009-01-20 18:50:10 +00:00
Julien Cristau
53426d7113
Merge tag 'mesa_7_3_rc3' into debian-experimental
...
Conflicts:
progs/tests/Makefile
2009-01-20 18:49:21 +00:00
Dave Airlie
e0ec3243e8
r300: start migrating common functions into common code
2009-01-21 02:21:45 +10:00
Dave Airlie
ddbd6ed326
r300: move to common texture_image object
2009-01-21 02:15:28 +10:00
Dave Airlie
33dc14c707
radeon/r200/r300: start to move to common miptree/texobj
2009-01-21 02:10:56 +10:00
Dave Airlie
d9c4a01bad
r200: make tri render on my r200.
2009-01-21 01:40:33 +10:00
Dave Airlie
04029e5ddb
r200: tri runs without crashing - doesn't draw anything
2009-01-20 22:59:34 +10:00
Dave Airlie
ed3a1cce73
r200: clear is working at least - not much else
2009-01-20 22:51:04 +10:00
Timo Aaltonen
1d4756de06
Update the changelog.
2009-01-16 23:12:14 +02:00
Timo Aaltonen
c1abb821f9
Merge commit 'mesa_7_3_rc2' into debian-experimental
2009-01-16 23:05:20 +02:00
Dave Airlie
08d90fe8a5
r300: move some more function to generic
2009-01-15 16:56:50 +10:00
Dave Airlie
1a51b76343
radeon/r200/r300: start to make cmd buf useful
2009-01-15 16:45:39 +10:00
Dave Airlie
0c0a55a211
r100/r200: move to new atom style emission
2009-01-15 16:38:59 +10:00
Dave Airlie
47e3a7d794
radeon: get ctx right in copybuffer
2009-01-14 15:54:28 +10:00
Dave Airlie
4aa874c636
r200: add missing symbols
2009-01-14 15:48:02 +10:00
Dave Airlie
8c6a7d0174
radeon/r200/r300: make legacy emit non-r300 specific
2009-01-14 15:45:29 +10:00
Dave Airlie
e7d06a55c5
radeon: move debug symbol add DRI2
2009-01-14 15:21:45 +10:00
Dave Airlie
61da612a4f
r300: start moving new r300 cmdbuf into common code
2009-01-14 15:14:09 +10:00
Dave Airlie
23295cf8e8
radeon/r200/r300: consolidate swap buffers
2009-01-14 13:38:12 +10:00
Dave Airlie
44b916b2c0
radeon: remove old lock code
2009-01-14 13:38:03 +10:00
Dave Airlie
7e5e327cea
radeon/r200/r300: consolidate the buffer copy/flip code into one place
2009-01-14 13:23:24 +10:00
Dave Airlie
d29e96bf33
radeon/r200/r300: attempt to move lock to common code
2009-01-14 12:04:00 +10:00
Dave Airlie
4637235183
radeon/r200/r300: initial attempt to convert to common context code
2009-01-14 10:54:52 +10:00
Dave Airlie
0217ed2cf9
radeon/r200: move more stuff closer together in context
2009-01-14 08:40:15 +10:00
Dave Airlie
b6e4869069
radeon/r200: move state atom to common header
2009-01-14 06:28:43 +10:00
Dave Airlie
692ca82116
radeon/r200: start splitting out commonalities into separate headers
2009-01-13 22:55:27 +10:00
Dave Airlie
4b9a09e9f6
radeon: use bo_wait to wait for all buffers to be rendered to
...
Not 100% sure this is correct, but its what Intel does and its better than
CP_IDLE.
2009-01-13 16:50:15 +10:00
Kristian Høgsberg
d67987b0d1
Bump dri2proto requirement to 1.99.3, drop CopyRegion bitmask from protocol.
...
(cherry picked from commit 154a9e5317 )
2009-01-11 09:45:04 +10:00
Dave Airlie
efe68930dc
radeon/r300: add code to setup r300 vs r500 using pci device from kernel
2009-01-11 09:47:38 +10:00
Julien Cristau
88083e9bab
Prepare changelog for upload
2009-01-10 22:34:36 +01:00
Julien Cristau
47e54545ed
Delete some now unused code from debian/rules.
2009-01-10 22:13:17 +01:00
Julien Cristau
54885ff0ad
Delete unused configs/debian-*, and install-source.sh script.
...
We've switched to using autoconf, and mesa-swx11-source is gone.
2009-01-10 21:55:19 +01:00
Julien Cristau
502fbe7cb3
Merge branch 'debian-unstable' into debian-experimental
...
Conflicts:
debian/changelog
debian/rules
2009-01-10 21:42:57 +01:00
Julien Cristau
08fdb497fb
Merge commit 'origin/upstream-unstable' into debian-experimental
2009-01-10 21:38:10 +01:00
Julien Cristau
2a6711c0e5
add bug closers
2009-01-10 21:02:55 +01:00
Julien Cristau
382a8f6e29
Require libdrm-dev 2.4.3.
2009-01-10 20:41:16 +01:00
Julien Cristau
a713ba4399
Update changelog
2009-01-10 20:31:20 +01:00
Julien Cristau
5359febc9b
Merge tag 'mesa_7_3_rc1' into debian-experimental
...
Conflicts:
progs/tests/Makefile
progs/tests/floattex.c
2009-01-10 20:30:41 +01:00
Dave Airlie
2a287ddd32
r300: disable settexoffset extension on r300
2008-12-22 17:04:39 +10:00
Dave Airlie
d9b325f77e
radeon: fix library name for consistency
2008-12-22 12:28:16 +10:00
Dave Airlie
e14ffb1fa1
radeon: remove start/end offset + cleanup some whitespace
2008-12-22 12:11:21 +10:00
Dave Airlie
a42000bd6b
radeon: fixup r500 FP emission for new CS
2008-12-22 11:41:23 +10:00
Dave Airlie
9f2732d312
radeno: hopefully make r200/radeon build
2008-12-21 09:54:35 +10:00
Julien Cristau
85d882983f
Prepare changelog for upload
2008-12-14 09:59:33 +05:30
Timo Aaltonen
5387880f18
delete progs/trivial/
2008-12-09 02:16:44 +02:00
Timo Aaltonen
a7a9398411
Build-depend on x11proto-dri2-dev (>= 1.99.3)
2008-12-09 02:01:40 +02:00
Timo Aaltonen
7593023f0b
Update the changelog for the snapshot
...
also drop 01_disable-intel-classic-warn.diff since it's obsolete now.
2008-12-09 01:57:44 +02:00
Timo Aaltonen
92d9a71f60
Merge commit 'origin/debian-experimental' into debian-experimental
...
Conflicts:
include/GLES/egltypes.h
progs/miniglx/glfbdevtest.c
progs/miniglx/manytex.c
progs/miniglx/sample_server.c
progs/miniglx/sample_server2.c
progs/miniglx/texline.c
progs/tests/Makefile.win
progs/tests/antialias.c
progs/tests/cva.c
progs/tests/dinoshade.c
progs/tests/getprocaddress.py
progs/tests/jkrahntest.c
progs/tests/manytex.c
progs/tests/multipal.c
progs/tests/multiwindow.c
progs/tests/sharedtex.c
progs/tests/texline.c
progs/tests/texrect.c
progs/tests/texwrap.c
progs/trivial/Makefile
2008-12-09 01:38:08 +02:00
Timo Aaltonen
661890211e
Merge commit 'mesa_7_2' into debian-experimental
2008-12-09 01:36:36 +02:00
Dave Airlie
72cd2c8c0c
radeon: make DRI1 one work with new CS mechanism
2008-12-01 16:39:58 +10:00
Jerome Glisse
9770bb32f5
radeon: cs add print cs callback
2008-11-16 17:59:46 +01:00
Jerome Glisse
f1d98e5127
radeon: fix pointer dangling
2008-11-16 17:58:43 +01:00
Jerome Glisse
56c458e0f2
radeon: update to libdrm-radeon API changes
2008-11-15 10:40:32 +01:00
Jerome Glisse
5b79c18c83
radeon: dri2 don't forget to free buffer
2008-11-14 11:26:17 +01:00
Jerome Glisse
93a9d2f18d
r300: release bo from pixmap
2008-11-14 11:26:17 +01:00
Jerome Glisse
c26ec97b13
r300: convert to new relocations format (see libdrm-radeon)
2008-11-14 11:26:17 +01:00
Jerome Glisse
d07d137931
r300: SetTex extension support
2008-11-14 11:26:17 +01:00
Jerome Glisse
3b43c28195
r300: cs + DRI2 support
...
If DRI2 is enabled then switch cmd assembly to directly build
hw packet.
2008-11-14 11:26:17 +01:00
Jerome Glisse
e5d5dab8c0
r300: bo and cs abstraction.
...
This abstract memory management and command stream building so we
can use different backend either legacy one which use old pathway
or a new one like with a new memory manager. This works was done by :
Nicolai Haehnle
Dave Airlie
Jerome Glisse
2008-11-14 11:26:17 +01:00
Julien Cristau
0206e20240
Also build the x86-specific dri drivers on kfreebsd ( closes : #492894 ).
2008-10-26 15:58:46 +01:00
Julien Cristau
83a4719056
Update changelog
2008-10-26 15:34:37 +01:00
Ian Romanick
6cfe871c75
Use 3Dnow! x86-64 routines only on processors that support 3Dnow!
...
Added an x86-64 CPUID function and use it to detect 3Dnow! If 3Dnow!
is available, use _mesa_3dnow_transform_points4_3d_no_rot,
_mesa_3dnow_transform_points4_perspective,
_mesa_3dnow_transform_points4_2d_no_rot, and _mesa_3dnow_transform_points4_2d.
This fixes long standing bug #8724 .
(cherry picked from commit 2b8d8989fb )
2008-10-26 15:23:27 +01:00
Julien Cristau
84bb8fc695
Prepare changelog for upload
2008-09-24 14:28:28 +02:00
Julien Cristau
872cb1a0dd
intel: don't warn about TTM init failure.
2008-09-24 14:25:30 +02:00
Julien Cristau
ee80a3a623
Remove the build-dep on dri2proto, DRI2 support has been removed.
2008-09-24 12:55:15 +02:00
Timo Aaltonen
e700c5ad99
Update the changelog, refresh patch 04.
2008-09-23 16:09:00 +03:00
Timo Aaltonen
08c0ec7a89
Merge commit 'mesa_7_2' into debian-experimental
...
Conflicts:
include/GLES/egl.h
2008-09-23 16:06:40 +03:00
Brian Paul
35fe0e56e6
mesa: docs: remove parenthesis
2008-09-20 09:28:22 -06:00
Brian Paul
69e5311ad3
mesa: set 7.2 version for tarballs
2008-09-20 09:24:17 -06:00
Brian Paul
e884c4db2b
mesa: prep for 7.2 release
2008-09-20 09:23:50 -06:00
Adam Jackson
e681bee04e
Update to SGI FreeB 2.0.
...
Under the terms of version 1.1, "once Covered Code has been published
under a particular version of the License, Recipient may, for the
duration of the License, continue to use it under the terms of that
version, or choose to use such Covered Code under the terms of any
subsequent version published by SGI."
FreeB 2.0 license refers to "dates of first publication". They are here
taken to be 1991-2000, as noted in the original license text:
** Original Code. The Original Code is: OpenGL Sample Implementation,
** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
** Copyright in any portions created by third parties is as indicated
** elsewhere herein. All Rights Reserved.
Official FreeB 2.0 text:
http://oss.sgi.com/projects/FreeB/SGIFreeSWLicB.2.0.pdf
As always, this code has not been tested for conformance with the OpenGL
specification. OpenGL conformance testing is available from
http://khronos.org/ and is required for use of the OpenGL logo in
product advertising and promotion.
2008-09-20 09:21:34 -06:00
Julien Cristau
07c1fcc604
Prepare changelog for upload
2008-09-20 16:32:02 +02:00
Julien Cristau
7959b95efa
Update debian/copyright to the SGI Free Software License B, version 2.0.
...
It now mirrors the free X11 license used by X.Org (closes : #368560 ).
http://www.sgi.com/company_info/newsroom/press_releases/2008/september/opengl.html
2008-09-19 18:03:59 +02:00
Brian Paul
3dd48d903f
document _tnl_InvalidateState() fix
2008-09-18 15:28:31 -06:00
Brian Paul
e0ea4337fc
mesa: fix null ptr deref bug in _tnl_InvalidateState(), bug 15834
2008-09-18 15:27:55 -06:00
Brian Paul
6290d7fd29
mesa: fix bug in previous changes to _slang_resolve_attributes()
2008-09-17 09:13:28 -06:00
Brian Paul
84ad182ab8
document glBindAttribLocation fixes
2008-09-16 16:37:17 -06:00
Brian Paul
a155ead515
mesa: rework GLSL vertex attribute binding
...
Calls to glBindAttribLocation() should not take effect until the next time
that glLinkProgram() is called.
gl_shader_program::Attributes now just contains user-defined bindings.
gl_shader_program::VertexProgram->Attributes contains the actual/final bindings.
2008-09-16 15:58:05 -06:00
Brian Paul
5b0f652456
mesa: fix display list regression (check if save->prim_count > 0 in vbo_save_EndList())
2008-09-16 13:32:13 -06:00
Brian Paul
1be50e1638
fix msaa enable/disable bug
2008-09-15 17:15:51 -06:00
Brian Paul
4fefa29d8c
mesa: fix MSAA enable state in update_multisample()
2008-09-15 17:14:41 -06:00
Brian Paul
ef479d9f2a
document display list bug fix
2008-09-15 09:22:07 -06:00
Brian Paul
fc04604856
mesa: remove some assertions that are invalid during context tear-down
2008-09-15 09:20:30 -06:00
Keith Whitwell
ef2bd7860f
mesa: get another class of degenerate dlists working
...
Primitive begin in one dlist, end in another.
2008-09-15 09:20:23 -06:00
Shane Blackett
dca8b4c964
glut: s/glut_fbc.c/glut_fcb.c/
2008-09-14 17:51:53 -06:00
Brian Paul
419353dc2f
mesa: Makefile: 7.2 release candidate 1
2008-09-13 16:06:12 -06:00
Brian Paul
38d3b2262b
mesa: documentation updates for 7.2 release
2008-09-13 14:43:54 -06:00
Brian Paul
4db2a7f36c
updated Cell driver info
2008-09-13 14:39:39 -06:00
Brian Paul
1145042fd2
Mesa: version bumps for 7.2 release
2008-09-13 14:36:35 -06:00
Brian Paul
772131280a
document 7.2 bug fixes, etc
2008-09-13 14:36:17 -06:00
Jakub Bogusz
ee913c0fcc
tdfx: fix crash and lack of visuals bug
2008-09-13 14:34:51 -06:00
Guillaume Melquiond
cd1804c43a
i915: fix himask constant init for 64-bit build
2008-09-13 14:26:35 -06:00
Guillaume Melquiond
253784d45e
glx: fix 64-bit datatype issue
2008-09-13 14:26:25 -06:00
Guillaume Melquiond
463d19d477
mesa: return after _mesa_problem() calls
2008-09-13 14:26:18 -06:00
Guillaume Melquiond
6e4fd90ca5
mesa: #include <stdio.h>
2008-09-13 14:26:13 -06:00
Guillaume Melquiond
06188c0c5c
remove invalid XDestroyWindow() call
2008-09-13 14:26:06 -06:00
Guillaume Melquiond
dec9097647
silence warning
2008-09-13 14:25:59 -06:00
Guillaume Melquiond
e234339dba
GLU: fix asst warnings
2008-09-13 14:25:53 -06:00
Ian Romanick
bb09d23e92
Remove DRI2 support
...
Remove support for the original incarnation of DRI2. This version has
since been abandoned and will never ship. This eliminates a build
dependency on a component that only exists in Fedora 9 and in now-dead
up-stream development trees.
I also recommend that we spin a Mesa 7.1.1 release with this patch.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com >
2008-09-12 13:48:14 -07:00
Xiang, Haihao
1ffbcddb6f
i965: Add support for G41 chipset which is another 4 series.
...
(cherry picked from commit b2e083eba2 )
2008-09-12 09:29:00 +08:00
Brice Goglin
5cd892a4e4
Fix grammar and punctuation in glxinfo(1)
2008-09-11 19:13:46 +02:00
Shane Blackett
33cf8f5c06
added 24bpp support
2008-09-11 08:35:37 -06:00
Shane Blackett
7b8d878bed
Fixes for Mingw
2008-09-10 08:23:19 -06:00
Brian Paul
86ae34fbb4
mesa: replace MALLOC w/ CALLOC to fix memory error in glPushClientAttrib()
2008-09-05 08:07:07 -06:00
Brian Paul
16f3461fd6
mesa: improved gl_buffer_object reference counting
...
Use new _mesa_reference_buffer_object() function wherever possible.
Fixes buffer object/display list crash reported in ParaView.
2008-09-04 15:26:07 -06:00
Xiang, Haihao
0ac8886b51
intel: Fix depth_stencil texture.
...
(cherry picked from commit 0adfd10210 )
2008-09-04 11:54:31 +08:00
Xiang, Haihao
1729d37223
mesa: merge stencil values into depth values for MESA_FORMAT_S8_Z24
...
(cherry picked from commit 218df7f9c5 )
2008-09-04 11:54:21 +08:00
Jakob Bornecrantz
81edef6f9f
mesa: Support for MESA_FORMAT_S8_Z24 texture
...
cherry-picked from gallium-0.1
(cherry picked from commit dc44bb8e92 )
2008-09-04 11:54:08 +08:00
Brian Paul
e040e18c7b
fix BUFFER_DEPTH/BUFFER_ACCUM mix-up
2008-09-02 18:13:53 -06:00
Roland Scheidegger
14d186644b
fix no error generated when calling glLight{if}[v] inside begin/end (bug 17408)
2008-09-02 15:49:35 +02:00
Xiang, Haihao
e4535e4d5e
i965: force thread switch after IF/ELSE/ENDIF. partial fix for #16882 .
...
A thread switch is implicitly invoked after the issuance of an IF/ELSE/ENDIF
instruction if necessary. Unfortunately it seems sometimes a forced thread
switch is needed.
2008-08-29 10:30:12 +08:00
Xiang, Haihao
a008813890
i965: mask control for BREAK/CONT/DO/WHILE. partial fix fox #16882
2008-08-29 10:30:03 +08:00
Xiang, Haihao
da50dc7bb3
i965: Push/pop instruction state. partial fix for #16882
2008-08-29 10:29:57 +08:00
Brian Paul
7f628d9cbc
mesa: bump MAX_INSN to 350
2008-08-28 15:16:33 -06:00
Julien Cristau
f9affb3059
Prepare changelog for upload
2008-08-27 19:52:30 +02:00
Julien Cristau
fd7cc514d2
Some more parallel build updates.
2008-08-27 19:52:14 +02:00
Julien Cristau
f6a927b45f
Update changelog
2008-08-27 17:29:28 +02:00
Julien Cristau
8772e02b68
Merge tag 'mesa_7_1' into debian-experimental
2008-08-27 17:28:31 +02:00
Brian Paul
b2ffd0be03
placeholder for upcoming 7.2 release notes
2008-08-26 16:24:37 -06:00
Brian Paul
912b16c689
added 7.1 MD5 sums
2008-08-26 16:11:56 -06:00
Brian Paul
6d9b25e522
mesa: don't check for GLSL 1.2 to advertise GL 2.1
...
The GLSL 1.2 features are minor...
2008-08-26 15:50:11 -06:00
Corbin Simpson
31bad23f0f
note ATI R500 series support
2008-08-26 12:39:27 -06:00
Timo Jyrinki
29b9b25e72
asst. html doc updates
2008-08-26 12:36:23 -06:00
Brian Paul
e794f496c6
mesa: assorted updates/prep for 7.1 release
2008-08-25 14:09:14 -06:00
Brian Paul
68067c66d3
mesa: glsl: regenerated file
2008-08-25 09:16:21 -06:00
Brian Paul
ad5474e995
mesa: glsl: grab latest fixes from gallium-0.1 branch
...
Includes:
1. Fixes failed asserting about bad swizzles in src reg emit.
2. Tracks uniform var usage.
3. Emit exp() in terms of EXP2 instruction.
2008-08-25 09:15:16 -06:00
Julien Cristau
ac8771ee99
Update changelog
2008-08-24 17:38:03 +02:00
Julien Cristau
16358bb3cc
Merge branch 'mesa_7_2_branch' of git.freedesktop.org:/git/mesa/mesa into debian-experimental
2008-08-24 17:34:47 +02:00
Julien Cristau
ef160330e5
Merge tag 'mesa_7_1_rc4' into debian-experimental
...
Conflicts:
progs/fp/Makefile
progs/slang/Makefile
progs/tools/trace/gltrace_support.cc
progs/trivial/Makefile
2008-08-16 18:43:53 +02:00
Julien Cristau
332dcfb60b
Add parallel build support.
2008-08-04 12:49:03 +02:00
Julien Cristau
a8dde163dc
Prepare changelog for upload
2008-07-13 19:42:01 +02:00
Julien Cristau
868d0accef
update changelog and patches
...
01_fix-installdir.patch dropped, applied upstream
04_osmesa_version.diff needed fixing
2008-07-13 19:36:56 +02:00
Julien Cristau
64e57ed257
Merge branch 'master' of git://anongit.freedesktop.org/git/mesa/mesa into debian-experimental
...
Conflicts:
progs/tests/antialias.c
progs/tools/trace/Makefile
2008-07-13 19:20:03 +02:00
Julien Cristau
e325b76444
Prepare changelog for upload
2008-07-12 18:56:22 +02:00
Julien Cristau
34eedc6a98
update changelog
2008-07-12 18:55:55 +02:00
Julien Cristau
8c21c2e07e
Merge branch 'mesa_7_0_branch' of git://anongit.freedesktop.org/git/mesa/mesa into debian-unstable
2008-07-12 17:21:50 +02:00
Brian Paul
27425708f5
mesa: return -1, not GL_FALSE if _glapi_add_dispatch() fails name sanity check
2008-07-09 15:06:49 -06:00
Brian Paul
fc07b6cda0
ARB program, GLSL fixes
2008-07-09 08:58:47 -06:00
Brian Paul
562ed27eb5
mesa: remove debug code
2008-07-09 08:52:44 -06:00
Brian Paul
0a0e09078d
mesa: implement glGetUniformiv() with new ctx->Driver function
...
The old implementation could overwrite the caller's param buffer.
cherry-picked from master
2008-07-09 08:51:35 -06:00
Brian Paul
50bc5a75a7
mesa: fix state.clip[n].plane parsing bug (bug 16611)
2008-07-09 08:42:49 -06:00
Brian Paul
6661f53eb3
mesa: check for OpenBSD (bug 15604)
...
cherry-picked from master
2008-07-09 08:42:28 -06:00
Xiang, Haihao
b8782affc8
i915: fall back to software rendering when shadow comparison is
...
enabled for 1D texture. fix #12176
Cherry-picked from commit 75e4db1804
2008-07-09 13:44:13 +08:00
Brian Paul
9a9e839b9b
added null texObj ptr check (bug 15567)
2008-07-08 15:13:23 -06:00
Julien Cristau
b04ccc9a03
Disable the i915tex driver, it doesn't build against libdrm 2.3.1.
2008-07-08 18:18:56 +02:00
Xiang, Haihao
aa522e14ee
i965: official name for GM45 chipset
2008-07-08 14:39:01 +08:00
Julien Cristau
dabd09f5a9
some more debian/rules adjustments
...
build the software libGL with --disable-gl-osmesa, and try to fix some
rules dependencies
2008-07-06 14:03:58 +02:00
Julien Cristau
46ffb3c0b1
debian/rules cleanup and fixes
...
* tell configure which dri drivers we want to build, based on the old
configs/debian-dri-default
* disable direct rendering for the glx libGL on the hurd
* make sure patches are applied before we run autoreconf, and autoreconf
runs before all builds
2008-07-05 14:03:57 +02:00
Julien Cristau
4b9b01f0a5
Use --with-driver=dri for the dri config
...
the default is xlib on some architectures and dri on others, so we
need to set that explicitly
2008-07-05 12:59:14 +02:00
Timo Aaltonen
0261355a03
Fix confflags CFLAGS and clean up confflags-dri.
2008-07-04 11:50:09 +03:00
Timo Aaltonen
beb8547c71
Delete two files not available on the tarball.
...
docs/gears.png
src/glut/os2/src-glut_os2pm.zip
2008-07-04 11:50:08 +03:00
Timo Aaltonen
4aa518a2d7
Add a patch from upstream to set installdir properly.
...
this also replaces 01_fix-libdir.patch and the need to set --libdir for
every target.
2008-07-04 11:50:08 +03:00
root
08af66d57e
Revert "Remove configs/current on clean."
...
This reverts commit 2380f8bd93 .
Conflicts:
debian/changelog
2008-07-04 11:50:08 +03:00
root
38eb154b39
Use --enable-glx-tls for dri.
2008-07-04 11:50:08 +03:00
Timo Aaltonen
2954e4c3d7
Disable glut for swx11 targets.
...
It was not built before either and would need new build-deps (xi xmu).
2008-07-04 11:50:08 +03:00
Julien Cristau
213803b4d4
fix libOSMesa versioning, to revert accidental SONAME bump.
2008-07-03 18:30:35 +02:00
Timo Aaltonen
2380f8bd93
Remove configs/current on clean.
2008-07-03 18:37:28 +03:00
Timo Aaltonen
e846ebc1a1
don't chmod configure which does not exist.
2008-07-03 18:14:25 +03:00
Timo Aaltonen
6dedd60350
Further autoconf changes:
...
add automake & autoconf to build-deps
add some cleanup rules
2008-07-03 15:53:19 +03:00
Timo Aaltonen
063a487fe1
Fix the configure.ac patch somewhat
...
workaround the problems by setting --libdir for all flavours, otherwise
the path used is /usr/usr/lib.
2008-07-03 13:20:21 +03:00
Timo Aaltonen
99a35fd4e1
01_fix-libdir.patch: libdir handling is broken in configure.ac, fix it.
2008-07-03 09:31:23 +03:00
Timo Aaltonen
cbaac82c2c
Further tweaks to the autoconf stuff. Getting closer but still not there
2008-07-03 09:26:46 +03:00
Brian Paul
2c9e332bce
mesa: when linking a shader program, make sure all the shaders compiled OK
...
cherry-picked from master
2008-07-02 17:05:01 -06:00
Brian Paul
e89deed74d
mesa: fix error codes in _mesa_shader_source(), _mesa_get_shader_source()
...
cherry-picked from master
If the 'shader' parameter is wrong, need to either generate GL_INVALID_VALUE
or GL_INVALID_OPERATION. It depends on whether 'shader' actually names a
'program' or is a totally unknown ID.
There might be other cases to fix...
2008-07-02 17:02:41 -06:00
Brian Paul
5cb6f5515f
mesa: regenerated file
2008-07-02 17:02:14 -06:00
Brian Paul
c5024d4a5c
mesa: added some missing equal() notEqual() intrinsics
...
cherry-picked from master
2008-07-02 17:01:26 -06:00
Timo Aaltonen
9d72de1fb2
Run autoreconf before building the various flavours.
2008-07-03 00:20:58 +03:00
Brian Paul
62626467b4
fixes some GLSL bugs
2008-07-02 12:45:16 -06:00
Brian Paul
c55a72ef48
mesa: regenerated files
2008-07-02 12:42:52 -06:00
Brian Paul
8a353c4020
mesa: fix all(bvec2) function typo, add missing bvec2/3/4() constuctors
...
cherry-picked from master
2008-07-02 12:42:12 -06:00
Brian Paul
8261c40bb9
mesa: init default span fog if fragprog uses fog input register
...
See bug #16194 for original patch. Cleaned up a bit here.
2008-07-02 08:58:32 -06:00
Timo Aaltonen
053bf7f5db
rules: Replace the old build system with the new autotools-based system.
2008-07-02 17:56:51 +03:00
Timo Aaltonen
e6a5e6512f
Add gl.pc to libgl1-mesa-dev
2008-07-02 14:07:23 +03:00
Timo Aaltonen
bc32cd7fc8
Add dri_interface.h to mesa-common-dev.
2008-07-01 18:58:17 +03:00
Timo Aaltonen
24fde3cf34
Drop mesa-swx11-source.
2008-07-01 18:56:38 +03:00
Timo Aaltonen
7ceaa0916a
Re-add linux-osmesa-static and linux-osmesa32-static
...
they were dropped by mistake during the merge.
2008-07-01 18:51:01 +03:00
Timo Aaltonen
4c958fbfb4
Build-depend on x11proto-dri2-dev.
2008-07-01 16:24:46 +03:00
Timo Aaltonen
9795ef4348
Refresh patches, and drop obsolete 00_create-libdir.patch and 01_fix-makefile.patch
2008-07-01 16:07:17 +03:00
Julien Cristau
768d8e0563
update changelog and require libdrm 2.3.1
2008-07-01 13:46:54 +02:00
Julien Cristau
374be37dd9
Merge branch 'master' of git.freedesktop.org:/git/mesa/mesa into debian-experimental
...
Conflicts:
.gitignore
Makefile
bin/mklib
configs/.gitignore
configs/default
configs/freebsd
configs/freebsd-dri
configs/linux-osmesa
configs/linux-osmesa16
configs/linux-osmesa16-static
configs/linux-osmesa32
docs/download.html
docs/install.html
docs/news.html
docs/relnotes.html
doxygen/Makefile
doxygen/doxy.bat
doxygen/header.html
doxygen/header_subset.html
include/GL/internal/dri_interface.h
progs/demos/.gitignore
progs/directfb/Makefile
progs/egl/Makefile
progs/fbdev/Makefile
progs/fbdev/glfbdevtest.c
progs/fp/Makefile
progs/glsl/.gitignore
progs/glsl/Makefile
progs/glsl/bump.c
progs/glsl/mandelbrot.c
progs/glsl/noise.c
progs/glsl/toyball.c
progs/miniglx/Makefile
progs/samples/.gitignore
progs/slang/Makefile
progs/tests/.gitignore
progs/tests/Makefile
progs/tests/arbnpot.c
progs/tests/cva.c
progs/tests/dinoshade.c
progs/tests/drawbuffers.c
progs/tests/fbotest2.c
progs/tests/fbotexture.c
progs/tests/getprocaddress.c
progs/tests/mipmap_limits.c
progs/tests/multipal.c
progs/tests/texline.c
progs/tools/trace/Makefile
progs/trivial/Makefile
progs/trivial/dlist-edgeflag-dangling.c
progs/trivial/dlist-edgeflag.c
progs/trivial/point-param.c
progs/trivial/quad-clip-nearplane.c
progs/trivial/tri.c
progs/vp/Makefile
progs/xdemos/.gitignore
progs/xdemos/Makefile
progs/xdemos/glthreads.c
src/egl/Makefile
src/egl/drivers/demo/Makefile
src/egl/drivers/dri/Makefile
src/egl/main/Makefile
src/glu/mesa/Makefile
src/glu/mesa/Makefile.m32
src/glu/mesa/project.c
src/glu/mini/project.c
src/glut/directfb/Makefile
src/glut/directfb/callback.c
src/glut/directfb/events.c
src/glut/directfb/internal.h
src/glut/directfb/window.c
src/glut/os2/Makefile
src/glut/os2/WarpWin.cpp
src/glut/os2/glutOverlay.cpp
src/glut/os2/glut_8x13.cpp
src/glut/os2/glut_9x15.cpp
src/glut/os2/glut_bitmap.cpp
src/glut/os2/glut_cindex.cpp
src/glut/os2/glut_cmap.cpp
src/glut/os2/glut_cursor.cpp
src/glut/os2/glut_event.cpp
src/glut/os2/glut_ext.cpp
src/glut/os2/glut_fullscrn.cpp
src/glut/os2/glut_gamemode.cpp
src/glut/os2/glut_get.cpp
src/glut/os2/glut_hel10.cpp
src/glut/os2/glut_hel12.cpp
src/glut/os2/glut_hel18.cpp
src/glut/os2/glut_init.cpp
src/glut/os2/glut_input.cpp
src/glut/os2/glut_key.cpp
src/glut/os2/glut_keyctrl.cpp
src/glut/os2/glut_keyup.cpp
src/glut/os2/glut_mesa.cpp
src/glut/os2/glut_modifier.cpp
src/glut/os2/glut_roman.cpp
src/glut/os2/glut_shapes.cpp
src/glut/os2/glut_stroke.cpp
src/glut/os2/glut_swap.cpp
src/glut/os2/glut_teapot.cpp
src/glut/os2/glut_tr24.cpp
src/glut/os2/glut_util.cpp
src/glut/os2/glut_vidresize.cpp
src/glut/os2/glut_warp.cpp
src/glut/os2/glut_win.cpp
src/glut/os2/glut_winmisc.cpp
src/glut/os2/glutbitmap.h
src/glut/os2/glutstroke.h
src/glut/os2/layerutil.h
src/glut/os2/libGlut.DEF
src/glut/os2/os2_glx.cpp
src/glut/os2/os2_menu.cpp
src/glut/os2/os2_winproc.cpp
src/glw/Makefile
src/glx/mini/Makefile
src/glx/mini/miniglx.c
src/glx/x11/glxext.c
src/mesa/Makefile
src/mesa/drivers/allegro/amesa.c
src/mesa/drivers/allegro/direct.h
src/mesa/drivers/allegro/generic.h
src/mesa/drivers/d3d/D3DCAPS.CPP
src/mesa/drivers/d3d/D3DHAL.H
src/mesa/drivers/d3d/D3DInit.cpp
src/mesa/drivers/d3d/D3DMESA.H
src/mesa/drivers/d3d/D3DRaster.cpp
src/mesa/drivers/d3d/D3DTEXT.CPP
src/mesa/drivers/d3d/D3DTextureMgr.cpp
src/mesa/drivers/d3d/D3DTextureMgr.h
src/mesa/drivers/d3d/D3DUTILS.CPP
src/mesa/drivers/d3d/DDrawPROCS.c
src/mesa/drivers/d3d/DEBUG.C
src/mesa/drivers/d3d/DEBUG.H
src/mesa/drivers/d3d/DbgEnv.bat
src/mesa/drivers/d3d/MAKEFILE
src/mesa/drivers/d3d/OPENGL32.DEF
src/mesa/drivers/d3d/WGL.C
src/mesa/drivers/dri/Makefile.template
src/mesa/drivers/dri/common/dri_bufmgr.c
src/mesa/drivers/dri/common/dri_drmpool.c
src/mesa/drivers/dri/common/dri_util.c
src/mesa/drivers/dri/common/dri_util.h
src/mesa/drivers/dri/common/xmlconfig.c
src/mesa/drivers/dri/glcore/Makefile
src/mesa/drivers/dri/i915/i915_fragprog.c
src/mesa/drivers/dri/i915/i915_program.h
src/mesa/drivers/dri/i915/i915_texprog.c
src/mesa/drivers/dri/i915/i915_texstate.c
src/mesa/drivers/dri/i915/i915_vtbl.c
src/mesa/drivers/dri/i915/intel_context.c
src/mesa/drivers/dri/i915/intel_context.h
src/mesa/drivers/dri/i915/intel_pixel.c
src/mesa/drivers/dri/i915/intel_render.c
src/mesa/drivers/dri/i915/intel_screen.c
src/mesa/drivers/dri/i915/intel_state.c
src/mesa/drivers/dri/i915/intel_tex.c
src/mesa/drivers/dri/i915/intel_tris.c
src/mesa/drivers/dri/i915tex/i830_reg.h
src/mesa/drivers/dri/i915tex/i830_texstate.c
src/mesa/drivers/dri/i915tex/i830_vtbl.c
src/mesa/drivers/dri/i915tex/i915_fragprog.c
src/mesa/drivers/dri/i915tex/i915_metaops.c
src/mesa/drivers/dri/i915tex/i915_tex_layout.c
src/mesa/drivers/dri/i915tex/i915_texstate.c
src/mesa/drivers/dri/i915tex/i915_vtbl.c
src/mesa/drivers/dri/i915tex/intel_render.c
src/mesa/drivers/dri/i915tex/intel_screen.c
src/mesa/drivers/dri/i915tex/intel_tris.c
src/mesa/drivers/dri/i965/brw_aub.c
src/mesa/drivers/dri/i965/brw_aub_playback.c
src/mesa/drivers/dri/i965/brw_cc.c
src/mesa/drivers/dri/i965/brw_clip.c
src/mesa/drivers/dri/i965/brw_clip_state.c
src/mesa/drivers/dri/i965/brw_clip_util.c
src/mesa/drivers/dri/i965/brw_context.c
src/mesa/drivers/dri/i965/brw_curbe.c
src/mesa/drivers/dri/i965/brw_defines.h
src/mesa/drivers/dri/i965/brw_draw.c
src/mesa/drivers/dri/i965/brw_draw_upload.c
src/mesa/drivers/dri/i965/brw_eu.h
src/mesa/drivers/dri/i965/brw_eu_emit.c
src/mesa/drivers/dri/i965/brw_gs_state.c
src/mesa/drivers/dri/i965/brw_misc_state.c
src/mesa/drivers/dri/i965/brw_sf_emit.c
src/mesa/drivers/dri/i965/brw_sf_state.c
src/mesa/drivers/dri/i965/brw_state_cache.c
src/mesa/drivers/dri/i965/brw_state_pool.c
src/mesa/drivers/dri/i965/brw_tex.c
src/mesa/drivers/dri/i965/brw_tex_layout.c
src/mesa/drivers/dri/i965/brw_vs_state.c
src/mesa/drivers/dri/i965/brw_vs_tnl.c
src/mesa/drivers/dri/i965/brw_wm.c
src/mesa/drivers/dri/i965/brw_wm.h
src/mesa/drivers/dri/i965/brw_wm_glsl.c
src/mesa/drivers/dri/i965/brw_wm_sampler_state.c
src/mesa/drivers/dri/i965/brw_wm_state.c
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
src/mesa/drivers/dri/i965/bufmgr_fake.c
src/mesa/drivers/dri/i965/intel_batchbuffer.c
src/mesa/drivers/dri/i965/intel_batchbuffer.h
src/mesa/drivers/dri/i965/intel_blit.c
src/mesa/drivers/dri/i965/intel_blit.h
src/mesa/drivers/dri/i965/intel_buffers.c
src/mesa/drivers/dri/i965/intel_context.c
src/mesa/drivers/dri/i965/intel_context.h
src/mesa/drivers/dri/i965/intel_mipmap_tree.c
src/mesa/drivers/dri/i965/intel_mipmap_tree.h
src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
src/mesa/drivers/dri/i965/intel_pixel_copy.c
src/mesa/drivers/dri/i965/intel_screen.c
src/mesa/drivers/dri/i965/intel_tex_validate.c
src/mesa/drivers/dri/i965/server/i830_common.h
src/mesa/drivers/dri/intel/intel_batchbuffer.c
src/mesa/drivers/dri/intel/intel_batchbuffer.h
src/mesa/drivers/dri/intel/intel_blit.c
src/mesa/drivers/dri/intel/intel_buffers.c
src/mesa/drivers/dri/intel/intel_context.c
src/mesa/drivers/dri/intel/intel_context.h
src/mesa/drivers/dri/intel/intel_mipmap_tree.c
src/mesa/drivers/dri/intel/intel_mipmap_tree.h
src/mesa/drivers/dri/intel/intel_screen.h
src/mesa/drivers/dri/r200/r200_texstate.c
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_context.h
src/mesa/drivers/dri/r300/r300_ioctl.c
src/mesa/drivers/dri/r300/r300_reg.h
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r300_tex.h
src/mesa/drivers/dri/r300/r300_texstate.c
src/mesa/drivers/dri/radeon/radeon_screen.c
src/mesa/drivers/windows/gdi/wmesa.c
src/mesa/drivers/x11/fakeglx.c
src/mesa/drivers/x11/xm_dd.c
src/mesa/glapi/Makefile
src/mesa/glapi/dispatch.h
src/mesa/glapi/glapioffsets.h
src/mesa/glapi/glapitable.h
src/mesa/glapi/glapitemp.h
src/mesa/glapi/glprocs.h
src/mesa/main/api_validate.c
src/mesa/main/attrib.c
src/mesa/main/config.h
src/mesa/main/context.c
src/mesa/main/context.h
src/mesa/main/dlist.c
src/mesa/main/drawpix.c
src/mesa/main/enums.c
src/mesa/main/fbobject.c
src/mesa/main/image.c
src/mesa/main/imports.h
src/mesa/main/mtypes.h
src/mesa/main/points.c
src/mesa/main/state.c
src/mesa/main/texcompress_fxt1.c
src/mesa/main/texenvprogram.c
src/mesa/main/teximage.c
src/mesa/main/texobj.c
src/mesa/main/texstate.c
src/mesa/main/version.h
src/mesa/shader/prog_execute.c
src/mesa/shader/program.c
src/mesa/shader/shader_api.c
src/mesa/shader/slang/library/slang_core.gc
src/mesa/shader/slang/library/slang_core_gc.h
src/mesa/shader/slang/slang_codegen.c
src/mesa/sources
src/mesa/sparc/glapi_sparc.S
src/mesa/swrast/s_aalinetemp.h
src/mesa/swrast/s_aatriangle.c
src/mesa/swrast/s_aatritemp.h
src/mesa/swrast/s_context.c
src/mesa/swrast/s_copypix.c
src/mesa/swrast/s_drawpix.c
src/mesa/swrast/s_fragprog.c
src/mesa/swrast/s_pointtemp.h
src/mesa/swrast/s_readpix.c
src/mesa/swrast/s_span.c
src/mesa/swrast/s_texfilter.c
src/mesa/swrast/s_tritemp.h
src/mesa/swrast/s_zoom.c
src/mesa/tnl/t_draw.c
src/mesa/tnl/t_vb_fog.c
src/mesa/tnl/t_vb_program.c
src/mesa/tnl/t_vp_build.c
src/mesa/vbo/vbo_split_copy.c
src/mesa/x86-64/xform4.S
src/mesa/x86/common_x86.c
src/mesa/x86/glapi_x86.S
windows/VC6/mesa/mesa/mesa.dsp
2008-07-01 13:18:27 +02:00
Xiang, Haihao
9fa552eb0f
dri: Take the base image size into account when computing
...
first level of the mipmap. fix #16421
2008-07-01 11:50:11 +08:00
Brian Paul
5f8ad807be
s/GL_INVALID_VALUE/GL_INVALID_OPERATION/ in _mesa_get_uniformfv()
2008-06-28 16:50:07 -06:00
Zou Nan hai
b6e165d661
optimize 965 clip
...
1. increase clip thread number to 2
2. do cliptest for -rhw
Cherry-picked from commits b47c9f8c91 ,
aa88d11e7d .
2008-06-23 15:16:11 +08:00
Roland Scheidegger
afbb645906
r200: fix typo in r200TryDrawPixels parameter validation (bug 16406)
2008-06-21 02:52:18 +02:00
Brice Goglin
2b831e73f5
Prepare changelog for upload
2008-06-18 20:59:24 +02:00
Brice Goglin
6ec170290c
Put all configs/ changes into the .diff.gz
...
Put back our configs/ changes into the .diff.gz since choose-configs
needs them before quilt is invoked. Put 04_cleanup-osmesa-configs.patch
there as well for #485161 .
2008-06-18 20:59:09 +02:00
Brice Goglin
7c8ea0899a
Revert "Move our configs/ changes from the .diff.gz into our quilt patches"
...
This reverts commit 03970183fc .
Conflicts:
debian/changelog
2008-06-18 20:55:42 +02:00
Brice Goglin
f81070dbd5
Pull from mesa_7_0_branch
2008-06-18 20:55:00 +02:00
Brice Goglin
955c2ef48f
Merge branch 'mesa_7_0_branch' of git://git.freedesktop.org/git/mesa/mesa into debian-unstable
2008-06-18 20:52:25 +02:00
Xiang, Haihao
2ac4919d24
i965: add support for Intel 4 series chipsets
2008-06-18 15:48:45 +08:00
Xiang, Haihao
3ed89025f3
i915: The pitch passed to intelEmitCopyBlitLocked should be in pixels,
...
not in bytes. Reported by Christopher Dissauer.
2008-06-18 13:52:04 +08:00
Xiang, Haihao
5b42bbce70
i915: fix data size in intelTryDrawPixels. Reported by Christopher Dissauer
2008-06-18 13:40:22 +08:00
Brian Paul
d2e0a11aab
mesa: fix inconsistent use of GL_UNSIGNED_INT vs. GL_UNSIGNED_INT_24_8_EXT for Z unpacking
2008-06-17 16:44:00 -06:00
Brice Goglin
5033e5b36d
Prepare changelog for upload
2008-06-17 20:01:01 +02:00
Brice Goglin
6a6a9c1c5a
Pull from mesa_7_0_branch
2008-06-17 20:00:37 +02:00
Brice Goglin
3d6aa2e06f
Merge branch 'mesa_7_0_branch' of git://git.freedesktop.org/git/mesa/mesa into debian-unstable
2008-06-17 19:54:47 +02:00
Brice Goglin
03970183fc
Move our configs/ changes from the .diff.gz into our quilt patches
...
with 04_cleanup-osmesa-configs.patch renamed into 04_debian-configs.patch
2008-06-17 19:32:21 +02:00
Brian Paul
47d046c93f
mesa: make mm.c use unsigned ints for offsets.
...
If you have a GPU using this code and it has the offsets up in this space,
this fails.
cherry-picked from master
2008-06-17 10:10:53 -06:00
Wilfried Holzke
718724deeb
assorted glide driver fixes/updates
2008-06-17 10:03:03 -06:00
Brian Paul
85c325c36c
add hyphen to rm command
2008-06-17 10:02:10 -06:00
Brian Paul
7e6d99f5ec
glu: silence warnings
2008-06-17 09:01:40 -06:00
Brian Paul
6ce6dc961b
bump version to 7.0.4
2008-06-16 10:19:29 -06:00
Brian Paul
186883611e
fix glPixelZoom stack over flow on Windows
2008-06-16 10:19:28 -06:00
Brian Paul
48b3c59cb9
mesa: allocate pixel zoom arrays on heap, not stack
...
Fixes stack overflow on Windows.
cherry-picked from master
2008-06-16 10:19:28 -06:00
Brian Paul
04b9d5bc23
Fix _mesa_new_program() recursive call regression
...
This was introduced by the "i965 GLSL merge" from master (ce7a9efb09 )
2008-06-16 10:19:28 -06:00
Brian Paul
91707e9020
fix GLSL generic vertex attrib linking bug
2008-06-16 10:19:28 -06:00
Xiang, Haihao
82a0e82232
i965: fix intel_batchbuffer_space. (bug#14709)
2008-06-13 13:53:46 +08:00
Brice Goglin
fe4264bf45
Prepare changelog for upload
2008-06-13 06:53:55 +02:00
Brice Goglin
2fa795a213
Pull from mesa_7_0_branch
2008-06-11 18:59:59 +02:00
Brice Goglin
e32aaf5da8
Merge branch 'mesa_7_0_branch' of git://git.freedesktop.org/git/mesa/mesa into debian-unstable
2008-06-11 18:58:59 +02:00
Brian
03447de338
disable ctx->Driver.NewProgram() call in _mesa_new_program()
...
This was causing infinite recursive calls w/ software drivers.
All vertex/fragment shaders should be allocated by calling
ctx->Driver.NewProgram(), not by calling _mesa_new_program().
(Cherry picked from commit 40133487db ,
351a83163a ).
2008-06-11 17:03:47 +08:00
Dave Airlie
ee5f4a4caf
r300: disable the lowimpact fallbacks by default.
...
because really we should be able to just fix the driver.
(cherry picked from commit 7013eecf28 )
There are actually even better reasons for this, the bottom line being that
enabling these fallbacks makes a lot of apps unusable mostly for no gain
whatsoever.
2008-06-11 10:42:16 +02:00
Xiang, Haihao
c04f3933ab
i915: fix fd.o #14966
2008-06-11 11:36:01 +08:00
Xiang, Haihao
8f328c45e5
i915: Keith Whitwell's swizzling TEX patch. fix #8283
...
Cherry picked from commit 3369cd9a6f
2008-06-11 11:32:12 +08:00
Brice Goglin
9676f0cffc
Pull from mesa_7_0_branch
2008-06-10 23:18:28 +02:00
Brice Goglin
2d0ca23319
Merge branch 'mesa_7_0_branch' of git://git.freedesktop.org/git/mesa/mesa into debian-unstable
2008-06-10 22:48:43 +02:00
Xiang, Haihao
6f4c8b5b50
i965: apply commit 6c1a98e97a to glsl
...
(cherry picked from commit a742bed99a )
2008-06-10 16:46:02 +08:00
Michal Wajdeczko
f8bd9cc30f
Add support for ATI_separate_stencil in display lists.
...
(cherry picked from commit 7f747204ea )
2008-06-10 16:28:06 +08:00
Michal Wajdeczko
d9f9b1cd0b
[965] Correctly set read mask for OPCODE_SWZ in pass1.
...
While OPCODE_SWZ has usually been optimized away in pass0, it may still
exist if a SWZ with dst saturate was emitted in pass_fp. Fixes an error
in oglconform fpalu.c.
(cherry picked from commit 13a6f73a64 )
2008-06-10 16:21:31 +08:00
Michal Wajdeczko
eca283976b
[965] Avoid emitting dead code for DPx/math instructions.
...
The pass1 optimization stage clears out writemasks and registers, but the
instructions themselves are still being processed at this stage, and could
have resulted in them still being emitted.
(cherry picked from commit c60b5dfde8 )
2008-06-10 16:18:48 +08:00
Michal Wajdeczko
2176259ca6
[965] Improve pinterp performance by delaying reads of just-written regs.
...
(cherry picked from commit bb419970ef )
2008-06-10 16:18:09 +08:00
Michal Wajdeczko
8fe6fcb900
[965] Fix negating of unsigned value in emit_wpos_xy.
...
(cherry picked from commit 6c1a98e97a )
2008-06-10 16:16:52 +08:00
Michal Wajdeczko
76d6edcc38
[965] Add MVP code for position invariant vertex programs.
...
This fixes the arbvptorus demo.
(cherry picked from commit 5f10438f2d )
2008-06-10 16:13:06 +08:00
Michal Wajdeczko
98d6c671f5
[win32] Use native aligned memory allocation functions.
...
(cherry picked from commit 31fe7cf5e3 )
2008-06-10 16:12:18 +08:00
Andrzej Trznadel
f652811df4
[965] Fix fp temp reg release code to not usually release all temps.
...
Also, use wrapped ffs() instead of native.
(cherry picked from commit 3105bc1d88 )
2008-06-10 15:45:11 +08:00
Andrzej Trznadel
e279f4601d
Fix compat implementation of ffs() to return 1-based bit numbers.
...
(cherry picked from commit e9809a36aa )
2008-06-10 15:44:53 +08:00
Keith Packard
87a30337a1
[i965] short immediate values must be replicated to both halves of the dword
...
The 32-bit immediate value in the i965 instruction word must contain two
copies of any 16-bit constants. brw_imm_uw and brw_imm_w just needed to
copy the value into both halves of the immediate value instruction field.
(cherry picked from commit ca73488f48 )
2008-06-10 15:37:11 +08:00
Eric Anholt
9c2047b275
[965] Don't let the negate flags of src0 affect 1 constants in precalc_dst/lit
...
This patch is a variant of a submission by Michal Wajdeczko to fix
oglconform fpalu failures.
(cherry picked from commit b4cbf6983e )
2008-06-10 15:32:53 +08:00
Zou Nan hai
1dcb0433a3
[i915] fix fragment.position
2008-06-10 15:28:07 +08:00
Zou Nan hai
5ff27e02b3
[i965] fix wpos height 1 pixel higher
...
(cherry picked from commit b0f681b458 )
2008-06-10 15:25:20 +08:00
Eric Anholt
4beee58e57
[965] Bug #9151 : make fragment.position return window coords not screen coords.
...
(cherry picked from commit 9c8f27ba13 )
2008-06-10 15:22:08 +08:00
Eric Anholt
1f9de20719
[915] Fix COS function using same plan as SIN.
...
The previous COS function failed badly outside of [-pi/2, pi/2].
2008-06-10 14:55:52 +08:00
Eric Anholt
d05a8d9750
[915] Use a quartic term to improve the accuracy of SIN results.
...
This is described in the link in the comment, and is the same technique that
r300 uses.
2008-06-10 14:46:12 +08:00
Eric Anholt
db5f206c00
[915] Fix fp SIN function, and use a quadratic approximation instead of Taylor.
...
The Taylor series notably fails at producing sin(pi) == 0, which leads to
discontinuity every 2*pi. The quadratic gets us sin(pi) == 0 behavior, at the
expense of going from 2.4% THD with working Taylor series to 3.8% THD (easily
seen on comparative graphs of the two). However, our previous implementation
was producing sin(pi) < -1 and worse, so any reasonable approximation is an
improvement. This also fixes the repeating behavior, where the previous
implementation would repeat sin(x) for x>pi as sin(x % pi) and the opposite
for x < -pi.
2008-06-10 14:22:36 +08:00
Eric Anholt
9dface8347
[965] Fix potential segfaults from bad realloc.
...
C has no order of evaluation restrictions on function arguments, so we
attempted to realloc from new-size to new-size.
(cherry picked from commit e747e9a072 )
2008-06-10 13:54:01 +08:00
Eric Anholt
32f4940883
[965] Fix inversion of SLT/SGE results in vertex programs.
...
The WM code had this right, so copy its behavior. This reverts a flipping
of the arguments to SLT in brw_vs_tnl which came in with the GLSL code that
probably occurred to work around the flipped results, and brings the code back
in line with t_vp_build.c.
(cherry picked from commit 9bae03a583 )
2008-06-10 13:44:54 +08:00
Eric Anholt
a7969a9b93
[965] Fix and enable separate stencil.
...
Note that this does not enable GL_EXT_stencil_two_side, because Mesa's computed
_TestTwoSide ends up respecting only STENCIL_TEST_TWO_SIDE_EXT (defaults to
GL_FALSE), even if the application uses only GL 2.0 / ATI entrypoints.
(cherry picked from commit 9136e1f2c8 )
2008-06-10 13:30:25 +08:00
Eric Anholt
ad88130df5
[965] Replace our own depth constants in intel context with GL context ones.
2008-06-10 13:08:09 +08:00
Eric Anholt
d1e71bc08b
[965] Remove dead code in upload_wm_surfaces.
...
(cherry picked from commit 3ecdae82d7 )
2008-06-10 11:19:53 +08:00
Roland Scheidegger
fa58fe247c
i965: fix OPCODE_TEX when additional ops are needed
2008-06-08 14:04:39 +02:00
Brian Paul
4b71478326
Set the attribute as used.
...
Cherry-picked from gallium-0.1
2008-06-04 14:42:55 -06:00
Zou Nan hai
0989471fdb
[i915] GL_DEPTH_TEXTURE_MODE fix
...
Cherry picked from commit 7233eabaf0
with manual changes.
2008-06-04 15:57:37 +08:00
Xiang, Haihao
696140bd1d
i965: handle source depth to render target for glsl,
...
(cherry picked from commit d2540e6d4b )
2008-06-04 11:54:25 +08:00
Brian
380d15b7fe
replace // comment with /* */ (bug 14916)
...
(cherry picked from commit eecb3ab7c6 )
2008-06-04 11:52:38 +08:00
Xiang, Haihao
41261d64b2
i965: use _Current pointer instead of Current pointer.
...
Cherry picked from commit de1e9880f8
2008-06-04 11:51:19 +08:00
Zou Nan hai
ce7a9efb09
[i965] Add support for GL shading language in I965 driver.
...
Cherry picked from commit 6ef27b88e6 ,
d0ebdca4fa .
2008-06-04 11:47:08 +08:00
Zou Nan hai
8a38ebe328
[i965] This is to fix random crash in some maps of Ut2004 demo.
...
e.g. bridge of fate.
If vs output is big, driver may fall back to use 8 urb entries for vs,
unfortunally, for some unknown reason, if vs is working at 4x2 mode,
8 entries is not enough, may lead to gpu hang.
Cherry picked from commmit c9c64a100d
2008-06-03 11:30:41 +08:00
Zou Nan hai
dcc6671b85
[i915] don't use 4x4 filter for 1D shadowmap
...
Cherry picked from commit d24a5254c2
2008-06-03 11:23:44 +08:00
Zou Nan hai
b53b7581e4
[i965] fix fd.o bug #11471 and #11478
...
1. Follow EXT_texture_rectangle with YCbCr texture
2. swap UV component for MESA_FORMAT_YCBCR
Cherry picked from commit 7676980d38 .
2008-06-03 11:04:10 +08:00
Zou Nan hai
64a4a03c2a
EXT_texture_sRGB support on i965
...
Cherry picked from commit 6bf81a5edf ,
246d1d2522 .
2008-06-03 10:09:33 +08:00
Brian Paul
b878c3f518
i915tex: fix fragment fog swizzle (from master) (bug 16195)
2008-06-02 09:29:22 -06:00
Brian Paul
6164163ca8
glDrawElement + VBO bug fix
2008-06-02 09:28:31 -06:00
Zou Nan hai
e92a53cd92
[i965] flip point sprite
...
Cherry picked from commit 1202c434d9
2008-06-02 17:05:57 +08:00
Zou Nan hai
2467af98b1
ARB sprite point support on i965
...
Cherry picked from commmit 60179434d1 ,
505453a04e with manual changes.
2008-06-02 17:01:31 +08:00
Xiang, Haihao
6f851d8875
_generic_read_RGBA_span_BGRA8888_REV_SSE2: It should adjust the source
...
and target pointers after do the first 2 pixels. fix bug #15850
Cherry-picked from commit 4b7d301c94
2008-06-02 14:28:42 +08:00
Xiang, Haihao
9b99bf89c4
i965: depth offset on glPolygonMode(GL_LINE/GL_POINT)
...
Cherry picked from 184cf464f4
2008-06-02 14:20:23 +08:00
Xiang, Haihao
7346fca083
965: use RGB565 to render a bitmap if Depth is 16
...
Cherry-picked from commit 5982d39799 .
2008-06-02 14:15:24 +08:00
Xiang, Haihao
7facbb69c6
i965: don't swizzle fogcoord if FogOption is FOG_NONE.
...
fix #10788 issue on 965.
Cherry picked from commit 83068115e2
2008-06-02 14:08:26 +08:00
Xiang, Haihao
f59267d650
i915: set fogcoord to (f,0,0,1). fix #10788 issue on 915.
...
Cherry picked from commit 7eef52e975
2008-06-02 14:06:14 +08:00
Xiang, Haihao
71cb014195
mesa: fix a bad cast in put_values_z24.
...
The values passed to put_values_z24 are GLuint,
not GLubyte. fix #13543
Cherry picked from commit cf46aee14a
2008-06-02 13:59:51 +08:00
Xiang, Haihao
6c0f8db9c2
i965: The jump instruction count is added
...
to IP pre-increment, and should point to
the first instruction after the do instruction
of the do-while block of code
Cherry picked from commit 46e03d584a
2008-06-02 13:54:45 +08:00
Xiang, Haihao
49f1e2fc4c
i965: fix an error in brw_vs_tnl.c
...
Update the tnl program if the state of TEXMAT is changed.
2008-06-02 13:46:31 +08:00
Eric Anholt
2d26e19535
[965] Clarify a bit of index buffer upload code.
...
Cherry picked from commit 5a49e84fcd
2008-06-02 13:18:00 +08:00
Xiang, Haihao
5b0c6cd49a
i965: align the address of the first element within
...
the index buffer. (fix#11910)
Cherry picked from ea07a0df9a
2008-06-02 13:16:53 +08:00
Xiang, Haihao
c3ee8e46cc
i965: fix projtex_mask
...
projtex_mask is only an 8bit field, and wm.input_size_masks includes
other attributes' information, therefore right shift is needed.
Cherry picked from 88451b04e9
2008-06-02 13:01:11 +08:00
Xiang, Haihao
46aac24261
i965: fix bad casts in do_blit_bitmap to support WindowPos correctly
...
Cherry picked from commit e66757c8ba
2008-06-02 11:54:35 +08:00
Xiang, Haihao
e1032ce718
i965: fix DEPTH_TEXTURE_MODE
...
Cherry picked from commit 6e620162a1 with
manual changes
2008-06-02 11:52:36 +08:00
Brian Paul
ce636f36f2
Fix segfault in _save_OBE_DrawElements() when using VBO and display list (bug 16156)
...
This was previously fixed in master by commit 982dcb74fd by Haihao Xiang.
2008-05-30 08:46:51 -06:00
Xiang, Haihao
93f2eec6b3
i965: roland's DXTn format texture patch(bug10347)
...
Cherry picked from commit db928291dc
2008-05-29 15:50:06 +08:00
Eric Anholt
46ef09d787
[965] Replace various alignment code with a shared ALIGN() macro.
...
In the process, fix some alignment issues:
- Scratch space allocation was aligned into units of 1KB, while the allocation
wanted units of bytes, so we never allocated enough space for scratch.
- GRF register count was programmed as ALIGN(val - 1, 16) / 16 instead of
ALIGN(val, 16) / 16 - 1, which overcounted for val != 16n+1.
Cherry picked from commit 77e0523fb7
2008-05-29 15:48:47 +08:00
Xiang, Haihao
7487ec0ff0
i965: align width/height for volume texture
...
Cherry picked from commit 00b86ecf6f
2008-05-29 15:45:12 +08:00
Xiang, Haihao
a25549866f
intel: applying right alignment to compressed texture,
...
which make small textures(4x4,2x2,1x1) work well.
Cherry picked from commit 8ea66fa2ec
2008-05-29 15:43:31 +08:00
Xiang, Haihao
558cc6e38f
i965: set mt->cpp differently with compressed texture
...
Cherry picked from commit 2cafd749b8
2008-05-29 15:40:44 +08:00
Xiang, Haihao
feb1fa1e83
i965: use BRW_TEXCOORDMODE_CLAMP instead of BRW_TEXCOORDMODE_CLAMP_BORDER
...
to implement GL_CLAMP
Cherry picked from commit ab99960858 . fix #16005
2008-05-28 16:29:17 +08:00
Brian Paul
f32462343d
allow GLX_SAMPLES_ARB==0 (bug 16073)
2008-05-27 09:49:44 -06:00
Brian Paul
08ef1b379a
added sampler types to sizeof_glsl_type()
2008-05-27 08:50:15 -06:00
Karl Schultz
1e79831b56
dependency fixes (bug 13544)
2008-05-27 08:50:14 -06:00
Tormod Volden
7a29164f70
dri: vblank_mode warning
...
From what I can see the environment variables LIBGL_THROTTLE_REFRESH
and LIBGL_SYNC_REFRESH were taken out like 3 years ago, but this
warning was never updated.
2008-05-24 18:34:27 +02:00
Brian Paul
f2533e787e
AA tri and glMaterial fixes
2008-05-16 15:35:19 -06:00
Brian Paul
b2ccd5c1ae
fix memory access error in vbo_bind_vertex_list
...
Picked from master (commit 8fc1a6808d )
2008-05-16 15:35:19 -06:00
Brian Paul
6f63543dd7
fix an attr/src mix-up when setting-up/binding vertex arrays
...
This fixes problems with incorrect material coefficients when glMaterial
is called per-vertex.
2008-05-16 15:35:19 -06:00
Brian Paul
c966f1629b
fix segfault in AA triangle code when using certain shaders
2008-05-16 15:35:19 -06:00
Xiang, Haihao
709f24adbb
intel: Set right cliprects for the current draw region. fix #15057
2008-05-14 15:01:44 +08:00
Brian Paul
52fe7ea3d1
mesa: free shader program data before deleting shader objects.
...
Picked from master.
Fixes mem corruption seen when glean/api2 test exits.
2008-05-07 16:10:32 +01:00
Xiang, Haihao
44f6a6f9c4
i915: Add E7221 variant to i915.
...
Cherry picked from commit 39bcbe0921
2008-05-07 14:09:28 +08:00
Brian Paul
ac88b3dd16
Add support for GL_REPLACE_EXT texture env mode.
...
GL_REPLACE_EXT comes from the ancient GL_EXT_texture extension. Found an old demo that
actually uses it.
The values of the GL_REPLACE and GL_REPLACE_EXT tokens is different, unfortunately.
2008-04-30 16:08:28 -06:00
Brian Paul
27b6fa5615
mesa: adjust glBitmap coords by a small epsilon
...
Fixes problem with bitmaps jumping around by one pixel depending on window
size. The rasterpos is often X.9999 instead of X+1.
Run progs/redbook/drawf and resize window to check.
Cherry picked from gallium-0.1 branch
2008-04-29 18:38:26 -06:00
Brian Paul
68eb76dfb7
Enabled GL_EXT_multi_draw_arrays extension in R200/R300 drivers
2008-04-29 18:38:26 -06:00
Ove Kaaven
392760ee0c
r200: fix state submission issue causing bogus textures (bug 15730)
2008-04-29 22:11:23 +02:00
Michel Dänzer
063b60a51f
Change default of driconf "allow_large_textures" to announce hardware limits.
...
The previous default these days served mostly to cause artifical problems with
GLX compositing managers like compiz (see e.g.
http://bugs.freedesktop.org/show_bug.cgi?id=10501 ).
(cherry picked from commit acba9c1771 )
2008-04-29 19:03:44 +02:00
Brian Paul
7b676192e9
enable GL_EXT_multi_draw_arrays (see bug 15670)
2008-04-24 16:31:28 -06:00
Brian Paul
138e0010eb
added FreeBSD static config
2008-04-23 08:23:18 -06:00
Anatolij Shkodin
36bad2b478
added freebsd-static
2008-04-23 08:23:18 -06:00
Alan Hourihane
f6d6fc603e
revert
2008-04-22 23:08:35 +01:00
Alan Hourihane
5545b46571
small cleanups
2008-04-22 20:29:42 +01:00
Alan Hourihane
06b0a7acce
correct the return value
2008-04-22 20:29:00 +01:00
Alan Hourihane
534f30064d
Fix error string
2008-04-22 20:28:35 +01:00
Brian Paul
6c9e1b2337
fix GL_ARB_texture_rectangle breakage
2008-04-14 13:44:05 -06:00
Brian Paul
62c67576e0
fixed WIN32 compile problem in libGLU
2008-04-14 13:41:17 -06:00
Brian Paul
91d59e4cb9
check for _WIN32 and __WIN32__
2008-04-14 13:40:39 -06:00
Brian Paul
8de268bb3c
add -Wl case (part of prev DragonFly patch)
2008-04-14 12:58:51 -06:00
Brian Paul
4fd7f6047c
define #extension GL_ARB_texture_rectangle
2008-04-14 12:58:51 -06:00
David Flynn
ff3033e190
define #extension GL_ARB_texture_rectangle
2008-04-14 12:58:51 -06:00
Roland Scheidegger
18404076e3
r200: fix XPD vertex program instruction when using temps as inputs
...
due to the two read ports limit into temp memory may need the MAD_2 instruction
for the second instruction of the decomposed XPD.
While here, also try to avoid MAD_2 for MAD if all 3 inputs are temps but the
temps aren't actually distinct.
2008-04-12 02:40:44 +02:00
Brice Goglin
59c9c40c01
Prepare changelog for upload
2008-04-11 08:42:55 +02:00
Brice Goglin
666e0635da
New upstream release
2008-04-11 08:41:32 +02:00
Brice Goglin
f9968a0346
Merge tag 'mesa_7_0_3' into debian-unstable
2008-04-11 08:38:26 +02:00
Hasso Tepper
39dca05d1d
New dragonfly configs
...
A re-do commit, this time with the intended commit message.
2008-04-09 19:05:59 -06:00
Brian Paul
f51b76b670
Revert "Hasso Tepper <hasso@estpak.ee>"
...
This reverts commit 40ee989db5 .
2008-04-09 19:04:36 -06:00
Brian Paul
40ee989db5
Hasso Tepper <hasso@estpak.ee>
2008-04-09 19:02:41 -06:00
Brian Paul
ef76dfc7a0
add link to 7.0.4 relnotes
2008-04-09 19:01:07 -06:00
Brian Paul
02ddc08353
initial 7.0.4 relnotes
2008-04-09 19:00:53 -06:00
Hasso Tepper
4b24d5261a
patches for DragonFly OS
2008-04-09 18:59:19 -06:00
Brian
4b96a39c48
added MD5 sums for 7.0.3
2008-04-04 19:24:32 -06:00
Brian
48616e71d2
final prep/changes for 7.0.3 release
2008-04-04 19:06:30 -06:00
Brian
70d227ac62
7.0.3 release candidate 3
2008-04-01 18:04:13 -06:00
Eric Anholt
7f2c4f96f5
Bug #13492 : Only call ProgramStringNotify if program parsing succeeded.
...
Wine intentionally tries some out-of-spec programs to test strictness, and
calling ProgramStringNotify on the results of a failed program parse resulted
in crashes in the 965 driver.
(cherry picked from commit 185320ae13 )
2008-04-01 16:27:48 -07:00
Roland Scheidegger
667f0f60fc
fix mistakenly set ATIFragmentShader._Enabled bit (bug 15269)
2008-04-01 23:25:04 +02:00
Brian
7592b8cc10
added some missing calls to _mesa_enable_x_y_extensions()
2008-04-01 08:41:24 -06:00
Brian
f55b831859
fix ARB f/v program comment parsing bug
2008-03-31 15:00:18 -06:00
Markus Amsler
217f7f7e5d
fix parsing bug involving comments at the end of ARB v/f programs
2008-03-31 15:00:18 -06:00
Julien Cristau
2e5a63f365
Prepare changelog for upload
2008-03-31 16:47:34 +02:00
Julien Cristau
7c614b4666
Fix libgl1-mesa-swx11-i686's dependencies
...
Change libgl1-mesa-swx11-i686's pre-dependency on libgl1-mesa-swx11 to a
regular versioned dependency, and add ${shlibs:Depends}.
I'm not sure why this used Pre-Depends in the first place, I don't think
that's needed.
2008-03-31 16:47:17 +02:00
Julien Cristau
b23d908829
Update 02_use-ieee-fp-on-s390-and-m68k.patch.
2008-03-31 13:17:24 +02:00
Julien Cristau
5379b84e63
Update changelog and add bug closer
2008-03-31 13:11:59 +02:00
Julien Cristau
32c913308e
Merge branch 'mesa_7_0_branch' of git.freedesktop.org:/git/mesa/mesa into debian-unstable
2008-03-31 13:00:20 +02:00
Xiang, Haihao
1e83d70b6d
i965: Apply -ve rhw to 965. Fix the regression introduced by
...
commit da476ff02d . (bug#14940)
2008-03-31 09:37:55 +08:00
Brian
767dfa5b9c
fix texture/renderbuffer mix-up in test_attachment_completeness()
2008-03-28 13:25:25 -06:00
Alan Hourihane
7ff5b38126
Fix build problems
2008-03-27 16:36:12 +00:00
Brian
e209f5300d
updated glext.h to version 40
2008-03-25 08:11:47 -06:00
Brian
3c4b50c352
updated to version 40
2008-03-25 08:11:36 -06:00
Brian
4e7c2fcf18
add GL_READ_FRAMEBUFFER_BINDING_EXT case, regenerate get.c file
2008-03-24 19:55:46 -06:00
Brian
22534f94f5
fix wrong values for GL_READ/DRAW_FRAMEBUFFER_BINDING_EXT tokens
2008-03-24 19:55:04 -06:00
Brian
1a6928fdbe
use ctx->Driver.DeleteProgram() in a few more places
2008-03-22 10:27:08 -06:00
Brian
325dbbac47
delete default programs with ctx->Driver.DeleteProgram()
2008-03-22 09:11:35 -06:00
Brian
39ac6b0481
Fix some PBO breakage.
...
In _mesa_Bitmap, can't early return if bitmap ptr is NULL, it may be an offset
into a PBO. Similarly for _mesa_GetTexImage.
2008-03-21 12:32:29 -06:00
Brian
46cc4854e9
fix IEEE_ONE definition for ICC compiler (bug 15134)
2008-03-19 17:25:18 -06:00
Alan Hourihane
f93882512e
set outputs_safe to 0 as it's possible for the code generation
...
to slip over the allocated memory for the vb.
pull in sse fixes from gallium-0.1
2008-03-19 01:03:48 +00:00
Markus Amsler
0dee2a4f6f
only set InputsRead bit if input is really used
2008-03-17 08:35:34 -06:00
Brian
3cebc35669
init tmpNode to zeros
2008-03-14 14:16:00 -06:00
Brian Paul
e75a204fb9
mesa: fix emit_clamp() so that we don't use an output register as temporary
...
IR_CLAMP is decomposed into OPCODE_MIN+OPCODE_MAX. Allocate a temporary
register for the intermediate value so we don't inadvertantly use an output
register (which are write-only on some GPUs).
2008-03-14 13:57:53 -06:00
Roland Scheidegger
ac06a5c16a
fix state.lightprod ambient/specular w value (bug #14983 )
2008-03-13 12:43:53 +01:00
Dan Nicholson
ed758fee0c
Merge branch '7.0-glx' into mesa_7_0_branch
2008-03-10 16:45:49 -07:00
Jeremy Huddleston
a21c61ee8b
Darwin: Fixed small error in darwin config files
2008-03-10 16:02:55 -07:00
Dan Nicholson
24697da20e
glapi: Resync generated files with 7.0 branch
...
The previous commits pulled in the generated files from master. This
regenerates the files from the source on the 7.0 branch.
2008-03-10 15:17:59 -07:00
Jeremy Huddleston
7120c0089d
Darwin: Config/source fixes to now build glxdemo apps and OSMesa
...
Also added darwin-fat-32bit darwin-fat-all configs and deleted old darwin-x86ppc config
2008-03-10 15:13:44 -07:00
Dan Nicholson
88a436a8f7
glapi: Generate xserver glapi sources in the mesa tree
...
Instead of generating the glapi sources for the xserver and commiting
them to the xserver tree, we can keep them in the mesa tree and change
the xserver build to use the files from the mesa tree.
This makes the xserver glx build more robust as it reduces the chances
for mismatches of the glX API used in the xserver vs. in mesa.
(cherry picked from commit 7688791fc5 )
2008-03-10 15:03:13 -07:00
Dan Nicholson
2fdb5a245d
glapi: Correct prerequisites for gl_and_glX_API.xml
...
The indirect_dispatch.h and indirect_table.c source files use
gl_and_glX_API.xml in their generation rather than glX_API.xml, but it
wasn't listed in their prerequisites. In turn, gl_and_glX_API.xml uses
glX_API.xml, but this is already listed in $(COMMON_GLX).
(cherry picked from commit 929b6d2ebf )
2008-03-10 15:03:01 -07:00
Dan Nicholson
8441b53538
glapi: Use make automatic variables to clean up the commands
...
Make use of the make automatic variables $@ (the target) and $< (first
prerequisite) to clean up the commands for the glapi generation. This
improves readability and guards against typos since words are repeated
less frequently.
(cherry picked from commit fc67d47708 )
2008-03-10 15:02:51 -07:00
Dan Nicholson
d336df8b73
glapi: Use variable for indent and flags
...
Put the path to indent and the flags to call it with in configs/default
rather than in the Makefile. This makes it easier to change the values
globally.
(cherry picked from commit 817af9bec2 )
2008-03-10 15:02:36 -07:00
Brian
8aaf805b8a
fix parsing of state.texenv.color (bug 14931)
2008-03-10 07:41:31 -06:00
Markus Amsler
8161fd2785
Set normalized flag for GLubyte arrays in _mesa_VertexAttribPointerNV()
2008-03-09 17:53:00 -06:00
Markus Amsler
2f23025dfe
init vertex weight attrib to (1,0,0,0)
2008-03-09 17:51:21 -06:00
Brian
1867eac230
fix __builtin_expect() definition test for IBM XLC (sf bug 1909832)
2008-03-09 10:54:50 -06:00
Roland Scheidegger
096e35d05f
state.depth.range alpha value should be 1, not 0 (bug #14733 )
2008-03-01 02:57:01 +01:00
Xiang, Haihao
8998f52b97
Don't Swap buffer if a DRIDrawable is entirely obscured by another window.
2008-02-28 11:43:54 +01:00
Brian
0fd38dcc83
Replace glut_fbc.c with glut_fcb.c (cb=callback)
2008-02-25 10:57:54 -07:00
Julien Cristau
d89cf0649e
Add bug closer for #408679 .
2008-02-24 10:23:17 +01:00
Julien Cristau
31e9d9d4f8
Prepare changelog for upload.
2008-02-23 18:18:42 +01:00
Julien Cristau
ea9c6d3d9e
03_optional-progs-and-install.patch: partly applied upstream, fixed up
2008-02-23 16:08:53 +01:00
Brian
ff63cf8068
bump libGL.so version number
2008-02-22 07:59:39 -07:00
Julien Cristau
eaac94c35a
Update changelog.
2008-02-22 12:16:27 +01:00
Julien Cristau
9291506af0
Merge branch 'mesa_7_0_branch' of git.freedesktop.org:/git/mesa/mesa into debian-unstable
...
Conflicts:
src/glx/mini/Makefile
2008-02-22 12:09:35 +01:00
Brian
4716670de9
prep for 7.0.3 rc-2
2008-02-21 16:59:20 -07:00
Brian
33c5b38034
latest bug fixes
2008-02-20 09:39:59 -07:00
Brian
5737d6c565
Fix point rasterization regression caused by commit 95a2eb9767
...
Even-sized, non-AA points need 0.5 bias in position to hit the right pixels.
Test program from bug report 11016 retested and is OK.
2008-02-20 09:38:16 -07:00
Brian
08a7f56c6a
raise GL_INVALID_OPERATION if glProgramString compilation fails
...
cherry picked from master.
2008-02-20 09:00:49 -07:00
Brian
7916f2b4aa
Fix glBegin-time test for invalid programs/shaders.
...
Cherry picked from master.
2008-02-20 08:56:20 -07:00
Brian
193d303ac7
Added <size name="Get" mode="get"/> lines for point parameter tokens.
...
Cherry picked from master
2008-02-19 08:46:39 -07:00
Jeremy Huddleston
e70609b7b8
Apple: Pulled in changes from Apple's patchset to allow mesa to build on darwin again
2008-02-19 00:54:35 -08:00
Xiang, Haihao
da476ff02d
i965: new integrated graphics chipset support
2008-02-19 15:59:50 +08:00
Brian
77e3b5d28b
Fix potential glDrawPixels(GL_DEPTH_COMPONENT) crashes (bug 13915)
...
Also, general clean-up of the Xlib-optimized glDraw/CopyPixels code.
2008-02-16 09:56:26 -07:00
Brian
bf97ca448c
Fix glBindTexture crash (bug 14514)
2008-02-15 13:42:19 -07:00
Roland Scheidegger
c5f8ff8b32
fix bug with generated fragment programs if vertex shader is active
...
When generating a fragment program from fixed function, checking
texUnit->_ReallyEnabled is not sufficient, need texUnit->Enabled too
since the former also represents texture enables from an active vertex
shader.
2008-02-15 17:26:58 +01:00
caner
50465766d1
miniglx doc updates
2008-02-14 09:34:08 -07:00
Xiang, Haihao
7d8df58a63
_mesa_swizzle_ubyt_image: Don't use single swizzle_copy call
...
if components don't match. fix #13508
2008-02-13 07:07:47 -07:00
Andy Skinner
762c074012
added -altopts to allow overriding all other opts
2008-02-07 13:19:55 -07:00
Brian
51f2ee3bfb
fix bug 9871
2008-02-06 07:55:26 -07:00
Brian
b5cd34aa21
Fix bug 9871: enable user-defined clip planes for R300
...
Patch provided by Erkin Bahceci <erkinbah@gmail.com >
2008-02-06 07:54:24 -07:00
Tony DeFeo
ae5c6dcd42
[965] Fix memory leak when deleting buffers with backing store.
2008-02-05 10:49:44 -08:00
Roland Scheidegger
97196d0c8c
regenerate glsl library functions
2008-01-31 01:36:23 +01:00
Roland Scheidegger
f6de56b88a
fix w component of glsl vec4 asin
2008-01-31 01:35:52 +01:00
Brian
d64ea43b76
fix bugs 13507, 14293
2008-01-30 08:12:06 -07:00
Brian
2deaf93d24
check if fb->Delete is null (bugs 13507,14293)
2008-01-30 08:12:06 -07:00
Alex Deucher
a107ec8300
Add new RV380 pci id
...
bug 14289
(cherry picked from commit 80efe27560 )
2008-01-29 10:15:32 -05:00
Alex Deucher
120a1f9508
Merge branch 'mesa_7_0_branch' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa into mesa_7_0_branch
2008-01-29 09:50:26 -05:00
Alex Deucher
bb84007a57
R300: RV410 SE chips have half the pipes of regular RV410
...
This fixes 3D rendering on x700 SE chips. Reported
by Kano.
(cherry picked from commit 0b7e0f8159 )
2008-01-29 09:46:48 -05:00
Alan Hourihane
86234e55a6
pull some more fixes for pbo access from trunk
2008-01-28 11:23:53 +00:00
Alan Hourihane
61972077cd
fix some pbo path problems
2008-01-28 11:15:53 +00:00
Xiang, Haihao
5a7feb8ea2
i965: valid message length includes message header.
2008-01-25 17:23:55 +08:00
Xiang, Haihao
4b4c131cd0
i965: re-define the type of reg.loopcount.
...
avoid some issues such that 1 + (-2) gets a big
positive value.
2008-01-25 17:23:15 +08:00
Julien Cristau
67617c8f89
Drop -O0 workaround on hppa.
...
Stop building with -O0 on hppa. Bug #451047 should be fixed in recent gcc
versions.
2008-01-24 22:52:48 +01:00
Brian
0fd23f01c6
Assorted patches for miniglx/linux-solo (Gavin Li <codeview@gmail.com>)
2008-01-23 16:04:02 -07:00
Adam Jackson
557b0d9df7
glxinfo: Fix multisample visual reporting.
...
strstr() == 0 tests for the string _not_ being present. Originally
Red Hat bug #351871 .
2008-01-22 14:04:39 -07:00
Brian
888f4380cf
fix GLX vertex array bug 14197
2008-01-22 08:41:22 -07:00
Brian
3266c5e95a
fix pc vs. gc->ps usage (bug 14197)
2008-01-22 08:38:48 -07:00
Brian
834decdaae
Don't build yuvrect_client by default
...
Added 'extra' rule to build optional yuvrect_client, shape, xdemo programs
2008-01-22 07:56:31 -07:00
Brian
18b2d83173
remove unused var
2008-01-22 07:54:37 -07:00
Alexey Sokolov
30c65c3c62
define M_PI if needed
2008-01-22 07:42:40 -07:00
Brian
04fcc4cf1e
prep for 7.0.3 release
2008-01-21 16:21:39 -07:00
Julien Cristau
09504dde1f
Update changelog; add Vcs-* and Homepage fields in debian/control.
2008-01-17 22:26:48 +01:00
Julien Cristau
c04885f072
Merge branch 'mesa_7_0_branch' of git://anongit.freedesktop.org/git/mesa/mesa into debian-unstable
...
Conflicts:
progs/tests/.gitignore
progs/tests/Makefile
2008-01-14 22:30:03 +01:00
Michel Dänzer
48ae5cf09d
i965: Fix byte vs. pixel unit mixup for aligned texture pitch.
...
I sincerely hope I don't manage to mess this up yet again...
Thanks again to Todd Merrill for pointing out the problem and testing the fix
on IRC.
2008-01-14 16:30:58 +01:00
Michel Dänzer
45cdb6eb45
i965: Fix unresolved symbol intel_miptree_pitch_align.
...
For some reason, I thought that function was shared with i915tex... The good
news is that i965 gets to keep the lower pitch alignment requirements.
Thanks to Todd Merrill for pointing out the problem on IRC.
2008-01-11 16:32:39 +01:00
Keith Packard
b9f3f732aa
i915tex: Centralize mipmap pitch computations.
...
mipmap pitches must account for the device alignment requirements, which
used to be fairly simple; just align to a 4-byte boundary. However, to allow
textures to be drawn to under TTM, they now need to be aligned to a 64-byte
boundary. Placing all of the alignment constraints in a single function
allows this new constraint to be applied uniformly.
There was some pitch constraining code in intel_miptree_create, but that was
modifying the pitch long after the miptree had been layed out, so it only
served to wreck the mipmap and cause rendering errors.
(cherry picked from commit a183efc132 with manual
changes for mesa_7_0_branch by Michel Dänzer. One side effect of this is that
i965 also aligns the pitch of 2D textures to multiples of 64 bytes, hopefully
that won't cause any issues)
2008-01-08 16:48:13 +01:00
Brian
17006ddd6b
fix 3d proxy texture depth bug
2008-01-05 15:44:51 -07:00
Brian
b77a354df3
fix depth/1 typo in glTexImage3D proxy code
2008-01-05 15:44:51 -07:00
Brian
71d46beebf
additional stub functions
2008-01-02 07:23:41 -07:00
Brian
454e296eb1
additional GL_COLOR_ATTACHMENTx_EXT cases (bug 13767)
2008-01-02 07:20:08 -07:00
Brian
f9b696be2b
fix vbo display list memleak upon context destruction
2008-01-01 10:23:56 -07:00
Brian
c923edbc71
additional GL_COLOR_ATTACHMENTx_EXT cases (bug 13767)
2008-01-01 10:10:18 -07:00
Brian
e20c1d987f
fix GLSL uniform/attrib bugs (13753)
2008-01-01 09:59:51 -07:00
Bruce Merry
cd354eb10f
Convert to 0/1 when setting boolean uniforms
...
Also add some extra tests to the shader_api regression tests
2008-01-01 09:59:51 -07:00
Bruce Merry
e9ac27ee23
Make use of count in _mesa_uniform_matrix
2008-01-01 09:59:50 -07:00
Bruce Merry
3f9dc9f5b6
Add a test program to test for assorted bugs in shader_api.c
2008-01-01 09:59:50 -07:00
Bruce Merry
ba709875ae
More fixes to shader_api
...
- return GL_INVALID_OPERATION instead of GL_INVALID_VALUE if location is bad
- correct the type-checking of uniforms from my previous commit
- accept location of -1 in _mesa_uniform_matrix
2008-01-01 09:59:50 -07:00
Bruce Merry
80f8397b35
Fix several bugs relating to uniforms and attributes in GLSL API
...
- fix sizes for GL_FLOAT_MAT2x3 and GL_FLOAT_MAT4x3 in sizeof_glsl_type
- fix size returns in _mesa_get_active_attrib
- fix out-of-bounds array access to vec_types in _mesa_get_active_attrib
- fix queries of matrix uniforms in _mesa_get_uniformfv
- fix _mesa_get_uniformfv to only return one base, even from an array
- allow location == -1 in _mesa_uniform
- validate types in _mesa_uniform
- allow array overruns in _mesa_uniform
2008-01-01 09:59:50 -07:00
Brian
b45fa27fa1
added 'get' info for framebuffer object tokens
2008-01-01 09:26:30 -07:00
Brian
b59480645d
add 'Get' info for MAX_3D_TEXTURE_SIZE (for bug 13811)
2008-01-01 09:04:13 -07:00
Brian
148cb36979
add missing double quote (bug 13878)
2008-01-01 07:59:58 -07:00
Roland Scheidegger
c1eb78f7ff
fix GL_LINE_LOOP with drivers using own render pipeline stage ( #12410 , #13527 )
...
primitive needs to include the begin/end flags (broken since vbo-0.2). Should
fix missing first/last line segment on gamma, i810, i915, mga, r200, radeon,
s3v, savage, unichrome (r300 already correct). Tested on r200, fixes #13527 .
2007-12-22 18:49:42 +01:00
Brian
8aa0fd6b20
glGetActiveUniform fix
2007-12-20 09:08:12 -07:00
Brian
a1b3a908f5
return correct size from glGetActiveUniform (bug 13751)
2007-12-20 09:08:12 -07:00
Xiang, Haihao
f9e70d951a
i965: allocate GRF registers before building subroutines,
...
it ensures there are sufficient registers for all subroutines.
2007-12-19 10:44:00 +08:00
Xiang, Haihao
41ed6be1da
i965: restore the flag after building the subroutine of the
...
GS thread. fix #13240
2007-12-19 10:36:56 +08:00
Brian
27de28fc3e
Remove -I$(TOP)/src/mesa/transform
2007-12-18 17:07:11 -07:00
Brian
dd2f01c229
simplify update two-side lighting test (follow-on to previous front/back-face changes)
2007-12-18 16:28:36 -07:00
Brian
deb5c56c77
fix NEED_SECONDARY_COLOR for vert/frag progs
2007-12-18 16:28:36 -07:00
Julien Cristau
9fd22f0e3f
Prepare changelog for upload.
2007-12-18 19:13:27 +01:00
Julien Cristau
942372dcdf
debian/control fixups
...
* Bump Standards-Version to 3.7.3.
* Move libgl1-mesa-swx11-dbg, mesa-common-dev and libosmesa6-dev to section
libdevel.
* libgl1-mesa-swx11 conflicts with libgl1-mesa-glx. Move it and
libgl1-mesa-swx11-dev to priority extra.
* Fix typo in mesa-common-dev's long description.
2007-12-18 13:57:06 +01:00
Julien Cristau
b7f901088b
Update changelog.
2007-12-18 13:32:01 +01:00
Julien Cristau
c02990525c
Merge branch 'mesa_7_0_branch' of git.freedesktop.org:/git/mesa/mesa into debian-unstable
...
Conflicts:
progs/trivial/quad-clip-nearplane.c
2007-12-18 12:28:29 +01:00
Michel Dänzer
0107acded0
i915tex: Fix issues with glDrawBuffer(GL_NONE).
...
Don't dereference NULL renderbuffer pointer, and make sure the software
fallback sticks.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=13694 .
2007-12-17 12:32:26 +01:00
Brian
2ac5e08d1d
fix polygon cull regression
2007-12-14 14:36:23 -07:00
Dan Nicholson
1837b8c214
configs: Fix linking with static libGL and --as-needed
...
Linking of the programs breaks when using a static libGL and the GNU ld
option --as-needed. This is because libXext is needed for the XShm
functions.
(cherry picked from commit 6aaf9bdd41 )
2007-12-07 11:51:18 -08:00
Brian
03d2bc1774
fix gl_FrontFacing
2007-12-04 14:07:15 -07:00
Brian
385bddbde0
fix span->facing computation and gl_FrontFacing initialization
2007-12-04 14:07:15 -07:00
Brian
c135426267
Fix gl_FrontFacing compilation problem
2007-12-04 14:07:15 -07:00
Michel Dänzer
4be0c98120
Use -Bsymbolic for linking all shared objects.
...
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=10132 .
Also remove comment about SONAME, as SONAME only applies to shared libraries.
(cherry picked from commit fc7ddea853 )
2007-12-04 18:33:07 +01:00
Brian
e760aebd5a
fix two-side lighting bug/crash
2007-12-03 14:13:08 -07:00
Brian
1f6e7d9c29
fix DD_TRI_LIGHT_TWOSIDE bug ( #13368 )
2007-12-03 14:12:34 -07:00
Dan Nicholson
c6d421af05
Fix the library name in glw.pc
...
Fix a copy and paste error s/GLU/GLw/ in glw.pc.
(cherry picked from commit 2dc85e8078 )
2007-12-03 12:08:03 -08:00
Brian
952df5e493
fix two-sided stencil
2007-12-03 12:00:21 -07:00
Brian
45acb8b058
added missing quote char
2007-12-03 12:00:21 -07:00
Michel Dänzer
e8997c0183
i915tex: Fix up state changes for i8xx.
...
(cherry picked from commit 2af613e0b8 )
2007-12-03 09:38:13 +01:00
Brian
169e62f563
fix-build: remove ctx->_Facing assignment
2007-11-30 15:52:41 -07:00
Brian
1b43babfb1
fix broken two-sided stencil
2007-11-30 13:01:42 -07:00
Brian
43e902f774
better front-plane clip test
2007-11-30 09:09:12 -07:00
Xiang, Haihao
b0a800e249
i965: use uncompressed instruction to ensure only
...
Pixel Mask Copy is modified as the pixel shader thread
turns off pixels based on kill instructions.
2007-11-30 12:36:07 +08:00
Brian
73d5f232ad
New ctx->Driver.Map/UnmapTexture() functions for accessing textures from t_vb_program.c
2007-11-29 08:18:11 -07:00
Brian
f7209541e4
cleanups, comments
...
Conflicts:
src/mesa/tnl/t_vb_program.c
2007-11-29 08:18:11 -07:00
Brian
397a32dca7
Move _mesa_load_tracked_matrices() from TNL module to prog_statevars.c
2007-11-29 08:18:11 -07:00
Roland Scheidegger
e0719d7122
make sure state token values are fully initialized
2007-11-29 03:08:48 +01:00
Michel Dänzer
3f18c0a9f2
r200: Fix texture format regression on big endian systems.
...
See https://bugs.freedesktop.org/show_bug.cgi?id=13324 .
Also use tx_table_be for VALID_FORMAT, in case r200SetTexImages ever gets
called for MESA_FORMAT_RGB888.
(cherry picked from commit dc88a96631 )
2007-11-28 10:25:01 +01:00
Delle
b14be61938
use DEFAULT_SOFTWARE_DEPTH_BITS
2007-11-27 18:18:48 -07:00
Brian
440d620308
minor additions to avoid FAQs
2007-11-27 10:32:39 -07:00
Brian
8dd9df0f3e
document GLSL float f/F suffix bug
2007-11-27 10:32:39 -07:00
Brian
6b9534eaf5
set fp->UsesKill when emitting OPCODE_KIL
2007-11-27 10:32:39 -07:00
Brian
c91d374ad7
improve 24-bit Z to 32-bit Z conversion
2007-11-27 10:32:39 -07:00
Keith Whitwell
1cab4160bc
i915tex: Fix some minor batchbuffer errors.
2007-11-26 17:12:15 +01:00
Keith Whitwell
718d2dfbbd
i915tex: Catch cases where not all state is emitted for a new batchbuffer.
...
This could lead to incorrect rendering or even lockups.
2007-11-26 17:10:26 +01:00
Michel Dänzer
0967e1270d
i915tex: Some additional blit fixes and assertions.
2007-11-26 16:59:41 +01:00
Michel Dänzer
a08c02f1a8
i915tex: Actually wait for previous commands to complete for glFinish().
2007-11-26 16:59:00 +01:00
Brian
bdfd9afead
Consolidate texture fetch code and use partial derivatives when possible.
2007-11-23 12:01:39 -07:00
Brian
1c91a590d6
fix a few GLSL bugs
2007-11-23 10:28:33 -07:00
Brian
65bd7968bf
Fix parsing of gl_FrontLightModelProduct.sceneColor, don't segfault on variable
...
array indexes.
2007-11-23 10:26:02 -07:00
Brian
6ccd23b87b
need to check border width in sample_linear_2d() - fixes failed assertion in texwrap.c test
2007-11-23 09:14:27 -07:00
Brian
823409b7d0
Bump version numbers to 7.0.3 for next release
2007-11-22 09:36:35 -07:00
Brian
c85d31f4a0
Recompute ctx->Point._Size if GL_POINT_SIZE_MIN/MAX changes.
...
Note that all the point size clamping stuff has been redone in Mesa/master.
2007-11-22 09:36:35 -07:00
Roland Scheidegger
24af5c44da
fix z buffer read/write issue with rv100-like chips and old ddx
2007-11-22 02:55:25 +01:00
Brian
75efacf8eb
Initial 7.0.3 relnotes
2007-11-20 08:16:25 -07:00
Brian
825e810247
bring over Fortran fixes from master
2007-11-20 08:15:19 -07:00
Brian
e20723cfc1
Obsolete
2007-11-20 08:13:14 -07:00
Brian
9f39a67c1d
Rename glut_fbc.c -> glut_fcb.c (cb=callback)
2007-11-20 08:13:03 -07:00
Brian
2044f3f791
clamp lambda to Min/MaxLod
2007-11-19 13:05:10 -07:00
Brian
30d4e8c422
fix some texture format assertions, etc
2007-11-19 10:37:41 -07:00
Brian
92d552f6a2
fix out-of-bounds array index (ix=-1)
2007-11-19 09:54:41 -07:00
Brian
5adfcbbc4f
added gl_dispatch_stub_772()
2007-11-16 10:03:57 -07:00
Roland Scheidegger
69969b3819
fix position invariant vertex programs for sw-tnl
...
do the same math as for fixed function pipe, including
user clip planes.
(mostly resurrected from the dead t_vb_arbprogram.c code)
2007-11-15 02:06:15 +01:00
Roland Scheidegger
edfee04fcb
fix bogus assumption if ddx has set up surface reg for z buffer
...
this is wrong since even if ddx has not set up a surface reg to cover the z
buffer we should pretend it has on those rv100 chips since they presumably do
not do z buffer tiling if not using hyperz, so we can use linear addressing
just the same. Doesn't seem to fix #13080 , but it's wrong anyway and the bug
almost certainly broke newer non-tcl chips.
2007-11-15 01:16:27 +01:00
Brice Goglin
ae0bf74db9
Prepare changelog for upload
2007-11-13 21:44:00 +01:00
Julien Cristau
1bf7ce97c0
* Add build-dep on libxext-dev. Thanks, Timo Aaltonen!
2007-11-13 21:40:49 +01:00
Julien Cristau
4971a009e0
* Workaround gcc ICE on hppa: build libOSMesa with -O0 (see bug#451047).
2007-11-13 20:59:08 +01:00
Julien Cristau
e1613ab80d
Don't set -fno-strict-aliasing in configs/debian-default.
...
Upstream uses that since 7.0.2.
2007-11-13 20:57:58 +01:00
Brian
28c9930888
add pointer to Gallium3D info
2007-11-13 09:51:14 -07:00
Brian
e3a35a123e
DRI memory manager info (fixes dangling link)
2007-11-13 09:50:42 -07:00
Brian
412168f2e8
remove dependency on libGLU
2007-11-12 08:21:21 -07:00
Brian
fc0fa0d636
add glw.pc.in to tarball list, remove from DEPEND_FILES
2007-11-12 07:52:20 -07:00
Brice Goglin
caf283329b
Prepare changelog for upload
2007-11-11 11:55:05 +01:00
Brice Goglin
5cedd4a43e
Remove DESTDIR from INSTALL_DIR in configs/debian-default
...
... and update 03_optional-progs-and-install.patch accordingly.
2007-11-11 11:49:16 +01:00
Brice Goglin
0595d32d8a
Refresh 03_optional-progs-and-install.patch
...
The default Makefile requires libGLU to be built
while linking progs/xdemos. However, we don't build
libGLU and progs/xdemos at the same time, and
these progs don't actually need libGLU.
2007-11-11 11:48:32 +01:00
Brice Goglin
e339b4e8da
New upstream release
2007-11-11 00:34:46 +01:00
Brice Goglin
11c827c588
Merge tag 'mesa_7_0_2' into debian-unstable
...
Conflicts:
.gitignore
progs/demos/.gitignore
progs/directfb/Makefile
progs/egl/Makefile
progs/fbdev/Makefile
progs/fp/Makefile
progs/miniglx/Makefile
progs/samples/.gitignore
progs/slang/Makefile
progs/tests/.gitignore
progs/tests/Makefile
progs/tools/trace/Makefile
progs/trivial/Makefile
progs/vp/Makefile
progs/xdemos/.gitignore
src/egl/drivers/demo/Makefile
src/egl/drivers/dri/Makefile
src/egl/main/Makefile
src/glu/mesa/Makefile
src/glut/directfb/Makefile
src/glx/mini/Makefile
2007-11-11 00:24:52 +01:00
Brian
8a40b670c3
added md5 checksums
2007-11-10 09:53:00 -07:00
Brian
d9fa5cbfc9
final changes for 7.0.2 relesae
2007-11-10 09:41:52 -07:00
Benno Schulenberg
1c21564292
code clean-ups, reformatting
2007-11-09 08:53:41 -07:00
Benno Schulenberg
6cc96bf156
remove commented-out code
2007-11-09 08:53:15 -07:00
Brian
29afd4bbc4
fix blender/unichrome crash, bug 13142
2007-11-08 07:36:30 -07:00
Benno Schulenberg
4e3db063ec
fix Unichrome/Blender crash, bug 13142
2007-11-08 07:36:30 -07:00
Brian
6560744c38
added -fno-strict-aliasing and -fPIC flags
2007-11-08 07:36:30 -07:00
Brian
572ad87881
change filenames for rc2
2007-11-08 07:36:30 -07:00
Michel Dänzer
2ab75d6cfa
r200: Fix SetTexOffset format for 16 bit pixmaps/textures.
...
Use symbolic array indices to clarify.
2007-11-06 18:39:50 +01:00
Chris Rankin
041a8eb5ec
r200: Implement SetTexOffset hook.
...
Implementation guidance by Michel Dänzer, final testing by Timo Aaltonen.
2007-11-06 18:32:33 +01:00
Brian
c1c13bdcfa
Check for NULL VB->EdgeFlag array.
...
There might be a bug elsewhere, but this is a simple work-around for now.
See bug 12614
2007-11-05 14:43:03 -07:00
Brian
403edd34dd
fix mmx code (bug 12614)
2007-11-05 14:38:12 -07:00
Brian
f279e48416
fix mmx code (bug 12614)
2007-11-05 14:38:05 -07:00
Brian
bf854d8d27
SSE codegen fixes
2007-11-03 08:45:42 -06:00
Brian
f334121679
Fix mem leak in SSE code generation path (Michel Dänzer) and don't crash if _mesa_exec_malloc() returns NULL.
2007-11-03 08:44:48 -06:00
Dan Nicholson
b88e2be609
Add -fno-strict-aliasing workaround for all GCC targets
...
Use a GCC option to work around aliasing bugs. See commit 013dbcd for
more details.
(cherry picked from commit 01b18abf93 )
Conflicts:
configs/freebsd
2007-11-01 11:07:02 -07:00
Dan Nicholson
08229c8bb8
configs: Set -fexceptions for GLUT on linux-dri like other targets
...
Quite a while ago, the GCC option -fexceptions was added for building
libglut. See here:
http://article.gmane.org/gmane.comp.video.mesa3d.devel/9499
This was missing in the linux-dri targets.
(cherry picked from commit dbcd20f1c2 )
2007-11-01 11:02:05 -07:00
Dan Nicholson
c984017f71
configs: Always use -fPIC for shared libraries, never for static
...
Mesa currently disables -fPIC for DRI on x86, but most Linux distros are
re-enabling -fPIC for all DRI arches. Let's just do that here since
that's normally what's wanted for shared libraries. Some justification:
http://bugs.gentoo.org/show_bug.cgi?id=110840#c9
On the other hand, position-independent code is only necessary when
building shared libraries, so disable it for the static cases.
(cherry picked from commit c3b5adaa9a )
2007-11-01 11:01:10 -07:00
Dan Nicholson
00e7dd8a13
Add -fno-strict-aliasing workaround for Linux GCC targets
...
Most Linux distros work around aliasing problems in Mesa by compiling
with the GCC option -fno-strict-aliasing. Two examples:
https://bugs.freedesktop.org/show_bug.cgi?id=6046
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=394311
This makes -fno-strict-aliasing the default with a comment that
developers should consider commenting it out. There is a already a note
about these bugs in docs/helpwanted.html.
(cherry picked from commit 013dbcd611 )
2007-11-01 10:56:01 -07:00
Brian
d11b375b16
fix typo
2007-10-31 09:43:17 -06:00
Brian
d1afa8146f
updated help/to-do list
2007-10-31 09:40:58 -06:00
Brian
31d4ba8a93
glDrawArrays(count=0) bugfix
2007-10-31 09:40:20 -06:00
Brian
1a7640958c
check for count==0 in _mesa_validate_DrawArrays()
2007-10-31 09:39:20 -06:00
Brian
2e2a5a450b
note G33/Q33/Q35 support
2007-10-31 08:19:14 -06:00
Brian
574fd63ff0
fix GL_ATI_separate_stencil
2007-10-30 10:46:31 -06:00
Brian
1063d47526
Alias glStencilOpSeparateATI with glStencilOpSeparate.
...
(Cherry-pick from master)
2007-10-30 10:45:47 -06:00
Brian
b59a892d3e
Finish up ATI_separate_stencil
...
Add entrypoints to glapi XML file and regenerate files.
Implement glStencilOpSeparateATI().
Consolidate some code in stencil.c
Conflicts:
src/mesa/glapi/dispatch.h
src/mesa/glapi/glapioffsets.h
src/mesa/glapi/glapitable.h
src/mesa/glapi/glapitemp.h
src/mesa/glapi/glprocs.h
src/mesa/main/enums.c
src/mesa/main/state.c
src/mesa/sparc/glapi_sparc.S
src/mesa/x86-64/glapi_x86-64.S
src/mesa/x86/glapi_x86.S
2007-10-30 10:34:26 -06:00
Roland Scheidegger
6e5d5d77df
add missing _mesa_StencilFuncSeparateATI function
2007-10-30 10:26:56 -06:00
Dan Nicholson
a6319d18cf
Build xdemos programs by default on linux-dri
...
Since libglut is no longer hardcoded, we can build the xdemos programs
so long as a GLX enabled libGL and libGLU have been built.
(cherry picked from commit 06ca14543e )
2007-10-29 12:08:34 -07:00
Dan Nicholson
5103e883fd
update APP_LIB_DEPS for static library configs (patch 3/3)
...
(cherry picked from commit 162914675a )
2007-10-29 12:06:50 -07:00
Dan Nicholson
98c4ea4b24
simplify APP_LIB_DEPS (patch 2/3)
...
(cherry picked from commit 9ef1d9f03a )
2007-10-29 12:06:23 -07:00
Dan Nicholson
29b8cac7d7
specify app lib dependencies in Makefiles (patch 1/3)
...
(cherry-picked from commit c05aa5ec4c )
Conflicts: progs/demos/Makefile
progs/xdemos/Makefile
2007-10-29 12:05:54 -07:00
Dan Nicholson
cdb02d43fe
linux-dri-xcb: Fix undefined refs when linking with libGL
...
GL_LIB_DEPS was missing -lXdamage and -lXfixes, which was causing
linker errors when trying to build the programs.
(cherry picked from commit 3b9e28d507 )
2007-10-29 11:44:30 -07:00
Michel Dänzer
50cecddc4a
driFenceType: Really return fence type, not flags.
...
This typo could lead to the i915tex driver waiting for an EXE only fence as RW,
causing it to abort with an error.
2007-10-29 13:27:59 +00:00
Alan Hourihane
177f6398e5
Only set R_MODE with NV_point_sprite
2007-10-28 20:08:15 +00:00
Dan Nicholson
887bd6a46f
configs: Fix linux-static to link correctly
...
The linux-static target was missing necessary libraries and hardcoding
their location to /usr/X11R6/lib. This makes it comparable to the x86
and x86-64 static targets.
(cherry picked from commit 9514209593 )
2007-10-26 15:49:00 -07:00
Brian
9af5153410
use grep -q
2007-10-25 14:48:08 -06:00
Dan Nicholson
0e2103689e
More ignored programs merged back from master
...
Some more entries in progs/*/.gitignore that were in master.
2007-10-25 11:59:26 -07:00
Brian
2c496d8e46
simplify/fix the ASM_FLAGS tests (bug 12931)
2007-10-25 11:12:17 -06:00
Brian
8f0ba02e44
Cray Xt3 config
2007-10-25 11:12:07 -06:00
Brian
524c56e417
Fix merge
2007-10-24 16:36:00 -06:00
Brian
773f3a266c
added catamount-osmesa-pgi config, fixes for cross-compiling
2007-10-24 16:35:47 -06:00
Brian
882ada0d22
don't build x86, x86-64 dirs if not needed
2007-10-24 16:33:24 -06:00
Brian
6229005f93
properly init dst reg's CondMask/Swizzle fields
2007-10-23 10:55:14 -06:00
Brian
6c63b35ef7
bump up MAX_INSTRUCTIONS and add an assertion to catch emitting too many instructions
2007-10-23 10:25:34 -06:00
Brian
fb85e50e09
add directfb glut sources to tarball
2007-10-23 08:22:11 -06:00
Brian
5e5f908d0c
don't apply ColorMask to main gc
2007-10-22 17:54:07 -06:00
Michel Dänzer
c09e2143c7
i915tex: Don't emit 'empty' blit rectangles.
...
The hardware seems to interpret them differently and produce unexpected
results...
2007-10-17 18:28:46 +02:00
Brian
74ced1e67f
fix fog, rescale_normals bugs (from gallium branch)
2007-10-15 18:02:14 -06:00
Andreas Micheler
dd02c1609e
faster write_rgba_span_front()
2007-10-15 08:28:06 -06:00
Brian
cdf4880a79
replace 'brick' with correct program name in printfs
2007-10-10 10:57:37 -06:00
Mrc Gran
2ec8e8547d
fix force_s3tc_enable option
2007-10-10 09:16:12 -06:00
Dan Nicholson
b7c36d1d33
Ignore more generated files in progs/
...
Many of the directories in progs/ were missing .gitignore files or
were tracking generated files. This patch is basically the process of
running `make' in each directory and then finding the untracked files
with `git-ls-files -o --exclude-per-directory=.gitignore'. The existing
files were also sorted.
Conflicts:
progs/demos/.gitignore
progs/tests/.gitignore
progs/xdemos/.gitignore
2007-10-10 08:49:59 -06:00
David Nusinow
8913402b74
Revert "* Disable building i915tex."
...
This reverts commit 76556f8264 .
2007-10-06 17:54:29 -04:00
David Nusinow
c00dfefd6f
Revert "Don't release just yet."
...
This reverts commit c3de7b5ade .
2007-10-06 17:54:13 -04:00
David Nusinow
c3de7b5ade
Don't release just yet.
2007-10-04 23:10:47 -04:00
David Nusinow
76556f8264
* Disable building i915tex.
...
It was previously only built on x86 and amd64. It was never
production-ready and relies on a kernel interface that never went
upstream.
2007-10-04 22:49:27 -04:00
Xiang, Haihao
970d18a708
Brian's fix for bug9829
2007-10-04 00:08:18 +02:00
Roland Scheidegger
9456e7f0ff
minor fog calc cleanup
2007-10-03 22:34:36 +02:00
Roland Scheidegger
a5db24adc2
fog: fix issues with negative fog coords (may fix #10529 )
...
Rework tnl fog a bit. Make sure we always use ABS(eyez) when fog coord source
is depth, OTOH it does not seem to be necessary to use it (as was done before
in some cases) if fog coord source is fogcoord (just to save some work).
This fixes tests/fog (the first 2 cases) with i915/i915tex.
2007-10-03 22:33:26 +02:00
Roland Scheidegger
17664e2620
make sure optimized fog params get updated
2007-10-03 22:33:03 +02:00
Roland Scheidegger
43a0eb0253
unbreak 3d textures (typo when setting tex layout)
2007-10-03 22:32:33 +02:00
Michel Dänzer
bcdaed2c0a
i915tex: Work around texture pitch related performance drops on i915 at least.
2007-10-03 10:48:56 +02:00
Brian
78c6637db5
updated glext.h license info (Khronos), plus other clean-ups
2007-10-01 17:56:48 -06:00
Brian
44214a98fd
fix VBO-split infinite loop (bug 12164)
2007-09-29 12:01:47 -06:00
Dan Nicholson
9cc6d2310c
add support for LDFLAGS env var
2007-09-28 18:47:11 -06:00
Brian
1a045954be
update the DRM/DRI instructions
2007-09-28 18:43:12 -06:00
Dave Airlie
b3fc9a1585
i965: fix vblank on 965gm laptops by bringing in code from i915
...
jbarnes has better fixes for this in 7.1, but for 7.0.2 this seems like the best
plan, for distros to pick it up.
2007-09-28 12:02:27 +10:00
Xiang, Haihao
2a86a449ca
mesa: make sure the gotten value isn't greater than the
...
max depth buffer value on 64bit system. fix bug #12095
2007-09-27 10:44:45 -06:00
Xiang, Haihao
44f032db61
i965: handle all unfilled mode in clip stage. fix bug #12453
2007-09-27 10:40:22 -06:00
Brian
5a520729ee
prep for 7.0.2 release
2007-09-27 10:35:10 -06:00
Brian
36fbe78c60
for Miniglx, use git sources
2007-09-27 10:34:44 -06:00
Brian
029bb17770
bump versions to 7.0.2
2007-09-27 10:30:13 -06:00
Brian
7958bee6be
fix blend bug 12164
2007-09-27 10:25:57 -06:00
Brian
0b9bb21ce4
Restore old _TriangleCaps code to fix Blender problem (bug 12164)
2007-09-27 10:25:33 -06:00
Roland Bär
cfcc5b794e
[i965] Bug #11812 : Fix fwrite return value checks in AUB file code.
2007-09-26 08:00:17 -06:00
Zou Nan hai
925ff408a6
fix fd.o bug #12217 , recalcuate urb when clip plane size change
2007-09-26 07:59:41 -06:00
Xiang, Haihao
f40ca444f5
i965: The cube map texture coordinates must be devided by the
...
component with the largest absolute value before they are
delivered. fix bug #12421
2007-09-26 07:58:57 -06:00
Zou Nan hai
638a5e0382
fix a bug in 965 ARB_occlusion_query,
...
fd.o bug #12132
2007-09-26 07:58:29 -06:00
Brian
6d777bf055
fix DrawRangeElements error msg
2007-09-23 13:57:36 -06:00
Brian
ae6d4e8bc0
fix -D_BSD_SOURC
2007-09-20 18:42:59 -06:00
Brian
f2728724d3
fix for __IBMC__
2007-09-20 15:12:42 -06:00
Brian
bc95b34cce
added bluegene-xlc-osmesa, fortran fixes
2007-09-20 15:12:21 -06:00
Brian
9eb89616af
fixes for bluegene-xlc-osmesa config
2007-09-20 15:10:35 -06:00
Brian
f7713a6d81
Added bluegene-xlc-osmesa config (Alexander Neundorf)
2007-09-20 15:09:54 -06:00
Brian
1cec9b727a
fix bug 10604
2007-09-14 13:43:58 -06:00
Brian
18a4730f5b
From trunk: mesa: bind VBO_ATTRIB_XXX to correct input array when executing a display list. fix #10604
...
This also fixes Bill Mitchell's Fortan/plot bug.
2007-09-14 13:43:09 -06:00
Brian
1342aefcdd
updated link
2007-09-14 09:57:16 -06:00
Brian
1fd4b1e702
fix glCopyPixel/glPixelZoom bug 12417)
2007-09-14 09:57:08 -06:00
Brian
32dff44c28
fix copypixels overlap test bug ( #12417 )
2007-09-14 09:56:05 -06:00
Brian
e7c2ae476a
fix ARB fp/vp parsing bug 12313
2007-09-13 11:42:48 -06:00
Brian
a66301f83d
added program_error2() function for better error reporting
2007-09-13 11:41:44 -06:00
Brian
a5f7d56221
Fix state.texgen parsing error (bug 12313).
...
Replace *(*inst++) with *(*inst)++ in a few places.
2007-09-13 11:29:51 -06:00
Brian
140080c1ec
added .pc.in files to tarballs
2007-09-13 09:27:06 -06:00
Brian
ef43af6d43
added DSTDIR, pkg-config items
2007-09-12 10:12:20 -06:00
Brian
949d0532f0
updated with pkg-config info
2007-09-12 10:12:06 -06:00
Dan Nicholson
96efc76d74
pkg-config support
2007-09-12 10:03:31 -06:00
Dan Nicholson
6ca0d63692
DESTDIR support.
2007-09-12 10:01:06 -06:00
Xiang, Haihao
95fc2485e2
i965: fix bug#11925
2007-09-12 16:58:45 +08:00
Xiang, Haihao
d6ce1e4834
i965: fix #11378
2007-09-12 15:29:11 +08:00
Brian
2cc2b12fc7
fix indirect rendering crash
2007-09-11 10:59:10 -06:00
Brian
2259f81cf7
In _mesa_make_current(), don't unbind FBOs from the old context.
...
This fixes the X server crash reported by KeithP on Aug 29.
The old context's FBOs will be unreferenced during context destruction so
there's no memleak with this change.
2007-09-11 10:59:10 -06:00
Brian
791f12880f
Update depth test state when binding new framebuffer object
2007-09-11 09:25:49 -06:00
Brian
7aa7373a64
fix comment
2007-09-11 09:25:49 -06:00
Xiang, Haihao
2f186a190f
i965: take the secondary color into account when drawing
...
bitmap. fix#10688
2007-09-11 17:03:07 +08:00
Xiang, Haihao
357893a873
i965: limit on LOD Bias, fix#11987
2007-09-11 17:02:15 +08:00
Brian
a17881da5f
clean-up (see bug 12317)
2007-09-10 08:36:01 -06:00
Brian
4872ee83a9
updated VC7 project files
2007-09-05 10:05:48 -06:00
Christoph Kubisch
5ec222a832
updated VC7 project files
2007-09-05 10:01:58 -06:00
Brian
40438b3440
Use temporary matrix in __gluInvertMatrixd() to fix aliasing problem (see bugs 12269, 6748)
2007-09-03 16:21:12 -06:00
Xiang, Haihao
e0b80660c8
fix bug#11009
2007-09-01 15:31:49 +08:00
Xiang, Haihao
a2016301f5
i965: Take the upper limitation on LOD into account.
2007-09-01 15:14:58 +08:00
Brian
7ec6729fb6
sync with trunk, fixing bug 12239
2007-08-31 16:36:17 -06:00
Brian
837a2cf72e
fix i965 bugs, x86-64 bugs
2007-08-31 16:35:38 -06:00
Roland Scheidegger
0adca14536
fix another occurence of movaps which might not be aligned
2007-08-31 00:06:30 +02:00
Brian
57b0f66c6d
s/movaps/movups/ (see bug 12216)
2007-08-30 08:41:43 -06:00
Xiang, Haihao
e47e7a9571
i965: store read drawable info in intel_context. Some OpenGL
...
operations are based on read drawable. fix bug#10136.
2007-08-30 14:06:26 +08:00
Xiang, Haihao
68ca01560f
i965: check NULL pointer. fix bug#12193
2007-08-30 14:06:19 +08:00
Xiang, Haihao
64f1c91fcb
i965: samplers group in fours in WM_STATE. fix bug#9415
2007-08-30 14:05:56 +08:00
Xiang, Haihao
7d33f94198
i965: flush batch buffer when getting the maximum. This makes
...
some 3D programs such as pymol work well.
2007-08-30 14:05:39 +08:00
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
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
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
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
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
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
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
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
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
Julien Cristau
d79e80a3d0
New upstream release candidate.
...
Drop patches included upstream.
2007-04-21 20:47:01 +02: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
Brice Goglin
47c3c706e8
Add 09_i915_always_enable_pixel_fog.patch
2007-04-21 18:00:12 +02: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
Brice Goglin
3832ecadae
Add 06_fix_texture_data_corruption.patch ( closes : #412346 )
2007-04-08 18:52:31 +02: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
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
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
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
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
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
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
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