diff options
author | Dave Airlie <airlied@redhat.com> | 2009-02-13 01:11:25 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-02-13 01:11:25 +1000 |
commit | 53116910b10e3b8a05f42970eff311c21808699f (patch) | |
tree | 6831e50a56a02fed324f8cb119e05d837e00d7cf /src/mesa/shader/slang/slang_compile_function.h | |
parent | 7e104f9cde94279a902b408e8d1cf21779b393a8 (diff) | |
parent | 0ccbc3c905f0594a35d72887a1f115e148aaa596 (diff) |
Merge remote branch 'origin/master' into radeon-rewrite
Conflicts:
configure.ac
src/mesa/drivers/dri/r200/r200_context.c
src/mesa/drivers/dri/r300/r300_render.c
Diffstat (limited to 'src/mesa/shader/slang/slang_compile_function.h')
-rw-r--r-- | src/mesa/shader/slang/slang_compile_function.h | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/src/mesa/shader/slang/slang_compile_function.h b/src/mesa/shader/slang/slang_compile_function.h index a59b094e08..a5445ec253 100644 --- a/src/mesa/shader/slang/slang_compile_function.h +++ b/src/mesa/shader/slang/slang_compile_function.h @@ -26,8 +26,6 @@ #define SLANG_COMPILE_FUNCTION_H -struct slang_code_unit_; - /** * Types of functions. */ @@ -40,21 +38,6 @@ typedef enum slang_function_kind_ /** - * When we need to fill in addresses which we won't know until the future, - * we keep track of them with a fix-up table. - */ -typedef struct slang_fixup_table_ -{ - GLuint *table; /**< array[count] of addresses */ - GLuint count; -} slang_fixup_table; - -extern void slang_fixup_table_init(slang_fixup_table *); -extern void slang_fixup_table_free(slang_fixup_table *); -extern GLboolean slang_fixup_save(slang_fixup_table *fixups, GLuint address); - - -/** * Description of a compiled shader function. */ typedef struct slang_function_ @@ -64,12 +47,14 @@ typedef struct slang_function_ slang_variable_scope *parameters; /**< formal parameters AND local vars */ unsigned int param_count; /**< number of formal params (no locals) */ slang_operation *body; /**< The instruction tree */ - unsigned int address; /**< Address of this func in memory */ - slang_fixup_table fixups; /**< Mem locations which need func's address */ } slang_function; extern int slang_function_construct(slang_function *); extern void slang_function_destruct(slang_function *); +extern slang_function *slang_function_new(slang_function_kind kind); + +extern GLboolean +_slang_function_has_return_value(const slang_function *fun); /** @@ -89,13 +74,19 @@ _slang_function_scope_ctr(slang_function_scope *); extern void slang_function_scope_destruct(slang_function_scope *); -extern GLboolean -_slang_function_has_return_value(const slang_function *fun); - extern int slang_function_scope_find_by_name(slang_function_scope *, slang_atom, int); extern slang_function * slang_function_scope_find(slang_function_scope *, slang_function *, int); +extern struct slang_function_ * +_slang_function_locate(const struct slang_function_scope_ *funcs, + slang_atom name, struct slang_operation_ *params, + GLuint num_params, + const struct slang_name_space_ *space, + slang_atom_pool *atoms, slang_info_log *log, + GLboolean *error); + + #endif /* SLANG_COMPILE_FUNCTION_H */ |