projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glsl/builtins: Use ivec for texel offsets in textureProjGradOffset.
[mesa.git]
/
src
/
glsl
/
glsl_symbol_table.h
diff --git
a/src/glsl/glsl_symbol_table.h
b/src/glsl/glsl_symbol_table.h
index f26de52432574e00d20e8642c535ebc1fd047964..637bc033b9353fe9160b14720baf691746438b3e 100644
(file)
--- a/
src/glsl/glsl_symbol_table.h
+++ b/
src/glsl/glsl_symbol_table.h
@@
-44,36
+44,34
@@
class symbol_table_entry;
*/
struct glsl_symbol_table {
private:
*/
struct glsl_symbol_table {
private:
- static
int
+ static
void
_glsl_symbol_table_destructor (glsl_symbol_table *table)
{
table->~glsl_symbol_table();
_glsl_symbol_table_destructor (glsl_symbol_table *table)
{
table->~glsl_symbol_table();
-
- return 0;
}
public:
}
public:
- /* Callers of this
t
alloc-based new need not call delete. It's
- * easier to just
t
alloc_free 'ctx' (or any of its ancestors). */
+ /* Callers of this
r
alloc-based new need not call delete. It's
+ * easier to just
r
alloc_free 'ctx' (or any of its ancestors). */
static void* operator new(size_t size, void *ctx)
{
void *table;
static void* operator new(size_t size, void *ctx)
{
void *table;
- table =
t
alloc_size(ctx, size);
+ table =
r
alloc_size(ctx, size);
assert(table != NULL);
assert(table != NULL);
-
talloc_set_destructor(table, (int
(*)(void*)) _glsl_symbol_table_destructor);
+
ralloc_set_destructor(table, (void
(*)(void*)) _glsl_symbol_table_destructor);
return table;
}
/* If the user *does* call delete, that's OK, we will just
return table;
}
/* If the user *does* call delete, that's OK, we will just
- *
t
alloc_free in that case. Here, C++ will have already called the
- * destructor so tell
t
alloc not to do that again. */
+ *
r
alloc_free in that case. Here, C++ will have already called the
+ * destructor so tell
r
alloc not to do that again. */
static void operator delete(void *table)
{
static void operator delete(void *table)
{
-
t
alloc_set_destructor(table, NULL);
-
t
alloc_free(table);
+
r
alloc_set_destructor(table, NULL);
+
r
alloc_free(table);
}
glsl_symbol_table();
}
glsl_symbol_table();
@@
-97,11
+95,16
@@
public:
* reduces the clarity of the intention of code that uses these methods.
*/
/*@{*/
* reduces the clarity of the intention of code that uses these methods.
*/
/*@{*/
- bool add_variable(
const char *name,
ir_variable *v);
+ bool add_variable(ir_variable *v);
bool add_type(const char *name, const glsl_type *t);
bool add_type(const char *name, const glsl_type *t);
- bool add_function(
const char *name,
ir_function *f);
+ bool add_function(ir_function *f);
/*@}*/
/*@}*/
+ /**
+ * Add an function at global scope without checking for scoping conflicts.
+ */
+ void add_global_function(ir_function *f);
+
/**
* \name Methods to get symbols from the table
*/
/**
* \name Methods to get symbols from the table
*/