Brian Paul
896c0cc8ec
bring in fixes/changes from gallium-0.1
2008-05-16 15:47:55 -06:00
Brian Paul
a2e6beade1
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:23:04 -06:00
Brian Paul
f27c6f3139
fix merge collision
2008-05-16 15:17:35 -06:00
Brian Paul
f2632212ad
silence warning, new assertion
2008-05-16 15:16:06 -06:00
Shunichi Fuji
e291cf6f8d
free(key) in _tnl_UpdateFixedFunctionProgram()
2008-05-16 15:16:06 -06:00
Brian Paul
8bdf5b6e64
Fix a program refcounting error, don't share program parameter lists.
...
The refcounting bug was causing a memleak (unfreed programs).
The old parameter list sharing is not needed since the change in how
uniforms are handled.
2008-05-16 15:16:06 -06:00
Brian Paul
a3e86d43e6
minor changes to aid debugging
2008-05-16 15:16:06 -06:00
Brian Paul
eb4271ea8b
remove stray, left-over RefCount++
2008-05-16 15:16:06 -06:00
Brian Paul
6de6999edc
whitespace/formatting
2008-05-16 15:16:06 -06:00
Brian Paul
1af2b14514
init SamplersUsed bits in _mesa_parse_arb_fragment_program
2008-05-16 15:16:06 -06:00
Brian Paul
885cc592df
fix assertion typo: s/=/==/
2008-05-16 15:16:06 -06:00
Shunichi Fuji
e6cd9d88d3
Fix memory leak in _tnl_UpdateFixedFunctionProgram
2008-05-16 13:18:25 -07:00
Brian Paul
0639998ee8
Fix DRI build
2008-05-16 13:15:03 -07:00
Brian Paul
ade508312c
Updated GLSL uniform/sampler handling from gallium-0.1 branch
...
Previously, the shader linker combined the uniforms used by the vertex and
fragment shaders into a combined set of uniforms. This made the implementation
of glUniform*() simple, but was rather inefficient otherwise. Now each shader
gets its own set of uniforms (no more modelview matrix showing up in the
fragment shader uniforms, for example).
cherry-picked by hand from gallium-0.1 branch
2008-05-14 16:09:46 -06:00
Brian Paul
c807c1a23f
mesa: new functions for managing list/index of uniforms
...
cherry-picked from gallium-0.1
2008-05-14 13:12:44 -06:00
Brian Paul
e0f160663e
clean-up swizzle fields in fog code, fix NegateBase
...
cherry-picked from gallium-0.1
2008-05-14 13:01:13 -06:00
Brian Paul
bff695b926
sync up with gallium-0.1 changes
...
New _mesa_num_inst_dst_regs(), _mesa_is_tex_instruction() functions
2008-05-14 13:00:27 -06:00
Brian Paul
6ca948a303
added _mesa_combine_parameter_lists()
...
cherry-picked from gallium-0.1
2008-05-14 12:53:03 -06:00
Brian Paul
19ad9cf774
mesa: added _mesa_insert_instructions()
...
Also, use new _mesa_free_instructions() in a few places.
cherry-picked from gallium-0.1
2008-05-14 12:39:41 -06:00
Brian Paul
450136d368
mesa: added _mesa_free_instructions()
...
cherry-picked from gallium-0.1
2008-05-14 12:37:07 -06:00
Brian Paul
57e222d6e5
fix some additional program refcounting bugs
2008-05-14 12:11:17 -06:00
Xiang, Haihao
4b7d301c94
_generic_read_RGBA_span_BGRA8888_REV_SSE2: It should adjust the source
...
and target pointers after do the first 2 pixels. fix bug #15850
2008-05-14 09:55:08 +08:00
Dan Nicholson
5dbbde5b22
Default DRI driver directory to match X.Org xserver
...
Since the only valid consumer of the DRI drivers is the X.Org xserver,
this changes the default DRI driver directory to match xorg-server:
${libdir}/dri. The old default of /usr/X11R6/modules/dri was wrong for
nearly all current systems.
2008-05-09 07:06:52 -07:00
Dave Airlie
0dbd5c8640
intel: use new mipmap generation hooks in driver.
2008-05-09 13:51:37 +10:00
Dave Airlie
86bd98c6aa
swrast/dri: switch over users of generate_mipmap to new interface
2008-05-09 13:41:02 +10:00
Dave Airlie
0449bab2f8
Revert "mesa/intel: map/unmap texture objects around mipmap generation function."
...
This reverts commit c50ffc4cb8
2008-05-09 13:33:56 +10:00
Brian
d4e1d85dba
Remove unused texunit parameter to ctx->Driver.GenerateMipmap()
...
(cherry picked from commit c3395f4473
2008-05-09 13:33:29 +10:00
Dave Airlie
a638676473
Added ctx->Driver.GenerateMipmap() driver hook
...
(cherry picked from commit 4c2f3dbca9
2008-05-09 13:33:06 +10:00
Dave Airlie
c50ffc4cb8
mesa/intel: map/unmap texture objects around mipmap generation function.
...
This at least stops the compiz brain explosion we were seeing, I do wonder
though if we should somehow be calling intel_generate_mipmap somehow.
2008-05-09 13:02:41 +10:00
Kristian Høgsberg
990e010394
Add RS690M PCI ID.
2008-05-08 19:48:32 -04:00
Brian Paul
b4e75d6c41
disable debug printfs
2008-05-08 10:59:31 -06:00
Xiang, Haihao
9508293e01
mesa: Call RENDER_FINISH on the zero pixel case.
2008-05-08 11:52:57 +08:00
Brian Paul
5b5c931527
fix refcounting bugs in tnl/tex program caches
2008-05-07 18:51:44 -06:00
Dan Nicholson
a6464b3cb0
Never fail `make clean'
...
Mostly some pedantic changes such that `make clean' always ignores
errors. Also changed the top clean target to do the `touch
configs/current' dance instead of realclean.
2008-05-07 11:35:23 -07:00
Dan Nicholson
df8134c3cf
Run `make clean' in drivers/xorg, too
2008-05-07 10:22:32 -07:00
Dan Nicholson
e8c2b9967f
Refactor installation targets
...
Currently, there is a single path in src/mesa/Makefile to install that
has a few conditionals in it. This commit changes install to act like
default where we loop over $(DRIVER_DIRS), deciding what to do.
A new target, install-headers, has been broken out to accomodate
installing a standalone OSMesa where neither libGL or gl.pc are wanted.
2008-05-07 07:48:29 -07:00
Dan Nicholson
ec813878e4
Ensure recursive makes always propagate errors
...
There were a couple spots left where a recursive make could fail in a
chain of commands without stopping.
2008-05-07 07:11:49 -07:00
Brian
df43fb661b
implement full reference counting for vertex/fragment programs
...
Use _mesa_reference_vert/fragprog() wherever we assign program pointers.
Fixes a memory corruption bug found with glean/api2 test.
2008-05-06 23:08:51 -06:00
Dan Nicholson
8eee0146f2
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa
2008-05-06 14:29:59 -07:00
Dan Nicholson
9f948b8c33
Prevent makedepend from running multiple times
...
The default target in src/mesa/Makefile calls a recursive $(MAKE). With
parallel jobs, this causes makedepend to run twice. Instead, block on
the first make until depend has been created.
2008-05-06 14:29:10 -07:00
Dan Nicholson
c5e2b850ad
Always cleanup the makedepend backup files
...
Consistently cleanup the depend.bak files created by makedepend. Also,
realclean has been changed to use a single find command, which speeds it
up considerably.
2008-05-06 14:00:43 -07:00
Michal Wajdeczko
7f747204ea
Add support for ATI_separate_stencil in display lists.
2008-05-06 13:02:06 -07:00
Dan Nicholson
cba14d85a8
Error consistently when running recursive make
...
When changing directories and running a sub-make, ensure that both the
cd and make commands propagate errors to the parent make.
2008-05-06 12:29:53 -07:00
Dave Airlie
17adf04e5c
i965: fix googleearth in classic mode.
...
In classic mode googleearth triggered a case where vbos weren't getting accounted properly.
2008-05-06 18:52:47 +10:00
Markus Amsler
113f5b14cb
r300: fragment.position input needs no blanking out, it's correctly handled in insert_wpos.
...
fixes bug 15447
2008-05-06 01:32:40 +02:00
George Sapountzis
2ed0f7278e
glcore: Set all external variables in configuration
...
based on patch by Dan Nicholson <dbn.lists@gmail.com>
2008-05-05 18:14:52 +03:00
Xiang, Haihao
2fa2dd3908
i965: Don't cast the result of brw_prepare_vertices to an unsigned value.
...
Negative value means other errors, not aperture overflow. fix bug #15752
2008-05-05 13:15:28 +08:00
Dave Airlie
a7016949f2
r300: fix swtcl texrect path properly.
...
We really need to update the shader state so the texrect parameters work.
This should fix compiz looking crappy on rs480 and rs690
(cherry picked from commit 66a5562ce2
2008-05-05 23:50:45 +10:00
Dave Airlie
2f0a75f004
r300: add R300_NO_TCL to allow testing of non-tcl on tcl cards
...
(cherry picked from commit 026ef8111a
2008-05-05 23:47:01 +10:00
Markus Amsler
acb47dee69
r300: Set correct VAP_CNTL per vertex program.
2008-05-04 11:11:38 +00:00
