diff options
author | Michal Krol <mjkrol@gmail.org> | 2006-02-21 12:35:06 +0000 |
---|---|---|
committer | Michal Krol <mjkrol@gmail.org> | 2006-02-21 12:35:06 +0000 |
commit | cc1591667d55a6dbfafbd3d6a7afa9f9288c625d (patch) | |
tree | a3ef92d3a8667e830c94db9441089dbadb45e31a /src/mesa/shader/slang/slang_storage.h | |
parent | 8986e36f368d11bcf3f1938d77b5df69aa2ee11b (diff) |
More GLSL code:
- uniforms (only GetLocation, Uniform1f and Uniform4fv for now for demos);
- fix bugs and optimize array size handling;
- 2D texture sampling (needs Enable(TEXTURE_2D) to work);
- decrease built-in library assembly size by 30%.
Diffstat (limited to 'src/mesa/shader/slang/slang_storage.h')
-rw-r--r-- | src/mesa/shader/slang/slang_storage.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/shader/slang/slang_storage.h b/src/mesa/shader/slang/slang_storage.h index 84206d0156..2a1ddffa0c 100644 --- a/src/mesa/shader/slang/slang_storage.h +++ b/src/mesa/shader/slang/slang_storage.h @@ -85,9 +85,12 @@ GLboolean slang_storage_aggregate_construct (slang_storage_aggregate *); GLvoid slang_storage_aggregate_destruct (slang_storage_aggregate *); GLboolean _slang_aggregate_variable (slang_storage_aggregate *, struct slang_type_specifier_ *, - struct slang_operation_ *, struct slang_function_scope_ *, slang_struct_scope *, + GLuint, struct slang_function_scope_ *, slang_struct_scope *, slang_variable_scope *, struct slang_machine_ *, struct slang_assembly_file_ *,
- slang_atom_pool *); + slang_atom_pool *);
+
+GLboolean _slang_evaluate_int (struct slang_assembly_file_ *, struct slang_machine_ *,
+ struct slang_assembly_name_space_ *, struct slang_operation_ *, GLuint *, slang_atom_pool *); /* * Returns total size (in machine units) of the given aggregate. |