Brian
776bc9cf55
Undo some STATE_POINT/FOG changes. Max length of state token array is now 5.
2007-02-22 09:29:46 -07:00
Michel Dänzer
641c966e3d
i915tex: Schedule flips when possible.
...
Also move vsync related state from context to window, so it's possible to
schedule several flips ahead of time with triple buffering.
2007-02-22 17:24:09 +01:00
Brian
3f4826a358
XXX comments about shaders
2007-02-22 09:10:38 -07:00
Brian
6ec7484ae8
use ctx->VertexProgram._Current instead of ctx->VertexProgram._Enabled
2007-02-22 09:10:24 -07:00
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
53bcdedc32
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
2007-02-22 08:57: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
Dave Airlie
4a1d7d6641
r300: get rid of CB_DPATH legacy
2007-02-22 19:33:50 +11: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
Michel Dänzer
e33a9d6894
i915tex: Triple buffering support, only effective with page flipping so far.
...
Pending flips are tracked per renderbuffer and the colour renderbuffer
attachments of window framebuffer objects are rotated on flips to avoid
stalling the pipeline for pending flips unnecessarily.
2007-02-20 19:15:44 +01:00
Michel Dänzer
356bf9563e
intelWindowMoved: Some debugging output was accidentally left always enabled.
2007-02-20 19:15:44 +01:00
Michel Dänzer
bfbc1de02e
intelRotateWindow: Only use back buffer and cliprects in very specific cases.
2007-02-20 19:15:44 +01:00
Michel Dänzer
6f2bf34748
intelCopyBuffer: Remove incorrect intel_fb->pf_current_page tests.
...
intel_get_rb_region already takes the current page into account.
This would result in broken rendering when multiple 3D windows are visible
and the pages are reversed.
2007-02-20 19:15:44 +01:00
Michel Dänzer
6b99cafd69
i915tex: Support page flipping on both CRTCs independently.
...
No longer track page flipping state per context but per window, via struct
intel_framebuffer which wraps struct gl_framebuffer for windows.
2007-02-20 19:15:44 +01:00
Michel Dänzer
af64dd2ae0
i915tex: Make page flipping work again.
2007-02-20 19:15:44 +01: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
18e9ca5fb0
more branch info
2007-02-20 09:24:06 -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