OSDN Git Service
Brian [Fri, 22 Dec 2006 00:50:22 +0000 (17:50 -0700)]
added INTERP_VARYING code
Brian [Fri, 22 Dec 2006 00:50:07 +0000 (17:50 -0700)]
s/attribute/varying/
Brian [Thu, 21 Dec 2006 18:21:26 +0000 (11:21 -0700)]
comment about uniforms
Brian [Thu, 21 Dec 2006 17:56:09 +0000 (10:56 -0700)]
checkpoint: rewrite vec/mat products
Brian [Thu, 21 Dec 2006 17:49:27 +0000 (10:49 -0700)]
fix typos
Brian [Thu, 21 Dec 2006 17:47:28 +0000 (10:47 -0700)]
added IR_NEG for negation
Brian [Thu, 21 Dec 2006 17:45:49 +0000 (10:45 -0700)]
checkpoint: matrix/float, unary negation rewrite
Brian [Thu, 21 Dec 2006 17:03:15 +0000 (10:03 -0700)]
checkpoint: ivec/int and mat/mat operations
Brian [Thu, 21 Dec 2006 16:40:08 +0000 (09:40 -0700)]
checkpoint: more basic math rewritting
Brian [Thu, 21 Dec 2006 01:04:59 +0000 (18:04 -0700)]
checkpoint: re-org assignment operator functions
Brian [Thu, 21 Dec 2006 00:56:29 +0000 (17:56 -0700)]
added glUniformMatrix2/3fv_func
Brian [Thu, 21 Dec 2006 00:55:42 +0000 (17:55 -0700)]
checkpoint: more basic math operator re-org
Brian [Thu, 21 Dec 2006 00:43:56 +0000 (17:43 -0700)]
Checkpoing: re-organization of basic arithmetic functions.
Brian [Thu, 21 Dec 2006 00:19:45 +0000 (17:19 -0700)]
handle PROGRAM_UNIFORM, fix a _mesa_problem() call
Brian [Thu, 21 Dec 2006 00:19:16 +0000 (17:19 -0700)]
Uniform matrix support.
Implement _mesa_uniform_matrix()
Support for program parameters/uniforms with more than 4 elements.
Store 4x4 matrices in column-major order in registers.
Update mat mul built-in functions accordingly.
Brian [Thu, 21 Dec 2006 00:17:38 +0000 (17:17 -0700)]
added _mesa_print_parameter_list()
Brian [Wed, 20 Dec 2006 19:41:59 +0000 (12:41 -0700)]
New IR_COND node for evaluating conditional expressions (for if/while/for).
Brian [Wed, 20 Dec 2006 16:57:56 +0000 (09:57 -0700)]
use cast wrappers for sanity checking
Brian [Wed, 20 Dec 2006 16:56:44 +0000 (09:56 -0700)]
code re-org
Brian [Wed, 20 Dec 2006 16:31:07 +0000 (09:31 -0700)]
Minor clean-ups, reformatting, comment changes.
Brian [Wed, 20 Dec 2006 16:27:42 +0000 (09:27 -0700)]
Fix shader object reference counting and hash table deallocation.
Brian [Wed, 20 Dec 2006 01:46:56 +0000 (18:46 -0700)]
Clean-up and re-org of the main GLSL object types.
Use the gl_shader struct as it should be.
Renamed gl_linked_program to gl_shader_program.
Store both shaders and programs in the same hash table and use the Type field
to distinguish them.
Brian [Wed, 20 Dec 2006 01:02:41 +0000 (18:02 -0700)]
Overhaul of GLSL API functions, dispatching, etc.
Brian [Wed, 20 Dec 2006 01:02:03 +0000 (18:02 -0700)]
Overhaul of GLSL API functions, dispatching, etc.
Brian [Wed, 20 Dec 2006 00:59:32 +0000 (17:59 -0700)]
Massive re-org of GLSL-related API functions.
Added new GLSL functions to struct dd_function_table.
main/shaders.c calls GLSL functions through the dd_function_table.
shader/shader_api.c implements the API functions.
Other assorted changes, fixes everywhere else.
Brian [Tue, 19 Dec 2006 16:52:07 +0000 (09:52 -0700)]
check for null Parameters ptr in _mesa_clone_program()
Brian [Tue, 19 Dec 2006 15:59:51 +0000 (08:59 -0700)]
lots of clean-up and re-org
Brian [Tue, 19 Dec 2006 15:59:36 +0000 (08:59 -0700)]
additional error checking
Brian [Tue, 19 Dec 2006 15:59:19 +0000 (08:59 -0700)]
new error msg
Brian [Tue, 19 Dec 2006 15:58:56 +0000 (08:58 -0700)]
rewrite +=, -= etc for floats
Brian [Tue, 19 Dec 2006 00:54:58 +0000 (17:54 -0700)]
Implement array indexing of simple vec2/3/4 types. A bit of a hack for now...
Brian [Mon, 18 Dec 2006 23:22:27 +0000 (16:22 -0700)]
Added instruction counter to catch infinite loops (temporary).
Brian [Mon, 18 Dec 2006 23:21:58 +0000 (16:21 -0700)]
Check for inst->CondUpdate, print .C suffix.
Brian [Mon, 18 Dec 2006 21:45:26 +0000 (14:45 -0700)]
Generate IR code for for/while loops, break and continue statements.
Brian [Mon, 18 Dec 2006 17:05:24 +0000 (10:05 -0700)]
Implement if-conditionals and while loops, added temporary resolve-branches function in linker.
Brian [Mon, 18 Dec 2006 15:28:54 +0000 (08:28 -0700)]
GLSL API functions.
Brian [Mon, 18 Dec 2006 15:28:06 +0000 (08:28 -0700)]
Use _mesa_free_linked_program_data()
Brian [Mon, 18 Dec 2006 15:25:23 +0000 (08:25 -0700)]
comments
Brian [Sat, 16 Dec 2006 19:52:55 +0000 (12:52 -0700)]
fix comment, handle NOP
Brian [Sat, 16 Dec 2006 19:52:19 +0000 (12:52 -0700)]
Initial code for conditional constructs.
Brian [Sat, 16 Dec 2006 19:51:34 +0000 (12:51 -0700)]
print BRA instructions
Brian [Sat, 16 Dec 2006 19:51:12 +0000 (12:51 -0700)]
added cases for BRA, NOP
Brian [Sat, 16 Dec 2006 19:50:51 +0000 (12:50 -0700)]
cases for NOP, BRA
Brian [Sat, 16 Dec 2006 00:05:53 +0000 (17:05 -0700)]
start implementing relational operators
Brian [Fri, 15 Dec 2006 23:47:42 +0000 (16:47 -0700)]
start rewriting the matrix/vector functions
Brian [Fri, 15 Dec 2006 22:37:32 +0000 (15:37 -0700)]
added assertion to catch use of too many temporaries
Brian [Fri, 15 Dec 2006 22:36:29 +0000 (15:36 -0700)]
fix double-printing of comment info
Brian [Fri, 15 Dec 2006 22:36:09 +0000 (15:36 -0700)]
code movement
Brian [Fri, 15 Dec 2006 22:35:57 +0000 (15:35 -0700)]
Lots of assorted changes.
Implement assignment/move for types larger than 4 floats.
Fix codegen bug for "return expr" in inlined functions.
More clean-up of storage allocation code (slang_resolve_storage).
Brian [Fri, 15 Dec 2006 22:32:11 +0000 (15:32 -0700)]
redo mat4 addition, mat4 constructor from vec4s
Brian [Fri, 15 Dec 2006 17:10:23 +0000 (10:10 -0700)]
vertex/fragment program field changes
Brian [Fri, 15 Dec 2006 17:10:01 +0000 (10:10 -0700)]
varying var changes
Brian [Fri, 15 Dec 2006 17:09:49 +0000 (10:09 -0700)]
varying var changes
Brian [Fri, 15 Dec 2006 17:09:33 +0000 (10:09 -0700)]
varying changes
Brian [Fri, 15 Dec 2006 17:09:12 +0000 (10:09 -0700)]
updated includes
Brian [Fri, 15 Dec 2006 17:08:59 +0000 (10:08 -0700)]
updated includes
Brian [Fri, 15 Dec 2006 17:08:24 +0000 (10:08 -0700)]
use MAX_VARYING
Brian [Fri, 15 Dec 2006 17:08:15 +0000 (10:08 -0700)]
use MAX_VARYING
Brian [Fri, 15 Dec 2006 17:08:02 +0000 (10:08 -0700)]
more debug output
Brian [Fri, 15 Dec 2006 17:07:26 +0000 (10:07 -0700)]
Lots of assorted changes for new GLSL compiler backend.
New datatypes, constants, variables.
Brian [Fri, 15 Dec 2006 16:31:14 +0000 (09:31 -0700)]
Use extfuncs.h helper. Added command line options for loading
vertex/fragment shaders from files.
Brian [Fri, 15 Dec 2006 16:30:31 +0000 (09:30 -0700)]
simple extension function wrangler
Brian [Fri, 15 Dec 2006 15:55:49 +0000 (08:55 -0700)]
change/add/rm several filenames
Brian [Fri, 15 Dec 2006 15:50:02 +0000 (08:50 -0700)]
Renamed s_nvfragprog.[ch] to s_fragprog.[ch]
Brian [Fri, 15 Dec 2006 15:49:27 +0000 (08:49 -0700)]
Renamed s_nvfragprog.[ch] to s_fragprog.[ch], program_instruction.h to prog_instruction.h
Brian [Thu, 14 Dec 2006 22:54:01 +0000 (15:54 -0700)]
remove unneeded includes
Brian [Thu, 14 Dec 2006 22:53:49 +0000 (15:53 -0700)]
remove unneeded includes
Brian [Thu, 14 Dec 2006 22:50:34 +0000 (15:50 -0700)]
remove unneded includes
Brian [Thu, 14 Dec 2006 22:49:09 +0000 (15:49 -0700)]
remove some unneeded includes
Brian [Thu, 14 Dec 2006 22:47:54 +0000 (15:47 -0700)]
include prog_print.h
Brian [Thu, 14 Dec 2006 22:47:34 +0000 (15:47 -0700)]
Remove some moved extern decls.
Brian [Thu, 14 Dec 2006 22:47:08 +0000 (15:47 -0700)]
Move some code from prog_print.c to prog_instruction.c
Brian [Thu, 14 Dec 2006 22:14:14 +0000 (15:14 -0700)]
Renamed from s_nvfragprog.[ch]
Brian [Thu, 14 Dec 2006 22:13:06 +0000 (15:13 -0700)]
Updated includes.
Brian [Thu, 14 Dec 2006 22:03:33 +0000 (15:03 -0700)]
chmod a-x
Brian [Thu, 14 Dec 2006 22:03:04 +0000 (15:03 -0700)]
Updated includes.
Brian [Thu, 14 Dec 2006 22:02:37 +0000 (15:02 -0700)]
Updated includes.
Brian [Thu, 14 Dec 2006 22:02:19 +0000 (15:02 -0700)]
Updated #includes after splitting program.h
Brian [Thu, 14 Dec 2006 22:01:28 +0000 (15:01 -0700)]
Move many functions into new files.
Brian [Thu, 14 Dec 2006 22:01:06 +0000 (15:01 -0700)]
Split the program.[ch] files into several new files.
Brian [Thu, 14 Dec 2006 20:59:53 +0000 (13:59 -0700)]
Modify _mesa_strdup() so it handles NULL correctly.
Brian [Thu, 14 Dec 2006 20:59:25 +0000 (13:59 -0700)]
Updates for new linker (merged varying/uniform vars).
Brian [Thu, 14 Dec 2006 20:58:57 +0000 (13:58 -0700)]
Assorted fix-ups for the new linker.
Disable some of the excessive debug output.
Brian [Thu, 14 Dec 2006 20:58:32 +0000 (13:58 -0700)]
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.
Brian [Thu, 14 Dec 2006 20:56:58 +0000 (13:56 -0700)]
New functions for cloning programs and parameter lists.
Brian [Thu, 14 Dec 2006 16:51:54 +0000 (09:51 -0700)]
Remove include of s_arbshader.h
Brian [Thu, 14 Dec 2006 02:20:45 +0000 (19:20 -0700)]
Remove unneeded -I directories (3Dlabs headers).
Brian [Wed, 13 Dec 2006 22:38:07 +0000 (15:38 -0700)]
Obsolete.
Brian [Wed, 13 Dec 2006 22:36:26 +0000 (15:36 -0700)]
Remove unused 3Dlabs code.
Brian [Wed, 13 Dec 2006 22:36:00 +0000 (15:36 -0700)]
Remove unused 3Dlabs code.
Brian [Wed, 13 Dec 2006 22:34:10 +0000 (15:34 -0700)]
Checkpoint GLSL compiler work. Add new sources, remove obsolete.
Brian [Wed, 13 Dec 2006 22:33:41 +0000 (15:33 -0700)]
Obsolete.
Brian [Wed, 13 Dec 2006 22:33:09 +0000 (15:33 -0700)]
Not needed.
Brian [Wed, 13 Dec 2006 22:06:28 +0000 (15:06 -0700)]
Retire old GLSL shader code.
Brian [Wed, 13 Dec 2006 22:05:23 +0000 (15:05 -0700)]
Checkpoint for GLSL compiler changes.
In brief:
Check for enabled fragment program by looking at ctx->FragmentProgram._Current.
New code for varying variables.
Brian [Wed, 13 Dec 2006 21:58:13 +0000 (14:58 -0700)]
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.
Brian [Wed, 13 Dec 2006 21:54:47 +0000 (14:54 -0700)]
Checkpoint of work for new GLSL compiler back-end. Lots of assorted changes.
Brian [Wed, 13 Dec 2006 21:49:41 +0000 (14:49 -0700)]
Rewrite/simplify most built-in functions to use updated set of __asm instructions.
Brian [Wed, 13 Dec 2006 21:48:36 +0000 (14:48 -0700)]
Checkpoint new GLSL compiler back-end to produce fp/vp-style assembly instructions.
George Sapountzis [Thu, 7 Dec 2006 16:01:13 +0000 (18:01 +0200)]
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.