Brian [Mon, 26 Feb 2007 21:32:53 +0000 (14:32 -0700)]
Overhaul of error handling.
Brian [Mon, 26 Feb 2007 21:32:29 +0000 (14:32 -0700)]
Overhaul of error logging.
Brian [Mon, 26 Feb 2007 21:22:05 +0000 (14:22 -0700)]
Use new slang_emit_info struct for passing context info around.
Brian [Mon, 26 Feb 2007 20:11:20 +0000 (13:11 -0700)]
Merge branch 'glsl-compiler-1' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into glsl-compiler-1
Brian [Mon, 26 Feb 2007 02:11:44 +0000 (19:11 -0700)]
update comments
Brian [Mon, 26 Feb 2007 02:01:16 +0000 (19:01 -0700)]
fix bounds checking in get_register_pointer()
Brian [Mon, 26 Feb 2007 01:56:57 +0000 (18:56 -0700)]
define and use MAX_PROGRAM_ADDRESS_REGS
Brian [Mon, 26 Feb 2007 01:52:41 +0000 (18:52 -0700)]
Add EnvParams field to gl_program_machine, avoid passing ctx to a bunch of functions.
Brian [Mon, 26 Feb 2007 01:39:46 +0000 (18:39 -0700)]
simplify _mesa_get_program_register()
Brian [Mon, 26 Feb 2007 01:35:47 +0000 (18:35 -0700)]
s/GetFragmentProgramRegister/GetProgramRegister/
Brian [Mon, 26 Feb 2007 01:30:45 +0000 (18:30 -0700)]
minor clean-ups in _mesa_execute_program()
Brian [Mon, 26 Feb 2007 01:26:50 +0000 (18:26 -0700)]
remove 'maxInst' parameter from _mesa_execute_program()
Brian [Mon, 26 Feb 2007 01:23:37 +0000 (18:23 -0700)]
remove unused 'element' parameter from _mesa_execute_program()
Brian [Mon, 26 Feb 2007 01:08:16 +0000 (18:08 -0700)]
s/attribs/results/
Brian [Mon, 26 Feb 2007 00:33:46 +0000 (17:33 -0700)]
remove unused VaryingPtr
Brian [Mon, 26 Feb 2007 00:29:00 +0000 (17:29 -0700)]
Optimize the loop for copying output results.
Brian [Mon, 26 Feb 2007 00:24:40 +0000 (17:24 -0700)]
add texture rotation
Brian [Sun, 25 Feb 2007 19:47:25 +0000 (12:47 -0700)]
only copy used outputs
Brian [Sun, 25 Feb 2007 19:46:56 +0000 (12:46 -0700)]
output texcoord in vertex program
Brian [Sun, 25 Feb 2007 01:27:46 +0000 (18:27 -0700)]
Revert "option to test mipmapping"
This reverts commit
a127537efb8a39cc341a09aacd3d86d50350e667.
Meant to do this on the trunk.
Brian [Sun, 25 Feb 2007 01:20:35 +0000 (18:20 -0700)]
option to test mipmapping
Brian [Sun, 25 Feb 2007 00:00:50 +0000 (17:00 -0700)]
add missing code for newer STATE_INTERNAL items
Brian [Sat, 24 Feb 2007 22:51:41 +0000 (15:51 -0700)]
Undo some changes to _mesa_UpdateTexEnvProgram(). Fixes broken i915 texturing.
Brian [Sat, 24 Feb 2007 22:49:54 +0000 (15:49 -0700)]
Outputs[] array wasn't large enough, define MAX_PROGRAM_OUTPUTS, new assertions.
Brian [Sat, 24 Feb 2007 22:39:37 +0000 (15:39 -0700)]
Remove unneeded _Fragment/VertexShaderPresent fields, update comments.
Brian [Sat, 24 Feb 2007 18:16:58 +0000 (11:16 -0700)]
Use prog_execute.c to run vertex programs until t_vb_arbprogram.c is updated to
handle branch instructions, etc.
Brian [Sat, 24 Feb 2007 18:15:27 +0000 (11:15 -0700)]
remove comment
Brian [Sat, 24 Feb 2007 18:14:57 +0000 (11:14 -0700)]
Fix assertion in get_register_pointer(), fix EXP case.
Note that GL_ARB_v_p and GL_NV_v_p define the z component of the EXP instruction
differently. We follow the ARB extension.
Brian [Sat, 24 Feb 2007 00:14:30 +0000 (17:14 -0700)]
added ARL, EXP, LOG, relative indexing
Brian [Sat, 24 Feb 2007 00:13:30 +0000 (17:13 -0700)]
add some missing cases in _mesa_program_state_string()
Brian [Sat, 24 Feb 2007 00:11:01 +0000 (17:11 -0700)]
fix fog breakage
Brian [Fri, 23 Feb 2007 23:53:24 +0000 (16:53 -0700)]
reindent
Brian [Fri, 23 Feb 2007 23:48:07 +0000 (16:48 -0700)]
don't pass program ptr to fetch_vector[14]()
Brian [Fri, 23 Feb 2007 20:40:13 +0000 (13:40 -0700)]
Update DRI drivers for new glsl compiler.
Mostly:
- update #includes
- update STATE_* token code
Brian [Fri, 23 Feb 2007 20:38:37 +0000 (13:38 -0700)]
expose _mesa_load_tracked_matrices()
Brian [Fri, 23 Feb 2007 18:58:46 +0000 (11:58 -0700)]
added linux-dri-debug
Brian [Fri, 23 Feb 2007 18:45:15 +0000 (11:45 -0700)]
SWvertex no longer has texcoord field, use attrib field instead
Brian [Fri, 23 Feb 2007 18:44:44 +0000 (11:44 -0700)]
s/GLint/gl_state_index/, length is now 5 not 6
Brian [Fri, 23 Feb 2007 18:44:14 +0000 (11:44 -0700)]
s/GLint/gl_state_index/, length is now 5 not 6
Brian [Fri, 23 Feb 2007 18:43:44 +0000 (11:43 -0700)]
re-expose _mesa_print_alu_instruction()
Brian [Fri, 23 Feb 2007 18:43:14 +0000 (11:43 -0700)]
remove dead code
Brian [Fri, 23 Feb 2007 18:21:03 +0000 (11:21 -0700)]
replace GLint with gl_state_index
Brian [Fri, 23 Feb 2007 17:19:55 +0000 (10:19 -0700)]
comments, clean-up
Brian [Fri, 23 Feb 2007 17:12:38 +0000 (10:12 -0700)]
remove unused slang_atom_pool_gen()
Brian [Fri, 23 Feb 2007 17:04:18 +0000 (10:04 -0700)]
added slang_label.c
Brian [Fri, 23 Feb 2007 16:55:21 +0000 (09:55 -0700)]
comments, clean-up
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