Brian
96abc6bf72
merge fix: add STATE_FOG_PARAMS_OPTIMIZED, STATE_SPOT_DIR_NORMALIZED
2007-02-22 09:08:53 -07:00
Brian
7b30053b26
fix negative indentation problem
2007-02-22 09:08:36 -07:00
Brian
29c471aafc
Merge branch 'origin' into glsl-compiler-1
...
Conflicts:
src/mesa/main/state.c
src/mesa/shader/program.c
src/mesa/shader/program.h
src/mesa/shader/programopt.c
src/mesa/shader/slang/slang_execute.c
src/mesa/sources
src/mesa/swrast/s_arbshader.c
src/mesa/swrast/s_context.c
src/mesa/swrast/s_span.c
src/mesa/swrast/s_zoom.c
src/mesa/tnl/t_context.c
src/mesa/tnl/t_save_api.c
src/mesa/tnl/t_vb_arbprogram.c
src/mesa/tnl/t_vp_build.c
src/mesa/tnl/t_vtx_eval.c
2007-02-22 08:53:33 -07:00
Brian
6d4cf6be4e
updated info about arrays, predefined uniforms
2007-02-21 16:07:03 -07:00
Brian
5a2c1ad625
disable debug
2007-02-21 16:05:56 -07:00
Brian
917a5086b3
Use gl_LightSource[0].position intead of a light position uniform.
2007-02-21 15:57:55 -07:00
Brian
5d89b027ee
remove unneeded #includes
2007-02-21 15:42:50 -07:00
Brian
502c132738
fix copy&paste errors
2007-02-21 15:42:10 -07:00
Brian
f958aabdf3
more minor changes to STATE_ indexing
2007-02-21 15:23:11 -07:00
Brian
78399d23dc
remove dead code
2007-02-21 15:22:17 -07:00
Brian
f941892829
Reimplement the _slang_alloc_statevar() function.
...
After several tries at making a table-based system for examining pre-defined
uniforms to find statevar indexes, give up and do it the simple way (lots of
strcmp() calls). Not terribly elegant, but perfectly functional.
2007-02-21 15:21:58 -07:00
Brian
6531952b3c
adjustments to STATE_ token layout/format so token[1] is always the array index
2007-02-21 11:08:21 -07:00
Brian
c3301d038d
checkpoint overhaul of pre-defined uniform code
2007-02-21 09:15:39 -07:00
Brian
aa7ddbd0ff
clean-up, move IR_ELEMENT code
2007-02-20 17:00:16 -07:00
Brian
760c114b24
alloc IR_FIELD's Storage in codegen, like IR_ELEMENT
2007-02-20 16:56:49 -07:00
Ian Romanick
a4b344baa2
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/mesa/mesa
2007-02-20 15:19:23 -08:00
Ian Romanick
f0bcee5db0
Delete two invalid assertions.
...
These two assertions are invalid for a couple reasons. Primarily,
when this code is compiled into the X-server, the symbols
"glSecondaryColor3fEXT" and "glPointParameterivNV" do not exist.
2007-02-20 15:18:53 -08:00
Brian
10f42ddb9e
work on struct/array handling
2007-02-20 15:22:38 -07:00
Brian
361b60678e
forgot to return length in parse_array_len()
2007-02-20 15:20:46 -07:00
Patrice Mandin
440759c2cd
nouveau: nv10: grr, ctx->DrawBuffer invalid?
2007-02-20 23:17:09 +01:00
Patrice Mandin
79870d100f
nouveau: nv10: also check ctx->DrawBuffer in nv10ViewportScale
2007-02-20 23:13:48 +01:00
Patrice Mandin
102ad2e066
nouveau: nv10: keep 24/8 depth/stencil value, don't check for depth bits
2007-02-20 23:04:21 +01:00
Brian
243c2dd746
implement support for pre-defined uniform structs (state vars)
2007-02-20 14:03:43 -07:00
Brian
48d65aabbc
added slang_builtin.c
2007-02-20 14:03:10 -07:00
Adam Jackson
d44027dbbd
Fix parallel make in r300 driver.
2007-02-20 12:48:50 -05:00
Brian
bd894c4705
added SWIZZLE_XXXX, SWIZZLE_YYYY, etc
2007-02-20 10:40:08 -07:00
Brian
906fd23e1d
glxext.h version 18
2007-02-20 08:41:15 -07:00
Brian
45b1f169b4
updated to version 18
2007-02-20 08:40:55 -07:00
Brian
d2ffe4ca07
glext.h version 39
2007-02-20 08:38:46 -07:00
Brian
c226e44437
updated to version 39
2007-02-20 08:38:29 -07:00
Christian Neumair
20e851bb9a
set log level w/ env var
2007-02-20 08:11:11 -07:00
Brian
174c555414
remove accidental check-in
2007-02-20 08:05:29 -07:00
Brian
3d001b81c2
Merge branch 'glsl-compiler-1' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into glsl-compiler-1
2007-02-20 08:04:40 -07:00
Thomas Hellstrom
d2b06403c6
i915tex: Fix performance regression with new vbo code and latest drm.
...
With current memory preferences, vbos ended up in AGP space
where reading from them got a bit slow.
Make sure buffer objects are initially created in system memory.
2007-02-19 19:57:30 +01:00
Brian
9449a4d894
s/PROG_PRINT_ARB/PROG_PRINT_DEBUG/
2007-02-17 09:41:59 -07:00
Brian
61d31ae10d
info about stand-alone compiler
2007-02-17 09:41:19 -07:00
Brian
cc153541a2
stand-alone GLSL compiler
2007-02-17 09:15:39 -07:00
Brian
501ee87180
Lots of changes to prog_print.c code.
...
Mainly, allow printing programs in either ARB, NV or "debug" formats.
2007-02-17 09:15:00 -07:00
Sean D'Epagnier
43c6b2f67f
Merge branch 'master' of git+ssh://geckosenator@git.freedesktop.org/git/mesa/mesa
2007-02-16 17:46:11 -07:00
Sean D'Epagnier
7ae8f388cf
Commiting a few minor fixes to glut fbdev (segfault on a separate stack)
...
Updated all drivers that used the old _ac_ functions to use
the new _vbo_ functions. I know this fixed the fbdev driver,
it looks like it might fix some other drivers too.
2007-02-16 17:44:13 -07:00
Jerome Glisse
515f495f4e
doxygen: update doxygen project number to 6.5
...
doxygen number was laggin behind a bit.
2007-02-16 23:22:04 +01:00
Jerome Glisse
c2e0570831
Update doxygen doc to reflet vbo changes.
...
Update doxygen doc, array_cache no longuer exist,
new shiny vbo modules is there. Tested on unix,
but i think i didn't broke that bat :).
2007-02-16 23:19:05 +01:00
Patrice Mandin
21f2f7f26b
nouveau: nv50: update
2007-02-16 22:39:28 +01:00
Patrice Mandin
4cc4a753fa
nouveau: nv10,20: wrong viewport clip setup
2007-02-16 22:39:12 +01:00
Patrice Mandin
0fccb646e0
nouveau: nv20: texture matrix
2007-02-16 22:09:42 +01:00
Patrice Mandin
66d8e55184
nouveau: nv20: update
2007-02-16 22:03:31 +01:00
Patrice Mandin
f942dc5522
nouveau: nv10: set clear value for 16 and 24 bits depth
2007-02-16 20:26:57 +01:00
Patrice Mandin
9131536f00
nouveau: nv10: rescale depth near and far
2007-02-16 19:54:55 +01:00
Patrice Mandin
252d1de054
nouveau: nv10: fix viewport scale and origin
2007-02-16 19:46:54 +01:00
Brian
00647c39de
remove dead code
2007-02-16 09:59:27 -07:00
