OSDN Git Service
Brian [Fri, 23 Feb 2007 16:42:11 +0000 (09:42 -0700)]
Replace slang_ir_node::Target w/ Field. Remove Comment field. Clean-up.
Brian [Fri, 23 Feb 2007 16:38:46 +0000 (09:38 -0700)]
remove old _slang_gen_if()
Brian [Fri, 23 Feb 2007 16:38:17 +0000 (09:38 -0700)]
Re-implement branching with slang_labels.
This eliminates the NOP instructions that had been used as placeholders for
branch targets.
Also, fix "return" statement bug.
Brian [Fri, 23 Feb 2007 16:36:29 +0000 (09:36 -0700)]
label routines for implementing branches, jumps
Brian [Fri, 23 Feb 2007 00:46:20 +0000 (17:46 -0700)]
debug code for emitting variable allocation comments
Brian [Fri, 23 Feb 2007 00:45:32 +0000 (17:45 -0700)]
expose _mesa_swizzle_string()
Brian [Thu, 22 Feb 2007 23:29:48 +0000 (16:29 -0700)]
glslcompiler build instructions
Brian [Thu, 22 Feb 2007 23:29:25 +0000 (16:29 -0700)]
updated for vbo
Brian [Thu, 22 Feb 2007 23:14:02 +0000 (16:14 -0700)]
Remove obsolete files.
Brian [Thu, 22 Feb 2007 23:09:40 +0000 (16:09 -0700)]
New, unified interpretor/executor for vertex and fragment programs.
This replaces the code formerly in nvvertexec.c and s_fragprog.c.
Currently, DDX, DDY don't work.
Brian [Thu, 22 Feb 2007 23:08:30 +0000 (16:08 -0700)]
use _mesa_get_program_register()
Brian [Thu, 22 Feb 2007 23:08:01 +0000 (16:08 -0700)]
Use the new unified vertex/fragment program interpreter from prog_execute.c.
Currently, DDX, DDY don't work.
Brian [Thu, 22 Feb 2007 23:07:17 +0000 (16:07 -0700)]
use new _mesa_execute_program() function
Brian [Thu, 22 Feb 2007 23:06:54 +0000 (16:06 -0700)]
FORCE_PROG_EXECUTE_C cpp flag, misc changes
Brian [Thu, 22 Feb 2007 23:02:18 +0000 (16:02 -0700)]
fix assertion
Brian [Thu, 22 Feb 2007 23:02:08 +0000 (16:02 -0700)]
emit high-level IF/ELSE/ENDIF for vertex progs now
Brian [Thu, 22 Feb 2007 23:00:54 +0000 (16:00 -0700)]
_mesa_ExecuteProgramNV is now a no-op
Brian [Thu, 22 Feb 2007 23:00:31 +0000 (16:00 -0700)]
remove nvvertexec.c, add prog_execute.c
Brian [Thu, 22 Feb 2007 21:57:40 +0000 (14:57 -0700)]
use MAX_PROGRAM_ENV_PARAMS
Brian [Thu, 22 Feb 2007 21:57:19 +0000 (14:57 -0700)]
added MAX_PROGRAM_ENV_PARAMS
Brian [Thu, 22 Feb 2007 21:56:43 +0000 (14:56 -0700)]
added CallStack, StackDepth
Brian [Thu, 22 Feb 2007 21:56:22 +0000 (14:56 -0700)]
remove unneeded #includes, misc clean-up
Brian [Thu, 22 Feb 2007 21:55:35 +0000 (14:55 -0700)]
reorg/clean-up/indent
Brian [Thu, 22 Feb 2007 21:43:41 +0000 (14:43 -0700)]
start implementing conditions, branching
Brian [Thu, 22 Feb 2007 18:00:10 +0000 (11:00 -0700)]
get rid of some unused slang_variable fields
Brian [Thu, 22 Feb 2007 17:56:41 +0000 (10:56 -0700)]
Replace slang_allocate_storage() with simpler _slang_attach_storage()
Brian [Thu, 22 Feb 2007 16:39:25 +0000 (09:39 -0700)]
updated debug code
Brian [Thu, 22 Feb 2007 16:29:46 +0000 (09:29 -0700)]
Undo some STATE_POINT/FOG changes. Max length of state token array is now 5.
Brian [Thu, 22 Feb 2007 16:10:38 +0000 (09:10 -0700)]
XXX comments about shaders
Brian [Thu, 22 Feb 2007 16:10:24 +0000 (09:10 -0700)]
use ctx->VertexProgram._Current instead of ctx->VertexProgram._Enabled
Brian [Thu, 22 Feb 2007 16:08:53 +0000 (09:08 -0700)]
merge fix: add STATE_FOG_PARAMS_OPTIMIZED, STATE_SPOT_DIR_NORMALIZED
Brian [Thu, 22 Feb 2007 16:08:36 +0000 (09:08 -0700)]
fix negative indentation problem
Brian [Thu, 22 Feb 2007 15:53:33 +0000 (08:53 -0700)]
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
Brian [Wed, 21 Feb 2007 23:07:03 +0000 (16:07 -0700)]
updated info about arrays, predefined uniforms
Brian [Wed, 21 Feb 2007 23:05:56 +0000 (16:05 -0700)]
disable debug
Brian [Wed, 21 Feb 2007 22:57:55 +0000 (15:57 -0700)]
Use gl_LightSource[0].position intead of a light position uniform.
Brian [Wed, 21 Feb 2007 22:42:50 +0000 (15:42 -0700)]
remove unneeded #includes
Brian [Wed, 21 Feb 2007 22:42:10 +0000 (15:42 -0700)]
fix copy&paste errors
Brian [Wed, 21 Feb 2007 22:23:11 +0000 (15:23 -0700)]
more minor changes to STATE_ indexing
Brian [Wed, 21 Feb 2007 22:22:17 +0000 (15:22 -0700)]
remove dead code
Brian [Wed, 21 Feb 2007 22:21:58 +0000 (15:21 -0700)]
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.
Brian [Wed, 21 Feb 2007 18:08:21 +0000 (11:08 -0700)]
adjustments to STATE_ token layout/format so token[1] is always the array index
Brian [Wed, 21 Feb 2007 16:15:39 +0000 (09:15 -0700)]
checkpoint overhaul of pre-defined uniform code
Brian [Wed, 21 Feb 2007 00:00:16 +0000 (17:00 -0700)]
clean-up, move IR_ELEMENT code
Brian [Tue, 20 Feb 2007 23:56:49 +0000 (16:56 -0700)]
alloc IR_FIELD's Storage in codegen, like IR_ELEMENT
Ian Romanick [Tue, 20 Feb 2007 23:19:23 +0000 (15:19 -0800)]
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/mesa/mesa
Ian Romanick [Tue, 20 Feb 2007 23:18:53 +0000 (15:18 -0800)]
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.
Brian [Tue, 20 Feb 2007 22:22:38 +0000 (15:22 -0700)]
work on struct/array handling
Brian [Tue, 20 Feb 2007 22:20:46 +0000 (15:20 -0700)]
forgot to return length in parse_array_len()
Patrice Mandin [Tue, 20 Feb 2007 22:17:09 +0000 (23:17 +0100)]
nouveau: nv10: grr, ctx->DrawBuffer invalid?
Patrice Mandin [Tue, 20 Feb 2007 22:13:48 +0000 (23:13 +0100)]
nouveau: nv10: also check ctx->DrawBuffer in nv10ViewportScale
Patrice Mandin [Tue, 20 Feb 2007 22:04:21 +0000 (23:04 +0100)]
nouveau: nv10: keep 24/8 depth/stencil value, don't check for depth bits
Brian [Tue, 20 Feb 2007 21:03:43 +0000 (14:03 -0700)]
implement support for pre-defined uniform structs (state vars)
Brian [Tue, 20 Feb 2007 21:03:10 +0000 (14:03 -0700)]
added slang_builtin.c
Adam Jackson [Tue, 20 Feb 2007 17:48:50 +0000 (12:48 -0500)]
Fix parallel make in r300 driver.
Brian [Tue, 20 Feb 2007 17:40:08 +0000 (10:40 -0700)]
added SWIZZLE_XXXX, SWIZZLE_YYYY, etc
Brian [Tue, 20 Feb 2007 15:41:15 +0000 (08:41 -0700)]
glxext.h version 18
Brian [Tue, 20 Feb 2007 15:40:55 +0000 (08:40 -0700)]
updated to version 18
Brian [Tue, 20 Feb 2007 15:38:46 +0000 (08:38 -0700)]
glext.h version 39
Brian [Tue, 20 Feb 2007 15:38:29 +0000 (08:38 -0700)]
updated to version 39
Christian Neumair [Tue, 20 Feb 2007 15:11:11 +0000 (08:11 -0700)]
set log level w/ env var
Brian [Tue, 20 Feb 2007 15:05:29 +0000 (08:05 -0700)]
remove accidental check-in
Brian [Tue, 20 Feb 2007 15:04:40 +0000 (08:04 -0700)]
Merge branch 'glsl-compiler-1' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into glsl-compiler-1
Thomas Hellstrom [Mon, 19 Feb 2007 18:57:30 +0000 (19:57 +0100)]
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.
Brian [Sat, 17 Feb 2007 16:41:59 +0000 (09:41 -0700)]
s/PROG_PRINT_ARB/PROG_PRINT_DEBUG/
Brian [Sat, 17 Feb 2007 16:41:19 +0000 (09:41 -0700)]
info about stand-alone compiler
Brian [Sat, 17 Feb 2007 16:15:39 +0000 (09:15 -0700)]
stand-alone GLSL compiler
Brian [Sat, 17 Feb 2007 16:15:00 +0000 (09:15 -0700)]
Lots of changes to prog_print.c code.
Mainly, allow printing programs in either ARB, NV or "debug" formats.
Sean D'Epagnier [Sat, 17 Feb 2007 00:46:11 +0000 (17:46 -0700)]
Merge branch 'master' of git+ssh://geckosenator@git.freedesktop.org/git/mesa/mesa
Sean D'Epagnier [Sat, 17 Feb 2007 00:44:13 +0000 (17:44 -0700)]
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.
Jerome Glisse [Fri, 16 Feb 2007 22:22:04 +0000 (23:22 +0100)]
doxygen: update doxygen project number to 6.5
doxygen number was laggin behind a bit.
Jerome Glisse [Fri, 16 Feb 2007 22:18:56 +0000 (23:18 +0100)]
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 :).
Patrice Mandin [Fri, 16 Feb 2007 21:39:28 +0000 (22:39 +0100)]
nouveau: nv50: update
Patrice Mandin [Fri, 16 Feb 2007 21:39:12 +0000 (22:39 +0100)]
nouveau: nv10,20: wrong viewport clip setup
Patrice Mandin [Fri, 16 Feb 2007 21:09:42 +0000 (22:09 +0100)]
nouveau: nv20: texture matrix
Patrice Mandin [Fri, 16 Feb 2007 21:03:31 +0000 (22:03 +0100)]
nouveau: nv20: update
Patrice Mandin [Fri, 16 Feb 2007 19:26:57 +0000 (20:26 +0100)]
nouveau: nv10: set clear value for 16 and 24 bits depth
Patrice Mandin [Fri, 16 Feb 2007 18:54:55 +0000 (19:54 +0100)]
nouveau: nv10: rescale depth near and far
Patrice Mandin [Fri, 16 Feb 2007 18:46:54 +0000 (19:46 +0100)]
nouveau: nv10: fix viewport scale and origin
Brian [Fri, 16 Feb 2007 16:59:27 +0000 (09:59 -0700)]
remove dead code
Brian [Fri, 16 Feb 2007 16:56:19 +0000 (09:56 -0700)]
s/_slang_link2/_slang_link/
Brian [Fri, 16 Feb 2007 16:31:35 +0000 (09:31 -0700)]
change all enum tokens to uppercase
Brian [Fri, 16 Feb 2007 16:06:09 +0000 (09:06 -0700)]
abort upon errors (temporary)
Brian [Fri, 16 Feb 2007 16:05:11 +0000 (09:05 -0700)]
added a comment
Brian [Fri, 16 Feb 2007 16:04:53 +0000 (09:04 -0700)]
Allow int->float argument conversion in _slang_locate_function().
Brian [Fri, 16 Feb 2007 15:58:42 +0000 (08:58 -0700)]
implement IR_I_TO_F
Rune Peterson [Wed, 14 Feb 2007 22:10:52 +0000 (23:10 +0100)]
r300: Fix cos & add scs to fragment program.
So this do :
- Fixes COS.
- Does range reductions for SIN & COS.
- Adds SCS.
- removes the optimized version of SIN & COS.
- tweaked weight (should help on precision).
- fixed a copy paste typo in emit_arith().
Etienne Clement [Wed, 14 Feb 2007 20:21:12 +0000 (13:21 -0700)]
test for POT before using sample_2d_linear_repeat()
Roland Scheidegger [Wed, 14 Feb 2007 19:34:52 +0000 (20:34 +0100)]
fix typo preventing generic arrays from working with ARB_vp (bug #9952)
Patrice Mandin [Wed, 14 Feb 2007 19:28:31 +0000 (20:28 +0100)]
nouveau: nv10: there are 8 clipping regions
Roland Scheidegger [Wed, 14 Feb 2007 15:38:32 +0000 (16:38 +0100)]
fix stupid bug in the optimized per-vertex fog generation code
Thomas Hellstrom [Wed, 14 Feb 2007 10:11:23 +0000 (11:11 +0100)]
i915tex: Take into account various mapping states when dropping the
batch buffer after a resolution / rotation switch.
Brian [Tue, 13 Feb 2007 16:23:00 +0000 (09:23 -0700)]
remove dead code
Xiang, Haihao [Mon, 12 Feb 2007 08:38:50 +0000 (16:38 +0800)]
I965: fix a failure on waiting irq.
Wait until getting the right fence if drm/i915 resets the
counter.
Zou Nan hai [Mon, 12 Feb 2007 04:16:49 +0000 (12:16 +0800)]
fd.o #BZ 9684
gcc may cast an overflowed float value to an negative int value on i386,
fix it to make sure at least some apps will not crash if it contains wrong normal data.
Rune Peterson [Sun, 11 Feb 2007 23:24:36 +0000 (00:24 +0100)]
r300: Add proper support for sin/cos instruction in fragment program
Getting proper SIN and COS wasn't as easy as it appeared.
I had to make make some changes to the fragment program code.
general FP changes:
- support HHH swizzle for vector instructions.
- don't copy a source to a temp when it is not XYZW swizzled, but
combine the two and have the swizzle resolve any issues.
(saves temps/instructions with more elaborate shader code)
- fix overflow in cnstv[].
Rune Peterson [Sun, 11 Feb 2007 01:19:43 +0000 (18:19 -0700)]
ctx->Point._Size fix
Brian [Fri, 9 Feb 2007 22:40:15 +0000 (15:40 -0700)]
add prog_debug.c
Brian [Fri, 9 Feb 2007 22:40:00 +0000 (15:40 -0700)]
move GL_MESA_program_debug funcs to prog_debug.c
Brian [Fri, 9 Feb 2007 22:39:32 +0000 (15:39 -0700)]
Move experimental GL_MESA_program_debug functions into new file.