diff options
author | marha <marha@users.sourceforge.net> | 2010-12-29 12:20:21 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-12-29 12:20:21 +0000 |
commit | 053f5dfd42ade05252e586a282e34906db10828d (patch) | |
tree | de215580ce205409a6d810a005c6c5909f3145d1 /mesalib/windows/VC8 | |
parent | 04ceb8c4a0cca3d8682f094d1d6faed8f693afb5 (diff) | |
parent | 807c6931fe683fd844ceec1b023232181e6aae03 (diff) | |
download | vcxsrv-053f5dfd42ade05252e586a282e34906db10828d.tar.gz vcxsrv-053f5dfd42ade05252e586a282e34906db10828d.tar.bz2 vcxsrv-053f5dfd42ade05252e586a282e34906db10828d.zip |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/windows/VC8')
4 files changed, 202 insertions, 163 deletions
diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj index e27516ab9..ff54b3b49 100644 --- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj +++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj @@ -112,59 +112,64 @@ <ClCompile Include="..\..\..\..\src\glsl\glsl_types.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\hir_field_selection.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_algebraic.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_basic_block.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_clone.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_constant_expression.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_constant_folding.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_constant_propagation.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_constant_variable.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_copy_propagation.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_dead_code.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_dead_code_local.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_dead_functions.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_div_to_mul_rcp.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_explog_to_explog2.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_expression_flattening.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_function.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_function_can_inline.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_function_inlining.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_hierarchical_visitor.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_hv_accept.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_if_simplification.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_if_to_cond_assign.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_import_prototypes.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_lower_jumps.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_mat_op_to_vec.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_mod_to_fract.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_noop_swizzle.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_print_visitor.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_reader.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_rvalue_visitor.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_set_program_inouts.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_structure_splitting.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_sub_to_add_neg.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_swizzle_swizzle.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_tree_grafting.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_validate.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_variable.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_variable_refcount.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_vec_index_to_cond_assign.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_vec_index_to_swizzle.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\linker.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\lower_discard.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\lower_if_to_cond_assign.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\lower_instructions.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\lower_jumps.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\lower_mat_op_to_vec.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\lower_noise.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\lower_texture_projection.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\lower_variable_index_to_cond_assign.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\lower_vector.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_cond_assign.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_swizzle.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\main.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_algebraic.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_constant_folding.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_constant_propagation.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_constant_variable.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code_local.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_dead_functions.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_discard_simplification.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_function_inlining.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_if_simplification.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_noop_swizzle.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_structure_splitting.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\strtod.c" />
<ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp" />
<ClCompile Include="..\..\..\..\src\mesa\program\hash_table.c" />
<ClCompile Include="..\..\..\..\src\mesa\program\symbol_table.c" />
<ClCompile Include="..\..\..\..\src\talloc\talloc.c" />
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\..\src\glsl\strtod.h" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters index 5f9719d38..61b196883 100644 --- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters +++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters @@ -51,9 +51,6 @@ <ClCompile Include="..\..\..\..\src\glsl\ir.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_algebraic.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\..\src\glsl\ir_basic_block.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -63,161 +60,175 @@ <ClCompile Include="..\..\..\..\src\glsl\ir_constant_expression.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_constant_folding.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\ir_expression_flattening.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_constant_propagation.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\ir_function.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_constant_variable.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\ir_function_can_inline.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_copy_propagation.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\ir_hierarchical_visitor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_dead_code.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\ir_hv_accept.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_dead_code_local.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\ir_import_prototypes.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_dead_functions.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\ir_print_visitor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_div_to_mul_rcp.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\ir_reader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_explog_to_explog2.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\ir_rvalue_visitor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_expression_flattening.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\ir_set_program_inouts.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_function.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\ir_validate.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_function_can_inline.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\ir_variable.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_function_inlining.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\ir_variable_refcount.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_hierarchical_visitor.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_hv_accept.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\linker.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_if_simplification.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_if_to_cond_assign.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_import_prototypes.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_lower_jumps.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\lower_noise.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_mat_op_to_vec.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\lower_variable_index_to_cond_assign.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_mod_to_fract.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_noop_swizzle.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_print_visitor.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_reader.cpp">
+ <ClCompile Include="..\..\..\..\src\talloc\talloc.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_rvalue_visitor.cpp">
+ <ClCompile Include="..\..\..\..\src\mesa\program\hash_table.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_set_program_inouts.cpp">
+ <ClCompile Include="..\..\..\..\src\mesa\program\symbol_table.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_structure_splitting.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\glcpp\pp.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_sub_to_add_neg.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_swizzle_swizzle.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_tree_grafting.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\getopt.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_validate.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_swizzle.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_variable.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\opt_constant_folding.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_variable_refcount.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\opt_structure_splitting.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_vec_index_to_cond_assign.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\opt_constant_variable.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_vec_index_to_swizzle.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\opt_algebraic.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\opt_if_simplification.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\linker.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\lower_instructions.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code_local.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\opt_discard_simplification.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_cond_assign.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\lower_noise.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\opt_function_inlining.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\lower_variable_index_to_cond_assign.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\lower_texture_projection.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\main.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\opt_dead_functions.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\lower_vector.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\strtod.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\talloc\talloc.c">
+ <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\mesa\program\hash_table.c">
+ <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\mesa\program\symbol_table.c">
+ <ClCompile Include="..\..\..\..\src\glsl\lower_discard.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\glcpp\pp.c">
+ <ClCompile Include="..\..\..\..\src\glsl\lower_mat_op_to_vec.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c">
+ <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c">
+ <ClCompile Include="..\..\..\..\src\glsl\opt_noop_swizzle.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\getopt.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\lower_jumps.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\src\glsl\opt_constant_propagation.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\..\src\glsl\lower_if_to_cond_assign.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\..\src\glsl\strtod.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj index 531f986ff..1c3377e89 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj @@ -117,45 +117,19 @@ <ClCompile Include="..\..\..\..\src\glsl\glsl_types.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\hir_field_selection.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_algebraic.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_basic_block.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_clone.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_constant_expression.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_constant_folding.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_constant_propagation.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_constant_variable.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_copy_propagation.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_dead_code.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_dead_code_local.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_dead_functions.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_div_to_mul_rcp.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_explog_to_explog2.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_expression_flattening.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_function.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_function_can_inline.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_function_inlining.cpp">
- <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- </ForcedIncludeFiles>
- <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- </ForcedIncludeFiles>
- </ClCompile>
<ClCompile Include="..\..\..\..\src\glsl\ir_hierarchical_visitor.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_hv_accept.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_if_simplification.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_if_to_cond_assign.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_import_prototypes.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_lower_jumps.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_mat_op_to_vec.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_mod_to_fract.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_noop_swizzle.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_print_visitor.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_reader.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_rvalue_visitor.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_set_program_inouts.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_structure_splitting.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_sub_to_add_neg.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_swizzle_swizzle.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_tree_grafting.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ir_validate.cpp">
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ForcedIncludeFiles>
@@ -169,16 +143,39 @@ </ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="..\..\..\..\src\glsl\ir_variable_refcount.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_vec_index_to_cond_assign.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\ir_vec_index_to_swizzle.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\linker.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\lower_discard.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\lower_if_to_cond_assign.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\lower_instructions.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\lower_jumps.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\lower_mat_op_to_vec.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\lower_noise.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\lower_texture_projection.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\lower_variable_index_to_cond_assign.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\lower_vector.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_cond_assign.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_swizzle.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_algebraic.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_constant_folding.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_constant_propagation.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_constant_variable.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code_local.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_dead_functions.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_discard_simplification.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_function_inlining.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_if_simplification.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_noop_swizzle.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_structure_splitting.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\strtod.c" />
<ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp" />
<ClCompile Include="..\..\..\..\src\mesa\main\accum.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\api_arrayelt.c" />
@@ -189,6 +186,8 @@ <ClCompile Include="..\..\..\..\src\mesa\main\arbprogram.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\atifragshader.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\nvprogram.c" />
+ <ClCompile Include="..\..\..\..\src\mesa\main\pack.c" />
+ <ClCompile Include="..\..\..\..\src\mesa\main\pixeltransfer.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\querymatrix.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\shaderapi.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\shaderobj.c" />
@@ -246,6 +245,8 @@ <ClCompile Include="..\..\..\..\src\mesa\program\prog_print.c" />
<ClCompile Include="..\..\..\..\src\mesa\program\prog_statevars.c" />
<ClCompile Include="..\..\..\..\src\mesa\program\prog_uniform.c" />
+ <ClCompile Include="..\..\..\..\src\mesa\program\register_allocate.c" />
+ <ClCompile Include="..\..\..\..\src\mesa\program\sampler.cpp" />
<ClCompile Include="..\..\..\..\src\mesa\program\symbol_table.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\hint.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\histogram.c" />
@@ -279,7 +280,6 @@ <ClCompile Include="..\..\..\..\src\mesa\tnl\t_draw.c" />
<ClCompile Include="..\..\..\..\src\mesa\tnl\t_pipeline.c" />
<ClCompile Include="..\..\..\..\src\mesa\tnl\t_rasterpos.c" />
- <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_cull.c" />
<ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_fog.c" />
<ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_light.c" />
<ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_normals.c" />
@@ -327,6 +327,9 @@ <ClCompile Include="..\..\..\..\src\mesa\main\vtxfmt.c" />
<ClCompile Include="..\..\..\..\src\talloc\talloc.c" />
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\..\src\glsl\strtod.h" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters index 302485e50..5c196ca6e 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters @@ -218,9 +218,6 @@ <ClCompile Include="..\..\..\..\src\mesa\tnl\t_rasterpos.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_cull.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_fog.c">
<Filter>Source Files</Filter>
</ClCompile>
@@ -452,9 +449,6 @@ <ClCompile Include="..\..\..\..\src\glsl\ir.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_div_to_mul_rcp.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\..\src\glsl\lower_variable_index_to_cond_assign.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -473,9 +467,6 @@ <ClCompile Include="..\..\..\..\src\glsl\ir_function_can_inline.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_function_inlining.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\..\src\glsl\ir_rvalue_visitor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -497,146 +488,175 @@ <ClCompile Include="..\..\..\..\src\glsl\glsl_parser_extras.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_dead_functions.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\ir_variable_refcount.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_copy_propagation.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\ir_basic_block.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_if_simplification.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\builtin_function.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_dead_code.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_dead_code_local.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_variable_refcount.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\ir_expression_flattening.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_basic_block.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\ir_import_prototypes.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_constant_variable.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_constant_propagation.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_sub_to_add_neg.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_algebraic.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_vec_index_to_swizzle.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\ast_expr.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_tree_grafting.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\hir_field_selection.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_constant_folding.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\glsl_lexer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_noop_swizzle.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_structure_splitting.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\glcpp\pp.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_swizzle_swizzle.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\builtin_function.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\ir_reader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\glsl_parser.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_expression_flattening.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\ir_print_visitor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_import_prototypes.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\ir_validate.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\ir_set_program_inouts.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\lower_noise.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ast_expr.cpp">
+ <ClCompile Include="..\..\..\..\src\mesa\main\pack.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\hir_field_selection.cpp">
+ <ClCompile Include="..\..\..\..\src\mesa\main\pixeltransfer.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\glsl_lexer.cpp">
+ <ClCompile Include="..\..\..\..\src\mesa\program\register_allocate.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_swizzle.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\glcpp\pp.c">
+ <ClCompile Include="..\..\..\..\src\glsl\opt_constant_folding.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c">
+ <ClCompile Include="..\..\..\..\src\glsl\opt_structure_splitting.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c">
+ <ClCompile Include="..\..\..\..\src\glsl\opt_constant_variable.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_reader.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\opt_algebraic.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_mat_op_to_vec.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\opt_if_simplification.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_lower_jumps.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\lower_instructions.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\glsl_parser.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code_local.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_explog_to_explog2.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\opt_discard_simplification.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_if_to_cond_assign.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_cond_assign.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_mod_to_fract.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\opt_function_inlining.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_print_visitor.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\lower_texture_projection.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_validate.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\opt_dead_functions.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_vec_index_to_cond_assign.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\lower_vector.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ir_set_program_inouts.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\strtod.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\lower_noise.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp">
+ <ClCompile Include="..\..\..\..\src\glsl\lower_discard.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\src\glsl\lower_mat_op_to_vec.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\..\src\glsl\opt_noop_swizzle.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\..\src\glsl\lower_jumps.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\..\src\glsl\opt_constant_propagation.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\..\src\glsl\lower_if_to_cond_assign.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\..\src\mesa\program\sampler.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\..\src\glsl\strtod.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file |