From cc1591667d55a6dbfafbd3d6a7afa9f9288c625d Mon Sep 17 00:00:00 2001 From: Michal Krol Date: Tue, 21 Feb 2006 12:35:06 +0000 Subject: 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%. --- src/mesa/shader/slang/slang_assemble.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/mesa/shader/slang/slang_assemble.h') diff --git a/src/mesa/shader/slang/slang_assemble.h b/src/mesa/shader/slang/slang_assemble.h index ec273aa308c..99c407d75ae 100644 --- a/src/mesa/shader/slang/slang_assemble.h +++ b/src/mesa/shader/slang/slang_assemble.h @@ -73,6 +73,7 @@ typedef enum slang_assembly_type_ slang_asm_addr_deref, slang_asm_addr_add, slang_asm_addr_multiply, + slang_asm_vec4_tex2d, slang_asm_jump, slang_asm_jump_if_zero, slang_asm_enter, @@ -179,7 +180,7 @@ slang_function *_slang_locate_function (slang_function_scope *funcs, slang_atom GLboolean _slang_assemble_function (slang_assemble_ctx *, struct slang_function_ *); -GLboolean _slang_cleanup_stack_ (slang_assemble_ctx *, slang_operation *); +GLboolean _slang_cleanup_stack (slang_assemble_ctx *, slang_operation *); GLboolean _slang_dereference (slang_assemble_ctx *, slang_operation *); @@ -189,7 +190,7 @@ GLboolean _slang_assemble_function_call (slang_assemble_ctx *, slang_function *, GLboolean _slang_assemble_function_call_name (slang_assemble_ctx *, const char *, slang_operation *, GLuint, GLboolean); -GLboolean _slang_assemble_operation_ (slang_assemble_ctx *, struct slang_operation_ *, slang_ref_type); +GLboolean _slang_assemble_operation (slang_assemble_ctx *, struct slang_operation_ *, slang_ref_type); #ifdef __cplusplus } -- cgit v1.2.3