aboutsummaryrefslogtreecommitdiff
path: root/mesalib
diff options
context:
space:
mode:
Diffstat (limited to 'mesalib')
-rw-r--r--mesalib/src/glsl/ir_builder.cpp2
-rw-r--r--mesalib/windows/VC8/mesa/mesa/mesa.vcxproj1
-rw-r--r--mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters3
3 files changed, 5 insertions, 1 deletions
diff --git a/mesalib/src/glsl/ir_builder.cpp b/mesalib/src/glsl/ir_builder.cpp
index 1e0dd5419..7f41ed69e 100644
--- a/mesalib/src/glsl/ir_builder.cpp
+++ b/mesalib/src/glsl/ir_builder.cpp
@@ -506,7 +506,7 @@ b2f(operand a)
}
ir_expression *
-fma_mesa(operand a, operand b, operand c)
+fma(operand a, operand b, operand c)
{
return expr(ir_triop_fma, a, b, c);
}
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
index 0310a6172..640f07bbf 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
@@ -316,6 +316,7 @@
<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\shaderimage.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\shaderobj.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\shader_query.cpp" />
<ClCompile Include="..\..\..\..\src\mesa\main\texcompress_cpal.c" />
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
index 53d113e6c..d2094db84 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
@@ -773,6 +773,9 @@
<ClCompile Include="..\..\..\..\src\mesa\main\textureview.c">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\src\mesa\main\shaderimage.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\src\glsl\strtod.h">