1 files changed, 5 insertions, 218 deletions
diff --git a/src/mesa/shader/slang/slang_assemble.h b/src/mesa/shader/slang/slang_assemble.h
index 7e380b3c33..bd49791a89 100644
--- a/src/mesa/shader/slang/slang_assemble.h
+++ b/src/mesa/shader/slang/slang_assemble.h
@@ -30,199 +30,9 @@
 #include "slang_utility.h"
 #include "slang_vartable.h"
 
-#if defined __cplusplus
-extern "C" {
-#endif
-
 
 struct slang_operation_;
 
-typedef enum slang_assembly_type_
-{
-   /* core */
-   slang_asm_none,
-   slang_asm_float_copy,
-   slang_asm_float_move,
-   slang_asm_float_push,
-   slang_asm_float_deref,
-   slang_asm_float_add,       /* a = pop(); b = pop(); push(a + b); */
-   slang_asm_float_subtract,
-   slang_asm_float_multiply,
-   slang_asm_float_divide,
-   slang_asm_float_negate,    /* push(-pop()) */
-   slang_asm_float_less,      /* a = pop(); b = pop(); push(a < b); */
-   slang_asm_float_equal_exp,
-   slang_asm_float_equal_int,
-   slang_asm_float_to_int,    /* push(floatToInt(pop())) */
-   slang_asm_float_sine,      /* push(sin(pop()) */
-   slang_asm_float_cosine,
-   slang_asm_float_arcsine,
-   slang_asm_float_arctan,
-   slang_asm_float_power,     /* push(pow(pop(), pop())) */
-   slang_asm_float_exp,
-   slang_asm_float_exp2,
-   slang_asm_float_rsq,
-   slang_asm_float_rcp,
-   slang_asm_float_log2,
-   slang_asm_float_min,
-   slang_asm_float_max,
-   slang_asm_float_ceil,
-   slang_asm_float_noise1,    /* push(noise1(pop()) */
-   slang_asm_float_noise2,    /* push(noise2(pop(), pop())) */
-   slang_asm_float_noise3,
-   slang_asm_float_noise4,
-
-   slang_asm_int_copy,
-   slang_asm_int_move,
-   slang_asm_int_push,
-   slang_asm_int_deref,
-   slang_asm_int_to_float,
-   slang_asm_int_to_addr,
-
-   slang_asm_bool_copy,
-   slang_asm_bool_move,
-   slang_asm_bool_push,
-   slang_asm_bool_deref,
-
-   slang_asm_addr_copy,
-   slang_asm_addr_push,
-   slang_asm_addr_deref,
-   slang_asm_addr_add,
-   slang_asm_addr_multiply,
-
-   slang_asm_vec4_tex1d,
-   slang_asm_vec4_tex2d,
-   slang_asm_vec4_tex3d,
-   slang_asm_vec4_texcube,
-   slang_asm_vec4_shad1d,
-   slang_asm_vec4_shad2d,
-
-   slang_asm_jump,
-   slang_asm_jump_if_zero,
-
-   slang_asm_enter,
-   slang_asm_leave,
-
-   slang_asm_local_alloc,
-   slang_asm_local_free,
-   slang_asm_local_addr,
-   slang_asm_global_addr,
-
-   slang_asm_call,          /* push(ip); jump(inst->param[0]); */
-   slang_asm_return,
-
-   slang_asm_discard,
-   slang_asm_exit,
-   /* GL_MESA_shader_debug */
-   slang_asm_float_print,
-   slang_asm_int_print,
-   slang_asm_bool_print,
-   /* vec4 */
-   slang_asm_float_to_vec4,
-   slang_asm_vec4_add,
-   slang_asm_vec4_subtract,
-   slang_asm_vec4_multiply,
-   slang_asm_vec4_divide,
-   slang_asm_vec4_negate,
-   slang_asm_vec4_min,
-   slang_asm_vec4_max,
-   slang_asm_vec4_seq,
-   slang_asm_vec4_sne,
-   slang_asm_vec4_sge,
-   slang_asm_vec4_sgt,
-   slang_asm_vec4_dot,
-   slang_asm_vec3_dot,
-   slang_asm_vec3_cross,
-   slang_asm_vec4_floor,
-   slang_asm_vec4_frac,
-   slang_asm_vec4_abs,
-
-   slang_asm_vec4_copy,
-   slang_asm_vec4_deref,
-   slang_asm_vec4_equal_int,
-   /* not a real assembly instruction */
-   slang_asm__last
-} slang_assembly_type;
-
-
-/**
- * An assembly-level shader instruction.
- */
-typedef struct slang_assembly_
-{
-   slang_assembly_type type;  /**< The instruction opcode */
-   GLfloat literal;           /**< float literal */
-   GLuint param[2];           /**< Two integer/address parameters */
-} slang_assembly;
-
-
-/**
- * A list of slang_assembly instructions
- */
-typedef struct slang_assembly_file_
-{
-   slang_assembly *code;
-   GLuint count;
-   GLuint capacity;
-} slang_assembly_file;
-
-
-extern GLvoid
-_slang_assembly_file_ctr(slang_assembly_file *);
-
-extern GLvoid
-slang_assembly_file_destruct(slang_assembly_file *);
-
-extern GLboolean
-slang_assembly_file_push(slang_assembly_file *, slang_assembly_type);
-
-extern GLboolean
-slang_assembly_file_push_label(slang_assembly_file *,
-                               slang_assembly_type, GLuint);
-
-extern GLboolean
-slang_assembly_file_push_label2(slang_assembly_file *, slang_assembly_type,
-                                GLuint, GLuint);
-
-extern GLboolean
-slang_assembly_file_push_literal(slang_assembly_file *,
-                                 slang_assembly_type, GLfloat);
-
-
-typedef struct slang_assembly_file_restore_point_
-{
-   GLuint count;
-} slang_assembly_file_restore_point;
-
-
-extern GLboolean
-slang_assembly_file_restore_point_save(slang_assembly_file *,
-                                       slang_assembly_file_restore_point *);
-
-extern GLboolean
-slang_assembly_file_restore_point_load(slang_assembly_file *,
-                                       slang_assembly_file_restore_point *);
-
-
-typedef struct slang_assembly_flow_control_
-{
-   GLuint loop_start;           /**< for "continue" statement */
-   GLuint loop_end;             /**< for "break" statement */
-   GLuint function_end;         /**< for "return" statement */
-} slang_assembly_flow_control;
-
-typedef struct slang_assembly_local_info_
-{
-   GLuint ret_size;
-   GLuint addr_tmp;
-   GLuint swizzle_tmp;
-} slang_assembly_local_info;
-
-typedef enum
-{
-   slang_ref_force,
-   slang_ref_forbid             /**< slang_ref_freelance */
-} slang_ref_type;
 
 /**
  * Holds complete information about vector swizzle - the <swizzle>
@@ -246,12 +56,8 @@ typedef struct slang_assembly_name_space_
 
 typedef struct slang_assemble_ctx_
 {
-   slang_assembly_file *file;
    slang_atom_pool *atoms;
    slang_assembly_name_space space;
-   slang_assembly_flow_control flow;
-   slang_assembly_local_info local;
-   slang_ref_type ref;
    slang_swizzle swz;
    struct gl_program *program;
    slang_var_table *vartable;
@@ -268,36 +74,17 @@ _slang_locate_function(const struct slang_function_scope_ *funcs,
                        const slang_assembly_name_space *space,
                        slang_atom_pool *);
 
-extern GLboolean
-_slang_assemble_function(slang_assemble_ctx *, struct slang_function_ *);
-
-extern GLboolean
-_slang_cleanup_stack(slang_assemble_ctx *, struct slang_operation_ *);
 
 extern GLboolean
-_slang_dereference(slang_assemble_ctx *, struct slang_operation_ *);
+_slang_is_swizzle(const char *field, GLuint rows, slang_swizzle *swz);
 
 extern GLboolean
-_slang_assemble_function_call(slang_assemble_ctx *, struct slang_function_ *,
-                              struct slang_operation_ *, GLuint, GLboolean);
+_slang_is_swizzle_mask(const slang_swizzle *swz, GLuint rows);
 
-extern GLboolean
-_slang_assemble_function_call_name(slang_assemble_ctx *, const char *,
-                                   struct slang_operation_ *, GLuint,
-                                   GLboolean);
-
-extern GLboolean
-_slang_assemble_operation(slang_assemble_ctx *, struct slang_operation_ *,
-                          slang_ref_type);
-
-
-#ifdef __cplusplus
-}
-#endif
+extern GLvoid
+_slang_multiply_swizzles(slang_swizzle *, const slang_swizzle *,
+                         const slang_swizzle *);
 
-#include "slang_assemble_assignment.h"
 #include "slang_assemble_typeinfo.h"
-#include "slang_assemble_constructor.h"
-#include "slang_assemble_conditional.h"
 
 #endif