2c1f975852
remove unneded includes
2006-12-14 15:50:34 -07:00
901c1bb402
remove some unneeded includes
2006-12-14 15:49:09 -07:00
0831ef5038
include prog_print.h
2006-12-14 15:47:54 -07:00
cc6a141dc1
Remove some moved extern decls.
2006-12-14 15:47:34 -07:00
464b82b1e6
Move some code from prog_print.c to prog_instruction.c
2006-12-14 15:47:08 -07:00
0ae7404835
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
2006-12-14 15:20:15 -07:00
865f88afc0
Renamed from s_nvfragprog.[ch]
2006-12-14 15:14:14 -07:00
49f82803cc
Updated includes.
2006-12-14 15:13:06 -07:00
60417b646d
chmod a-x
2006-12-14 15:03:33 -07:00
57d9531cd6
Updated includes.
2006-12-14 15:03:04 -07:00
c0551f0a46
Updated includes.
2006-12-14 15:02:37 -07:00
a7a89e362b
Updated #includes after splitting program.h
2006-12-14 15:02:19 -07:00
0560d81ce9
Move many functions into new files.
2006-12-14 15:01:28 -07:00
00cdc0a472
Split the program.[ch] files into several new files.
2006-12-14 15:01:06 -07:00
5cc1292508
Replace __extension__ with LONGSTRING.
2006-12-14 14:27:05 -07:00
200736ebd8
Modify _mesa_strdup() so it handles NULL correctly.
2006-12-14 13:59:53 -07:00
cc0c8b2248
Updates for new linker (merged varying/uniform vars).
2006-12-14 13:59:25 -07:00
ef264c2971
Assorted fix-ups for the new linker.
...
Disable some of the excessive debug output.
2006-12-14 13:58:57 -07:00
d4f7e4cc01
The new linker actually does a few things right now:
...
The varying vars used by the vertex and fragment shader are merged so they
agree.
Similarly, uniforms are merged (along with constants, etc).
The vertex/fragment program instructions are then cloned and rewritten
with the newly resolved uniform/varying locations.
2006-12-14 13:58:32 -07:00
b2a3a8554a
New functions for cloning programs and parameter lists.
2006-12-14 13:56:58 -07:00
e7e4181361
Remove include of s_arbshader.h
2006-12-14 09:51:54 -07:00
b56a5261fe
Check in a long-misplaced spec update.
2006-12-14 09:38:06 -07:00
fde908444a
Fix copy-and-paste-o of my e-mail address.
2006-12-14 12:57:59 +01:00
e0c9361a7c
Avoid failing assertion in intel_miptree_set_image_offset() with cube maps.
...
Cube maps still aren't working quite correctly though.
2006-12-14 12:47:44 +01:00
81855f22cd
Fix some corner cases in i945_miptree_layout_2d().
...
Based on a patch from Keith Whitwell, with some further fixes.
2006-12-14 12:42:51 +01:00
3416ef303a
Share code to lay out >= 945 style 2D mipmaps between i915tex and i965 drivers.
...
Use the i965 version as it has some fixes over the i915tex version.
2006-12-14 12:39:38 +01:00
cc1afed671
intel_finalize_mipmap_tree: Add more conditions for rebuilding mipmap trees.
...
These are taken from the i965 driver and fix corruption of some mipmap levels
under some circumsances with 945 chipsets at least.
Also flush the batchbuffer after copying data between trees, or some apps fail
an assertion elsewhere.
2006-12-14 11:04:10 +01:00
5f8a3e586f
intel_batchbuffer_flush: Don't assert cliprects when lock is not held.
...
This is a legitimate situation when copying texture data between mipmap trees.
2006-12-14 11:01:39 +01:00
4cb09df015
intelTexSubimage: Fix last parameter for intel_miptree_image_map().
2006-12-14 11:01:38 +01:00
9c09259b8b
_mesa_swizzle_ubyte_image: Only use single swizzle_copy call when strides match.
...
This fixes texture data corruption with glTexSubimage (and probably glTexImage
under some circumstances) with the texstore swizzle path.
2006-12-14 11:01:38 +01:00
78a6e05439
mipmap_limits: Fix display of current texture filtering mode.
2006-12-14 11:01:38 +01:00
99878298da
Improve SwapBuffers a bit.
2006-12-14 04:34:38 +00:00
c95557f48b
0x4497 doesn't have NV30_TCL_PRIMITIVE_3D_NORMALIZE_ENABLE
2006-12-14 04:12:05 +00:00
15c7e8896b
Some more voodoo to get 3D going with a minimal initial context.
2006-12-14 03:24:57 +00:00
2a9950dcb3
Remove unneeded -I directories (3Dlabs headers).
2006-12-13 19:20:45 -07:00
2956a0c8a8
submit vertex weights to make World of Warcraft maybe happy (bug 8250)
...
submit the vertex weights to hw, which will enable broken vertex programs
errorneously using them to work. Note however that this will only work
if glWeight is used, there is no code in mesa at all to deal with weight
vertex array (glWeightPointerARB).
2006-12-14 00:34:44 +01:00
2cbfbcd972
Obsolete.
2006-12-13 15:38:07 -07:00
33ae886bbd
Remove unused 3Dlabs code.
2006-12-13 15:36:26 -07:00
aed4f2cc2c
Remove unused 3Dlabs code.
2006-12-13 15:36:00 -07:00
05dab5eaa2
Checkpoint GLSL compiler work. Add new sources, remove obsolete.
2006-12-13 15:34:10 -07:00
1fbb1c8d78
Obsolete.
2006-12-13 15:33:41 -07:00
a5011d9753
Not needed.
2006-12-13 15:33:09 -07:00
8dcfcad7a2
Move all the code for computing ctx->_TriangleCaps into state.c.
...
ctx->_TriangleCaps should probably go away altogether someday...
2006-12-13 15:31:14 -07:00
cefc983bec
Retire old GLSL shader code.
2006-12-13 15:06:28 -07:00
12ef1fbefc
Checkpoint for GLSL compiler changes.
...
In brief:
Check for enabled fragment program by looking at ctx->FragmentProgram._Current.
New code for varying variables.
2006-12-13 15:05:23 -07:00
a328e469d3
Checkpoint work for new GLSL compiler back-end.
...
Among changes:
Remove ctx->FragmentProgram._Active
Remove _UseTexEnvProgram
Move _MaintainTnlProgram, _MaintainTexEnvProgram, _TexEnvProgram and
_TnlProgram fields.
Remove/disable old GLSL interpreter code.
2006-12-13 14:58:13 -07:00
fe1d01cb39
Checkpoint of work for new GLSL compiler back-end. Lots of assorted changes.
2006-12-13 14:54:47 -07:00
8627bf1452
Rewrite/simplify most built-in functions to use updated set of __asm instructions.
2006-12-13 14:49:41 -07:00
77b862a849
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2006-12-13 13:49:00 -08:00
aff8e204d2
Checkpoint new GLSL compiler back-end to produce fp/vp-style assembly instructions.
2006-12-13 14:48:36 -07:00
Brian