slang: Handle OOM condition in new_instruction().

[mesa.git] / src / mesa / shader / slang / slang_compile_variable.h

diff --git a/src/mesa/shader/slang/slang_compile_variable.h b/src/mesa/shader/slang/slang_compile_variable.h
index 554684b75f5ff03a32fd4ef3d6a0ca08354c9ef0..b4585599f248219d1efb33e207a3f09eed3d957e 100644 (file)
--- a/src/mesa/shader/slang/slang_compile_variable.h
+++ b/src/mesa/shader/slang/slang_compile_variable.h
@@ -25,10 +25,6 @@
 #ifndef SLANG_COMPILE_VARIABLE_H
 #define SLANG_COMPILE_VARIABLE_H
 
-#if defined __cplusplus
-extern "C" {
-#endif
-
 
 struct slang_ir_storage_;
 
@@ -42,8 +38,8 @@ typedef struct slang_variable_
    slang_atom a_name;               /**< The variable's name (char *) */
    GLuint array_len;                /**< only if type == SLANG_SPEC_ARRAy */
    struct slang_operation_ *initializer; /**< Optional initializer code */
-   GLuint address;                  /**< Storage location */
    GLuint size;                     /**< Variable's size in bytes */
+   GLboolean is_global;
    GLboolean isTemp;                /**< a named temporary (__resultTmp) */
    GLboolean declared;              /**< for debug */
    struct slang_ir_storage_ *store; /**< Storage for this var */
@@ -87,12 +83,8 @@ extern int
 slang_variable_copy(slang_variable *, const slang_variable *);
 
 extern slang_variable *
-_slang_locate_variable(const slang_variable_scope *, const slang_atom a_name,
+_slang_variable_locate(const slang_variable_scope *, const slang_atom a_name,
                        GLboolean all);
 
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* SLANG_COMPILE_VARIABLE_H */