From a7313d3a6c1a2074ab83fa3d605cd2c5e4a99f87 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 4 Jun 2013 17:08:21 +0200
Subject: Solved compilation problems

---
 mesalib/src/mapi/glapi/gen/gen.bat                     |  2 +-
 mesalib/src/mapi/glapi/gen/gen.sh                      |  2 +-
 .../mesa/glsl_apps_compile/glsl_apps_compile.vcxproj   |  5 +++++
 .../glsl_apps_compile.vcxproj.filters                  | 15 +++++++++++++++
 mesalib/windows/VC8/mesa/makefile                      | 11 +++++++----
 mesalib/windows/VC8/mesa/mesa/mesa.vcxproj             |  6 ++++++
 mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters     | 18 ++++++++++++++++++
 7 files changed, 53 insertions(+), 6 deletions(-)

(limited to 'mesalib')

diff --git a/mesalib/src/mapi/glapi/gen/gen.bat b/mesalib/src/mapi/glapi/gen/gen.bat
index 5759bacf3..aec698a80 100644
--- a/mesalib/src/mapi/glapi/gen/gen.bat
+++ b/mesalib/src/mapi/glapi/gen/gen.bat
@@ -22,5 +22,5 @@ glX_proto_send.py -m init_c > indirect_init.c
 
 gl_enums.py -f gl_and_es_API.xml > enums.c
 remap_helper.py -f gl_and_es_API.xml > remap_helper.h
-copy ..\..\mapi\mapi_abi.py
+copy ..\..\mapi_abi.py
 mapi_abi.py --printer glapi --mode lib gl_and_es_API.xml > glapi_mapi_tmp.h
diff --git a/mesalib/src/mapi/glapi/gen/gen.sh b/mesalib/src/mapi/glapi/gen/gen.sh
index c4d8cf914..1c50f2c5c 100755
--- a/mesalib/src/mapi/glapi/gen/gen.sh
+++ b/mesalib/src/mapi/glapi/gen/gen.sh
@@ -21,6 +21,6 @@
 
 ./gl_enums.py -f gl_and_es_API.xml > enums.c
 ./remap_helper.py -f gl_and_es_API.xml > remap_helper.h
-cp ../../mapi/mapi_abi.py .
+cp ../../mapi_abi.py .
 ./mapi_abi.py --printer glapi --mode lib gl_and_es_API.xml > glapi_mapi_tmp.h
 
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 f30faa3c3..84c85879c 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
@@ -90,6 +90,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\glsl\ast_array_index.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ast_expr.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp" />
@@ -126,6 +127,7 @@
     <ClCompile Include="..\..\..\..\src\glsl\ir_variable_refcount.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\linker.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\link_interface_blocks.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\link_uniforms.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\link_uniform_blocks.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\link_uniform_block_active_visitor.cpp" />
@@ -141,11 +143,13 @@
     <ClCompile Include="..\..\..\..\src\glsl\lower_jumps.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\lower_clip_distance.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\lower_mat_op_to_vec.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\lower_named_interface_blocks.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\lower_noise.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\lower_packed_varyings.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_vector_insert.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" />
@@ -160,6 +164,7 @@
     <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code_local.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\opt_dead_functions.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\opt_flatten_nested_if_blocks.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\opt_flip_matrices.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" />
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 c96c9bee8..a037b606b 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
@@ -270,6 +270,21 @@
     <ClCompile Include="..\..\..\..\src\glsl\opt_flatten_nested_if_blocks.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\ast_array_index.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\lower_vector_insert.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\opt_flip_matrices.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\lower_named_interface_blocks.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\link_interface_blocks.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\src\glsl\strtod.h">
diff --git a/mesalib/windows/VC8/mesa/makefile b/mesalib/windows/VC8/mesa/makefile
index 45ecd6cd7..9b19ad899 100644
--- a/mesalib/windows/VC8/mesa/makefile
+++ b/mesalib/windows/VC8/mesa/makefile
@@ -46,7 +46,8 @@ DEPS:=$(wildcard ..\..\..\src\mesa\swrast\*.c) \
       ..\..\..\src\mesa\main\glapitable.h \
       ..\..\..\src\mesa\main\enums.c \
       ..\..\..\src\mesa\main\api_exec.c \
-      ..\..\..\src\mesa\main\get_hash.h
+      ..\..\..\src\mesa\main\get_hash.h \
+      ..\..\..\src\mesa\main\remap_helper.h
 
 all: Release\swrast_dri.dll Debug\swrast_dri.dll
 
@@ -62,11 +63,13 @@ all: Release\swrast_dri.dll Debug\swrast_dri.dll
 ..\..\..\src\mesa\main\api_exec.c: $(wildcard ..\..\..\src\mapi\glapi\gen\*.xml) ..\..\..\src\mapi\glapi\gen\gl_genexec.py
 	cd ..\..\..\src\mapi\glapi\gen & python gl_genexec.py -f gl_and_es_API.xml > ..\..\..\mesa\main\api_exec.c
 
-API_DEFINES=-DFEATURE_GL=1
 GET_HASH_GEN = ..\..\..\src\mesa\main\get_hash_generator.py
-GET_HASH_GEN_FLAGS := $(patsubst -DFEATURE_%=1,-a %, $(patsubst -DFEATURE_%=0,,$(API_DEFINES)))
 ..\..\..\src\mesa\main\get_hash.h: ..\..\..\src\mapi\glapi\gen\gl_and_es_API.xml ..\..\..\src\mesa\main\get_hash_params.py $(GET_HASH_GEN)
-	python $(GET_HASH_GEN) $(GET_HASH_GEN_FLAGS) -f $< > $@
+	python $(GET_HASH_GEN) -f $< > $@
+
+REMAP_HELPER = ..\..\..\src\mapi\glapi\gen\remap_helper.py
+..\..\..\src\mesa\main\remap_helper.h: ..\..\..\src\mapi\glapi\gen\gl_and_es_API.xml $(REMAP_HELPER)
+	python $(REMAP_HELPER) -f $< > $@
 
 Debug\swrast_dri.dll: $(DEPS)
 	$(BUILDCMD) "Debug|Win32"
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
index 31f8742c6..f0470d3a1 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
@@ -103,6 +103,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\glsl\ast_array_index.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ast_expr.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp" />
@@ -148,6 +149,7 @@
     <ClCompile Include="..\..\..\..\src\glsl\ir_variable_refcount.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\linker.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\link_interface_blocks.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\link_uniforms.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\link_uniform_blocks.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\link_uniform_block_active_visitor.cpp" />
@@ -163,11 +165,13 @@
     <ClCompile Include="..\..\..\..\src\glsl\lower_jumps.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\lower_clip_distance.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\lower_mat_op_to_vec.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\lower_named_interface_blocks.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\lower_noise.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\lower_packed_varyings.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_vector_insert.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" />
@@ -181,6 +185,7 @@
     <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code_local.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\opt_dead_functions.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\opt_flatten_nested_if_blocks.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\opt_flip_matrices.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" />
@@ -208,6 +213,7 @@
     <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\remap.c" />
     <ClCompile Include="..\..\..\..\src\mesa\main\set.c" />
     <ClCompile Include="..\..\..\..\src\mesa\main\shaderapi.c" />
     <ClCompile Include="..\..\..\..\src\mesa\main\shaderobj.c" />
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
index 45950cfb5..b1cb9b736 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
@@ -728,6 +728,24 @@
     <ClCompile Include="..\..\..\..\src\glsl\opt_flatten_nested_if_blocks.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\remap.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\lower_vector_insert.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\lower_named_interface_blocks.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\link_interface_blocks.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\opt_flip_matrices.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\ast_array_index.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\src\glsl\strtod.h">
-- 
cgit v1.2.3