Brian Paul
cc67bd8799
st/mesa: remove dead code
2010-05-03 13:11:22 -06:00
Brian Paul
529b7b355d
st/mesa: restore original last_layer comparison
...
Commit e648d4a1d1 changed the original
less-than test to a not-equal test. This was an effort to save some
memory by switching the texture layout to a non-mipmapped layout when
we mis-guessed about the original layout (thus saving some memory).
However, this causes us to hit a new (apparently broken) code path
when copying the old texture's data to the new texture. Simply
undo this change for the time being until the other/new bug is fixed.
Fixes fd.o bug 27933.
2010-05-03 13:10:27 -06:00
Marek Olšák
ac6a26b429
r300g: use util_format_short_name and util_format_is_plain
2010-05-03 20:39:43 +02:00
Marek Olšák
5a6b9f3855
util: add util_format_short_name
2010-05-03 20:39:43 +02:00
Marek Olšák
bc3d9a8b18
util: add util_format_is_plain
2010-05-03 20:39:43 +02:00
Marek Olšák
5cdedaaf29
r300g: refuse to create a texture with size 0
2010-05-03 20:39:40 +02:00
Marek Olšák
0bcb4f1001
r300g: improve texture debug output, split into TEX and TEXALLOC flags
2010-05-03 19:29:32 +02:00
Török Edwin
15af543f10
Reorder LLVM passes, running mem2reg earlier.
...
This gives a ~30% shader optimization time improvement on blender.
Tested by comparing the dumped LLVM modules.
Current ordering:
time ~/llvm-git/obj/Release-Asserts/bin/opt l.bc -constprop -instcombine
-mem2reg -gvn -simplifycfg
real 0m1.126s
user 0m1.108s
sys 0m0.012s
With this patch:
time ~/llvm-git/obj/Release-Asserts/bin/opt l.bc -mem2reg -constprop -instcombine -gvn -simplifycfg
real 0m0.885s
user 0m0.880s
sys 0m0.000s
The overall improvement in blender is ~15%.
Blender without the patch takes 1m13s:
edwin 5934 87.6 11.5 729440 458296 pts/5 SLl+ 17:35 1:13 blender
Blender with the patch takes 1m3s:
edwin 5726 94.2 11.2 716424 446168 pts/5 SLl+ 17:32 1:03 blender
It is still slow with the patch, but better (most of the optimization time is
taken up by GVN, see LLVM PR7023).
Signed-off-by: Török Edwin <edwintorok@gmail.com>
Signed-off-by: José Fonseca <jfonseca@vmware.com>
2010-05-03 17:01:20 +01:00
José Fonseca
723ab664f6
svga: Silent warning.
2010-05-03 17:01:20 +01:00
Kristian Høgsberg
723511bb32
Generate es glapi files when es1 or es2 is enabled
2010-05-03 08:33:23 -04:00
José Fonseca
9db4a211e9
gallivm: Display message instead of crashing when sampler generator was not supplied for tgsi translation.
2010-05-03 13:18:53 +01:00
Kristian Høgsberg
9ab3df4ebb
driswrast: Fix more context creation breakage
...
Pointed out by Colin Harrison.
2010-05-03 08:01:24 -04:00
José Fonseca
4b891234f8
translate: Make translate_generic truly generic.
...
PIPE_FORMAT_R10G10B10X2_USCALED, half floats, were not supported, so
just rely on u_format for (almost) universal format support.
2010-05-03 12:18:55 +01:00
José Fonseca
caede7528d
draw: Remove draw_pt_fetch_prepare call from llvm middle end.
...
Unneeded since we code generate the vertex fecthes.
2010-05-03 12:15:32 +01:00
José Fonseca
14a0328d4b
tgsi: Parse and dump predicates.
2010-05-03 12:13:54 +01:00
José Fonseca
d288698a76
gallium: Remove loop register file.
...
It was only used for D3D's REP/END/BGNFOR/ENDFOR. D3D's aL register is
just like another address register now.
2010-05-03 10:53:32 +01:00
José Fonseca
e27983bc08
gallivm: Replace predicate assertion failure with warning message.
2010-05-03 09:54:01 +01:00
José Fonseca
d44c8ee568
draw: Disable rtasm compilation when using LLVM.
...
Saves time and trouble.
2010-05-03 09:53:12 +01:00
Dave Airlie
738cb50237
nouveau: fix nouveau_create_context decleration
2010-05-03 17:09:54 +10:00
Dave Airlie
e8f48b1dc9
softpipe: invalidate cache view when swizzles are different.
...
Current code only invalidated if the texture was different, however we
store swizzled values in the cache, so we need to invalidate in that case
also.
Signed-off-by: Dave Airlie <airlied@redhat.com>
2010-05-03 16:27:42 +10:00
Dave Airlie
26a9b7e4c7
glx: fix regression with GLX_USE_GL
...
update for fbconfig_style_tags
2010-05-03 16:17:25 +10:00
Zack Rusin
d2b6ed7c4d
gallivm: fix nested break and continue statements
...
we were resetting the mask on each new break/continue statement within
the same scope. we always need to and the current execution mask
with the current break/continue mask to get the correct result (the
masks are always ~1 initially)
2010-05-02 21:40:30 -04:00
Jakob Bornecrantz
c2c1f60391
identity: Move sampler view create and destroy to id_objects.c
2010-05-03 00:27:38 +01:00
Jakob Bornecrantz
59b160d286
identity: s/texture/resource/
2010-05-03 00:27:37 +01:00
Jakob Bornecrantz
eda7c2506a
identity: Whitespace & Style
2010-05-03 00:27:37 +01:00
Jakob Bornecrantz
83a1a0bc3e
swrast: Correct include for mtypes.h
2010-05-03 00:27:37 +01:00
Luca Barbieri
d0f9e7521c
gallium/util: print \n after DXTn printf
...
Re-add commit 2d65a7caf9
Signed-off-by: Xavier Chantry <chantry.xavier@gmail.com>
Signed-off-by: José Fonseca <jfonseca@vmware.com>
2010-05-03 00:14:20 +01:00
Xavier Chantry
5362f77b47
llvmpipe: add lp_test_* to .gitignore
...
Signed-off-by: Xavier Chantry <chantry.xavier@gmail.com>
Signed-off-by: José Fonseca <jfonseca@vmware.com>
2010-05-03 00:13:36 +01:00
José Fonseca
b84590994c
svga: Remove the screen private context.
...
All affected operations have already been moved to context.
More cleanup work can be done, in particular with the buffer transfers.
2010-05-03 00:13:36 +01:00
José Fonseca
49e37469bd
svga: Remove empty file.
2010-05-03 00:13:36 +01:00
José Fonseca
7e28479c3a
svga: Update flags documentation.
2010-05-03 00:13:36 +01:00
José Fonseca
4885cd4ff7
softpipe: Fix alpha blending for formats without alpha channel.
...
Don't use the dst alpha channel from the tile cache when it does not
exist in the true format.
2010-05-03 00:13:36 +01:00
José Fonseca
59253a79d8
llvmpipe: Fix alpha blending for formats without alpha channel.
...
Don't use the dst alpha channel from the swizzled tile when it does not
exist in the true format.
2010-05-03 00:13:36 +01:00
Xavier Chantry
b44c52870d
Update drisw state tracker to use new API aware context create
...
Even though swrast defines its own __DriverAPIRec it still shares the
driCreateNewContext() implementation from dri_util.c. So the CreateContext
prototypes have to match in the two __DriverAPIRecs.
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Xavier Chantry <chantry.xavier@gmail.com>
2010-05-02 17:46:43 -04:00
Vinson Lee
6edb18ee35
svga: Include svga_surface.h in svga_screen.c.
...
Fixes svga_screen_init_surface_functions implicit declaration warning.
2010-05-02 13:34:50 -07:00
Vinson Lee
1a30d98159
r300g: Remove unnecessary header.
2010-05-02 13:30:40 -07:00
Xavier Chantry
38e3fb23da
Update dri state tracker to use new API aware context create
2010-05-02 16:27:42 -04:00
Vinson Lee
801dcd9e8f
mesa: Include api_exec.h in dlist.c.
...
Fixes _mesa_alloc_dispatch_table implicit declaration warning.
2010-05-02 13:22:37 -07:00
Marek Olšák
b08b7b7377
r300g: do not validate buffers in check_cs
...
It's already done in r300_emit_buffer_validate.
This also fixes Total Annihilation 3D on debug builds at least.
2010-05-02 20:59:47 +02:00
Marek Olšák
3b2cf97c5c
r300g: fix surface_copy for compressed formats
...
No accelerated blitting for these, it's too messy.
2010-05-02 20:59:47 +02:00
Kristian Høgsberg
2df3c361ef
configure.ac: Fix test for whether to build src/gles
2010-05-02 14:52:39 -04:00
Kristian Høgsberg
aa8606fb23
mesa: Include mfeatures.h before testing feature macros
2010-05-02 14:19:54 -04:00
Kristian Høgsberg
da76a4d845
mesa: Only compile ES files when ES1 or ES2 are selected
...
This still requieres manual generation of the es1 and es2 glapis and is
disabled by default.
2010-05-02 14:09:52 -04:00
José Fonseca
559d124ed3
mesa: #ifdef out more remap_table related code when disabled.
...
Seems to get everything building again here.
2010-05-02 16:10:40 +01:00
José Fonseca
316b6fa509
retrace: Add sampler_view_destroy
2010-05-02 15:32:09 +01:00
José Fonseca
db1ed3da6c
trace: Fix typo in method name.
2010-05-02 15:32:09 +01:00
Kristian Høgsberg
0870e4a202
Merge branch 'gles2-2'
...
Conflicts:
src/mesa/drivers/dri/common/dri_util.h
2010-05-02 10:17:07 -04:00
Kristian Høgsberg
9fd5fa0512
Hook in install rules for es1 and es2
2010-05-02 10:14:53 -04:00
Kristian Høgsberg
74399d4af5
Add glesv2.pc and glesv1_cm.pc pkg-config files for ES 1 and 2
2010-05-02 09:51:13 -04:00
Kristian Høgsberg
a804af2a1e
st/mesa: Create context for API_OPENGL as first priority
2010-05-02 09:27:51 -04:00