Brian
d9fb113e05
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
2007-02-24 18:15:45 -07:00
Brian
53170942e3
Fix broken cubemap mipmap layout (the cubemap.c demo was segfaulting).
...
In i915_miptree_layout() change the width, height parameters that are passed
to intel_miptree_set_level_info(). As it was, the width, height values were
larger than the source image dimensions and we segfaulted in memcpy() when
copying the original texture data into the texture buffer region.
This fix should probably be checked by someone more familiar with the code (Keith?)
2007-02-24 18:14:53 -07:00
Brian
aeaad937b9
clean-up, comment code
2007-02-24 18:11:09 -07:00
Brian
5cd30a2b20
make src ptr const
2007-02-24 18:10:41 -07:00
Brian
fbc4929185
add missing code for newer STATE_INTERNAL items
2007-02-24 17:00:50 -07:00
Brian
efcfdbd4d1
Undo some changes to _mesa_UpdateTexEnvProgram(). Fixes broken i915 texturing.
2007-02-24 15:51:41 -07:00
Brian
292a80466d
Outputs[] array wasn't large enough, define MAX_PROGRAM_OUTPUTS, new assertions.
2007-02-24 15:49:54 -07:00
Brian
5e80c62f31
Remove unneeded _Fragment/VertexShaderPresent fields, update comments.
2007-02-24 15:39:37 -07:00
Brian
197af3dc32
Use prog_execute.c to run vertex programs until t_vb_arbprogram.c is updated to
...
handle branch instructions, etc.
2007-02-24 11:16:58 -07:00
Brian
824dcd4399
remove comment
2007-02-24 11:15:27 -07:00
Brian
761728afe8
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.
2007-02-24 11:14:57 -07:00
Brian
f183a2d7ea
added ARL, EXP, LOG, relative indexing
2007-02-23 17:14:30 -07:00
Brian
a2786a97d7
add some missing cases in _mesa_program_state_string()
2007-02-23 17:13:30 -07:00
Brian
f1390a3424
fix fog breakage
2007-02-23 17:11:01 -07:00
Brian
e80d901d98
reindent
2007-02-23 16:53:24 -07:00
Brian
6df328e84d
don't pass program ptr to fetch_vector[14]()
2007-02-23 16:48:07 -07:00
Ian Romanick
3f8c5969ff
Fix GLAPIENTRYP for OS X.
...
Fix build problems related to incorrect define of GLAPIENTRYP on OS X.
Reported by bushing on IRC.
2007-02-23 15:15:50 -08:00
Brian
064ae479a7
Update DRI drivers for new glsl compiler.
...
Mostly:
- update #includes
- update STATE_* token code
2007-02-23 13:40:13 -07:00
Brian
36a0ee199d
expose _mesa_load_tracked_matrices()
2007-02-23 13:38:37 -07:00
Brian
15b3bd1689
added linux-dri-debug
2007-02-23 11:58:46 -07:00
Brian
cc6a08b2a0
SWvertex no longer has texcoord field, use attrib field instead
2007-02-23 11:45:15 -07:00
Brian
fce8409cbb
s/GLint/gl_state_index/, length is now 5 not 6
2007-02-23 11:44:44 -07:00
Brian
9fe3e2efc3
s/GLint/gl_state_index/, length is now 5 not 6
2007-02-23 11:44:14 -07:00
Brian
0020d1022f
re-expose _mesa_print_alu_instruction()
2007-02-23 11:43:44 -07:00
Brian
ef0cc9db54
remove dead code
2007-02-23 11:43:14 -07:00
Brian
aa9d22a1c0
replace GLint with gl_state_index
2007-02-23 11:21:03 -07:00
Brian
99902198de
comments, clean-up
2007-02-23 10:19:55 -07:00
Brian
5186ae9bbe
remove unused slang_atom_pool_gen()
2007-02-23 10:12:38 -07:00
Brian
308be21c2f
added slang_label.c
2007-02-23 10:04:18 -07:00
Brian
c2a261f493
comments, clean-up
2007-02-23 09:55:21 -07:00
Brian
75d4ed968d
Replace slang_ir_node::Target w/ Field. Remove Comment field. Clean-up.
2007-02-23 09:42:11 -07:00
Brian
c18c75b0b7
remove old _slang_gen_if()
2007-02-23 09:38:46 -07:00
Brian
afbf7c7e6b
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.
2007-02-23 09:38:17 -07:00
Brian
d8d07b2a8a
label routines for implementing branches, jumps
2007-02-23 09:36:29 -07:00
Brian
0cc9419631
debug code for emitting variable allocation comments
2007-02-22 17:46:20 -07:00
Brian
059376c855
expose _mesa_swizzle_string()
2007-02-22 17:45:32 -07:00
Roland Scheidegger
5e66843733
r200 fix broken (by new input handling) fogcoord
2007-02-23 01:45:19 +01:00
Brian
ff0cc92757
glslcompiler build instructions
2007-02-22 16:29:48 -07:00
Brian
bc18ac45a3
updated for vbo
2007-02-22 16:29:25 -07:00
Brian
da46353056
Remove obsolete files.
2007-02-22 16:14:02 -07:00
Brian
13e3b21b16
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.
2007-02-22 16:09:40 -07:00
Brian
7aaefcbe48
use _mesa_get_program_register()
2007-02-22 16:08:30 -07:00
Brian
f6803de739
Use the new unified vertex/fragment program interpreter from prog_execute.c.
...
Currently, DDX, DDY don't work.
2007-02-22 16:08:01 -07:00
Brian
e382efc85d
use new _mesa_execute_program() function
2007-02-22 16:07:17 -07:00
Brian
6cfe2114f1
FORCE_PROG_EXECUTE_C cpp flag, misc changes
2007-02-22 16:06:54 -07:00
Brian
fd89396012
fix assertion
2007-02-22 16:02:18 -07:00
Brian
7c86e10193
emit high-level IF/ELSE/ENDIF for vertex progs now
2007-02-22 16:02:08 -07:00
Brian
740a8b0b66
_mesa_ExecuteProgramNV is now a no-op
2007-02-22 16:00:54 -07:00
Brian
ef64cda978
remove nvvertexec.c, add prog_execute.c
2007-02-22 16:00:31 -07:00
Brian
3ed1acd13c
use MAX_PROGRAM_ENV_PARAMS
2007-02-22 14:57:40 -07:00