Michal Krol
75f371e973
Remove grammar module -- no dependencies left.
2009-12-12 16:58:43 +01:00
Michal Krol
a3b32934c8
slang: Delete a file that is now autogenerated.
...
This file has been modified in master and removed in feature branch.
This gave a merge conflict I couldn't resolve by removing and git adding
it to index.
2009-12-12 16:49:26 +01:00
Michal Krol
a3eb0f718e
Merge branch 'master' into glsl-pp-rework-2
...
Conflicts:
progs/perf/drawoverhead.c
progs/perf/teximage.c
progs/perf/vbo.c
progs/perf/vertexrate.c
src/mesa/shader/slang/library/slang_common_builtin_gc.h
2009-12-12 16:48:32 +01:00
Christoph Bumiller
d80778218d
nv50: support TXB and TXL
...
... and don't set the 'live' flag for TEX anymore, we'd
have to know if results affect the inputs for another TEX,
and I'm not going to do that kind of analysis now.
2009-12-12 16:39:00 +01:00
Christoph Bumiller
b0036f391a
nv50: add S8Z24 depth texture format too
2009-12-12 16:38:59 +01:00
Christoph Bumiller
cc0ffaba7d
nv50: fix depth comparison func TSC bits
...
Unfortunately it seems that if depth comparison is
active and we read a 2D texture, i.e. provide only
2 inputs, the second is used for comparison ...
2009-12-12 16:38:59 +01:00
Christoph Bumiller
6a689783b9
nv50: add src_mask case for IF opcode
2009-12-12 16:38:59 +01:00
Christoph Bumiller
9f3644c423
nv50: plug memory leak in miptree creation/destruction
...
Keeping this dynamically allocated for texture arrays.
Since we don't use it to store zslice offsets anymore
it's either 1 or 6 integers (cube) ...
2009-12-12 16:38:59 +01:00
Christoph Bumiller
f7a9734492
nv50: use copies of tgsi src nv50_regs
...
So we can use the 'mod' member without concern
if a source is used multiple times in 1 insn.
2009-12-12 16:38:59 +01:00
Christoph Bumiller
6a15ec9141
nv50: support vertex program textures
2009-12-12 16:38:59 +01:00
Maciej Cencora
784cca9fa5
r300: disable blit debugging info
2009-12-12 00:52:52 +01:00
Maciej Cencora
6b8315494a
r300: emit number of used colorbuffers to pass radeon cs checker
2009-12-12 00:52:52 +01:00
Maciej Cencora
dbd53f8f55
r300: setup render target format for r300/r400 cards too
2009-12-12 00:52:51 +01:00
Maciej Cencora
353966b2da
r300: finish blit support for r300
2009-12-12 00:52:51 +01:00
Maciej Cencora
c1a7cc1e44
more blit fixes
2009-12-12 00:52:51 +01:00
Maciej Cencora
cd5f167353
blit WIP
2009-12-12 00:52:51 +01:00
Maciej Cencora
7255a5486d
r300: use accelerated emit for CopyTex[Sub]Image functions
2009-12-12 00:52:51 +01:00
Maciej Cencora
a4df3f9227
r300: accelerated blit support
2009-12-12 00:52:51 +01:00
Maciej Cencora
0a0d410bdb
r300: fix wrong assertion
2009-12-12 00:52:51 +01:00
Maciej Cencora
bd58253f67
r300: export translateTexFormat function
2009-12-12 00:52:51 +01:00
Maciej Cencora
9975c484ad
r300: refactor PVS code and constants emission
2009-12-12 00:52:50 +01:00
Maciej Cencora
545a2f4f2d
r300: refactor R500 fragment program emission
2009-12-12 00:52:50 +01:00
Maciej Cencora
05fae9fbf6
r300: refactor color buffer setup
2009-12-12 00:52:50 +01:00
Maciej Cencora
5ee270820b
r300: use _mesa_meta_Clear for buffer clears
2009-12-12 00:52:50 +01:00
Maciej Cencora
da73c1ed41
r300: minor texture code refactoring
2009-12-12 00:52:50 +01:00
Brian Paul
4430a05a3a
gallium: added comment for pipe_reference() return value
2009-12-11 16:50:25 -07:00
Brian Paul
9c01cf425f
mesa: minor reformatting/rewrapping in dd.h
2009-12-11 16:42:31 -07:00
Brian Paul
56dce15dcc
mesa: remove unused ctx->Driver.ActiveTexture() hook
2009-12-11 16:42:31 -07:00
Brian Paul
e24a8de8ba
mesa: updated comment
2009-12-11 16:42:30 -07:00
Brian Paul
09aa984494
Revert "scons: Pass -fno-strict-aliasing to gcc."
...
This reverts commit a2937a2f4e .
Per Jose's comment, We don't want this on master.
2009-12-11 10:11:45 -07:00
Brian Paul
a087eb590d
Merge branch 'mesa_7_7_branch'
...
Conflicts:
src/gallium/state_trackers/xorg/xorg_xv.c
src/mesa/drivers/dri/intel/intel_span.c
2009-12-11 10:04:07 -07:00
Brian Paul
e128cc205e
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
2009-12-11 09:51:27 -07: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
b605f4ff11
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
2009-12-11 09:22:00 -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
José Fonseca
da3bc492d2
scons: Tweak MSVC release options.
...
Enable whole program optimizations and fast math.
2009-12-11 15:16:22 +00:00
José Fonseca
ffae1f938d
svga: Add a missing dependency from the prescale state.
...
Thanks for Keith to finding this.
Fixes Jedi Knight 2 menus.
2009-12-11 14:14:03 +00:00
José Fonseca
8469baf41b
svga: Always pass SVGA3D_SURFACE_HINT_DYNAMIC.
...
Since we're reusing buffers we're effectively transforming all
of them into dynamic buffers.
It would be nice to not cache long lived static buffers. But there
is no way to detect the long lived from short lived ones yet. A
good heuristic would be buffer size.
2009-12-11 13:15:12 +00:00
José Fonseca
16876b8328
svga: Keep tight control of texture handle ownership.
...
The texture owns the surface handle. All derivatives need to keep
a reference to texture.
This fixes several assertions failures starting up Jedi Knight 2.
Should cause no change for DRM surface sharing -- reference count still
done as before there.
2009-12-11 12:29:02 +00:00
José Fonseca
770323e33e
svga: Fix mixed signed comparisons.
2009-12-11 12:28:53 +00:00
José Fonseca
a2937a2f4e
scons: Pass -fno-strict-aliasing to gcc.
...
Strict aliasing tule violations were fixed on master, but
they're still causing problem in this branch, so disable this assumptions.
Do not apply this fix to master (revert when you merge).
2009-12-11 12:28:53 +00:00
José Fonseca
8c981b94dc
scons: Make it work with MinGW build of LLVM 2.6.
...
LLVM 2.5 is no longer supported on windows.
2009-12-11 12:28:53 +00: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
Ian Romanick
e624b77eb2
intel: Remove ARGB internal_format == GL_RGB hacks
...
Now that XRGB is supported, we don't need to hack around cases of an RGBA
format buffer with an internal format of GL_RGB.
2009-12-10 15:12:31 -08:00