From 9ac9605de156408580b81ba7e2780bd3f5372c6d Mon Sep 17 00:00:00 2001 From: Michal Krol Date: Mon, 27 Feb 2006 14:41:41 +0000 Subject: More GLSL code: - add x86 code generator; - add full support for uniforms in ARB_shader_objects; - add assembly instruction: global_addr; - reorganize #includes; - built-in uniforms accessed by index, rather than by name; - add some entries to x86sse rtasm; - add configurations to VC6 projects: 'Release x86' and 'Debug x86'; - #define SLANG_X86 active only on VC6 x86 builds; - introduce code export table for a shader; - remove GNU license from the noise library; --- src/mesa/shader/slang/slang_compile_variable.h | 61 -------------------------- 1 file changed, 61 deletions(-) (limited to '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 4261dd1689..6d2e23702f 100644 --- a/src/mesa/shader/slang/slang_compile_variable.h +++ b/src/mesa/shader/slang/slang_compile_variable.h @@ -25,8 +25,6 @@ #if !defined SLANG_COMPILE_VARIABLE_H #define SLANG_COMPILE_VARIABLE_H -#include "slang_export.h" - #if defined __cplusplus extern "C" { #endif @@ -44,49 +42,9 @@ typedef enum slang_type_qualifier_ slang_qual_fixedinput /* internal */ } slang_type_qualifier; -typedef enum slang_type_specifier_type_ -{ - slang_spec_void, - slang_spec_bool, - slang_spec_bvec2, - slang_spec_bvec3, - slang_spec_bvec4, - slang_spec_int, - slang_spec_ivec2, - slang_spec_ivec3, - slang_spec_ivec4, - slang_spec_float, - slang_spec_vec2, - slang_spec_vec3, - slang_spec_vec4, - slang_spec_mat2, - slang_spec_mat3, - slang_spec_mat4, - slang_spec_sampler1D, - slang_spec_sampler2D, - slang_spec_sampler3D, - slang_spec_samplerCube, - slang_spec_sampler1DShadow, - slang_spec_sampler2DShadow, - slang_spec_struct, - slang_spec_array -} slang_type_specifier_type; - slang_type_specifier_type slang_type_specifier_type_from_string (const char *); const char *slang_type_specifier_type_to_string (slang_type_specifier_type); -typedef struct slang_type_specifier_ -{ - slang_type_specifier_type type; - struct slang_struct_ *_struct; /* type: spec_struct */ - struct slang_type_specifier_ *_array; /* type: spec_array */ -} slang_type_specifier; - -int slang_type_specifier_construct (slang_type_specifier *); -void slang_type_specifier_destruct (slang_type_specifier *); -int slang_type_specifier_copy (slang_type_specifier *, const slang_type_specifier *); -int slang_type_specifier_equal (const slang_type_specifier *, const slang_type_specifier *); - typedef struct slang_fully_specified_type_ { slang_type_qualifier qualifier; @@ -125,27 +83,8 @@ int slang_variable_copy (slang_variable *, const slang_variable *); slang_variable *_slang_locate_variable (slang_variable_scope *, slang_atom a_name, GLboolean all); -typedef struct -{ - slang_export_data_quant *quant; - char *name; -} slang_active_uniform; - -typedef struct -{ - slang_active_uniform *table; - GLuint count; -} slang_active_uniforms; - -GLvoid slang_active_uniforms_ctr (slang_active_uniforms *); -GLvoid slang_active_uniforms_dtr (slang_active_uniforms *); -GLboolean slang_active_uniforms_add (slang_active_uniforms *, slang_export_data_quant *, - const char *); - GLboolean _slang_build_export_data_table (slang_export_data_table *, slang_variable_scope *); -GLboolean _slang_gather_active_uniforms (slang_active_uniforms *, slang_export_data_table *); - #ifdef __cplusplus } #endif -- cgit v1.2.3