Commit Graph

9047 Commits

Author SHA1 Message Date
Brian d6aff512fe varying var changes 2006-12-15 10:10:01 -07:00
Brian 464b9f4f6c varying var changes 2006-12-15 10:09:49 -07:00
Brian 9abf73b8cc varying changes 2006-12-15 10:09:33 -07:00
Brian a7e252026d updated includes 2006-12-15 10:09:12 -07:00
Brian 60a7200c0d updated includes 2006-12-15 10:08:59 -07:00
Brian 89f88058b9 use MAX_VARYING 2006-12-15 10:08:24 -07:00
Brian e3b2668865 use MAX_VARYING 2006-12-15 10:08:15 -07:00
Brian a7a582296b more debug output 2006-12-15 10:08:02 -07:00
Brian a90046f109 Lots of assorted changes for new GLSL compiler backend.
New datatypes, constants, variables.
2006-12-15 10:07:26 -07:00
Brian becb393d42 Use extfuncs.h helper. Added command line options for loading
vertex/fragment shaders from files.
2006-12-15 09:31:14 -07:00
Brian e55b771a1e simple extension function wrangler 2006-12-15 09:30:31 -07:00
Brian 39adc30250 change/add/rm several filenames 2006-12-15 08:55:49 -07:00
Brian c968d3d410 Renamed s_nvfragprog.[ch] to s_fragprog.[ch] 2006-12-15 08:50:02 -07:00
Brian b78fb7abaf Renamed s_nvfragprog.[ch] to s_fragprog.[ch], program_instruction.h to prog_instruction.h 2006-12-15 08:49:27 -07:00
Brian 6232438acb remove unneeded includes 2006-12-14 15:54:01 -07:00
Brian 885afd59ec remove unneeded includes 2006-12-14 15:53:49 -07:00
Brian 2c1f975852 remove unneded includes 2006-12-14 15:50:34 -07:00
Brian 901c1bb402 remove some unneeded includes 2006-12-14 15:49:09 -07:00
Brian 0831ef5038 include prog_print.h 2006-12-14 15:47:54 -07:00
Brian cc6a141dc1 Remove some moved extern decls. 2006-12-14 15:47:34 -07:00
Brian 464b82b1e6 Move some code from prog_print.c to prog_instruction.c 2006-12-14 15:47:08 -07:00
Brian 865f88afc0 Renamed from s_nvfragprog.[ch] 2006-12-14 15:14:14 -07:00
Brian 49f82803cc Updated includes. 2006-12-14 15:13:06 -07:00
Brian 60417b646d chmod a-x 2006-12-14 15:03:33 -07:00
Brian 57d9531cd6 Updated includes. 2006-12-14 15:03:04 -07:00
Brian c0551f0a46 Updated includes. 2006-12-14 15:02:37 -07:00
Brian a7a89e362b Updated #includes after splitting program.h 2006-12-14 15:02:19 -07:00
Brian 0560d81ce9 Move many functions into new files. 2006-12-14 15:01:28 -07:00
Brian 00cdc0a472 Split the program.[ch] files into several new files. 2006-12-14 15:01:06 -07:00
Brian 200736ebd8 Modify _mesa_strdup() so it handles NULL correctly. 2006-12-14 13:59:53 -07:00
Brian cc0c8b2248 Updates for new linker (merged varying/uniform vars). 2006-12-14 13:59:25 -07:00
Brian ef264c2971 Assorted fix-ups for the new linker.
Disable some of the excessive debug output.
2006-12-14 13:58:57 -07:00
Brian 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
Brian b2a3a8554a New functions for cloning programs and parameter lists. 2006-12-14 13:56:58 -07:00
Brian e7e4181361 Remove include of s_arbshader.h 2006-12-14 09:51:54 -07:00
Brian 2a9950dcb3 Remove unneeded -I directories (3Dlabs headers). 2006-12-13 19:20:45 -07:00
Brian 2cbfbcd972 Obsolete. 2006-12-13 15:38:07 -07:00
Brian 33ae886bbd Remove unused 3Dlabs code. 2006-12-13 15:36:26 -07:00
Brian aed4f2cc2c Remove unused 3Dlabs code. 2006-12-13 15:36:00 -07:00
Brian 05dab5eaa2 Checkpoint GLSL compiler work. Add new sources, remove obsolete. 2006-12-13 15:34:10 -07:00
Brian 1fbb1c8d78 Obsolete. 2006-12-13 15:33:41 -07:00
Brian a5011d9753 Not needed. 2006-12-13 15:33:09 -07:00
Brian cefc983bec Retire old GLSL shader code. 2006-12-13 15:06:28 -07:00
Brian 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
Brian 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
Brian fe1d01cb39 Checkpoint of work for new GLSL compiler back-end. Lots of assorted changes. 2006-12-13 14:54:47 -07:00
Brian 8627bf1452 Rewrite/simplify most built-in functions to use updated set of __asm instructions. 2006-12-13 14:49:41 -07:00
Brian aff8e204d2 Checkpoint new GLSL compiler back-end to produce fp/vp-style assembly instructions. 2006-12-13 14:48:36 -07:00
George Sapountzis 5b35132b41 Bug 7260: mach64 texture memory mng cleanup
mach64 uses its own set of texture memory management routines which are buggy,
running a second DRI client kills the first one. This patch ports mach64 code
to the stock dri texture managment code.
2006-12-12 12:51:37 +02:00
George Sapountzis c180678d92 Bug 7861: mach64 with render acceleration should restore texture state
RENDER acceleration uses texturing, thus when RENDER acceleration is enabled,
the mach64 DRI driver should restore texture state when acquiring the DRI lock.
2006-12-12 12:51:33 +02:00